@opengeoweb/api 4.14.1 → 4.15.0

package/index.esm.js

@@ -323,7 +323,8 @@ var makeCredentialsFromTokenResponse = function makeCredentialsFromTokenResponse
     token: access_token,
     refresh_token: refresh_token || '',
     expires_at: epochTimeTokenExpirationInSeconds,
-    keep_session_alive_at: getCurrentTimeInSeconds() + KEEP_ALIVE_IN_SECONDS
+    keep_session_alive_at: getCurrentTimeInSeconds() + KEEP_ALIVE_IN_SECONDS,
+    has_connection_issue: false
   };
   return newAuth;
 };
@@ -382,40 +383,29 @@ var refreshAccessTokenAndSetAuthContext = function refreshAccessTokenAndSetAuthC
 
           case 3:
             refreshedToken = _context.sent;
-            newAuth = makeCredentialsFromTokenResponse(refreshedToken);
-            /*
-              Note: Should not use the spread operator here on the auth object to create a new object.
-              Creating a new object and setting that via onSetAuth might change the auth object too late.
-              Instead assign the new token directly to the property and then use the onSetAuth.
-            */
-            // eslint-disable-next-line no-param-reassign
+            newAuth = makeCredentialsFromTokenResponse(refreshedToken); // Cognito does not send a new refresh token, but gitlab does. Set it here into the auth context.
 
-            auth.token = newAuth.token; // eslint-disable-next-line no-param-reassign
+            if (!newAuth.refresh_token || newAuth.refresh_token.length === 0) {
+              newAuth.refresh_token = auth.refresh_token;
+            }
 
-            auth.expires_at = newAuth.expires_at; // eslint-disable-next-line no-param-reassign
-
-            auth.refresh_token = newAuth.refresh_token || auth.refresh_token; // eslint-disable-next-line no-param-reassign
-
-            auth.keep_session_alive_at = newAuth.keep_session_alive_at;
-            onSetAuth(Object.assign(Object.assign({}, auth), {
-              has_connection_issue: false
-            }));
-            _context.next = 15;
+            onSetAuth(newAuth);
+            _context.next = 12;
             break;
 
-          case 12:
-            _context.prev = 12;
+          case 9:
+            _context.prev = 9;
             _context.t0 = _context["catch"](0);
             onSetAuth(Object.assign(Object.assign({}, auth), {
               has_connection_issue: true
             }));
 
-          case 15:
+          case 12:
           case "end":
             return _context.stop();
         }
       }
-    }, _callee, null, [[0, 12]]);
+    }, _callee, null, [[0, 9]]);
   }));
 };
 var createApiInstance = function createApiInstance(_ref3) {

package/index.umd.js

@@ -350,7 +350,8 @@
         token: access_token,
         refresh_token: refresh_token || '',
         expires_at: epochTimeTokenExpirationInSeconds,
-        keep_session_alive_at: getCurrentTimeInSeconds() + KEEP_ALIVE_IN_SECONDS
+        keep_session_alive_at: getCurrentTimeInSeconds() + KEEP_ALIVE_IN_SECONDS,
+        has_connection_issue: false
       };
       return newAuth;
     };
@@ -411,24 +412,13 @@
 
             case 1:
               refreshedToken = _c.sent();
-              newAuth = makeCredentialsFromTokenResponse(refreshedToken);
-              /*
-                Note: Should not use the spread operator here on the auth object to create a new object.
-                Creating a new object and setting that via onSetAuth might change the auth object too late.
-                Instead assign the new token directly to the property and then use the onSetAuth.
-              */
-              // eslint-disable-next-line no-param-reassign
+              newAuth = makeCredentialsFromTokenResponse(refreshedToken); // Cognito does not send a new refresh token, but gitlab does. Set it here into the auth context.
 
-              auth.token = newAuth.token; // eslint-disable-next-line no-param-reassign
+              if (!newAuth.refresh_token || newAuth.refresh_token.length === 0) {
+                newAuth.refresh_token = auth.refresh_token;
+              }
 
-              auth.expires_at = newAuth.expires_at; // eslint-disable-next-line no-param-reassign
-
-              auth.refresh_token = newAuth.refresh_token || auth.refresh_token; // eslint-disable-next-line no-param-reassign
-
-              auth.keep_session_alive_at = newAuth.keep_session_alive_at;
-              onSetAuth(__assign(__assign({}, auth), {
-                has_connection_issue: false
-              }));
+              onSetAuth(newAuth);
               return [3
               /*break*/
               , 3];

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@opengeoweb/api",
-  "version": "4.14.1",
+  "version": "4.15.0",
   "description": "GeoWeb API library for the opengeoweb project",
   "license": "Apache-2.0",
   "repository": {
@@ -14,9 +14,9 @@
   "peerDependencies": {
     "react": "^18.2.0",
     "axios": "^0.25.0",
-    "@opengeoweb/shared": "4.14.1",
+    "@opengeoweb/shared": "4.15.0",
     "@mui/material": "^5.10.8",
-    "@opengeoweb/theme": "4.14.1",
+    "@opengeoweb/theme": "4.15.0",
     "react-draggable": "^4.4.5",
     "re-resizable": "^6.9.0",
     "@redux-eggs/core": "^2.2.0",