authscape 1.0.229 → 1.0.231

package/index.js

@@ -99,7 +99,7 @@ function AuthScapeApp(_ref) {
     open: isLoading
   }, /*#__PURE__*/_react["default"].createElement(_CircularProgress["default"], {
     color: "inherit"
-  })), /*#__PURE__*/_react["default"].createElement(_reactToastify.ToastContainer, null))), process.env.microsoftClarityTrackingCode != null && /*#__PURE__*/_react["default"].createElement("script", {
+  })), /*#__PURE__*/_react["default"].createElement(_reactToastify.ToastContainer, null))), loadedUser && process.env.microsoftClarityTrackingCode != null && /*#__PURE__*/_react["default"].createElement("script", {
     dangerouslySetInnerHTML: {
       __html: "\n                        (function(c,l,a,r,i,t,y){\n                            c[a] = c[a] || function () { (c[a].q = c[a].q || []).push(arguments) };\n                            t=l.createElement(r);\n                            t.async=1;\n                            t.src=\"https://www.clarity.ms/tag/\"+i;\n                            y=l.getElementsByTagName(r)[0];\n                            y.parentNode.insertBefore(t,y);\n                        })(window, document, \"clarity\", \"script\", \"" + process.env.microsoftClarityTrackingCode + "\");"
     }
@@ -2453,7 +2453,7 @@ var setupDefaultOptions = /*#__PURE__*/function () {
 }();
 var RefreshToken = /*#__PURE__*/function () {
   var _ref2 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee2(originalRequest, instance) {
-    var accessToken, refreshToken, response;
+    var accessToken, refreshToken, response, domainHost;
     return _regeneratorRuntime().wrap(function _callee2$(_context2) {
       while (1) switch (_context2.prev = _context2.next) {
         case 0:
@@ -2474,34 +2474,35 @@ var RefreshToken = /*#__PURE__*/function () {
         case 4:
           response = _context2.sent;
           if (!(response != null && response.status == 200)) {
-            _context2.next = 13;
+            _context2.next = 14;
             break;
           }
+          domainHost = window.location.hostname.split('.').slice(-2).join('.');
           originalRequest.headers['Authorization'] = 'Bearer ' + response.data.access_token;
-          _context2.next = 9;
+          _context2.next = 10;
           return (0, _nookies.setCookie)(null, "access_token", response.data.access_token, {
             maxAge: 2147483647,
             path: '/',
-            domain: window.location.host,
+            domain: domainHost,
             secure: true
           });
-        case 9:
-          _context2.next = 11;
+        case 10:
+          _context2.next = 12;
           return (0, _nookies.setCookie)(null, "expires_in", response.data.expires_in, {
             maxAge: 2147483647,
             path: '/',
-            domain: window.location.host,
+            domain: domainHost,
             secure: true
           });
-        case 11:
-          _context2.next = 13;
+        case 12:
+          _context2.next = 14;
           return (0, _nookies.setCookie)(null, "refresh_token", response.data.refresh_token, {
             maxAge: 2147483647,
             path: '/',
-            domain: window.location.host,
+            domain: domainHost,
             secure: true
           });
-        case 13:
+        case 14:
         case "end":
           return _context2.stop();
       }
@@ -2528,7 +2529,7 @@ var apiService = function apiService() {
     return response;
   }, /*#__PURE__*/function () {
     var _ref3 = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee3(error) {
-      var originalConfig;
+      var originalConfig, domainHost;
       return _regeneratorRuntime().wrap(function _callee3$(_context3) {
         while (1) switch (_context3.prev = _context3.next) {
           case 0:
@@ -2558,20 +2559,21 @@ var apiService = function apiService() {
             if (error.response.config.url.includes("/connect/token"))
               // remove the access and refresh if invalid
               {
+                domainHost = window.location.hostname.split('.').slice(-2).join('.');
                 (0, _nookies.destroyCookie)(null, "access_token", {
                   maxAge: 2147483647,
                   path: '/',
-                  domain: window.location.host
+                  domain: domainHost
                 });
                 (0, _nookies.destroyCookie)(null, "refresh_token", {
                   maxAge: 2147483647,
                   path: '/',
-                  domain: window.location.host
+                  domain: domainHost
                 });
                 (0, _nookies.destroyCookie)(null, "expires_in", {
                   maxAge: 2147483647,
                   path: '/',
-                  domain: window.location.host
+                  domain: domainHost
                 });
               }
             return _context3.abrupt("return", Promise.reject(error));
@@ -3025,27 +3027,29 @@ var authService = function authService() {
     logout: function () {
       var _logout = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee4() {
         var redirectUri,
+          domainHost,
           AuthUri,
           _args4 = arguments;
         return _regeneratorRuntime().wrap(function _callee4$(_context4) {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               redirectUri = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : null;
+              domainHost = window.location.hostname.split('.').slice(-2).join('.');
               AuthUri = process.env.authorityUri;
               (0, _nookies.destroyCookie)({}, "access_token", {
                 maxAge: 2147483647,
                 path: '/',
-                domain: window.location.host
+                domain: domainHost
               });
               (0, _nookies.destroyCookie)({}, "refresh_token", {
                 maxAge: 2147483647,
                 path: '/',
-                domain: window.location.host
+                domain: domainHost
               });
               (0, _nookies.destroyCookie)({}, "expires_in", {
                 maxAge: 2147483647,
                 path: '/',
-                domain: window.location.host
+                domain: domainHost
               });
               setTimeout(function () {
                 if (redirectUri == null) {
@@ -3054,7 +3058,7 @@ var authService = function authService() {
                   window.location.href = AuthUri + "/connect/logout?redirect=" + redirectUri;
                 }
               }, 500);
-            case 6:
+            case 7:
             case "end":
               return _context4.stop();
           }
@@ -3143,13 +3147,13 @@ function asyncGeneratorStep(gen, resolve, reject, _next, _throw, key, arg) { try
 function _asyncToGenerator(fn) { return function () { var self = this, args = arguments; return new Promise(function (resolve, reject) { var gen = fn.apply(self, args); function _next(value) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "next", value); } function _throw(err) { asyncGeneratorStep(gen, resolve, reject, _next, _throw, "throw", err); } _next(undefined); }); }; }
 var signInValidator = /*#__PURE__*/function () {
   var _ref = _asyncToGenerator( /*#__PURE__*/_regeneratorRuntime().mark(function _callee(queryCode) {
-    var codeVerifier, headers, queryString, response, redirectUri;
+    var codeVerifier, headers, queryString, response, domainHost, redirectUri;
     return _regeneratorRuntime().wrap(function _callee$(_context) {
       while (1) switch (_context.prev = _context.next) {
         case 0:
           codeVerifier = window.localStorage.getItem("verifier");
           if (!(queryCode != null && codeVerifier != null)) {
-            _context.next = 17;
+            _context.next = 18;
             break;
           }
           headers = {
@@ -3169,31 +3173,32 @@ var signInValidator = /*#__PURE__*/function () {
           });
         case 6:
           response = _context.sent;
+          domainHost = window.location.hostname.split('.').slice(-2).join('.');
           window.localStorage.removeItem("verifier");
-          _context.next = 10;
+          _context.next = 11;
           return (0, _nookies.setCookie)(null, "access_token", response.data.access_token, {
             maxAge: 2147483647,
             path: '/',
-            domain: window.location.host,
+            domain: domainHost,
             secure: true
           });
-        case 10:
-          _context.next = 12;
+        case 11:
+          _context.next = 13;
           return (0, _nookies.setCookie)(null, "expires_in", response.data.expires_in, {
             maxAge: 2147483647,
             path: '/',
-            domain: window.location.host,
+            domain: domainHost,
             secure: true
           });
-        case 12:
-          _context.next = 14;
+        case 13:
+          _context.next = 15;
           return (0, _nookies.setCookie)(null, "refresh_token", response.data.refresh_token, {
             maxAge: 2147483647,
             path: '/',
-            domain: window.location.host,
+            domain: domainHost,
             secure: true
           });
-        case 14:
+        case 15:
           redirectUri = localStorage.getItem("redirectUri");
           localStorage.clear();
           if (redirectUri != null) {
@@ -3201,7 +3206,7 @@ var signInValidator = /*#__PURE__*/function () {
           } else {
             window.location.href = "/";
           }
-        case 17:
+        case 18:
         case "end":
           return _context.stop();
       }

package/package.json

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

package/src/components/AuthScapeApp.js

@@ -91,7 +91,7 @@ export function AuthScapeApp({Component, pageProps, muiTheme = {}, enforceLogged
                 }
             </ThemeProvider>
 
-            {process.env.microsoftClarityTrackingCode != null &&
+            {(loadedUser && process.env.microsoftClarityTrackingCode != null) &&
                 <script
                 dangerouslySetInnerHTML={{
                     __html: `

package/src/services/apiService.js

@@ -55,13 +55,14 @@ const RefreshToken = async (originalRequest, instance) => {
 
     if (response != null && response.status == 200)
     {
+        let domainHost = window.location.hostname.split('.').slice(-2).join('.');
         originalRequest.headers['Authorization'] = 'Bearer ' + response.data.access_token;
 
         await setCookie(null, "access_token", response.data.access_token,
         {
             maxAge: 2147483647,
             path: '/',
-            domain: window.location.host,
+            domain: domainHost,
             secure: true
         });
     
@@ -69,7 +70,7 @@ const RefreshToken = async (originalRequest, instance) => {
         {
             maxAge: 2147483647,
             path: '/',
-            domain: window.location.host,
+            domain: domainHost,
             secure: true
         });
     
@@ -77,7 +78,7 @@ const RefreshToken = async (originalRequest, instance) => {
         {
             maxAge: 2147483647,
             path: '/',
-            domain: window.location.host,
+            domain: domainHost,
             secure: true
         });
     }
@@ -123,22 +124,24 @@ export const apiService = (ctx = null) => {
 
                     if (error.response.config.url.includes("/connect/token")) // remove the access and refresh if invalid
                     {
+                        let domainHost = window.location.hostname.split('.').slice(-2).join('.');
+
                         destroyCookie(null, "access_token", {
                             maxAge: 2147483647,
                             path: '/',
-                            domain: window.location.host
+                            domain: domainHost
                         });
 
                         destroyCookie(null, "refresh_token", {
                             maxAge: 2147483647,
                             path: '/',
-                            domain: window.location.host
+                            domain: domainHost
                         });
 
                         destroyCookie(null, "expires_in", {
                             maxAge: 2147483647,
                             path: '/',
-                            domain: window.location.host
+                            domain: domainHost
                         });
                     }
 

package/src/services/authService.js

@@ -83,23 +83,24 @@ export const authService = () => {
         },
         logout: async (redirectUri = null) => {
 
+            let domainHost = window.location.hostname.split('.').slice(-2).join('.');
             let AuthUri = process.env.authorityUri;
             destroyCookie({}, "access_token", {
                 maxAge: 2147483647,
                 path: '/',
-                domain: window.location.host
+                domain: domainHost
             });
 
             destroyCookie({}, "refresh_token", {
                 maxAge: 2147483647,
                 path: '/',
-                domain: window.location.host
+                domain: domainHost
             });
 
             destroyCookie({}, "expires_in", {
                 maxAge: 2147483647,
                 path: '/',
-                domain: window.location.host
+                domain: domainHost
             });
 
             setTimeout(() => {

package/src/services/signInValidator.js

@@ -23,13 +23,14 @@ export const signInValidator = async (queryCode) => {
           headers: headers
         });
 
+        let domainHost = window.location.hostname.split('.').slice(-2).join('.');
         window.localStorage.removeItem("verifier");
 
         await setCookie(null, "access_token", response.data.access_token,
         {
             maxAge: 2147483647,
             path: '/',
-            domain: window.location.host,
+            domain: domainHost,
             secure: true
         });
     
@@ -37,7 +38,7 @@ export const signInValidator = async (queryCode) => {
         {
             maxAge: 2147483647,
             path: '/',
-            domain: window.location.host,
+            domain: domainHost,
             secure: true
         });
     
@@ -45,7 +46,7 @@ export const signInValidator = async (queryCode) => {
         {
             maxAge: 2147483647,
             path: '/',
-            domain: window.location.host,
+            domain: domainHost,
             secure: true
         });