authscape 1.0.774 → 1.0.778

package/index.js

@@ -42,9 +42,10 @@ exports.useNotifications = useNotifications;
 var _react = _interopRequireWildcard(require("react"));
 var _reactToastify = require("react-toastify");
 var _head = _interopRequireDefault(require("next/head"));
-var _router = _interopRequireWildcard(require("next/router"));
+var _navigation = require("next/navigation");
 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");
@@ -726,6 +727,7 @@ function ensureUserHelpers(u) {
 // AuthScapeApp Component
 // ============================================================================
 function AuthScapeApp(_ref0) {
+  var _searchParams$get;
   var Component = _ref0.Component,
     layout = _ref0.layout,
     loadingLayout = _ref0.loadingLayout,
@@ -769,21 +771,9 @@ function AuthScapeApp(_ref0) {
   var ga4React = (0, _react.useRef)(null);
   var errorTrackingInitializedRef = (0, _react.useRef)(false);
   var loginRedirectPending = (0, _react.useRef)(false);
-
-  // 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 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)();
   var signInValidator = /*#__PURE__*/function () {
     var _ref1 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee8(codeFromQuery) {
       var codeVerifier, headers, body, response, domainHost, redirectUri, usr, enrichedUser;

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.774",
+  "version": "1.0.778",
   "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 { useRouter } from "next/router";
+import { useSearchParams, usePathname } from "next/navigation";
 import axios from "axios";
 import querystring from "query-string";
 import Router from "next/router";
@@ -501,22 +501,9 @@ export function AuthScapeApp({
   const errorTrackingInitializedRef = useRef(false);
   const loginRedirectPending = useRef(false);
 
-  // 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 searchParams = useSearchParams();
+  const queryCode = searchParams?.get("code") ?? null;
+  const pathname = usePathname();
 
   const signInValidator = async (codeFromQuery) => {
     if (queryCodeUsed.current === codeFromQuery) return;