authscape 1.0.668 → 1.0.672

package/index.js

@@ -261,10 +261,19 @@ function AuthScapeApp(_ref) {
   };
   (0, _react.useEffect)(function () {
     if (frontEndLoadedState) {
-      if (process.env.googleAnalytics4 != "") {
+      if (pageProps.googleAnalytics4Code != null) {
+        initGA(pageProps.googleAnalytics4Code);
+      } else if (process.env.googleAnalytics4 != "") {
         initGA(process.env.googleAnalytics4);
       }
-      if (process.env.microsoftClarityTrackingCode != "") {
+      if (pageProps.microsoftClarityCode != null) {
+        _reactMicrosoftClarity.clarity.init(pageProps.microsoftClarityCode);
+        if (signedInUser.current != null && _reactMicrosoftClarity.clarity.hasStarted()) {
+          _reactMicrosoftClarity.clarity.identify('USER_ID', {
+            userProperty: signedInUser.current.id.toString()
+          });
+        }
+      } else if (process.env.microsoftClarityTrackingCode != "") {
         _reactMicrosoftClarity.clarity.init(process.env.microsoftClarityTrackingCode);
         if (signedInUser.current != null && _reactMicrosoftClarity.clarity.hasStarted()) {
           _reactMicrosoftClarity.clarity.identify('USER_ID', {
@@ -9183,7 +9192,7 @@ function PrivateLabelPageModule(_x, _x2) {
 }
 function _PrivateLabelPageModule() {
   _PrivateLabelPageModule = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(apiUri, host) {
-    var data, response;
+    var data, response, dataResponse, hasWWW;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
@@ -9204,19 +9213,31 @@ function _PrivateLabelPageModule() {
           _context.next = 8;
           return response.json();
         case 8:
-          data = _context.sent;
-          if (data != null) {
-            if (data.companyId != null) {
-              data.oemCompanyId = data.companyId;
+          dataResponse = _context.sent;
+          if (dataResponse != null) {
+            if (dataResponse.companyId != null) {
+              data.oemCompanyId = dataResponse.companyId;
+            }
+            if (dataResponse.demoCompanyId != null) {
+              data.demoId = dataResponse.demoCompanyId;
             }
-            if (data.demoCompanyId != null) {
-              data.demoId = data.demoCompanyId;
+            if (dataResponse.favIcon != null) {
+              data.favIcon = dataResponse.favIcon;
             }
-            if (data.favIcon != null) {
-              data.favIcon = data.favIcon;
+            if (dataResponse.companyName != null) {
+              data.companyName = dataResponse.companyName;
             }
-            if (data.companyName != null) {
-              data.companyName = data.companyName;
+
+            // check for redirect
+            if (dataResponse.redirectTrafficToCanonical) {
+              hasWWW = host.startsWith('www.');
+              if (hasWWW) {
+                data.redirect = {
+                  destination: dataResponse.canonicalBaseUrl,
+                  // Replace with your target URL
+                  permanent: false // Set to true for a permanent redirect (HTTP 308)
+                };
+              }
             }
           }
         case 10:

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "authscape",
-  "version": "1.0.668",
+  "version": "1.0.672",
   "description": "",
   "main": "index.js",
   "scripts": {
@@ -15,11 +15,11 @@
     "react-dom": "^18.2.0"
   },
   "devDependencies": {
-    "@babel/cli": "^7.21.5",
-    "@babel/core": "^7.22.1",
-    "@babel/preset-env": "^7.22.2",
-    "@babel/preset-react": "^7.0.0",
-    "react-dom": "^18.2.0"
+    "@babel/cli": "^7.27.0",
+    "@babel/core": "^7.26.10",
+    "@babel/preset-env": "^7.26.9",
+    "@babel/preset-react": "^7.26.3",
+    "react-dom": "^18.3.1"
   },
   "dependencies": {
     "@microsoft/signalr": "^8.0.0",

package/src/components/AuthScapeApp.js

@@ -219,12 +219,25 @@ export function AuthScapeApp ({Component, layout, loadingLayout, pageProps, muiT
 
         if (frontEndLoadedState)
         {
-            if (process.env.googleAnalytics4 != "")
+            if (pageProps.googleAnalytics4Code != null)
+            {
+                initGA(pageProps.googleAnalytics4Code);
+            }
+            else if (process.env.googleAnalytics4 != "")
             {
                 initGA(process.env.googleAnalytics4);
             }
 
-            if (process.env.microsoftClarityTrackingCode != "")
+            if (pageProps.microsoftClarityCode != null)
+            {
+                clarity.init(pageProps.microsoftClarityCode);
+
+                if (signedInUser.current != null && clarity.hasStarted())
+                {
+                    clarity.identify('USER_ID', { userProperty: signedInUser.current.id.toString() });
+                }
+            }
+            else if (process.env.microsoftClarityTrackingCode != "")
             {
                 clarity.init(process.env.microsoftClarityTrackingCode);
 

package/src/services/PrivateLabelPageModule.js

@@ -15,27 +15,39 @@ export async function PrivateLabelPageModule(apiUri, host) {
     const response = await fetch(apiUri + "/api/PrivateLabel/GetCompanyIdFromDomain?domain=" + host);
     if (response.status == 200)
     {
-        var data = await response.json();
-        if (data != null)
+        var dataResponse = await response.json();
+        if (dataResponse != null)
         {
-            if (data.companyId != null)
+            if (dataResponse.companyId != null)
             {
-                data.oemCompanyId = data.companyId;
+                data.oemCompanyId = dataResponse.companyId;
             }
 
-            if (data.demoCompanyId != null)
+            if (dataResponse.demoCompanyId != null)
             {
-                data.demoId = data.demoCompanyId;
+                data.demoId = dataResponse.demoCompanyId;
             }
 
-            if (data.favIcon != null)
+            if (dataResponse.favIcon != null)
             {
-                data.favIcon = data.favIcon;
+                data.favIcon = dataResponse.favIcon;
             }
 
-            if (data.companyName != null)
+            if (dataResponse.companyName != null)
             {
-                data.companyName = data.companyName;
+                data.companyName = dataResponse.companyName;
+            }
+
+            // check for redirect
+            if (dataResponse.redirectTrafficToCanonical)
+            {
+                const hasWWW = host.startsWith('www.');
+                if (hasWWW) {
+                    data.redirect = {
+                        destination: dataResponse.canonicalBaseUrl, // Replace with your target URL
+                        permanent: false, // Set to true for a permanent redirect (HTTP 308)
+                    }
+                }
             }
         }
     }