diff --git a/src/js/common/utils/cordovaUtils.js b/src/js/common/utils/cordovaUtils.js index e565d25..53b1606 100644 --- a/src/js/common/utils/cordovaUtils.js +++ b/src/js/common/utils/cordovaUtils.js @@ -1,7 +1,7 @@ import React from 'react'; import webAppConfig from '../../config'; import { isAndroid, isAndroidTablet, isCordova, isWebApp } from './isCordovaOrWebApp'; -import { cordovaOffsetLog, oAuthLog } from './logging'; +import { cordovaOffsetLog, authLog } from './logging'; /* global $ */ @@ -76,18 +76,18 @@ export function cordovaOpenSafariViewSub (requestURL, onExit) { if (isIOS()) { console.log(`cordovaOpenSafariView -1- requestURL: ${requestURL}`); SafariViewController.isAvailable(() => { // eslint-disable-line no-undef - oAuthLog(`cordovaOpenSafariView requestURL: ${requestURL}`); + authLog(`cordovaOpenSafariView requestURL: ${requestURL}`); SafariViewController.show({ // eslint-disable-line no-undef url: requestURL, dismissButton: 1, }, (result) => { if (result.event === 'opened') { - oAuthLog(`cordovaOpenSafariView opened url: ${requestURL}`); + authLog(`cordovaOpenSafariView opened url: ${requestURL}`); } else if (result.event === 'loaded') { - oAuthLog(`cordovaOpenSafariView URL result from loading: ${JSON.stringify(result)}`); + authLog(`cordovaOpenSafariView URL result from loading: ${JSON.stringify(result)}`); } else if (result.event === 'closed') { - oAuthLog(`cordovaOpenSafariView closed: ${JSON.stringify(result)}`); + authLog(`cordovaOpenSafariView closed: ${JSON.stringify(result)}`); if (onExit) { onExit(); } @@ -95,7 +95,7 @@ export function cordovaOpenSafariViewSub (requestURL, onExit) { }, (msg) => { - oAuthLog(`cordovaOpenSafariView KO: ${JSON.stringify(msg)}`); + authLog(`cordovaOpenSafariView KO: ${JSON.stringify(msg)}`); }); }); } else { diff --git a/src/js/common/utils/logging.js b/src/js/common/utils/logging.js index 0e21049..b516f8c 100644 --- a/src/js/common/utils/logging.js +++ b/src/js/common/utils/logging.js @@ -44,8 +44,8 @@ export function httpLog (text, res) { } // Log oAuth steps -export function oAuthLog (text, res) { - if (webAppConfig.LOG_SIGNIN_STEPS) { +export function authLog (text, res) { + if (webAppConfig.LOG_AUTHENTICATION) { if (res) { console.log('>> oAuth >> ', text, res); } else { diff --git a/src/js/components/PrivateRoute.jsx b/src/js/components/PrivateRoute.jsx index 0fbfb29..9cc1940 100644 --- a/src/js/components/PrivateRoute.jsx +++ b/src/js/components/PrivateRoute.jsx @@ -1,11 +1,12 @@ import React from 'react'; import { Navigate, Outlet, useLocation } from 'react-router'; +import { authLog } from '../common/utils/logging'; import { useConnectAppContext } from '../contexts/ConnectAppContext'; const PrivateRoute = () => { const { getAppContextValue } = useConnectAppContext(); const isAuthenticated = getAppContextValue('isAuthenticated'); - console.log('========= PrivateRoute =========== isAuthenticated: ', isAuthenticated); + authLog('========= PrivateRoute =========== isAuthenticated: ', isAuthenticated); const location = useLocation(); return isAuthenticated ? : ; diff --git a/src/js/config-template.js b/src/js/config-template.js index 8e82163..a102d58 100644 --- a/src/js/config-template.js +++ b/src/js/config-template.js @@ -51,7 +51,7 @@ module.exports = { LOG_ONLY_FIRST_RENDER_EVENTS: false, LOG_HTTP_REQUESTS: false, LOG_ROUTING: false, - LOG_SIGNIN_STEPS: false, // oAuthLog function prints to console + LOG_AUTHENTICATION: false, // authLog function prints to console LOG_CORDOVA_OFFSETS: false, SHOW_CORDOVA_URL_FIELD: false, // Only needed for debugging in Cordova ENABLE_REACT_QUERY_TOOLS: false, // Show ReactQueryDevtools icon/console