authscape 1.0.224 → 1.0.227

package/index.js

@@ -2477,7 +2477,7 @@ var RefreshToken = /*#__PURE__*/function () {
             _context2.next = 14;
             break;
           }
-          baseURL = window.location.protocol + "//" + window.location.host;
+          baseURL = window.location.origin;
           originalRequest.headers['Authorization'] = 'Bearer ' + response.data.access_token;
           _context2.next = 10;
           return (0, _nookies.setCookie)(null, "access_token", response.data.access_token, {
@@ -2562,7 +2562,7 @@ var apiService = function apiService() {
             if (error.response.config.url.includes("/connect/token"))
               // remove the access and refresh if invalid
               {
-                baseURL = window.location.protocol + "//" + window.location.host;
+                baseURL = window.location.origin;
                 (0, _nookies.destroyCookie)(null, "access_token", {
                   maxAge: 2147483647,
                   path: '/',
@@ -3039,7 +3039,7 @@ var authService = function authService() {
           while (1) switch (_context4.prev = _context4.next) {
             case 0:
               redirectUri = _args4.length > 0 && _args4[0] !== undefined ? _args4[0] : null;
-              cookieDomain = window.location.protocol + "//" + window.location.host;
+              cookieDomain = window.location.origin;
               AuthUri = process.env.authorityUri; //let cookieDomain = process.env.cookieDomain;
               (0, _nookies.destroyCookie)({}, "access_token", {
                 maxAge: 2147483647,
@@ -3152,13 +3152,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, domain, redirectUri;
+    var codeVerifier, headers, queryString, response, 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 = 18;
+            _context.next = 17;
             break;
           }
           headers = {
@@ -3181,31 +3181,33 @@ var signInValidator = /*#__PURE__*/function () {
           window.localStorage.removeItem("verifier");
 
           //let domain = process.env.cookieDomain;
-          domain = window.location.protocol + "//" + window.location.host;
-          _context.next = 11;
+          _context.next = 10;
           return (0, _nookies.setCookie)(null, "access_token", response.data.access_token, {
             maxAge: 2147483647,
             path: '/',
-            domain: domain,
-            secure: true
+            domain: window.location.origin,
+            secure: true,
+            sameSite: false
           });
-        case 11:
-          _context.next = 13;
+        case 10:
+          _context.next = 12;
           return (0, _nookies.setCookie)(null, "expires_in", response.data.expires_in, {
             maxAge: 2147483647,
             path: '/',
-            domain: domain,
-            secure: true
+            domain: window.location.origin,
+            secure: true,
+            sameSite: false
           });
-        case 13:
-          _context.next = 15;
+        case 12:
+          _context.next = 14;
           return (0, _nookies.setCookie)(null, "refresh_token", response.data.refresh_token, {
             maxAge: 2147483647,
             path: '/',
-            domain: domain,
-            secure: true
+            domain: window.location.origin,
+            secure: true,
+            sameSite: false
           });
-        case 15:
+        case 14:
           redirectUri = localStorage.getItem("redirectUri");
           localStorage.clear();
           if (redirectUri != null) {
@@ -3213,7 +3215,7 @@ var signInValidator = /*#__PURE__*/function () {
           } else {
             window.location.href = "/";
           }
-        case 18:
+        case 17:
         case "end":
           return _context.stop();
       }

package/package.json

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

package/src/services/apiService.js

@@ -55,7 +55,7 @@ const RefreshToken = async (originalRequest, instance) => {
 
     if (response != null && response.status == 200)
     {
-        var baseURL = window.location.protocol + "//" + window.location.host;
+        var baseURL = window.location.origin;
         
         originalRequest.headers['Authorization'] = 'Bearer ' + response.data.access_token;
 
@@ -125,7 +125,7 @@ export const apiService = (ctx = null) => {
 
                     if (error.response.config.url.includes("/connect/token")) // remove the access and refresh if invalid
                     {
-                        var baseURL = window.location.protocol + "//" + window.location.host;
+                        var baseURL = window.location.origin;
 
                         destroyCookie(null, "access_token", {
                             maxAge: 2147483647,

package/src/services/authService.js

@@ -83,7 +83,7 @@ export const authService = () => {
         },
         logout: async (redirectUri = null) => {
 
-            var cookieDomain = window.location.protocol + "//" + window.location.host;
+            var cookieDomain = window.location.origin;
 
             let AuthUri = process.env.authorityUri;
             //let cookieDomain = process.env.cookieDomain;

package/src/services/signInValidator.js

@@ -26,30 +26,32 @@ export const signInValidator = async (queryCode) => {
         window.localStorage.removeItem("verifier");
 
         //let domain = process.env.cookieDomain;
-        var domain = window.location.protocol + "//" + window.location.host;
 
         await setCookie(null, "access_token", response.data.access_token,
         {
             maxAge: 2147483647,
             path: '/',
-            domain: domain,
-            secure: true
+            domain: window.location.origin,
+            secure: true,
+            sameSite: false
         });
     
         await setCookie(null, "expires_in", response.data.expires_in,
         {
             maxAge: 2147483647,
             path: '/',
-            domain: domain,
-            secure: true
+            domain: window.location.origin,
+            secure: true,
+            sameSite: false
         });
     
         await setCookie(null, "refresh_token", response.data.refresh_token,
         {
             maxAge: 2147483647,
             path: '/',
-            domain: domain,
-            secure: true
+            domain: window.location.origin,
+            secure: true,
+            sameSite: false
         });