authscape 1.0.710 → 1.0.712

package/index.js

@@ -60,7 +60,7 @@ function AuthScapeApp(_ref) {
   var queryCodeUsed = (0, _react.useRef)(null);
   var ga4React = (0, _react.useRef)(null);
   var searchParams = (0, _navigation.useSearchParams)();
-  var queryCode = searchParams.get('code');
+  var queryCode = searchParams.get("code");
   var pathname = (0, _navigation.usePathname)();
 
   // ---------- PKCE Sign-in ----------
@@ -77,15 +77,21 @@ function AuthScapeApp(_ref) {
             return _context.abrupt("return");
           case 2:
             queryCodeUsed.current = queryCode;
+            if (!(typeof window === "undefined")) {
+              _context.next = 5;
+              break;
+            }
+            return _context.abrupt("return");
+          case 5:
             codeVerifier = window.localStorage.getItem("verifier");
             if (!(!queryCode || !codeVerifier)) {
-              _context.next = 6;
+              _context.next = 8;
               break;
             }
             return _context.abrupt("return");
-          case 6:
+          case 8:
             headers = {
-              'Content-Type': 'application/x-www-form-urlencoded'
+              "Content-Type": "application/x-www-form-urlencoded"
             };
             queryString = _queryString["default"].stringify({
               code: queryCode,
@@ -95,53 +101,53 @@ function AuthScapeApp(_ref) {
               client_secret: process.env.client_secret,
               code_verifier: codeVerifier
             });
-            _context.prev = 8;
-            _context.next = 11;
-            return _axios["default"].post(process.env.authorityUri + '/connect/token', queryString, {
+            _context.prev = 10;
+            _context.next = 13;
+            return _axios["default"].post(process.env.authorityUri + "/connect/token", queryString, {
               headers: headers
             });
-          case 11:
+          case 13:
             response = _context.sent;
-            domainHost = window.location.hostname.split('.').slice(-2).join('.');
+            domainHost = window.location.hostname.split(".").slice(-2).join(".");
             window.localStorage.removeItem("verifier");
-            _context.next = 16;
-            return setCookie('access_token', response.data.access_token, {
-              maxAge: 60 * 60 * 24 * 365,
-              path: '/',
-              domain: domainHost,
-              secure: true
-            });
-          case 16:
             _context.next = 18;
-            return setCookie('expires_in', response.data.expires_in, {
+            return setCookie("access_token", response.data.access_token, {
               maxAge: 60 * 60 * 24 * 365,
-              path: '/',
+              path: "/",
               domain: domainHost,
               secure: true
             });
           case 18:
             _context.next = 20;
-            return setCookie('refresh_token', response.data.refresh_token, {
+            return setCookie("expires_in", response.data.expires_in, {
               maxAge: 60 * 60 * 24 * 365,
-              path: '/',
+              path: "/",
               domain: domainHost,
               secure: true
             });
           case 20:
+            _context.next = 22;
+            return setCookie("refresh_token", response.data.refresh_token, {
+              maxAge: 60 * 60 * 24 * 365,
+              path: "/",
+              domain: domainHost,
+              secure: true
+            });
+          case 22:
             redirectUri = localStorage.getItem("redirectUri");
             localStorage.clear();
             window.location.href = redirectUri || "/";
-            _context.next = 28;
+            _context.next = 30;
             break;
-          case 25:
-            _context.prev = 25;
-            _context.t0 = _context["catch"](8);
+          case 27:
+            _context.prev = 27;
+            _context.t0 = _context["catch"](10);
             console.error("PKCE sign-in failed", _context.t0);
-          case 28:
+          case 30:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[8, 25]]);
+      }, _callee, null, [[10, 27]]);
     }));
     return function signInValidator(_x) {
       return _ref2.apply(this, arguments);
@@ -157,7 +163,7 @@ function AuthScapeApp(_ref) {
       return _regeneratorRuntime().wrap(function _callee2$(_context2) {
         while (1) switch (_context2.prev = _context2.next) {
           case 0:
-            if (!(!_ga4React["default"].isInitialized() && G && typeof window !== "undefined")) {
+            if (!(typeof window !== "undefined" && !_ga4React["default"].isInitialized() && G)) {
               _context2.next = 10;
               break;
             }
@@ -190,6 +196,7 @@ function AuthScapeApp(_ref) {
   var databaseDrivenPageView = function databaseDrivenPageView(pathName) {
     var _signedInUser$current, _signedInUser$current2, _signedInUser$current3;
     if (process.env.enableDatabaseAnalytics !== "true") return;
+    if (typeof window === "undefined") return;
     if (pathName === "/signin-oidc") return;
     var host = window.location.protocol + "//" + window.location.host;
     apiService().post("/Analytics/PageView", {
@@ -201,7 +208,7 @@ function AuthScapeApp(_ref) {
     });
   };
 
-  // ---------- Auth + Tracking Init ----------
+  // ---------- Auth Init ----------
   (0, _react.useEffect)(function () {
     if (queryCode) {
       signInValidator(queryCode);
@@ -221,7 +228,7 @@ function AuthScapeApp(_ref) {
 
   // ---------- Analytics Init ----------
   (0, _react.useEffect)(function () {
-    if (!frontEndLoadedState) return;
+    if (!frontEndLoadedState || typeof window === "undefined") return;
     if (pageProps.googleAnalytics4Code) {
       initGA(pageProps.googleAnalytics4Code);
     } else if (process.env.googleAnalytics4) {
@@ -233,7 +240,7 @@ function AuthScapeApp(_ref) {
       _reactMicrosoftClarity.clarity.init(process.env.microsoftClarityTrackingCode);
     }
     databaseDrivenPageView(window.location.pathname);
-    _router["default"].events.on('routeChangeComplete', function (url) {
+    _router["default"].events.on("routeChangeComplete", function (url) {
       var _ga4React$current;
       (_ga4React$current = ga4React.current) === null || _ga4React$current === void 0 || _ga4React$current.pageview(url);
       databaseDrivenPageView(url);

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.710",
+  "version": "1.0.712",
   "description": "",
   "main": "index.js",
   "scripts": {

package/src/components/AuthScapeApp.js

@@ -1,15 +1,15 @@
-import React, { useState, useRef, useEffect } from 'react';
-import { ToastContainer, toast } from 'react-toastify';
-import { ThemeProvider } from '@mui/material/styles';
+import React, { useState, useRef, useEffect } from "react";
+import { ToastContainer, toast } from "react-toastify";
+import { ThemeProvider } from "@mui/material/styles";
 import Head from "next/head";
-import { useSearchParams, usePathname } from 'next/navigation';
-import axios from 'axios';
+import { useSearchParams, usePathname } from "next/navigation";
+import axios from "axios";
 import querystring from "query-string";
-import Router from 'next/router';
-import GA4React from 'ga-4-react';
-import { create } from 'zustand';
-import { clarity } from 'react-microsoft-clarity';
-import { authService } from 'authscape';
+import Router from "next/router";
+import GA4React from "ga-4-react";
+import { create } from "zustand";
+import { clarity } from "react-microsoft-clarity";
+import { authService } from "authscape";
 
 export function AuthScapeApp({
   Component,
@@ -19,7 +19,7 @@ export function AuthScapeApp({
   muiTheme = {},
   store = {},
   enforceLoggedIn = false,
-  enableAuth = true
+  enableAuth = true,
 }) {
   const [frontEndLoadedState, setFrontEndLoadedState] = useState(false);
   const [isLoadingShow, setIsLoadingShow] = useState(false);
@@ -31,7 +31,7 @@ export function AuthScapeApp({
   const ga4React = useRef(null);
 
   const searchParams = useSearchParams();
-  const queryCode = searchParams.get('code');
+  const queryCode = searchParams.get("code");
   const pathname = usePathname();
 
   // ---------- PKCE Sign-in ----------
@@ -39,10 +39,12 @@ export function AuthScapeApp({
     if (queryCodeUsed.current === queryCode) return;
     queryCodeUsed.current = queryCode;
 
+    if (typeof window === "undefined") return;
+
     const codeVerifier = window.localStorage.getItem("verifier");
     if (!queryCode || !codeVerifier) return;
 
-    const headers = { 'Content-Type': 'application/x-www-form-urlencoded' };
+    const headers = { "Content-Type": "application/x-www-form-urlencoded" };
 
     const queryString = querystring.stringify({
       code: queryCode,
@@ -50,32 +52,40 @@ export function AuthScapeApp({
       redirect_uri: window.location.origin + "/signin-oidc",
       client_id: process.env.client_id,
       client_secret: process.env.client_secret,
-      code_verifier: codeVerifier
+      code_verifier: codeVerifier,
     });
 
     try {
-      const response = await axios.post(process.env.authorityUri + '/connect/token', queryString, { headers });
-      const domainHost = window.location.hostname.split('.').slice(-2).join('.');
+      const response = await axios.post(
+        process.env.authorityUri + "/connect/token",
+        queryString,
+        { headers }
+      );
+
+      const domainHost = window.location.hostname
+        .split(".")
+        .slice(-2)
+        .join(".");
 
       window.localStorage.removeItem("verifier");
 
-      await setCookie('access_token', response.data.access_token, {
+      await setCookie("access_token", response.data.access_token, {
         maxAge: 60 * 60 * 24 * 365,
-        path: '/',
+        path: "/",
         domain: domainHost,
-        secure: true
+        secure: true,
       });
-      await setCookie('expires_in', response.data.expires_in, {
+      await setCookie("expires_in", response.data.expires_in, {
         maxAge: 60 * 60 * 24 * 365,
-        path: '/',
+        path: "/",
         domain: domainHost,
-        secure: true
+        secure: true,
       });
-      await setCookie('refresh_token', response.data.refresh_token, {
+      await setCookie("refresh_token", response.data.refresh_token, {
         maxAge: 60 * 60 * 24 * 365,
-        path: '/',
+        path: "/",
         domain: domainHost,
-        secure: true
+        secure: true,
       });
 
       const redirectUri = localStorage.getItem("redirectUri");
@@ -88,8 +98,14 @@ export function AuthScapeApp({
 
   // ---------- GA + Clarity ----------
   async function initGA(G) {
-    if (!GA4React.isInitialized() && G && typeof window !== "undefined") {
-      ga4React.current = new GA4React(G, { debug_mode: !process.env.production });
+    if (
+      typeof window !== "undefined" &&
+      !GA4React.isInitialized() &&
+      G
+    ) {
+      ga4React.current = new GA4React(G, {
+        debug_mode: !process.env.production,
+      });
       try {
         await ga4React.current.initialize();
       } catch (error) {
@@ -106,6 +122,7 @@ export function AuthScapeApp({
 
   const databaseDrivenPageView = (pathName) => {
     if (process.env.enableDatabaseAnalytics !== "true") return;
+    if (typeof window === "undefined") return;
     if (pathName === "/signin-oidc") return;
 
     const host = window.location.protocol + "//" + window.location.host;
@@ -115,11 +132,11 @@ export function AuthScapeApp({
       locationId: signedInUser.current?.locationId,
       companyId: signedInUser.current?.companyId,
       uri: pathName,
-      host
+      host,
     });
   };
 
-  // ---------- Auth + Tracking Init ----------
+  // ---------- Auth Init ----------
   useEffect(() => {
     if (queryCode) {
       signInValidator(queryCode);
@@ -139,7 +156,7 @@ export function AuthScapeApp({
 
   // ---------- Analytics Init ----------
   useEffect(() => {
-    if (!frontEndLoadedState) return;
+    if (!frontEndLoadedState || typeof window === "undefined") return;
 
     if (pageProps.googleAnalytics4Code) {
       initGA(pageProps.googleAnalytics4Code);
@@ -155,7 +172,7 @@ export function AuthScapeApp({
 
     databaseDrivenPageView(window.location.pathname);
 
-    Router.events.on('routeChangeComplete', (url) => {
+    Router.events.on("routeChangeComplete", (url) => {
       ga4React.current?.pageview(url);
       databaseDrivenPageView(url);
     });
@@ -163,32 +180,59 @@ export function AuthScapeApp({
 
   // ---------- Enforce Login ----------
   useEffect(() => {
-    if (enforceLoggedIn && pathname !== "/signin-oidc" && frontEndLoadedState && !signedInUserState) {
+    if (
+      enforceLoggedIn &&
+      pathname !== "/signin-oidc" &&
+      frontEndLoadedState &&
+      !signedInUserState
+    ) {
       authService().login();
     }
   }, [signedInUserState, enforceLoggedIn, frontEndLoadedState, pathname]);
 
   const GetSignedInUser = () => signedInUser.current;
-
-  const useStore = create((set) => (store));
+  const useStore = create((set) => store);
 
   // ---------- Render ----------
   const pageContent = layout
     ? layout({
-        children: <Component {...pageProps} currentUser={GetSignedInUser()} loadedUser={frontEndLoadedState} setIsLoading={setIsLoadingShow} logEvent={logEvent} store={useStore} toast={toast} />,
+        children: (
+          <Component
+            {...pageProps}
+            currentUser={GetSignedInUser()}
+            loadedUser={frontEndLoadedState}
+            setIsLoading={setIsLoadingShow}
+            logEvent={logEvent}
+            store={useStore}
+            toast={toast}
+          />
+        ),
         currentUser: GetSignedInUser(),
         setIsLoading: setIsLoadingShow,
         logEvent,
         toast,
         store: useStore,
-        pageProps
+        pageProps,
       })
-    : <Component {...pageProps} currentUser={GetSignedInUser()} loadedUser={frontEndLoadedState} setIsLoading={setIsLoadingShow} logEvent={logEvent} store={useStore} toast={toast} />;
+    : (
+      <Component
+        {...pageProps}
+        currentUser={GetSignedInUser()}
+        loadedUser={frontEndLoadedState}
+        setIsLoading={setIsLoadingShow}
+        logEvent={logEvent}
+        store={useStore}
+        toast={toast}
+      />
+    );
 
   return (
     <>
       <Head>
-        <meta name="viewport" content="width=device-width, initial-scale=0.86, maximum-scale=5.0, minimum-scale=0.86" />
+        <meta
+          name="viewport"
+          content="width=device-width, initial-scale=0.86, maximum-scale=5.0, minimum-scale=0.86"
+        />
       </Head>
 
       <ThemeProvider theme={muiTheme}>