authscape 1.0.768 → 1.0.772

package/index.js

@@ -4,6 +4,7 @@ Object.defineProperty(exports, "__esModule", {
   value: true
 });
 exports.AuthScapeApp = AuthScapeApp;
+exports.AuthScapeProvider = void 0;
 Object.defineProperty(exports, "Bounce", {
   enumerable: true,
   get: function get() {
@@ -41,10 +42,9 @@ exports.useNotifications = useNotifications;
 var _react = _interopRequireWildcard(require("react"));
 var _reactToastify = require("react-toastify");
 var _head = _interopRequireDefault(require("next/head"));
-var _navigation = require("next/navigation");
+var _router = _interopRequireWildcard(require("next/router"));
 var _axios = _interopRequireDefault(require("axios"));
 var _queryString = _interopRequireDefault(require("query-string"));
-var _router = _interopRequireDefault(require("next/router"));
 var _ga4React = _interopRequireDefault(require("ga-4-react"));
 var _zustand = require("zustand");
 var _reactMicrosoftClarity = require("react-microsoft-clarity");
@@ -136,10 +136,10 @@ function logError(_x) {
   return _logError.apply(this, arguments);
 }
 function _logError() {
-  _logError = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee10(errorData) {
+  _logError = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee0(errorData) {
     var error, response;
-    return _regeneratorRuntime().wrap(function _callee10$(_context10) {
-      while (1) switch (_context10.prev = _context10.next) {
+    return _regeneratorRuntime().wrap(function _callee0$(_context0) {
+      while (1) switch (_context0.prev = _context0.next) {
         case 0:
           if (!errorTrackingSessionId && typeof window !== 'undefined') {
             errorTrackingSessionId = getOrCreateSessionId();
@@ -156,25 +156,25 @@ function _logError() {
             ipAddress: '',
             metadata: errorData.metadata || null
           };
-          _context10.prev = 2;
-          _context10.next = 5;
+          _context0.prev = 2;
+          _context0.next = 5;
           return module.exports.apiService().post('/ErrorTracking/LogError', error);
         case 5:
-          response = _context10.sent;
+          response = _context0.sent;
           if (response && response.status !== 200) {
             console.error('Error tracking API returned:', response.status);
           }
-          _context10.next = 12;
+          _context0.next = 12;
           break;
         case 9:
-          _context10.prev = 9;
-          _context10.t0 = _context10["catch"](2);
-          console.error('Failed to send error to tracking system:', _context10.t0.message);
+          _context0.prev = 9;
+          _context0.t0 = _context0["catch"](2);
+          console.error('Failed to send error to tracking system:', _context0.t0.message);
         case 12:
         case "end":
-          return _context10.stop();
+          return _context0.stop();
       }
-    }, _callee10, null, [[2, 9]]);
+    }, _callee0, null, [[2, 9]]);
   }));
   return _logError.apply(this, arguments);
 }
@@ -725,57 +725,68 @@ function ensureUserHelpers(u) {
 // ============================================================================
 // AuthScapeApp Component
 // ============================================================================
-function AuthScapeApp(_ref10) {
-  var _searchParams$get;
-  var Component = _ref10.Component,
-    layout = _ref10.layout,
-    loadingLayout = _ref10.loadingLayout,
-    signInLoadingComponent = _ref10.signInLoadingComponent,
-    pageProps = _ref10.pageProps,
-    _ref10$muiTheme = _ref10.muiTheme,
-    muiTheme = _ref10$muiTheme === void 0 ? null : _ref10$muiTheme,
-    _ref10$store = _ref10.store,
-    store = _ref10$store === void 0 ? {} : _ref10$store,
-    _ref10$enforceLoggedI = _ref10.enforceLoggedIn,
-    enforceLoggedIn = _ref10$enforceLoggedI === void 0 ? false : _ref10$enforceLoggedI,
-    _ref10$enableAuth = _ref10.enableAuth,
-    enableAuth = _ref10$enableAuth === void 0 ? true : _ref10$enableAuth,
-    _ref10$enableNotifica = _ref10.enableNotifications,
-    enableNotifications = _ref10$enableNotifica === void 0 ? true : _ref10$enableNotifica,
-    _ref10$enableErrorTra = _ref10.enableErrorTracking,
-    enableErrorTracking = _ref10$enableErrorTra === void 0 ? true : _ref10$enableErrorTra,
-    _ref10$toastConfig = _ref10.toastConfig,
-    toastConfig = _ref10$toastConfig === void 0 ? {} : _ref10$toastConfig,
-    _ref10$onUserLoaded = _ref10.onUserLoaded,
-    onUserLoaded = _ref10$onUserLoaded === void 0 ? null : _ref10$onUserLoaded;
+function AuthScapeApp(_ref0) {
+  var Component = _ref0.Component,
+    layout = _ref0.layout,
+    loadingLayout = _ref0.loadingLayout,
+    signInLoadingComponent = _ref0.signInLoadingComponent,
+    pageProps = _ref0.pageProps,
+    _ref0$muiTheme = _ref0.muiTheme,
+    muiTheme = _ref0$muiTheme === void 0 ? null : _ref0$muiTheme,
+    _ref0$store = _ref0.store,
+    store = _ref0$store === void 0 ? {} : _ref0$store,
+    _ref0$enforceLoggedIn = _ref0.enforceLoggedIn,
+    enforceLoggedIn = _ref0$enforceLoggedIn === void 0 ? false : _ref0$enforceLoggedIn,
+    _ref0$enableAuth = _ref0.enableAuth,
+    enableAuth = _ref0$enableAuth === void 0 ? true : _ref0$enableAuth,
+    _ref0$enableNotificat = _ref0.enableNotifications,
+    enableNotifications = _ref0$enableNotificat === void 0 ? true : _ref0$enableNotificat,
+    _ref0$enableErrorTrac = _ref0.enableErrorTracking,
+    enableErrorTracking = _ref0$enableErrorTrac === void 0 ? true : _ref0$enableErrorTrac,
+    _ref0$toastConfig = _ref0.toastConfig,
+    toastConfig = _ref0$toastConfig === void 0 ? {} : _ref0$toastConfig,
+    _ref0$onUserLoaded = _ref0.onUserLoaded,
+    onUserLoaded = _ref0$onUserLoaded === void 0 ? null : _ref0$onUserLoaded;
   var _useState9 = (0, _react.useState)(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    frontEndLoadedState = _useState10[0],
-    setFrontEndLoadedState = _useState10[1];
-  var _useState11 = (0, _react.useState)(false),
+    _useState0 = _slicedToArray(_useState9, 2),
+    frontEndLoadedState = _useState0[0],
+    setFrontEndLoadedState = _useState0[1];
+  var _useState1 = (0, _react.useState)(false),
+    _useState10 = _slicedToArray(_useState1, 2),
+    isLoadingShow = _useState10[0],
+    setIsLoadingShow = _useState10[1];
+  var _useState11 = (0, _react.useState)(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    isLoadingShow = _useState12[0],
-    setIsLoadingShow = _useState12[1];
-  var _useState13 = (0, _react.useState)(null),
+    signedInUserState = _useState12[0],
+    setSignedInUserState = _useState12[1];
+  var _useState13 = (0, _react.useState)(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    signedInUserState = _useState14[0],
-    setSignedInUserState = _useState14[1];
-  var _useState15 = (0, _react.useState)(false),
-    _useState16 = _slicedToArray(_useState15, 2),
-    isSigningIn = _useState16[0],
-    setIsSigningIn = _useState16[1];
+    isSigningIn = _useState14[0],
+    setIsSigningIn = _useState14[1];
   var loadingAuth = (0, _react.useRef)(false);
   var signedInUser = (0, _react.useRef)(null);
   var queryCodeUsed = (0, _react.useRef)(null);
   var ga4React = (0, _react.useRef)(null);
   var errorTrackingInitializedRef = (0, _react.useRef)(false);
   var loginRedirectPending = (0, _react.useRef)(false);
-  var searchParams = (0, _navigation.useSearchParams)();
-  var queryCode = (_searchParams$get = searchParams === null || searchParams === void 0 ? void 0 : searchParams.get("code")) !== null && _searchParams$get !== void 0 ? _searchParams$get : null;
-  var pathname = (0, _navigation.usePathname)();
+
+  // Use Pages Router's `useRouter` instead of `useSearchParams`/`usePathname`
+  // from `next/navigation`. The `next/navigation` hooks don't hydrate query
+  // params reliably on the 404 page in Webkit/Safari — when the IDP redirects
+  // back to /signin-oidc (a URL with no Next.js page in the consumer project),
+  // useSearchParams() returns null and the PKCE code is never picked up.
+  // The Pages Router router parses query from `asPath` and works on 404 too.
+  var router = (0, _router.useRouter)();
+  var rawQueryCode = router.isReady ? router.query.code : null;
+  // router.query values can be string | string[] — coerce to a single string.
+  var queryCode = typeof rawQueryCode === "string" ? rawQueryCode : Array.isArray(rawQueryCode) ? rawQueryCode[0] : null;
+  // Pages Router's `router.pathname` returns the route file path (e.g. "/_error"
+  // for the 404 page). The auth-redirect guard below compares against
+  // "/signin-oidc", so we derive the actual URL path from `asPath` instead.
+  var pathname = (router.asPath || "").split("?")[0].split("#")[0];
   var signInValidator = /*#__PURE__*/function () {
-    var _ref11 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(codeFromQuery) {
-      var codeVerifier, headers, body, response, domainHost, redirectUri;
+    var _ref1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(codeFromQuery) {
+      var codeVerifier, headers, body, response, domainHost, redirectUri, usr, enrichedUser;
       return _regeneratorRuntime().wrap(function _callee8$(_context8) {
         while (1) switch (_context8.prev = _context8.next) {
           case 0:
@@ -844,24 +855,65 @@ function AuthScapeApp(_ref10) {
             resetRedirectCounter();
             redirectUri = window.localStorage.getItem("redirectUri") || "/";
             window.localStorage.clear();
-            window.location.href = redirectUri;
-            _context8.next = 35;
+
+            // Pre-load user while spinner is still showing — eliminates the
+            // second GetCurrentUser call (and resulting re-renders) on the destination page.
+            usr = null;
+            _context8.prev = 27;
+            _context8.next = 30;
+            return module.exports.apiService().GetCurrentUser();
+          case 30:
+            usr = _context8.sent;
+            _context8.next = 36;
             break;
-          case 29:
-            _context8.prev = 29;
-            _context8.t0 = _context8["catch"](14);
-            console.error("PKCE sign-in failed", _context8.t0);
+          case 33:
+            _context8.prev = 33;
+            _context8.t0 = _context8["catch"](27);
+            console.warn("[AuthScape] GetCurrentUser failed after token exchange:", _context8.t0);
+          case 36:
+            enrichedUser = ensureUserHelpers(usr);
+            signedInUser.current = enrichedUser;
+            setSignedInUserState(enrichedUser);
+            setFrontEndLoadedState(true);
+
+            // Prevent the useEffect from calling GetCurrentUser again when queryCode → null.
+            loadingAuth.current = true;
+            if (enableErrorTracking && enrichedUser && !errorTrackingInitializedRef.current) {
+              initializeErrorTracking(enrichedUser);
+              errorTrackingInitializedRef.current = true;
+            }
+            if (onUserLoaded && enrichedUser) {
+              onUserLoaded(enrichedUser);
+            }
+
+            // Dismiss spinner before navigating so destination renders logged-in UI on first paint.
+            setIsSigningIn(false);
+
+            // Client-side navigation preserves the React component tree and all ref values,
+            // eliminating the hard-reload → remount → re-render chain.
+            // Fall back to hard navigation for absolute external URLs.
+            if (redirectUri.startsWith("http://") || redirectUri.startsWith("https://")) {
+              window.location.href = redirectUri;
+            } else {
+              _router["default"].push(redirectUri);
+            }
+            _context8.next = 53;
+            break;
+          case 47:
+            _context8.prev = 47;
+            _context8.t1 = _context8["catch"](14);
+            console.error("PKCE sign-in failed", _context8.t1);
             window.localStorage.clear();
             setIsSigningIn(false);
             setFrontEndLoadedState(true);
-          case 35:
+          case 53:
           case "end":
             return _context8.stop();
         }
-      }, _callee8, null, [[14, 29]]);
+      }, _callee8, null, [[14, 47], [27, 33]]);
     }));
     return function signInValidator(_x4) {
-      return _ref11.apply(this, arguments);
+      return _ref1.apply(this, arguments);
     };
   }();
   function initGA(_x5) {
@@ -1063,6 +1115,11 @@ function AuthScapeApp(_ref10) {
     customTheme: muiTheme
   }, wrappedContent), /*#__PURE__*/_react["default"].createElement(_reactToastify.ToastContainer, defaultToastConfig), loadingLayout && loadingLayout(isLoadingShow));
 }
+
+// AuthScapeProvider is the umbrella component that bundles the three always-on AuthScape
+// features (auth, error tracking, analytics) plus optional in-app notifications. Wrap your
+// NextJS _app.js return value with it. Existing call sites can continue using AuthScapeApp.
+var AuthScapeProvider = exports.AuthScapeProvider = AuthScapeApp;
 "use strict";
 
 function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
@@ -1546,25 +1603,25 @@ var DocumentManager = exports.DocumentManager = function DocumentManager(_ref) {
     masterFolder = _useState8[0],
     setMasterFolder = _useState8[1];
   var _useState9 = (0, _react.useState)([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    breadCrumb = _useState10[0],
-    setBreadCrumb = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    breadCrumb = _useState0[0],
+    setBreadCrumb = _useState0[1];
+  var _useState1 = (0, _react.useState)(null),
+    _useState10 = _slicedToArray(_useState1, 2),
+    uploadParentId = _useState10[0],
+    setUploadParentId = _useState10[1];
   var _useState11 = (0, _react.useState)(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    uploadParentId = _useState12[0],
-    setUploadParentId = _useState12[1];
+    contextMenu = _useState12[0],
+    setContextMenu = _useState12[1];
   var _useState13 = (0, _react.useState)(null),
     _useState14 = _slicedToArray(_useState13, 2),
-    contextMenu = _useState14[0],
-    setContextMenu = _useState14[1];
-  var _useState15 = (0, _react.useState)(null),
+    contextFile = _useState14[0],
+    setContextFile = _useState14[1];
+  var _useState15 = (0, _react.useState)(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    contextFile = _useState16[0],
-    setContextFile = _useState16[1];
-  var _useState17 = (0, _react.useState)(false),
-    _useState18 = _slicedToArray(_useState17, 2),
-    dialogDelete = _useState18[0],
-    setDialogDelete = _useState18[1];
+    dialogDelete = _useState16[0],
+    setDialogDelete = _useState16[1];
   var handleContextMenu = function handleContextMenu(event, file) {
     event.preventDefault();
     setContextFile(file);
@@ -1657,10 +1714,10 @@ var DocumentManager = exports.DocumentManager = function DocumentManager(_ref) {
       fetchDocuments();
     }
   }, [loadedUser, folderParent, update]);
-  var _useState19 = (0, _react.useState)(null),
-    _useState20 = _slicedToArray(_useState19, 2),
-    anchorEl = _useState20[0],
-    setAnchorEl = _useState20[1];
+  var _useState17 = (0, _react.useState)(null),
+    _useState18 = _slicedToArray(_useState17, 2),
+    anchorEl = _useState18[0],
+    setAnchorEl = _useState18[1];
   var open = Boolean(anchorEl);
   var handleClick = function handleClick(event) {
     setAnchorEl(event.currentTarget);
@@ -2536,21 +2593,21 @@ var FileUploader = exports.FileUploader = function FileUploader(_ref) {
     viewDeleteDialog = _useState8[0],
     setViewDeleteDialog = _useState8[1];
   var _useState9 = (0, _react.useState)([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    filesUploaded = _useState10[0],
-    setFilesUploaded = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    filesUploaded = _useState0[0],
+    setFilesUploaded = _useState0[1];
+  var _useState1 = (0, _react.useState)(null),
+    _useState10 = _slicedToArray(_useState1, 2),
+    orderFileId = _useState10[0],
+    setOrderFileId = _useState10[1];
   var _useState11 = (0, _react.useState)(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    orderFileId = _useState12[0],
-    setOrderFileId = _useState12[1];
-  var _useState13 = (0, _react.useState)(null),
+    filesDownloadable = _useState12[0],
+    setFilesDownloadable = _useState12[1];
+  var _useState13 = (0, _react.useState)([]),
     _useState14 = _slicedToArray(_useState13, 2),
-    filesDownloadable = _useState14[0],
-    setFilesDownloadable = _useState14[1];
-  var _useState15 = (0, _react.useState)([]),
-    _useState16 = _slicedToArray(_useState15, 2),
-    parameters = _useState16[0],
-    setParameters = _useState16[1];
+    parameters = _useState14[0],
+    setParameters = _useState14[1];
   var fileUploader = (0, _react.useRef)();
   var handleUpload = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(event) {
@@ -3282,13 +3339,13 @@ var GoogleMapsAutoComplete = exports.GoogleMapsAutoComplete = function GoogleMap
     zip = _useState8[0],
     setPostalcode = _useState8[1];
   var _useState9 = (0, _react.useState)(null),
-    _useState10 = _slicedToArray(_useState9, 2),
-    lat = _useState10[0],
-    setLat = _useState10[1];
-  var _useState11 = (0, _react.useState)(null),
-    _useState12 = _slicedToArray(_useState11, 2),
-    lng = _useState12[0],
-    setLng = _useState12[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    lat = _useState0[0],
+    setLat = _useState0[1];
+  var _useState1 = (0, _react.useState)(null),
+    _useState10 = _slicedToArray(_useState1, 2),
+    lng = _useState10[0],
+    setLng = _useState10[1];
   return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_Box["default"], null, /*#__PURE__*/_react["default"].createElement(AutoCompleteDialog, {
     placeholder: "Address",
     defaultValue: address,
@@ -3412,25 +3469,25 @@ function AssignMapping(_ref) {
     documentType = _useState8[0],
     setDocumentType = _useState8[1];
   var _useState9 = (0, _react.useState)(null),
-    _useState10 = _slicedToArray(_useState9, 2),
-    documentName = _useState10[0],
-    setDocumentName = _useState10[1];
-  var _useState11 = (0, _react.useState)(1),
+    _useState0 = _slicedToArray(_useState9, 2),
+    documentName = _useState0[0],
+    setDocumentName = _useState0[1];
+  var _useState1 = (0, _react.useState)(1),
+    _useState10 = _slicedToArray(_useState1, 2),
+    urlTick = _useState10[0],
+    setURLTick = _useState10[1];
+  var _useState11 = (0, _react.useState)(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    urlTick = _useState12[0],
-    setURLTick = _useState12[1];
-  var _useState13 = (0, _react.useState)(null),
+    spreadSheetAddress = _useState12[0],
+    setSpreadSheetAddress = _useState12[1];
+  var _useState13 = (0, _react.useState)(false),
     _useState14 = _slicedToArray(_useState13, 2),
-    spreadSheetAddress = _useState14[0],
-    setSpreadSheetAddress = _useState14[1];
-  var _useState15 = (0, _react.useState)(false),
+    showPreviewDialog = _useState14[0],
+    setShowPreviewDialog = _useState14[1];
+  var _useState15 = (0, _react.useState)(null),
     _useState16 = _slicedToArray(_useState15, 2),
-    showPreviewDialog = _useState16[0],
-    setShowPreviewDialog = _useState16[1];
-  var _useState17 = (0, _react.useState)(null),
-    _useState18 = _slicedToArray(_useState17, 2),
-    advanceQuery = _useState18[0],
-    setAdvanceQuery = _useState18[1];
+    advanceQuery = _useState16[0],
+    setAdvanceQuery = _useState16[1];
   var spreadSheetRef = (0, _react.useRef)(null);
   var fetchMappingTo = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee() {
@@ -3936,9 +3993,9 @@ function Datasources(_ref) {
     databaseTables = _useState8[0],
     setDatabaseTables = _useState8[1];
   var _useState9 = (0, _react.useState)("database"),
-    _useState10 = _slicedToArray(_useState9, 2),
-    mappingType = _useState10[0],
-    setMappingType = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    mappingType = _useState0[0],
+    setMappingType = _useState0[1];
   var refTypeName = (0, _react.useRef)(null);
   var refAssemblyFullName = (0, _react.useRef)(null);
   (0, _react.useEffect)(function () {
@@ -4283,49 +4340,49 @@ function ManageMappingDocuments(_ref) {
     showTrainingDocument = _useState8[0],
     setShowTrainingDocument = _useState8[1];
   var _useState9 = (0, _react.useState)(''),
-    _useState10 = _slicedToArray(_useState9, 2),
-    columnName = _useState10[0],
-    setColumnName = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    columnName = _useState0[0],
+    setColumnName = _useState0[1];
+  var _useState1 = (0, _react.useState)(null),
+    _useState10 = _slicedToArray(_useState1, 2),
+    selectedAddedColumn = _useState10[0],
+    setSelectedAddedColumn = _useState10[1];
   var _useState11 = (0, _react.useState)(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    selectedAddedColumn = _useState12[0],
-    setSelectedAddedColumn = _useState12[1];
+    documentMappingColumns = _useState12[0],
+    setDocumentMappingColumns = _useState12[1];
   var _useState13 = (0, _react.useState)(null),
     _useState14 = _slicedToArray(_useState13, 2),
-    documentMappingColumns = _useState14[0],
-    setDocumentMappingColumns = _useState14[1];
+    toColumnOptions = _useState14[0],
+    setToColumnOptions = _useState14[1];
   var _useState15 = (0, _react.useState)(null),
     _useState16 = _slicedToArray(_useState15, 2),
-    toColumnOptions = _useState16[0],
-    setToColumnOptions = _useState16[1];
+    removeDocument = _useState16[0],
+    setRemoveDocument = _useState16[1];
   var _useState17 = (0, _react.useState)(null),
     _useState18 = _slicedToArray(_useState17, 2),
-    removeDocument = _useState18[0],
-    setRemoveDocument = _useState18[1];
-  var _useState19 = (0, _react.useState)(null),
+    selectedDocumentComponentId = _useState18[0],
+    setSelectedDocumentComponentId = _useState18[1];
+  var _useState19 = (0, _react.useState)(0),
     _useState20 = _slicedToArray(_useState19, 2),
-    selectedDocumentComponentId = _useState20[0],
-    setSelectedDocumentComponentId = _useState20[1];
+    dataGridRefreshKey = _useState20[0],
+    setDataGridRefreshKey = _useState20[1];
   var _useState21 = (0, _react.useState)(0),
     _useState22 = _slicedToArray(_useState21, 2),
-    dataGridRefreshKey = _useState22[0],
-    setDataGridRefreshKey = _useState22[1];
-  var _useState23 = (0, _react.useState)(0),
+    dataGridMappingRefreshKey = _useState22[0],
+    setDataGridMappingRefreshKey = _useState22[1];
+  var _useState23 = (0, _react.useState)(null),
     _useState24 = _slicedToArray(_useState23, 2),
-    dataGridMappingRefreshKey = _useState24[0],
-    setDataGridMappingRefreshKey = _useState24[1];
-  var _useState25 = (0, _react.useState)(null),
+    selectedDocument = _useState24[0],
+    setSelectedDocument = _useState24[1];
+  var _useState25 = (0, _react.useState)(0),
     _useState26 = _slicedToArray(_useState25, 2),
-    selectedDocument = _useState26[0],
-    setSelectedDocument = _useState26[1];
-  var _useState27 = (0, _react.useState)(0),
+    status = _useState26[0],
+    setStatus = _useState26[1];
+  var _useState27 = (0, _react.useState)([]),
     _useState28 = _slicedToArray(_useState27, 2),
-    status = _useState28[0],
-    setStatus = _useState28[1];
-  var _useState29 = (0, _react.useState)([]),
-    _useState30 = _slicedToArray(_useState29, 2),
-    componentTypes = _useState30[0],
-    setComponentTypes = _useState30[1];
+    componentTypes = _useState28[0],
+    setComponentTypes = _useState28[1];
   var refHeaderRowInput = (0, _react.useRef)(null);
   var fileUploaderRef = (0, _react.useRef)(null);
   var refNewDocumentName = (0, _react.useRef)(null);
@@ -6050,9 +6107,9 @@ function AddDomain(_ref) {
     fullDomain = _useState8[0],
     setFullDomain = _useState8[1];
   var _useState9 = (0, _react.useState)(null),
-    _useState10 = _slicedToArray(_useState9, 2),
-    errorMessage = _useState10[0],
-    setErrorMessage = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    errorMessage = _useState0[0],
+    setErrorMessage = _useState0[1];
   var refDomain = (0, _react.useRef)(null);
   var refCNameTarget = (0, _react.useRef)(null);
   var reftxtTarget = (0, _react.useRef)(null);
@@ -6590,29 +6647,29 @@ function PrivateLabelEditor(_ref) {
     oEMDomainList = _useState8[0],
     setOEMDomainList = _useState8[1];
   var _useState9 = (0, _react.useState)([]),
-    _useState10 = _slicedToArray(_useState9, 2),
-    dnsFields = _useState10[0],
-    setDnsFields = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    dnsFields = _useState0[0],
+    setDnsFields = _useState0[1];
+  var _useState1 = (0, _react.useState)(null),
+    _useState10 = _slicedToArray(_useState1, 2),
+    selectedFont = _useState10[0],
+    setSelectedFont = _useState10[1];
   var _useState11 = (0, _react.useState)(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    selectedFont = _useState12[0],
-    setSelectedFont = _useState12[1];
+    fontUri = _useState12[0],
+    setFontUri = _useState12[1];
   var _useState13 = (0, _react.useState)(null),
     _useState14 = _slicedToArray(_useState13, 2),
-    fontUri = _useState14[0],
-    setFontUri = _useState14[1];
-  var _useState15 = (0, _react.useState)(null),
+    oEMDomain = _useState14[0],
+    setOEMDomain = _useState14[1];
+  var _useState15 = (0, _react.useState)(''),
     _useState16 = _slicedToArray(_useState15, 2),
-    oEMDomain = _useState16[0],
-    setOEMDomain = _useState16[1];
-  var _useState17 = (0, _react.useState)(''),
+    stateBaseUri = _useState16[0],
+    setBaseUri = _useState16[1];
+  var _useState17 = (0, _react.useState)(false),
     _useState18 = _slicedToArray(_useState17, 2),
-    stateBaseUri = _useState18[0],
-    setBaseUri = _useState18[1];
-  var _useState19 = (0, _react.useState)(false),
-    _useState20 = _slicedToArray(_useState19, 2),
-    isNewAccount = _useState20[0],
-    setIsNewAccount = _useState20[1];
+    isNewAccount = _useState18[0],
+    setIsNewAccount = _useState18[1];
   var handleChange = function handleChange(event, newValue) {
     setValue(newValue);
   };
@@ -7312,17 +7369,17 @@ function Toolbar(_ref3) {
     isUnderline = _useState8[0],
     setIsUnderline = _useState8[1];
   var _useState9 = (0, _react.useState)(false),
-    _useState10 = _slicedToArray(_useState9, 2),
-    isStrikethrough = _useState10[0],
-    setIsStrikethrough = _useState10[1];
-  var _useState11 = (0, _react.useState)(false),
+    _useState0 = _slicedToArray(_useState9, 2),
+    isStrikethrough = _useState0[0],
+    setIsStrikethrough = _useState0[1];
+  var _useState1 = (0, _react.useState)(false),
+    _useState10 = _slicedToArray(_useState1, 2),
+    isCode = _useState10[0],
+    setIsCode = _useState10[1];
+  var _useState11 = (0, _react.useState)('paragraph'),
     _useState12 = _slicedToArray(_useState11, 2),
-    isCode = _useState12[0],
-    setIsCode = _useState12[1];
-  var _useState13 = (0, _react.useState)('paragraph'),
-    _useState14 = _slicedToArray(_useState13, 2),
-    blockType = _useState14[0],
-    setBlockType = _useState14[1];
+    blockType = _useState12[0],
+    setBlockType = _useState12[1];
   var updateToolbar = (0, _react.useCallback)(function () {
     var selection = (0, _lexical.$getSelection)();
     if ((0, _lexical.$isRangeSelection)(selection)) {
@@ -7551,14 +7608,14 @@ var RichTextEditor = exports.RichTextEditor = function RichTextEditor(_ref5) {
     height = _ref5$height === void 0 ? 400 : _ref5$height,
     _ref5$isDisabled = _ref5.isDisabled,
     isDisabled = _ref5$isDisabled === void 0 ? false : _ref5$isDisabled;
-  var _useState15 = (0, _react.useState)(html || ''),
+  var _useState13 = (0, _react.useState)(html || ''),
+    _useState14 = _slicedToArray(_useState13, 2),
+    editorHtml = _useState14[0],
+    setEditorHtml = _useState14[1];
+  var _useState15 = (0, _react.useState)(false),
     _useState16 = _slicedToArray(_useState15, 2),
-    editorHtml = _useState16[0],
-    setEditorHtml = _useState16[1];
-  var _useState17 = (0, _react.useState)(false),
-    _useState18 = _slicedToArray(_useState17, 2),
-    isMounted = _useState18[0],
-    setIsMounted = _useState18[1];
+    isMounted = _useState16[0],
+    setIsMounted = _useState16[1];
   (0, _react.useEffect)(function () {
     setIsMounted(true);
   }, []);
@@ -7732,52 +7789,52 @@ var SpreadsheetViewer = exports.SpreadsheetViewer = /*#__PURE__*/(0, _react.forw
   var _useState9 = (0, _react.useState)(function () {
       return [];
     }),
-    _useState10 = _slicedToArray(_useState9, 2),
-    cellChanges = _useState10[0],
-    setCellChanges = _useState10[1];
+    _useState0 = _slicedToArray(_useState9, 2),
+    cellChanges = _useState0[0],
+    setCellChanges = _useState0[1];
   var highlightsRef = (0, _react.useRef)([]);
   var userIdRef = (0, _react.useRef)(0);
   var returnedRef = (0, _react.useRef)([]);
-  var _useState11 = (0, _react.useState)(false),
-    _useState12 = _slicedToArray(_useState11, 2),
-    showStickyDialog = _useState12[0],
-    setShowStickyDialog = _useState12[1];
+  var _useState1 = (0, _react.useState)(false),
+    _useState10 = _slicedToArray(_useState1, 2),
+    showStickyDialog = _useState10[0],
+    setShowStickyDialog = _useState10[1];
   var leftColumnRef = (0, _react.useRef)(null);
   var rightColumnRef = (0, _react.useRef)(null);
   var topRowRef = (0, _react.useRef)(null);
   var bottomRowRef = (0, _react.useRef)(null);
+  var _useState11 = (0, _react.useState)(null),
+    _useState12 = _slicedToArray(_useState11, 2),
+    leftColumnSticky = _useState12[0],
+    setLeftColumnSticky = _useState12[1];
   var _useState13 = (0, _react.useState)(null),
     _useState14 = _slicedToArray(_useState13, 2),
-    leftColumnSticky = _useState14[0],
-    setLeftColumnSticky = _useState14[1];
+    rightColumnSticky = _useState14[0],
+    setRightColumnSticky = _useState14[1];
   var _useState15 = (0, _react.useState)(null),
     _useState16 = _slicedToArray(_useState15, 2),
-    rightColumnSticky = _useState16[0],
-    setRightColumnSticky = _useState16[1];
+    topRowSticky = _useState16[0],
+    setTopRowSticky = _useState16[1];
   var _useState17 = (0, _react.useState)(null),
     _useState18 = _slicedToArray(_useState17, 2),
-    topRowSticky = _useState18[0],
-    setTopRowSticky = _useState18[1];
-  var _useState19 = (0, _react.useState)(null),
+    bottomRowSticky = _useState18[0],
+    setBottomRowSticky = _useState18[1];
+  var _useState19 = (0, _react.useState)([]),
     _useState20 = _slicedToArray(_useState19, 2),
-    bottomRowSticky = _useState20[0],
-    setBottomRowSticky = _useState20[1];
+    highlights = _useState20[0],
+    setHighlights = _useState20[1];
   var _useState21 = (0, _react.useState)([]),
     _useState22 = _slicedToArray(_useState21, 2),
-    highlights = _useState22[0],
-    setHighlights = _useState22[1];
+    sessions = _useState22[0],
+    setSessions = _useState22[1];
   var _useState23 = (0, _react.useState)([]),
     _useState24 = _slicedToArray(_useState23, 2),
-    sessions = _useState24[0],
-    setSessions = _useState24[1];
-  var _useState25 = (0, _react.useState)([]),
+    requestedChanges = _useState24[0],
+    setRequestedChanges = _useState24[1];
+  var _useState25 = (0, _react.useState)(null),
     _useState26 = _slicedToArray(_useState25, 2),
-    requestedChanges = _useState26[0],
-    setRequestedChanges = _useState26[1];
-  var _useState27 = (0, _react.useState)(null),
-    _useState28 = _slicedToArray(_useState27, 2),
-    hubConnection = _useState28[0],
-    setHubConnection = _useState28[1];
+    hubConnection = _useState26[0],
+    setHubConnection = _useState26[1];
   var getRows = function getRows() {
     return returnedRef.current;
   };
@@ -8837,17 +8894,17 @@ function StripePayment(_ref3) {
     walletId = _useState8[0],
     setWalletId = _useState8[1];
   var _useState9 = (0, _react.useState)(0),
-    _useState10 = _slicedToArray(_useState9, 2),
-    value = _useState10[0],
-    setValue = _useState10[1];
-  var _useState11 = (0, _react.useState)([]),
+    _useState0 = _slicedToArray(_useState9, 2),
+    value = _useState0[0],
+    setValue = _useState0[1];
+  var _useState1 = (0, _react.useState)([]),
+    _useState10 = _slicedToArray(_useState1, 2),
+    paymentMethods = _useState10[0],
+    setPaymentMethods = _useState10[1];
+  var _useState11 = (0, _react.useState)(null),
     _useState12 = _slicedToArray(_useState11, 2),
-    paymentMethods = _useState12[0],
-    setPaymentMethods = _useState12[1];
-  var _useState13 = (0, _react.useState)(null),
-    _useState14 = _slicedToArray(_useState13, 2),
-    paymentMethod = _useState14[0],
-    setPaymentMethod = _useState14[1];
+    paymentMethod = _useState12[0],
+    setPaymentMethod = _useState12[1];
   var paymentMethodOpened = /*#__PURE__*/function () {
     var _ref4 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var response, responsePayments;
@@ -10043,7 +10100,7 @@ var apiService = exports.apiService = function apiService() {
           }
         }, _callee9, null, [[4, 21]]);
       }));
-      function DownloadFile(_x10, _x11, _x12) {
+      function DownloadFile(_x0, _x1, _x10) {
         return _DownloadFile.apply(this, arguments);
       }
       return DownloadFile;
@@ -10141,7 +10198,7 @@ function _asyncToGenerator(n) { return function () { var t = this, e = arguments
 var _authService = exports.authService = function authService() {
   return {
     dec2hex: function dec2hex(dec) {
-      return ('0' + dec.toString(16)).substr(-2);
+      return ('0' + dec.toString(16)).slice(-2);
     },
     generateRandomString: function generateRandomString() {
       var array = new Uint32Array(56 / 2);
@@ -10242,12 +10299,10 @@ var _authService = exports.authService = function authService() {
     login: function () {
       var _login = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
         var redirectUserUri,
-          dnsRecord,
           deviceId,
           state,
           verifier,
           challenge,
-          storedVerifier,
           redirectUri,
           loginUri,
           _args4 = arguments;
@@ -10255,34 +10310,24 @@ var _authService = exports.authService = function authService() {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               redirectUserUri = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : null;
-              dnsRecord = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : null;
-              deviceId = _args4.length > 2 && _args4[2] !== undefined ? _args4[2] : null;
-              state = "1234";
+              deviceId = _args4.length > 1 && _args4[1] !== undefined ? _args4[1] : null;
+              state = _authService().generateRandomString();
               if (redirectUserUri != null) {
                 localStorage.setItem("redirectUri", redirectUserUri);
               }
               verifier = _authService().generateRandomString();
-              _context4.next = 8;
+              _context4.next = 7;
               return _authService().challenge_from_verifier(verifier);
-            case 8:
+            case 7:
               challenge = _context4.sent;
-              console.log('[PKCE] Login initiated');
-              console.log('[PKCE] Verifier generated | length:', verifier.length, '| preview:', verifier.substring(0, 10) + '...');
-              console.log('[PKCE] Challenge generated | value:', challenge);
-              console.log('[PKCE] authorityUri:', process.env.authorityUri);
-              console.log('[PKCE] client_id:', process.env.client_id);
               window.localStorage.setItem("verifier", verifier);
-              storedVerifier = window.localStorage.getItem("verifier");
-              console.log('[PKCE] Verifier stored successfully:', storedVerifier === verifier);
-              console.log('[PKCE] Stored verifier length:', storedVerifier === null || storedVerifier === void 0 ? void 0 : storedVerifier.length);
               redirectUri = window.location.origin + "/signin-oidc";
               loginUri = process.env.authorityUri + "/connect/authorize?response_type=code&state=" + state + "&client_id=" + process.env.client_id + "&scope=email%20openid%20offline_access%20profile%20api1&redirect_uri=" + redirectUri + "&code_challenge=" + challenge + "&code_challenge_method=S256";
               if (deviceId) {
                 loginUri += "&deviceId=" + deviceId; // will be for chrome extention and mobile apps later
               }
-              console.log('[PKCE] Redirecting to:', loginUri);
               window.location.href = loginUri;
-            case 23:
+            case 13:
             case "end":
               return _context4.stop();
           }
@@ -10350,32 +10395,11 @@ var _authService = exports.authService = function authService() {
                 domain: domainHost,
                 secure: true
               });
-
-              // destroyCookie({}, "access_token", {
-              //     maxAge: 2147483647,
-              //     path: '/',
-              //     domain: domainHost
-              // });
-
-              // destroyCookie({}, "refresh_token", {
-              //     maxAge: 2147483647,
-              //     path: '/',
-              //     domain: domainHost
-              // });
-
-              // destroyCookie({}, "expires_in", {
-              //     maxAge: 2147483647,
-              //     path: '/',
-              //     domain: domainHost
-              // });
-
-              setTimeout(function () {
-                if (redirectUri == null) {
-                  window.location.href = AuthUri + "/connect/logout?redirect=" + window.location.href;
-                } else {
-                  window.location.href = AuthUri + "/connect/logout?redirect=" + redirectUri;
-                }
-              }, 500);
+              if (redirectUri == null) {
+                window.location.href = AuthUri + "/connect/logout?redirect=" + window.location.href;
+              } else {
+                window.location.href = AuthUri + "/connect/logout?redirect=" + redirectUri;
+              }
             case 7:
             case "end":
               return _context6.stop();
@@ -10479,150 +10503,6 @@ function HeaderRecords(_ref) {
 }
 "use strict";
 
-function _typeof(o) { "@babel/helpers - typeof"; return _typeof = "function" == typeof Symbol && "symbol" == typeof Symbol.iterator ? function (o) { return typeof o; } : function (o) { return o && "function" == typeof Symbol && o.constructor === Symbol && o !== Symbol.prototype ? "symbol" : typeof o; }, _typeof(o); }
-Object.defineProperty(exports, "__esModule", {
-  value: true
-});
-exports.signInValidator = void 0;
-var _react = _interopRequireWildcard(require("react"));
-var _axios = _interopRequireDefault(require("axios"));
-var _queryString = _interopRequireDefault(require("query-string"));
-function _interopRequireDefault(e) { return e && e.__esModule ? e : { "default": e }; }
-function _getRequireWildcardCache(e) { if ("function" != typeof WeakMap) return null; var r = new WeakMap(), t = new WeakMap(); return (_getRequireWildcardCache = function _getRequireWildcardCache(e) { return e ? t : r; })(e); }
-function _interopRequireWildcard(e, r) { if (!r && e && e.__esModule) return e; if (null === e || "object" != _typeof(e) && "function" != typeof e) return { "default": e }; var t = _getRequireWildcardCache(r); if (t && t.has(e)) return t.get(e); var n = { __proto__: null }, a = Object.defineProperty && Object.getOwnPropertyDescriptor; for (var u in e) if ("default" !== u && {}.hasOwnProperty.call(e, u)) { var i = a ? Object.getOwnPropertyDescriptor(e, u) : null; i && (i.get || i.set) ? Object.defineProperty(n, u, i) : n[u] = e[u]; } return n["default"] = e, t && t.set(e, n), n; }
-function _regeneratorRuntime() { "use strict"; /*! regenerator-runtime -- Copyright (c) 2014-present, Facebook, Inc. -- license (MIT): https://github.com/facebook/regenerator/blob/main/LICENSE */ _regeneratorRuntime = function _regeneratorRuntime() { return e; }; var t, e = {}, r = Object.prototype, n = r.hasOwnProperty, o = Object.defineProperty || function (t, e, r) { t[e] = r.value; }, i = "function" == typeof Symbol ? Symbol : {}, a = i.iterator || "@@iterator", c = i.asyncIterator || "@@asyncIterator", u = i.toStringTag || "@@toStringTag"; function define(t, e, r) { return Object.defineProperty(t, e, { value: r, enumerable: !0, configurable: !0, writable: !0 }), t[e]; } try { define({}, ""); } catch (t) { define = function define(t, e, r) { return t[e] = r; }; } function wrap(t, e, r, n) { var i = e && e.prototype instanceof Generator ? e : Generator, a = Object.create(i.prototype), c = new Context(n || []); return o(a, "_invoke", { value: makeInvokeMethod(t, r, c) }), a; } function tryCatch(t, e, r) { try { return { type: "normal", arg: t.call(e, r) }; } catch (t) { return { type: "throw", arg: t }; } } e.wrap = wrap; var h = "suspendedStart", l = "suspendedYield", f = "executing", s = "completed", y = {}; function Generator() {} function GeneratorFunction() {} function GeneratorFunctionPrototype() {} var p = {}; define(p, a, function () { return this; }); var d = Object.getPrototypeOf, v = d && d(d(values([]))); v && v !== r && n.call(v, a) && (p = v); var g = GeneratorFunctionPrototype.prototype = Generator.prototype = Object.create(p); function defineIteratorMethods(t) { ["next", "throw", "return"].forEach(function (e) { define(t, e, function (t) { return this._invoke(e, t); }); }); } function AsyncIterator(t, e) { function invoke(r, o, i, a) { var c = tryCatch(t[r], t, o); if ("throw" !== c.type) { var u = c.arg, h = u.value; return h && "object" == _typeof(h) && n.call(h, "__await") ? e.resolve(h.__await).then(function (t) { invoke("next", t, i, a); }, function (t) { invoke("throw", t, i, a); }) : e.resolve(h).then(function (t) { u.value = t, i(u); }, function (t) { return invoke("throw", t, i, a); }); } a(c.arg); } var r; o(this, "_invoke", { value: function value(t, n) { function callInvokeWithMethodAndArg() { return new e(function (e, r) { invoke(t, n, e, r); }); } return r = r ? r.then(callInvokeWithMethodAndArg, callInvokeWithMethodAndArg) : callInvokeWithMethodAndArg(); } }); } function makeInvokeMethod(e, r, n) { var o = h; return function (i, a) { if (o === f) throw Error("Generator is already running"); if (o === s) { if ("throw" === i) throw a; return { value: t, done: !0 }; } for (n.method = i, n.arg = a;;) { var c = n.delegate; if (c) { var u = maybeInvokeDelegate(c, n); if (u) { if (u === y) continue; return u; } } if ("next" === n.method) n.sent = n._sent = n.arg;else if ("throw" === n.method) { if (o === h) throw o = s, n.arg; n.dispatchException(n.arg); } else "return" === n.method && n.abrupt("return", n.arg); o = f; var p = tryCatch(e, r, n); if ("normal" === p.type) { if (o = n.done ? s : l, p.arg === y) continue; return { value: p.arg, done: n.done }; } "throw" === p.type && (o = s, n.method = "throw", n.arg = p.arg); } }; } function maybeInvokeDelegate(e, r) { var n = r.method, o = e.iterator[n]; if (o === t) return r.delegate = null, "throw" === n && e.iterator["return"] && (r.method = "return", r.arg = t, maybeInvokeDelegate(e, r), "throw" === r.method) || "return" !== n && (r.method = "throw", r.arg = new TypeError("The iterator does not provide a '" + n + "' method")), y; var i = tryCatch(o, e.iterator, r.arg); if ("throw" === i.type) return r.method = "throw", r.arg = i.arg, r.delegate = null, y; var a = i.arg; return a ? a.done ? (r[e.resultName] = a.value, r.next = e.nextLoc, "return" !== r.method && (r.method = "next", r.arg = t), r.delegate = null, y) : a : (r.method = "throw", r.arg = new TypeError("iterator result is not an object"), r.delegate = null, y); } function pushTryEntry(t) { var e = { tryLoc: t[0] }; 1 in t && (e.catchLoc = t[1]), 2 in t && (e.finallyLoc = t[2], e.afterLoc = t[3]), this.tryEntries.push(e); } function resetTryEntry(t) { var e = t.completion || {}; e.type = "normal", delete e.arg, t.completion = e; } function Context(t) { this.tryEntries = [{ tryLoc: "root" }], t.forEach(pushTryEntry, this), this.reset(!0); } function values(e) { if (e || "" === e) { var r = e[a]; if (r) return r.call(e); if ("function" == typeof e.next) return e; if (!isNaN(e.length)) { var o = -1, i = function next() { for (; ++o < e.length;) if (n.call(e, o)) return next.value = e[o], next.done = !1, next; return next.value = t, next.done = !0, next; }; return i.next = i; } } throw new TypeError(_typeof(e) + " is not iterable"); } return GeneratorFunction.prototype = GeneratorFunctionPrototype, o(g, "constructor", { value: GeneratorFunctionPrototype, configurable: !0 }), o(GeneratorFunctionPrototype, "constructor", { value: GeneratorFunction, configurable: !0 }), GeneratorFunction.displayName = define(GeneratorFunctionPrototype, u, "GeneratorFunction"), e.isGeneratorFunction = function (t) { var e = "function" == typeof t && t.constructor; return !!e && (e === GeneratorFunction || "GeneratorFunction" === (e.displayName || e.name)); }, e.mark = function (t) { return Object.setPrototypeOf ? Object.setPrototypeOf(t, GeneratorFunctionPrototype) : (t.__proto__ = GeneratorFunctionPrototype, define(t, u, "GeneratorFunction")), t.prototype = Object.create(g), t; }, e.awrap = function (t) { return { __await: t }; }, defineIteratorMethods(AsyncIterator.prototype), define(AsyncIterator.prototype, c, function () { return this; }), e.AsyncIterator = AsyncIterator, e.async = function (t, r, n, o, i) { void 0 === i && (i = Promise); var a = new AsyncIterator(wrap(t, r, n, o), i); return e.isGeneratorFunction(r) ? a : a.next().then(function (t) { return t.done ? t.value : a.next(); }); }, defineIteratorMethods(g), define(g, u, "Generator"), define(g, a, function () { return this; }), define(g, "toString", function () { return "[object Generator]"; }), e.keys = function (t) { var e = Object(t), r = []; for (var n in e) r.push(n); return r.reverse(), function next() { for (; r.length;) { var t = r.pop(); if (t in e) return next.value = t, next.done = !1, next; } return next.done = !0, next; }; }, e.values = values, Context.prototype = { constructor: Context, reset: function reset(e) { if (this.prev = 0, this.next = 0, this.sent = this._sent = t, this.done = !1, this.delegate = null, this.method = "next", this.arg = t, this.tryEntries.forEach(resetTryEntry), !e) for (var r in this) "t" === r.charAt(0) && n.call(this, r) && !isNaN(+r.slice(1)) && (this[r] = t); }, stop: function stop() { this.done = !0; var t = this.tryEntries[0].completion; if ("throw" === t.type) throw t.arg; return this.rval; }, dispatchException: function dispatchException(e) { if (this.done) throw e; var r = this; function handle(n, o) { return a.type = "throw", a.arg = e, r.next = n, o && (r.method = "next", r.arg = t), !!o; } for (var o = this.tryEntries.length - 1; o >= 0; --o) { var i = this.tryEntries[o], a = i.completion; if ("root" === i.tryLoc) return handle("end"); if (i.tryLoc <= this.prev) { var c = n.call(i, "catchLoc"), u = n.call(i, "finallyLoc"); if (c && u) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } else if (c) { if (this.prev < i.catchLoc) return handle(i.catchLoc, !0); } else { if (!u) throw Error("try statement without catch or finally"); if (this.prev < i.finallyLoc) return handle(i.finallyLoc); } } } }, abrupt: function abrupt(t, e) { for (var r = this.tryEntries.length - 1; r >= 0; --r) { var o = this.tryEntries[r]; if (o.tryLoc <= this.prev && n.call(o, "finallyLoc") && this.prev < o.finallyLoc) { var i = o; break; } } i && ("break" === t || "continue" === t) && i.tryLoc <= e && e <= i.finallyLoc && (i = null); var a = i ? i.completion : {}; return a.type = t, a.arg = e, i ? (this.method = "next", this.next = i.finallyLoc, y) : this.complete(a); }, complete: function complete(t, e) { if ("throw" === t.type) throw t.arg; return "break" === t.type || "continue" === t.type ? this.next = t.arg : "return" === t.type ? (this.rval = this.arg = t.arg, this.method = "return", this.next = "end") : "normal" === t.type && e && (this.next = e), y; }, finish: function finish(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.finallyLoc === t) return this.complete(r.completion, r.afterLoc), resetTryEntry(r), y; } }, "catch": function _catch(t) { for (var e = this.tryEntries.length - 1; e >= 0; --e) { var r = this.tryEntries[e]; if (r.tryLoc === t) { var n = r.completion; if ("throw" === n.type) { var o = n.arg; resetTryEntry(r); } return o; } } throw Error("illegal catch attempt"); }, delegateYield: function delegateYield(e, r, n) { return this.delegate = { iterator: values(e), resultName: r, nextLoc: n }, "next" === this.method && (this.arg = t), y; } }, e; }
-function ownKeys(e, r) { var t = Object.keys(e); if (Object.getOwnPropertySymbols) { var o = Object.getOwnPropertySymbols(e); r && (o = o.filter(function (r) { return Object.getOwnPropertyDescriptor(e, r).enumerable; })), t.push.apply(t, o); } return t; }
-function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t = null != arguments[r] ? arguments[r] : {}; r % 2 ? ownKeys(Object(t), !0).forEach(function (r) { _defineProperty(e, r, t[r]); }) : Object.getOwnPropertyDescriptors ? Object.defineProperties(e, Object.getOwnPropertyDescriptors(t)) : ownKeys(Object(t)).forEach(function (r) { Object.defineProperty(e, r, Object.getOwnPropertyDescriptor(t, r)); }); } return e; }
-function _defineProperty(e, r, t) { return (r = _toPropertyKey(r)) in e ? Object.defineProperty(e, r, { value: t, enumerable: !0, configurable: !0, writable: !0 }) : e[r] = t, e; }
-function _toPropertyKey(t) { var i = _toPrimitive(t, "string"); return "symbol" == _typeof(i) ? i : i + ""; }
-function _toPrimitive(t, r) { if ("object" != _typeof(t) || !t) return t; var e = t[Symbol.toPrimitive]; if (void 0 !== e) { var i = e.call(t, r || "default"); if ("object" != _typeof(i)) return i; throw new TypeError("@@toPrimitive must return a primitive value."); } return ("string" === r ? String : Number)(t); }
-function asyncGeneratorStep(n, t, e, r, o, a, c) { try { var i = n[a](c), u = i.value; } catch (n) { return void e(n); } i.done ? t(u) : Promise.resolve(u).then(r, o); }
-function _asyncToGenerator(n) { return function () { var t = this, e = arguments; return new Promise(function (r, o) { var a = n.apply(t, e); function _next(n) { asyncGeneratorStep(a, r, o, _next, _throw, "next", n); } function _throw(n) { asyncGeneratorStep(a, r, o, _next, _throw, "throw", n); } _next(void 0); }); }; }
-// import Cookies from 'js-cookie';
-
-var signInValidator = exports.signInValidator = /*#__PURE__*/function () {
-  var _ref = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(queryCode) {
-    var codeVerifier, _tokenParams$code, _tokenParams$code_ver, _tokenParams$code_ver2, headers, tokenParams, queryString, response, _response$data, _response$data2, _err$response, _err$response2, domainHost, redirectUri;
-    return _regeneratorRuntime().wrap(function _callee$(_context) {
-      while (1) switch (_context.prev = _context.next) {
-        case 0:
-          codeVerifier = window.localStorage.getItem("verifier");
-          console.log('[PKCE] signInValidator called');
-          console.log('[PKCE] queryCode present:', !!queryCode, '| value:', queryCode);
-          console.log('[PKCE] codeVerifier present:', !!codeVerifier, '| length:', codeVerifier === null || codeVerifier === void 0 ? void 0 : codeVerifier.length);
-          if (!(queryCode != null && codeVerifier != null)) {
-            _context.next = 38;
-            break;
-          }
-          headers = {
-            'Content-Type': 'application/x-www-form-urlencoded'
-          };
-          tokenParams = {
-            code: queryCode,
-            grant_type: "authorization_code",
-            redirect_uri: window.location.origin + "/signin-oidc",
-            client_id: process.env.client_id,
-            client_secret: process.env.client_secret,
-            code_verifier: codeVerifier
-          };
-          console.log('[PKCE] Token request params:', _objectSpread(_objectSpread({}, tokenParams), {}, {
-            client_secret: tokenParams.client_secret ? '***' : '(missing!)',
-            code: ((_tokenParams$code = tokenParams.code) === null || _tokenParams$code === void 0 ? void 0 : _tokenParams$code.substring(0, 10)) + '...',
-            code_verifier: ((_tokenParams$code_ver = tokenParams.code_verifier) === null || _tokenParams$code_ver === void 0 ? void 0 : _tokenParams$code_ver.substring(0, 10)) + '... (length: ' + ((_tokenParams$code_ver2 = tokenParams.code_verifier) === null || _tokenParams$code_ver2 === void 0 ? void 0 : _tokenParams$code_ver2.length) + ')'
-          }));
-          console.log('[PKCE] Token endpoint:', process.env.authorityUri + '/connect/token');
-          console.log('[PKCE] redirect_uri:', tokenParams.redirect_uri);
-          queryString = _queryString["default"].stringify(tokenParams);
-          _context.prev = 11;
-          _context.next = 14;
-          return _axios["default"].post(process.env.authorityUri + '/connect/token', queryString, {
-            headers: headers
-          });
-        case 14:
-          response = _context.sent;
-          console.log('[PKCE] Token response status:', response.status);
-          console.log('[PKCE] Token response has access_token:', !!((_response$data = response.data) !== null && _response$data !== void 0 && _response$data.access_token));
-          console.log('[PKCE] Token response has refresh_token:', !!((_response$data2 = response.data) !== null && _response$data2 !== void 0 && _response$data2.refresh_token));
-          _context.next = 27;
-          break;
-        case 20:
-          _context.prev = 20;
-          _context.t0 = _context["catch"](11);
-          console.error('[PKCE] Token request FAILED');
-          console.error('[PKCE] Status:', (_err$response = _context.t0.response) === null || _err$response === void 0 ? void 0 : _err$response.status);
-          console.error('[PKCE] Error data:', JSON.stringify((_err$response2 = _context.t0.response) === null || _err$response2 === void 0 ? void 0 : _err$response2.data));
-          console.error('[PKCE] Error message:', _context.t0.message);
-          throw _context.t0;
-        case 27:
-          domainHost = window.location.hostname.split('.').slice(-2).join('.');
-          window.localStorage.removeItem("verifier");
-          _context.next = 31;
-          return setCookie('access_token', response.data.access_token, {
-            maxAge: 60 * 60 * 24 * 365,
-            // 1 year,
-            path: '/',
-            domain: domainHost,
-            secure: true
-          });
-        case 31:
-          _context.next = 33;
-          return setCookie('expires_in', response.data.expires_in, {
-            maxAge: 60 * 60 * 24 * 365,
-            // 1 year,
-            path: '/',
-            domain: domainHost,
-            secure: true
-          });
-        case 33:
-          _context.next = 35;
-          return setCookie('refresh_token', response.data.refresh_token, {
-            maxAge: 60 * 60 * 24 * 365,
-            // 1 year,
-            path: '/',
-            domain: domainHost,
-            secure: true
-          });
-        case 35:
-          // await setCookie(null, "access_token", response.data.access_token,
-          // {
-          //     maxAge: 2147483647,
-          //     path: '/',
-          //     domain: domainHost,
-          //     secure: true
-          // });
-          // await setCookie(null, "expires_in", response.data.expires_in,
-          // {
-          //     maxAge: 2147483647,
-          //     path: '/',
-          //     domain: domainHost,
-          //     secure: true
-          // });
-          // await setCookie(null, "refresh_token", response.data.refresh_token,
-          // {
-          //     maxAge: 2147483647,
-          //     path: '/',
-          //     domain: domainHost,
-          //     secure: true
-          // });
-          redirectUri = localStorage.getItem("redirectUri");
-          localStorage.clear();
-          if (redirectUri != null) {
-            window.location.href = redirectUri;
-          } else {
-            window.location.href = "/";
-          }
-        case 38:
-        case "end":
-          return _context.stop();
-      }
-    }, _callee, null, [[11, 20]]);
-  }));
-  return function signInValidator(_x) {
-    return _ref.apply(this, arguments);
-  };
-}();
-"use strict";
-
 Object.defineProperty(exports, "__esModule", {
   value: true
 });

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.768",
+  "version": "1.0.772",
   "description": "",
   "main": "index.js",
   "files": [

package/src/components/AuthScapeApp.js

@@ -4,7 +4,7 @@ import Head from "next/head";
 
 // Re-export toast and transitions so pages can import from authscape
 export { toast, Bounce, Slide, Zoom, Flip };
-import { useSearchParams, usePathname } from "next/navigation";
+import { useRouter } from "next/router";
 import axios from "axios";
 import querystring from "query-string";
 import Router from "next/router";
@@ -501,9 +501,22 @@ export function AuthScapeApp({
   const errorTrackingInitializedRef = useRef(false);
   const loginRedirectPending = useRef(false);
 
-  const searchParams = useSearchParams();
-  const queryCode = searchParams?.get("code") ?? null;
-  const pathname = usePathname();
+  // Use Pages Router's `useRouter` instead of `useSearchParams`/`usePathname`
+  // from `next/navigation`. The `next/navigation` hooks don't hydrate query
+  // params reliably on the 404 page in Webkit/Safari — when the IDP redirects
+  // back to /signin-oidc (a URL with no Next.js page in the consumer project),
+  // useSearchParams() returns null and the PKCE code is never picked up.
+  // The Pages Router router parses query from `asPath` and works on 404 too.
+  const router = useRouter();
+  const rawQueryCode = router.isReady ? router.query.code : null;
+  // router.query values can be string | string[] — coerce to a single string.
+  const queryCode = typeof rawQueryCode === "string"
+    ? rawQueryCode
+    : (Array.isArray(rawQueryCode) ? rawQueryCode[0] : null);
+  // Pages Router's `router.pathname` returns the route file path (e.g. "/_error"
+  // for the 404 page). The auth-redirect guard below compares against
+  // "/signin-oidc", so we derive the actual URL path from `asPath` instead.
+  const pathname = (router.asPath || "").split("?")[0].split("#")[0];
 
   const signInValidator = async (codeFromQuery) => {
     if (queryCodeUsed.current === codeFromQuery) return;
@@ -567,7 +580,43 @@ export function AuthScapeApp({
       const redirectUri = window.localStorage.getItem("redirectUri") || "/";
       window.localStorage.clear();
 
-      window.location.href = redirectUri;
+      // Pre-load user while spinner is still showing — eliminates the
+      // second GetCurrentUser call (and resulting re-renders) on the destination page.
+      let usr = null;
+      try {
+        usr = await module.exports.apiService().GetCurrentUser();
+      } catch (fetchErr) {
+        console.warn("[AuthScape] GetCurrentUser failed after token exchange:", fetchErr);
+      }
+      const enrichedUser = ensureUserHelpers(usr);
+
+      signedInUser.current = enrichedUser;
+      setSignedInUserState(enrichedUser);
+      setFrontEndLoadedState(true);
+
+      // Prevent the useEffect from calling GetCurrentUser again when queryCode → null.
+      loadingAuth.current = true;
+
+      if (enableErrorTracking && enrichedUser && !errorTrackingInitializedRef.current) {
+        initializeErrorTracking(enrichedUser);
+        errorTrackingInitializedRef.current = true;
+      }
+
+      if (onUserLoaded && enrichedUser) {
+        onUserLoaded(enrichedUser);
+      }
+
+      // Dismiss spinner before navigating so destination renders logged-in UI on first paint.
+      setIsSigningIn(false);
+
+      // Client-side navigation preserves the React component tree and all ref values,
+      // eliminating the hard-reload → remount → re-render chain.
+      // Fall back to hard navigation for absolute external URLs.
+      if (redirectUri.startsWith("http://") || redirectUri.startsWith("https://")) {
+        window.location.href = redirectUri;
+      } else {
+        Router.push(redirectUri);
+      }
     } catch (exp) {
       console.error("PKCE sign-in failed", exp);
       window.localStorage.clear();
@@ -805,3 +854,8 @@ export function AuthScapeApp({
     </>
   );
 }
+
+// AuthScapeProvider is the umbrella component that bundles the three always-on AuthScape
+// features (auth, error tracking, analytics) plus optional in-app notifications. Wrap your
+// NextJS _app.js return value with it. Existing call sites can continue using AuthScapeApp.
+export const AuthScapeProvider = AuthScapeApp;

package/src/services/authService.js

@@ -5,7 +5,7 @@ export const authService = () => {
     return {
 
         dec2hex: (dec) => {
-            return ('0' + dec.toString(16)).substr(-2)
+            return ('0' + dec.toString(16)).slice(-2)
         },
         generateRandomString: () => {
             var array = new Uint32Array(56/2);
@@ -64,9 +64,10 @@ export const authService = () => {
 
             return response;
         },
-        login: async (redirectUserUri = null, dnsRecord = null, deviceId = null) => {
+        login: async (redirectUserUri = null, deviceId = null) => {
+
+            let state = authService().generateRandomString();
 
-            let state = "1234";
             if (redirectUserUri != null)
             {
                 localStorage.setItem("redirectUri", redirectUserUri);
@@ -75,18 +76,8 @@ export const authService = () => {
             let verifier = authService().generateRandomString();
             var challenge = await authService().challenge_from_verifier(verifier);
 
-            console.log('[PKCE] Login initiated');
-            console.log('[PKCE] Verifier generated | length:', verifier.length, '| preview:', verifier.substring(0, 10) + '...');
-            console.log('[PKCE] Challenge generated | value:', challenge);
-            console.log('[PKCE] authorityUri:', process.env.authorityUri);
-            console.log('[PKCE] client_id:', process.env.client_id);
-
             window.localStorage.setItem("verifier", verifier);
 
-            const storedVerifier = window.localStorage.getItem("verifier");
-            console.log('[PKCE] Verifier stored successfully:', storedVerifier === verifier);
-            console.log('[PKCE] Stored verifier length:', storedVerifier?.length);
-
             let redirectUri = window.location.origin + "/signin-oidc";
             let loginUri = process.env.authorityUri + "/connect/authorize?response_type=code&state=" + state + "&client_id=" + process.env.client_id + "&scope=email%20openid%20offline_access%20profile%20api1&redirect_uri=" + redirectUri + "&code_challenge=" + challenge + "&code_challenge_method=S256";
 
@@ -95,7 +86,6 @@ export const authService = () => {
                 loginUri += "&deviceId=" + deviceId; // will be for chrome extention and mobile apps later
             }
 
-            console.log('[PKCE] Redirecting to:', loginUri);
             window.location.href = loginUri;
         },
         signUp: (redirectUrl = null) => {
@@ -126,40 +116,18 @@ export const authService = () => {
             let domainHost = window.location.hostname.split('.').slice(-2).join('.');
             let AuthUri = process.env.authorityUri;
 
-
             Cookies.remove('access_token', { path: '/', domain: domainHost, secure: true });
             Cookies.remove('refresh_token', { path: '/', domain: domainHost, secure: true });
             Cookies.remove('expires_in', { path: '/', domain: domainHost, secure: true });
 
-
-            // destroyCookie({}, "access_token", {
-            //     maxAge: 2147483647,
-            //     path: '/',
-            //     domain: domainHost
-            // });
-
-            // destroyCookie({}, "refresh_token", {
-            //     maxAge: 2147483647,
-            //     path: '/',
-            //     domain: domainHost
-            // });
-
-            // destroyCookie({}, "expires_in", {
-            //     maxAge: 2147483647,
-            //     path: '/',
-            //     domain: domainHost
-            // });
-
-            setTimeout(() => {
-                if (redirectUri == null)
-                {
-                    window.location.href = AuthUri + "/connect/logout?redirect=" + window.location.href;
-                }
-                else
-                {
-                    window.location.href = AuthUri + "/connect/logout?redirect=" + redirectUri;
-                }
-            }, 500);
+            if (redirectUri == null)
+            {
+                window.location.href = AuthUri + "/connect/logout?redirect=" + window.location.href;
+            }
+            else
+            {
+                window.location.href = AuthUri + "/connect/logout?redirect=" + redirectUri;
+            }
 
         },
     }

package/src/services/signInValidator.js

@@ -1,117 +0,0 @@
-import React, { useEffect, useState } from 'react';
-import axios from 'axios';
-import querystring from "query-string";
-// import Cookies from 'js-cookie';
-
-export const signInValidator = async (queryCode) => {
-
-  let codeVerifier = window.localStorage.getItem("verifier");
-
-      console.log('[PKCE] signInValidator called');
-      console.log('[PKCE] queryCode present:', !!queryCode, '| value:', queryCode);
-      console.log('[PKCE] codeVerifier present:', !!codeVerifier, '| length:', codeVerifier?.length);
-
-      if (queryCode != null && codeVerifier != null)
-      {
-        const headers = {'Content-Type': 'application/x-www-form-urlencoded'}
-
-        const tokenParams = {
-          code: queryCode,
-          grant_type: "authorization_code",
-          redirect_uri: window.location.origin + "/signin-oidc",
-          client_id: process.env.client_id,
-          client_secret: process.env.client_secret,
-          code_verifier: codeVerifier
-        };
-
-        console.log('[PKCE] Token request params:', {
-          ...tokenParams,
-          client_secret: tokenParams.client_secret ? '***' : '(missing!)',
-          code: tokenParams.code?.substring(0, 10) + '...',
-          code_verifier: tokenParams.code_verifier?.substring(0, 10) + '... (length: ' + tokenParams.code_verifier?.length + ')',
-        });
-        console.log('[PKCE] Token endpoint:', process.env.authorityUri + '/connect/token');
-        console.log('[PKCE] redirect_uri:', tokenParams.redirect_uri);
-
-        let queryString = querystring.stringify(tokenParams);
-
-        let response;
-        try {
-          response = await axios.post(process.env.authorityUri + '/connect/token', queryString, {
-            headers: headers
-          });
-          console.log('[PKCE] Token response status:', response.status);
-          console.log('[PKCE] Token response has access_token:', !!response.data?.access_token);
-          console.log('[PKCE] Token response has refresh_token:', !!response.data?.refresh_token);
-        } catch (err) {
-          console.error('[PKCE] Token request FAILED');
-          console.error('[PKCE] Status:', err.response?.status);
-          console.error('[PKCE] Error data:', JSON.stringify(err.response?.data));
-          console.error('[PKCE] Error message:', err.message);
-          throw err;
-        }
-
-        let domainHost = window.location.hostname.split('.').slice(-2).join('.');
-        window.localStorage.removeItem("verifier");
-
-
-
-        await setCookie('access_token', response.data.access_token, {
-            maxAge: 60 * 60 * 24 * 365, // 1 year,
-            path: '/',
-            domain: domainHost,
-            secure: true
-        });
-
-        await setCookie('expires_in', response.data.expires_in, {
-            maxAge: 60 * 60 * 24 * 365, // 1 year,
-            path: '/',
-            domain: domainHost,
-            secure: true
-        });
-
-        await setCookie('refresh_token', response.data.refresh_token, {
-          maxAge: 60 * 60 * 24 * 365, // 1 year,
-          path: '/',
-          domain: domainHost,
-          secure: true
-        });
-
-
-        // await setCookie(null, "access_token", response.data.access_token,
-        // {
-        //     maxAge: 2147483647,
-        //     path: '/',
-        //     domain: domainHost,
-        //     secure: true
-        // });
-    
-        // await setCookie(null, "expires_in", response.data.expires_in,
-        // {
-        //     maxAge: 2147483647,
-        //     path: '/',
-        //     domain: domainHost,
-        //     secure: true
-        // });
-    
-        // await setCookie(null, "refresh_token", response.data.refresh_token,
-        // {
-        //     maxAge: 2147483647,
-        //     path: '/',
-        //     domain: domainHost,
-        //     secure: true
-        // });
-
-
-        let redirectUri = localStorage.getItem("redirectUri")
-        localStorage.clear();
-        if (redirectUri != null)
-        {
-          window.location.href = redirectUri;
-        }
-        else
-        {
-          window.location.href = "/";
-        }
-    }
-}