authscape 1.0.755 → 1.0.760

package/index.js

@@ -76,6 +76,7 @@ function AuthScapeApp(_ref) {
   var Component = _ref.Component,
     layout = _ref.layout,
     loadingLayout = _ref.loadingLayout,
+    signInLoadingComponent = _ref.signInLoadingComponent,
     pageProps = _ref.pageProps,
     _ref$muiTheme = _ref.muiTheme,
     muiTheme = _ref$muiTheme === void 0 ? {} : _ref$muiTheme,
@@ -97,6 +98,10 @@ function AuthScapeApp(_ref) {
     _useState6 = _slicedToArray(_useState5, 2),
     signedInUserState = _useState6[0],
     setSignedInUserState = _useState6[1];
+  var _useState7 = (0, _react.useState)(false),
+    _useState8 = _slicedToArray(_useState7, 2),
+    isSigningIn = _useState8[0],
+    setIsSigningIn = _useState8[1];
   var loadingAuth = (0, _react.useRef)(false);
   var signedInUser = (0, _react.useRef)(null);
   var queryCodeUsed = (0, _react.useRef)(null);
@@ -105,10 +110,13 @@ function AuthScapeApp(_ref) {
   var queryCode = searchParams.get("code");
   var pathname = (0, _navigation.usePathname)();
 
+  // Check if we're on the signin-oidc page
+  var isOnSignInPage = pathname === "/signin-oidc";
+
   // ----- PKCE Sign-in (browser-only) -----
   var signInValidator = /*#__PURE__*/function () {
     var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(codeFromQuery) {
-      var codeVerifier, headers, body, response, domainHost, redirectUri;
+      var codeVerifier, headers, body, response, domainHost, redirectUri, usr;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
@@ -125,13 +133,17 @@ function AuthScapeApp(_ref) {
             }
             return _context.abrupt("return");
           case 5:
+            setIsSigningIn(true);
             codeVerifier = window.localStorage.getItem("verifier");
             if (!(!codeFromQuery || !codeVerifier)) {
-              _context.next = 8;
+              _context.next = 11;
               break;
             }
+            // No code or verifier - redirect to login
+            window.localStorage.clear();
+            module.exports.authService().login();
             return _context.abrupt("return");
-          case 8:
+          case 11:
             headers = {
               "Content-Type": "application/x-www-form-urlencoded"
             };
@@ -143,55 +155,83 @@ function AuthScapeApp(_ref) {
               client_secret: process.env.client_secret,
               code_verifier: codeVerifier
             });
-            _context.prev = 10;
-            _context.next = 13;
+            _context.prev = 13;
+            _context.next = 16;
             return _axios["default"].post(process.env.authorityUri + "/connect/token", body, {
               headers: headers
             });
-          case 13:
+          case 16:
             response = _context.sent;
             domainHost = window.location.hostname.split(".").slice(-2).join(".");
             window.localStorage.removeItem("verifier");
 
             // NOTE: replace setCookie below with your implementation if different
-            _context.next = 18;
+            _context.next = 21;
             return setCookie("access_token", response.data.access_token, {
               maxAge: 60 * 60 * 24 * 365,
               path: "/",
               domain: domainHost,
               secure: true
             });
-          case 18:
-            _context.next = 20;
+          case 21:
+            _context.next = 23;
             return setCookie("expires_in", response.data.expires_in, {
               maxAge: 60 * 60 * 24 * 365,
               path: "/",
               domain: domainHost,
               secure: true
             });
-          case 20:
-            _context.next = 22;
+          case 23:
+            _context.next = 25;
             return setCookie("refresh_token", response.data.refresh_token, {
               maxAge: 60 * 60 * 24 * 365,
               path: "/",
               domain: domainHost,
               secure: true
             });
-          case 22:
-            redirectUri = window.localStorage.getItem("redirectUri");
+          case 25:
+            redirectUri = window.localStorage.getItem("redirectUri") || "/";
             window.localStorage.clear();
-            window.location.href = redirectUri || "/";
-            _context.next = 30;
+
+            // Use history.replaceState to change URL without a page reload, then fetch user
+            window.history.replaceState({}, "", redirectUri);
+
+            // Now load the current user and update state
+            _context.prev = 28;
+            _context.next = 31;
+            return module.exports.apiService().GetCurrentUser();
+          case 31:
+            usr = _context.sent;
+            signedInUser.current = ensureUserHelpers(usr);
+            setSignedInUserState(signedInUser.current);
+            setFrontEndLoadedState(true);
+
+            // Trigger a soft navigation using Next.js router
+            _router["default"].replace(redirectUri, undefined, {
+              shallow: false
+            });
+            _context.next = 41;
             break;
-          case 27:
-            _context.prev = 27;
-            _context.t0 = _context["catch"](10);
-            console.error("PKCE sign-in failed", _context.t0);
-          case 30:
+          case 38:
+            _context.prev = 38;
+            _context.t0 = _context["catch"](28);
+            // If we can't get user, still navigate
+            _router["default"].replace(redirectUri);
+          case 41:
+            _context.next = 48;
+            break;
+          case 43:
+            _context.prev = 43;
+            _context.t1 = _context["catch"](13);
+            console.error("PKCE sign-in failed", _context.t1);
+            // Invalid code - clear storage and redirect to login
+            window.localStorage.clear();
+            module.exports.authService().login();
+          case 48:
           case "end":
             return _context.stop();
         }
-      }, _callee, null, [[10, 27]]);
+      }, _callee, null, [[13, 43], [28, 38]]);
     }));
     return function signInValidator(_x) {
       return _ref2.apply(this, arguments);
@@ -321,6 +361,43 @@ function AuthScapeApp(_ref) {
   });
 
   // ----- Render (SSR-safe; always output page so <title> is visible) -----
+
+  // Default sign-in loading component if none provided
+  var defaultSignInLoading = /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      display: 'flex',
+      flexDirection: 'column',
+      alignItems: 'center',
+      justifyContent: 'center',
+      height: '100vh',
+      width: '100%',
+      backgroundColor: '#f5f5f5'
+    }
+  }, /*#__PURE__*/_react["default"].createElement("div", {
+    style: {
+      width: '40px',
+      height: '40px',
+      border: '4px solid #e0e0e0',
+      borderTop: '4px solid #3498db',
+      borderRadius: '50%',
+      animation: 'spin 1s linear infinite'
+    }
+  }), /*#__PURE__*/_react["default"].createElement("p", {
+    style: {
+      marginTop: '16px',
+      color: '#666'
+    }
+  }, "Signing in..."), /*#__PURE__*/_react["default"].createElement("style", null, "\n        @keyframes spin {\n          0% { transform: rotate(0deg); }\n          100% { transform: rotate(360deg); }\n        }\n      "));
+
+  // Show loading screen when on signin-oidc page
+  if (isOnSignInPage || isSigningIn) {
+    return /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, /*#__PURE__*/_react["default"].createElement(_head["default"], null, /*#__PURE__*/_react["default"].createElement("meta", {
+      name: "viewport",
+      content: "width=device-width, initial-scale=0.86, maximum-scale=5.0, minimum-scale=0.86"
+    })), /*#__PURE__*/_react["default"].createElement(_styles.ThemeProvider, {
+      theme: muiTheme
+    }, signInLoadingComponent || defaultSignInLoading));
+  }
   var pageContent = layout ? layout({
     children: /*#__PURE__*/_react["default"].createElement(Component, _extends({}, pageProps, {
       currentUser: currentUser,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.755",
+  "version": "1.0.760",
   "description": "",
   "main": "index.js",
   "files": [
@@ -48,7 +48,7 @@
     "html2canvas": "^1.4.1",
     "js-cookie": "^3.0.5",
     "js-file-download": "^0.4.12",
-    "jspdf": "^3.0.0",
+    "jspdf": "^4.0.0",
     "query-string": "^7.1.1",
     "react": "^18.2.0",
     "react-color": "^2.19.3",

package/readme.md

@@ -1,103 +1,103 @@
-# AuthScape NPM Package
-
-Complete authentication and user management solution for Next.js applications.
-
-## Installation
-
-```bash
-npm install authscape
-```
-
-## Quick Start
-
-See the main [AuthScape Documentation](https://authscape.com/docs) for complete setup instructions.
-
-## Features
-
-### Core Features
-- OAuth2/PKCE Authentication
-- Multi-tenant support
-- User management
-- Role-based permissions
-- Analytics integration (GA4, Microsoft Clarity)
-- Material-UI components
-
-### Components
-- Document Manager
-- File Uploader
-- Rich Text Editor
-- Data Tables
-- Stripe Payment Integration
-- Google Maps Integration
-- And more...
-
-## Additional Features
-
-### Sitemap Generation (NEW!)
-
-Automatically generate SEO-friendly sitemaps for your Next.js application.
-
-**Automatic setup on install:**
-
-When you run `npm install authscape`, a sitemap is automatically configured at `/sitemap.xml` that syncs with your AuthScape content.
-
-- Supports both Pages Router and App Router
-- Automatically detects your Next.js project structure
-- Works with both `pages/` and `src/pages/` layouts
-- Works with both `app/` and `src/app/` layouts
-
-**To disable:** Simply delete the auto-generated file:
-- Pages Router: `pages/sitemap.xml.js`
-- App Router: `app/sitemap.xml/route.js`
-
-## Environment Variables
-
-Required environment variables in your `.env.local`:
-
-```env
-apiUri=https://your-authscape-api.com
-authorityUri=https://your-auth-server.com
-client_id=your-client-id
-client_secret=your-client-secret
-```
-
-Optional analytics:
-
-```env
-googleAnalytics4=G-XXXXXXXXXX
-microsoftClarityTrackingCode=xxxxxxxxxx
-enableDatabaseAnalytics=true
-```
-
-## Usage Example
-
-```javascript
-// pages/_app.js
-import { AuthScapeApp } from 'authscape';
-import 'react-toastify/dist/ReactToastify.css';
-
-function MyApp({ Component, pageProps }) {
-  return (
-    <AuthScapeApp
-      Component={Component}
-      pageProps={pageProps}
-      enforceLoggedIn={false}
-      enableAuth={true}
-    />
-  );
-}
-
-export default MyApp;
-```
-
-## Documentation
-
-- [AuthScape Docs](https://authscape.com/docs) - Complete documentation
-
-## Support
-
-For issues or questions, contact AuthScape support or visit [authscape.com](https://authscape.com).
-
-## License
-
-ISC
+# AuthScape NPM Package
+
+Complete authentication and user management solution for Next.js applications.
+
+## Installation
+
+```bash
+npm install authscape
+```
+
+## Quick Start
+
+See the main [AuthScape Documentation](https://authscape.com/docs) for complete setup instructions.
+
+## Features
+
+### Core Features
+- OAuth2/PKCE Authentication
+- Multi-tenant support
+- User management
+- Role-based permissions
+- Analytics integration (GA4, Microsoft Clarity)
+- Material-UI components
+
+### Components
+- Document Manager
+- File Uploader
+- Rich Text Editor
+- Data Tables
+- Stripe Payment Integration
+- Google Maps Integration
+- And more...
+
+## Additional Features
+
+### Sitemap Generation (NEW!)
+
+Automatically generate SEO-friendly sitemaps for your Next.js application.
+
+**Automatic setup on install:**
+
+When you run `npm install authscape`, a sitemap is automatically configured at `/sitemap.xml` that syncs with your AuthScape content.
+
+- Supports both Pages Router and App Router
+- Automatically detects your Next.js project structure
+- Works with both `pages/` and `src/pages/` layouts
+- Works with both `app/` and `src/app/` layouts
+
+**To disable:** Simply delete the auto-generated file:
+- Pages Router: `pages/sitemap.xml.js`
+- App Router: `app/sitemap.xml/route.js`
+
+## Environment Variables
+
+Required environment variables in your `.env.local`:
+
+```env
+apiUri=https://your-authscape-api.com
+authorityUri=https://your-auth-server.com
+client_id=your-client-id
+client_secret=your-client-secret
+```
+
+Optional analytics:
+
+```env
+googleAnalytics4=G-XXXXXXXXXX
+microsoftClarityTrackingCode=xxxxxxxxxx
+enableDatabaseAnalytics=true
+```
+
+## Usage Example
+
+```javascript
+// pages/_app.js
+import { AuthScapeApp } from 'authscape';
+import 'react-toastify/dist/ReactToastify.css';
+
+function MyApp({ Component, pageProps }) {
+  return (
+    <AuthScapeApp
+      Component={Component}
+      pageProps={pageProps}
+      enforceLoggedIn={false}
+      enableAuth={true}
+    />
+  );
+}
+
+export default MyApp;
+```
+
+## Documentation
+
+- [AuthScape Docs](https://authscape.com/docs) - Complete documentation
+
+## Support
+
+For issues or questions, contact AuthScape support or visit [authscape.com](https://authscape.com).
+
+## License
+
+ISC

package/src/components/AuthScapeApp.js

@@ -60,6 +60,7 @@ export function AuthScapeApp({
   Component,
   layout,
   loadingLayout,
+  signInLoadingComponent,
   pageProps,
   muiTheme = {},
   store = {},
@@ -69,6 +70,7 @@ export function AuthScapeApp({
   const [frontEndLoadedState, setFrontEndLoadedState] = useState(false);
   const [isLoadingShow, setIsLoadingShow] = useState(false);
   const [signedInUserState, setSignedInUserState] = useState(null);
+  const [isSigningIn, setIsSigningIn] = useState(false);
 
   const loadingAuth = useRef(false);
   const signedInUser = useRef(null);
@@ -79,6 +81,9 @@ export function AuthScapeApp({
   const queryCode = searchParams.get("code");
   const pathname = usePathname();
 
+  // Check if we're on the signin-oidc page
+  const isOnSignInPage = pathname === "/signin-oidc";
+
   // ----- PKCE Sign-in (browser-only) -----
   const signInValidator = async (codeFromQuery) => {
     if (queryCodeUsed.current === codeFromQuery) return;
@@ -86,8 +91,15 @@ export function AuthScapeApp({
 
     if (typeof window === "undefined") return;
 
+    setIsSigningIn(true);
+
     const codeVerifier = window.localStorage.getItem("verifier");
-    if (!codeFromQuery || !codeVerifier) return;
+    if (!codeFromQuery || !codeVerifier) {
+      // No code or verifier - redirect to login
+      window.localStorage.clear();
+      module.exports.authService().login();
+      return;
+    }
 
     const headers = { "Content-Type": "application/x-www-form-urlencoded" };
 
@@ -131,11 +143,30 @@ export function AuthScapeApp({
         secure: true,
       });
 
-      const redirectUri = window.localStorage.getItem("redirectUri");
+      const redirectUri = window.localStorage.getItem("redirectUri") || "/";
       window.localStorage.clear();
-      window.location.href = redirectUri || "/";
+
+      // Use history.replaceState to change URL without a page reload, then fetch user
+      window.history.replaceState({}, "", redirectUri);
+
+      // Now load the current user and update state
+      try {
+        const usr = await module.exports.apiService().GetCurrentUser();
+        signedInUser.current = ensureUserHelpers(usr);
+        setSignedInUserState(signedInUser.current);
+        setFrontEndLoadedState(true);
+
+        // Trigger a soft navigation using Next.js router
+        Router.replace(redirectUri, undefined, { shallow: false });
+      } catch (userErr) {
+        // If we can't get user, still navigate
+        Router.replace(redirectUri);
+      }
     } catch (exp) {
       console.error("PKCE sign-in failed", exp);
+      // Invalid code - clear storage and redirect to login
+      window.localStorage.clear();
+      module.exports.authService().login();
     }
   };
 
@@ -246,6 +277,53 @@ export function AuthScapeApp({
   const useStore = create(() => store);
 
   // ----- Render (SSR-safe; always output page so <title> is visible) -----
+
+  // Default sign-in loading component if none provided
+  const defaultSignInLoading = (
+    <div style={{
+      display: 'flex',
+      flexDirection: 'column',
+      alignItems: 'center',
+      justifyContent: 'center',
+      height: '100vh',
+      width: '100%',
+      backgroundColor: '#f5f5f5'
+    }}>
+      <div style={{
+        width: '40px',
+        height: '40px',
+        border: '4px solid #e0e0e0',
+        borderTop: '4px solid #3498db',
+        borderRadius: '50%',
+        animation: 'spin 1s linear infinite'
+      }} />
+      <p style={{ marginTop: '16px', color: '#666' }}>Signing in...</p>
+      <style>{`
+        @keyframes spin {
+          0% { transform: rotate(0deg); }
+          100% { transform: rotate(360deg); }
+        }
+      `}</style>
+    </div>
+  );
+
+  // Show loading screen when on signin-oidc page
+  if (isOnSignInPage || isSigningIn) {
+    return (
+      <>
+        <Head>
+          <meta
+            name="viewport"
+            content="width=device-width, initial-scale=0.86, maximum-scale=5.0, minimum-scale=0.86"
+          />
+        </Head>
+        <ThemeProvider theme={muiTheme}>
+          {signInLoadingComponent || defaultSignInLoading}
+        </ThemeProvider>
+      </>
+    );
+  }
+
   const pageContent = layout
     ? layout({
         children: (