authscape 1.0.702 → 1.0.706

package/index.js

@@ -42,19 +42,25 @@ function AuthScapeApp(_ref) {
     _ref$enforceLoggedIn = _ref.enforceLoggedIn,
     enforceLoggedIn = _ref$enforceLoggedIn === void 0 ? false : _ref$enforceLoggedIn,
     _ref$enableAuth = _ref.enableAuth,
-    enableAuth = _ref$enableAuth === void 0 ? true : _ref$enableAuth;
+    enableAuth = _ref$enableAuth === void 0 ? true : _ref$enableAuth,
+    _ref$enableConsentDia = _ref.enableConsentDialog,
+    enableConsentDialog = _ref$enableConsentDia === void 0 ? false : _ref$enableConsentDia;
   var _useState = (0, _react.useState)(false),
     _useState2 = _slicedToArray(_useState, 2),
     frontEndLoadedState = _useState2[0],
     setFrontEndLoadedState = _useState2[1];
   var _useState3 = (0, _react.useState)(false),
     _useState4 = _slicedToArray(_useState3, 2),
-    isLoadingShow = _useState4[0],
-    setIsLoadingShow = _useState4[1];
-  var _useState5 = (0, _react.useState)(null),
+    concentState = _useState4[0],
+    setConcentState = _useState4[1];
+  var _useState5 = (0, _react.useState)(false),
     _useState6 = _slicedToArray(_useState5, 2),
-    signedInUserState = _useState6[0],
-    setSignedInUserState = _useState6[1];
+    isLoadingShow = _useState6[0],
+    setIsLoadingShow = _useState6[1];
+  var _useState7 = (0, _react.useState)(null),
+    _useState8 = _slicedToArray(_useState7, 2),
+    signedInUserState = _useState8[0],
+    setSignedInUserState = _useState8[1];
   var loadingAuth = (0, _react.useRef)(false);
   var frontEndLoaded = (0, _react.useRef)(false);
   var signedInUser = (0, _react.useRef)(null);
@@ -64,20 +70,13 @@ function AuthScapeApp(_ref) {
   var queryRef = searchParams.get('ref');
   var queryCode = searchParams.get('code');
   var pathname = (0, _navigation.usePathname)();
-  (0, _react.useEffect)(function () {
-    var stored = localStorage.getItem("gdpr-consent");
-    if (stored) {
-      var prefs = JSON.parse(stored);
-      console.log("User previously consented:", prefs);
-      // optional: send to your backend
-    }
-  }, []);
   var handleConsentAccepted = function handleConsentAccepted(prefs) {
     console.log("Consent accepted:", prefs);
-    // optional: send to backend
+    setConcentState(prefs);
   };
   var handleConsentRejected = function handleConsentRejected() {
     console.log("Consent rejected");
+    setConcentState(null);
     // disable analytics scripts, etc.
   };
   var signInValidator = /*#__PURE__*/function () {
@@ -274,7 +273,15 @@ function AuthScapeApp(_ref) {
     }
   };
   (0, _react.useEffect)(function () {
-    if (frontEndLoadedState) {
+    var enableAnalytics = false;
+    var stored = localStorage.getItem("gdpr-consent");
+    if (stored) {
+      var prefs = JSON.parse(stored);
+      if (prefs.analytics) {
+        enableAnalytics = true;
+      }
+    }
+    if (frontEndLoadedState && !enableConsentDialog || frontEndLoadedState && enableConsentDialog && enableAnalytics) {
       if (pageProps.googleAnalytics4Code != null) {
         initGA(pageProps.googleAnalytics4Code);
       } else if (process.env.googleAnalytics4 != "") {
@@ -315,7 +322,7 @@ function AuthScapeApp(_ref) {
         document.body.appendChild(script);
       }
     }
-  }, [frontEndLoadedState]);
+  }, [frontEndLoadedState, concentState]);
   var validateUserSignedIn = /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator(/*#__PURE__*/_regeneratorRuntime().mark(function _callee2() {
       var usr;
@@ -463,22 +470,15 @@ function AuthScapeApp(_ref) {
   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(GDPRConsentDialog, {
+  })), enableConsentDialog && /*#__PURE__*/_react["default"].createElement(GDPRConsentDialog, {
     onAccept: handleConsentAccepted,
     onReject: handleConsentRejected,
     enableAnalytics: true,
-    enableMarketing: true,
-    additionalPrivacyFeatures: [{
-      id: "danceParty",
-      title: "Dance Party",
-      description: "Hello world this is about the feature",
-      checked: true
-    }, {
-      id: "frog",
-      title: "Able to see Frogs",
-      description: "Frogs will appear on your screen",
-      checked: true
-    }]
+    enableMarketing: false
+    // additionalPrivacyFeatures={[
+    //     {id: "danceParty", title: "Dance Party", description: "Hello world this is about the feature", checked: true },
+    //     {id: "frog", title: "Able to see Frogs", description: "Frogs will appear on your screen", checked: true }
+    // ]}
   }), /*#__PURE__*/_react["default"].createElement(_styles.ThemeProvider, {
     theme: muiTheme
   }, frontEndLoadedState != null && frontEndLoadedState && pathname != "/signin-oidc" && /*#__PURE__*/_react["default"].createElement(_react["default"].Fragment, null, layout != null && layout({
@@ -2366,7 +2366,7 @@ var FileUploader = exports.FileUploader = function FileUploader(_ref) {
 Object.defineProperty(exports, "__esModule", {
   value: true
 });
-exports["default"] = GDPRConsentDialog;
+exports.GDPRConsentDialog = void 0;
 var _react = _interopRequireWildcard(require("react"));
 var _material = require("@mui/material");
 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); }
@@ -2383,7 +2383,7 @@ function _objectSpread(e) { for (var r = 1; r < arguments.length; r++) { var t =
 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 GDPRConsentDialog(_ref) {
+var GDPRConsentDialog = exports.GDPRConsentDialog = function GDPRConsentDialog(_ref) {
   var onAccept = _ref.onAccept,
     onReject = _ref.onReject,
     _ref$enableAnalytics = _ref.enableAnalytics,
@@ -2568,7 +2568,7 @@ function GDPRConsentDialog(_ref) {
       return setCustomize(false);
     }
   }, "Cancel")))));
-}
+};
 "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); }

package/package.json

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

package/src/components/AuthScapeApp.js

@@ -11,9 +11,10 @@ import { create } from 'zustand'
 import { clarity } from 'react-microsoft-clarity';
 import { authService } from 'authscape';
 
-export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiTheme = {}, store={}, enforceLoggedIn = false, enableAuth = true}) {
+export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiTheme = {}, store={}, enforceLoggedIn = false, enableAuth = true, enableConsentDialog = false}) {
 
     const [frontEndLoadedState, setFrontEndLoadedState] = useState(false);
+    const [concentState, setConcentState] = useState(false);
 
     const [isLoadingShow, setIsLoadingShow] = useState(false);
 
@@ -32,23 +33,14 @@ export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiT
 
     const pathname = usePathname();
 
-
-    useEffect(() => {
-        const stored = localStorage.getItem("gdpr-consent");
-        if (stored) {
-        const prefs = JSON.parse(stored);
-        console.log("User previously consented:", prefs);
-        // optional: send to your backend
-        }
-    }, []);
-
     const handleConsentAccepted = (prefs) => {
         console.log("Consent accepted:", prefs);
-        // optional: send to backend
+        setConcentState(prefs);
     };
 
     const handleConsentRejected = () => {
         console.log("Consent rejected");
+        setConcentState(null);
         // disable analytics scripts, etc.
     };
 
@@ -234,7 +226,17 @@ export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiT
 
     useEffect(() => {
 
-        if (frontEndLoadedState)
+        let enableAnalytics = false;
+        const stored = localStorage.getItem("gdpr-consent");
+        if (stored) {
+            const prefs = JSON.parse(stored);
+            if (prefs.analytics)
+            {
+                enableAnalytics = true;
+            }
+        }
+
+        if ((frontEndLoadedState && !enableConsentDialog) || (frontEndLoadedState && enableConsentDialog && enableAnalytics))
         {
             if (pageProps.googleAnalytics4Code != null)
             {
@@ -290,7 +292,7 @@ export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiT
             }
         }
 
-    }, [frontEndLoadedState]);
+    }, [frontEndLoadedState, concentState]);
 
     const validateUserSignedIn = async () => {
 
@@ -492,16 +494,18 @@ export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiT
 
             </Head>
 
-            <GDPRConsentDialog
-                onAccept={handleConsentAccepted}
-                onReject={handleConsentRejected}
-                enableAnalytics={true}
-                enableMarketing={true}
-                additionalPrivacyFeatures={[
-                    {id: "danceParty", title: "Dance Party", description: "Hello world this is about the feature", checked: true },
-                    {id: "frog", title: "Able to see Frogs", description: "Frogs will appear on your screen", checked: true }
-                ]}
-            />
+            {enableConsentDialog &&
+                <GDPRConsentDialog
+                    onAccept={handleConsentAccepted}
+                    onReject={handleConsentRejected}
+                    enableAnalytics={true}
+                    enableMarketing={false}
+                    // additionalPrivacyFeatures={[
+                    //     {id: "danceParty", title: "Dance Party", description: "Hello world this is about the feature", checked: true },
+                    //     {id: "frog", title: "Able to see Frogs", description: "Frogs will appear on your screen", checked: true }
+                    // ]}
+                />
+            }
 
             <ThemeProvider theme={muiTheme}>
                 {frontEndLoadedState != null && frontEndLoadedState && pathname != "/signin-oidc" &&

package/src/components/GDPRConsentDialog.js

@@ -9,13 +9,13 @@ import {
   Collapse,
 } from "@mui/material";
 
-export default function GDPRConsentDialog({
+export const GDPRConsentDialog = ({
   onAccept,
   onReject,
   enableAnalytics = true,
   enableMarketing = true,
   additionalPrivacyFeatures = []
-}) {
+}) => {
   const initialPreferences = {
     necessary: true,
     analytics: enableAnalytics,