authscape 1.0.712 → 1.0.714

package/index.js

@@ -1,6 +1,5 @@
 "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
 });
@@ -30,6 +29,50 @@ function _unsupportedIterableToArray(r, a) { if (r) { if ("string" == typeof r)
 function _arrayLikeToArray(r, a) { (null == a || a > r.length) && (a = r.length); for (var e = 0, n = Array(a); e < a; e++) n[e] = r[e]; return n; }
 function _iterableToArrayLimit(r, l) { var t = null == r ? null : "undefined" != typeof Symbol && r[Symbol.iterator] || r["@@iterator"]; if (null != t) { var e, n, i, u, a = [], f = !0, o = !1; try { if (i = (t = t.call(r)).next, 0 === l) { if (Object(t) !== t) return; f = !1; } else for (; !(f = (e = i.call(t)).done) && (a.push(e.value), a.length !== l); f = !0); } catch (r) { o = !0, n = r; } finally { try { if (!f && null != t["return"] && (u = t["return"](), Object(u) !== u)) return; } finally { if (o) throw n; } } return a; } }
 function _arrayWithHoles(r) { if (Array.isArray(r)) return r; }
+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); }
+// ---- optional: import your cookie util if not global ----
+// import { setCookie } from "cookies-next";
+// import { apiService } from "@/services/api"; // wherever yours lives
+
+// Decorate a user object with role/permission helpers (idempotent)
+function ensureUserHelpers(u) {
+  if (!u || _typeof(u) !== "object") return u;
+
+  // Avoid redefining on every call
+  if (typeof u.hasRole === "function" && typeof u.hasRoleId === "function" && typeof u.hasPermission === "function") {
+    return u;
+  }
+  var rolesArr = Array.isArray(u.roles) ? u.roles : [];
+  var permsArr = Array.isArray(u.permissions) ? u.permissions : [];
+
+  // defineProperty keeps them non-enumerable
+  Object.defineProperty(u, "hasRole", {
+    value: function hasRole(name) {
+      if (!name) return false;
+      return rolesArr.some(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.name) === name;
+      });
+    },
+    writable: false
+  });
+  Object.defineProperty(u, "hasRoleId", {
+    value: function hasRoleId(id) {
+      if (id === undefined || id === null) return false;
+      return rolesArr.some(function (r) {
+        return (r === null || r === void 0 ? void 0 : r.id) === id;
+      });
+    },
+    writable: false
+  });
+  Object.defineProperty(u, "hasPermission", {
+    value: function hasPermission(name) {
+      if (!name) return false;
+      return permsArr.includes(name);
+    },
+    writable: false
+  });
+  return u;
+}
 function AuthScapeApp(_ref) {
   var Component = _ref.Component,
     layout = _ref.layout,
@@ -63,20 +106,20 @@ function AuthScapeApp(_ref) {
   var queryCode = searchParams.get("code");
   var pathname = (0, _navigation.usePathname)();
 
-  // ---------- PKCE Sign-in ----------
+  // ----- PKCE Sign-in (browser-only) -----
   var signInValidator = /*#__PURE__*/function () {
-    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(queryCode) {
-      var codeVerifier, headers, queryString, response, domainHost, redirectUri;
+    var _ref2 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee(codeFromQuery) {
+      var codeVerifier, headers, body, response, domainHost, redirectUri;
       return _regeneratorRuntime().wrap(function _callee$(_context) {
         while (1) switch (_context.prev = _context.next) {
           case 0:
-            if (!(queryCodeUsed.current === queryCode)) {
+            if (!(queryCodeUsed.current === codeFromQuery)) {
               _context.next = 2;
               break;
             }
             return _context.abrupt("return");
           case 2:
-            queryCodeUsed.current = queryCode;
+            queryCodeUsed.current = codeFromQuery;
             if (!(typeof window === "undefined")) {
               _context.next = 5;
               break;
@@ -84,7 +127,7 @@ function AuthScapeApp(_ref) {
             return _context.abrupt("return");
           case 5:
             codeVerifier = window.localStorage.getItem("verifier");
-            if (!(!queryCode || !codeVerifier)) {
+            if (!(!codeFromQuery || !codeVerifier)) {
               _context.next = 8;
               break;
             }
@@ -93,8 +136,8 @@ function AuthScapeApp(_ref) {
             headers = {
               "Content-Type": "application/x-www-form-urlencoded"
             };
-            queryString = _queryString["default"].stringify({
-              code: queryCode,
+            body = _queryString["default"].stringify({
+              code: codeFromQuery,
               grant_type: "authorization_code",
               redirect_uri: window.location.origin + "/signin-oidc",
               client_id: process.env.client_id,
@@ -103,13 +146,15 @@ function AuthScapeApp(_ref) {
             });
             _context.prev = 10;
             _context.next = 13;
-            return _axios["default"].post(process.env.authorityUri + "/connect/token", queryString, {
+            return _axios["default"].post(process.env.authorityUri + "/connect/token", body, {
               headers: headers
             });
           case 13:
             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;
             return setCookie("access_token", response.data.access_token, {
               maxAge: 60 * 60 * 24 * 365,
@@ -134,8 +179,8 @@ function AuthScapeApp(_ref) {
               secure: true
             });
           case 22:
-            redirectUri = localStorage.getItem("redirectUri");
-            localStorage.clear();
+            redirectUri = window.localStorage.getItem("redirectUri");
+            window.localStorage.clear();
             window.location.href = redirectUri || "/";
             _context.next = 30;
             break;
@@ -154,7 +199,7 @@ function AuthScapeApp(_ref) {
     };
   }();
 
-  // ---------- GA + Clarity ----------
+  // ----- GA + Clarity -----
   function initGA(_x2) {
     return _initGA.apply(this, arguments);
   }
@@ -189,9 +234,8 @@ function AuthScapeApp(_ref) {
     return _initGA.apply(this, arguments);
   }
   var logEvent = function logEvent(category, action, label) {
-    if (ga4React.current) {
-      ga4React.current.event(action, label, category);
-    }
+    if (ga4React.current) ga4React.current.event(action, label, category);
+    // your DB analytics can go here if desired
   };
   var databaseDrivenPageView = function databaseDrivenPageView(pathName) {
     var _signedInUser$current, _signedInUser$current2, _signedInUser$current3;
@@ -208,16 +252,23 @@ function AuthScapeApp(_ref) {
     });
   };
 
-  // ---------- Auth Init ----------
+  // ----- Auth init (runs once) -----
   (0, _react.useEffect)(function () {
     if (queryCode) {
       signInValidator(queryCode);
-    } else if (!loadingAuth.current) {
+      return;
+    }
+    if (!loadingAuth.current) {
       loadingAuth.current = true;
       if (enableAuth) {
         apiService().GetCurrentUser().then(function (usr) {
-          signedInUser.current = usr;
-          setSignedInUserState(usr);
+          signedInUser.current = ensureUserHelpers(usr);
+          setSignedInUserState(signedInUser.current);
+          setFrontEndLoadedState(true);
+        })["catch"](function () {
+          // no user / anonymous
+          signedInUser.current = null;
+          setSignedInUserState(null);
           setFrontEndLoadedState(true);
         });
       } else {
@@ -226,7 +277,7 @@ function AuthScapeApp(_ref) {
     }
   }, [queryCode, enableAuth]);
 
-  // ---------- Analytics Init ----------
+  // ----- Analytics init -----
   (0, _react.useEffect)(function () {
     if (!frontEndLoadedState || typeof window === "undefined") return;
     if (pageProps.googleAnalytics4Code) {
@@ -240,44 +291,50 @@ function AuthScapeApp(_ref) {
       _reactMicrosoftClarity.clarity.init(process.env.microsoftClarityTrackingCode);
     }
     databaseDrivenPageView(window.location.pathname);
-    _router["default"].events.on("routeChangeComplete", function (url) {
+    var handler = function handler(url) {
       var _ga4React$current;
       (_ga4React$current = ga4React.current) === null || _ga4React$current === void 0 || _ga4React$current.pageview(url);
       databaseDrivenPageView(url);
-    });
-  }, [frontEndLoadedState]);
+    };
+    _router["default"].events.on("routeChangeComplete", handler);
+    return function () {
+      return _router["default"].events.off("routeChangeComplete", handler);
+    };
+  }, [frontEndLoadedState, pageProps.googleAnalytics4Code, pageProps.microsoftClarityCode]);
 
-  // ---------- Enforce Login ----------
+  // ----- Enforce login (client) -----
   (0, _react.useEffect)(function () {
     if (enforceLoggedIn && pathname !== "/signin-oidc" && frontEndLoadedState && !signedInUserState) {
       (0, _authscape.authService)().login();
     }
   }, [signedInUserState, enforceLoggedIn, frontEndLoadedState, pathname]);
-  var GetSignedInUser = function GetSignedInUser() {
-    return signedInUser.current;
-  };
-  var useStore = (0, _zustand.create)(function (set) {
+
+  // Stable getter for current user (with helpers)
+  var currentUser = (0, _react.useMemo)(function () {
+    return ensureUserHelpers(signedInUser.current);
+  }, [signedInUserState]);
+  var useStore = (0, _zustand.create)(function () {
     return store;
   });
 
-  // ---------- Render ----------
+  // ----- Render (SSR-safe; always output page so <title> is visible) -----
   var pageContent = layout ? layout({
     children: /*#__PURE__*/_react["default"].createElement(Component, _extends({}, pageProps, {
-      currentUser: GetSignedInUser(),
+      currentUser: currentUser,
       loadedUser: frontEndLoadedState,
       setIsLoading: setIsLoadingShow,
       logEvent: logEvent,
       store: useStore,
       toast: _reactToastify.toast
     })),
-    currentUser: GetSignedInUser(),
+    currentUser: currentUser,
     setIsLoading: setIsLoadingShow,
     logEvent: logEvent,
     toast: _reactToastify.toast,
     store: useStore,
     pageProps: pageProps
   }) : /*#__PURE__*/_react["default"].createElement(Component, _extends({}, pageProps, {
-    currentUser: GetSignedInUser(),
+    currentUser: currentUser,
     loadedUser: frontEndLoadedState,
     setIsLoading: setIsLoadingShow,
     logEvent: logEvent,

package/package.json

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

package/src/components/AuthScapeApp.js

@@ -1,4 +1,4 @@
-import React, { useState, useRef, useEffect } from "react";
+import React, { useState, useRef, useEffect, useMemo } from "react";
 import { ToastContainer, toast } from "react-toastify";
 import { ThemeProvider } from "@mui/material/styles";
 import Head from "next/head";
@@ -11,6 +11,52 @@ import { create } from "zustand";
 import { clarity } from "react-microsoft-clarity";
 import { authService } from "authscape";
 
+// ---- optional: import your cookie util if not global ----
+// import { setCookie } from "cookies-next";
+// import { apiService } from "@/services/api"; // wherever yours lives
+
+// Decorate a user object with role/permission helpers (idempotent)
+function ensureUserHelpers(u) {
+  if (!u || typeof u !== "object") return u;
+
+  // Avoid redefining on every call
+  if (typeof u.hasRole === "function" &&
+      typeof u.hasRoleId === "function" &&
+      typeof u.hasPermission === "function") {
+    return u;
+  }
+
+  const rolesArr = Array.isArray(u.roles) ? u.roles : [];
+  const permsArr = Array.isArray(u.permissions) ? u.permissions : [];
+
+  // defineProperty keeps them non-enumerable
+  Object.defineProperty(u, "hasRole", {
+    value: function hasRole(name) {
+      if (!name) return false;
+      return rolesArr.some(r => r?.name === name);
+    },
+    writable: false
+  });
+
+  Object.defineProperty(u, "hasRoleId", {
+    value: function hasRoleId(id) {
+      if (id === undefined || id === null) return false;
+      return rolesArr.some(r => r?.id === id);
+    },
+    writable: false
+  });
+
+  Object.defineProperty(u, "hasPermission", {
+    value: function hasPermission(name) {
+      if (!name) return false;
+      return permsArr.includes(name);
+    },
+    writable: false
+  });
+
+  return u;
+}
+
 export function AuthScapeApp({
   Component,
   layout,
@@ -34,20 +80,20 @@ export function AuthScapeApp({
   const queryCode = searchParams.get("code");
   const pathname = usePathname();
 
-  // ---------- PKCE Sign-in ----------
-  const signInValidator = async (queryCode) => {
-    if (queryCodeUsed.current === queryCode) return;
-    queryCodeUsed.current = queryCode;
+  // ----- PKCE Sign-in (browser-only) -----
+  const signInValidator = async (codeFromQuery) => {
+    if (queryCodeUsed.current === codeFromQuery) return;
+    queryCodeUsed.current = codeFromQuery;
 
     if (typeof window === "undefined") return;
 
     const codeVerifier = window.localStorage.getItem("verifier");
-    if (!queryCode || !codeVerifier) return;
+    if (!codeFromQuery || !codeVerifier) return;
 
     const headers = { "Content-Type": "application/x-www-form-urlencoded" };
 
-    const queryString = querystring.stringify({
-      code: queryCode,
+    const body = querystring.stringify({
+      code: codeFromQuery,
       grant_type: "authorization_code",
       redirect_uri: window.location.origin + "/signin-oidc",
       client_id: process.env.client_id,
@@ -58,17 +104,15 @@ export function AuthScapeApp({
     try {
       const response = await axios.post(
         process.env.authorityUri + "/connect/token",
-        queryString,
+        body,
         { headers }
       );
 
-      const domainHost = window.location.hostname
-        .split(".")
-        .slice(-2)
-        .join(".");
+      const domainHost = window.location.hostname.split(".").slice(-2).join(".");
 
       window.localStorage.removeItem("verifier");
 
+      // NOTE: replace setCookie below with your implementation if different
       await setCookie("access_token", response.data.access_token, {
         maxAge: 60 * 60 * 24 * 365,
         path: "/",
@@ -88,24 +132,18 @@ export function AuthScapeApp({
         secure: true,
       });
 
-      const redirectUri = localStorage.getItem("redirectUri");
-      localStorage.clear();
+      const redirectUri = window.localStorage.getItem("redirectUri");
+      window.localStorage.clear();
       window.location.href = redirectUri || "/";
     } catch (exp) {
       console.error("PKCE sign-in failed", exp);
     }
   };
 
-  // ---------- GA + Clarity ----------
+  // ----- GA + Clarity -----
   async function initGA(G) {
-    if (
-      typeof window !== "undefined" &&
-      !GA4React.isInitialized() &&
-      G
-    ) {
-      ga4React.current = new GA4React(G, {
-        debug_mode: !process.env.production,
-      });
+    if (typeof window !== "undefined" && !GA4React.isInitialized() && G) {
+      ga4React.current = new GA4React(G, { debug_mode: !process.env.production });
       try {
         await ga4React.current.initialize();
       } catch (error) {
@@ -115,9 +153,8 @@ export function AuthScapeApp({
   }
 
   const logEvent = (category, action, label) => {
-    if (ga4React.current) {
-      ga4React.current.event(action, label, category);
-    }
+    if (ga4React.current) ga4React.current.event(action, label, category);
+    // your DB analytics can go here if desired
   };
 
   const databaseDrivenPageView = (pathName) => {
@@ -136,16 +173,25 @@ export function AuthScapeApp({
     });
   };
 
-  // ---------- Auth Init ----------
+  // ----- Auth init (runs once) -----
   useEffect(() => {
     if (queryCode) {
       signInValidator(queryCode);
-    } else if (!loadingAuth.current) {
+      return;
+    }
+
+    if (!loadingAuth.current) {
       loadingAuth.current = true;
+
       if (enableAuth) {
         apiService().GetCurrentUser().then((usr) => {
-          signedInUser.current = usr;
-          setSignedInUserState(usr);
+          signedInUser.current = ensureUserHelpers(usr);
+          setSignedInUserState(signedInUser.current);
+          setFrontEndLoadedState(true);
+        }).catch(() => {
+          // no user / anonymous
+          signedInUser.current = null;
+          setSignedInUserState(null);
           setFrontEndLoadedState(true);
         });
       } else {
@@ -154,7 +200,7 @@ export function AuthScapeApp({
     }
   }, [queryCode, enableAuth]);
 
-  // ---------- Analytics Init ----------
+  // ----- Analytics init -----
   useEffect(() => {
     if (!frontEndLoadedState || typeof window === "undefined") return;
 
@@ -172,13 +218,15 @@ export function AuthScapeApp({
 
     databaseDrivenPageView(window.location.pathname);
 
-    Router.events.on("routeChangeComplete", (url) => {
+    const handler = (url) => {
       ga4React.current?.pageview(url);
       databaseDrivenPageView(url);
-    });
-  }, [frontEndLoadedState]);
+    };
+    Router.events.on("routeChangeComplete", handler);
+    return () => Router.events.off("routeChangeComplete", handler);
+  }, [frontEndLoadedState, pageProps.googleAnalytics4Code, pageProps.microsoftClarityCode]);
 
-  // ---------- Enforce Login ----------
+  // ----- Enforce login (client) -----
   useEffect(() => {
     if (
       enforceLoggedIn &&
@@ -190,16 +238,18 @@ export function AuthScapeApp({
     }
   }, [signedInUserState, enforceLoggedIn, frontEndLoadedState, pathname]);
 
-  const GetSignedInUser = () => signedInUser.current;
-  const useStore = create((set) => store);
+  // Stable getter for current user (with helpers)
+  const currentUser = useMemo(() => ensureUserHelpers(signedInUser.current), [signedInUserState]);
+
+  const useStore = create(() => store);
 
-  // ---------- Render ----------
+  // ----- Render (SSR-safe; always output page so <title> is visible) -----
   const pageContent = layout
     ? layout({
         children: (
           <Component
             {...pageProps}
-            currentUser={GetSignedInUser()}
+            currentUser={currentUser}
             loadedUser={frontEndLoadedState}
             setIsLoading={setIsLoadingShow}
             logEvent={logEvent}
@@ -207,7 +257,7 @@ export function AuthScapeApp({
             toast={toast}
           />
         ),
-        currentUser: GetSignedInUser(),
+        currentUser,
         setIsLoading: setIsLoadingShow,
         logEvent,
         toast,
@@ -217,7 +267,7 @@ export function AuthScapeApp({
     : (
       <Component
         {...pageProps}
-        currentUser={GetSignedInUser()}
+        currentUser={currentUser}
         loadedUser={frontEndLoadedState}
         setIsLoading={setIsLoadingShow}
         logEvent={logEvent}