studiokit-scaffolding-js 7.0.19 → 7.0.20-alpha.1

package/lib/redux/sagas/authSaga.d.ts

@@ -14,6 +14,12 @@ export declare function credentialsLoginFlow(action: AuthCasV1LoginRequestAction
 export declare function casV1LoginFlow(action: AuthCasV1LoginRequestAction): SagaIterator;
 export declare function localLoginFlow(action: AuthLocalLoginRequestAction): SagaIterator;
 export declare function casTicketLoginFlow(ticket: string, service: string): SagaIterator;
+/**
+ * When an Unauthorized 401 response is received, try to refresh the access token, otherwise trigger log out.
+ *
+ * This should be unlikely since we normally have a refresh token loop happening
+ * but if the app is backgrounded, the loop might not be caught up yet.
+ */
 export declare function handleAuthFailure(action: ModelFetchErrorAction): SagaIterator;
 export declare const getOAuthToken: TokenAccessFunction;
 export default function authSaga(clientCredentialsParam: ClientCredentials, tokenPersistenceServiceParam?: TokenPersistenceService, ticketProviderService?: TicketProviderService, codeProviderService?: CodeProviderService): SagaIterator;

package/lib/redux/sagas/authSaga.js

@@ -279,17 +279,31 @@ function casTicketLoginFlow(ticket, service) {
     });
 }
 exports.casTicketLoginFlow = casTicketLoginFlow;
+/**
+ * When an Unauthorized 401 response is received, try to refresh the access token, otherwise trigger log out.
+ *
+ * This should be unlikely since we normally have a refresh token loop happening
+ * but if the app is backgrounded, the loop might not be caught up yet.
+ */
 function handleAuthFailure(action) {
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                if (!(oauthToken && action.errorData && action.errorData.status === types_1.HTTP_STATUS_CODE.UNAUTHORIZED)) return [3 /*break*/, 2];
+                if (!(oauthToken && action.errorData && action.errorData.status === types_1.HTTP_STATUS_CODE.UNAUTHORIZED)) return [3 /*break*/, 4];
+                if (!oauthToken.refresh_token) return [3 /*break*/, 2];
                 logger.debug('token expired - refreshing');
                 return [4 /*yield*/, effects_1.call(performTokenRefresh)];
             case 1:
                 _a.sent();
-                _a.label = 2;
-            case 2: return [2 /*return*/];
+                return [3 /*break*/, 4];
+            case 2: 
+            // no refresh token, trigger log out
+            return [4 /*yield*/, effects_1.put({ type: actions_1.AUTH_ACTION_TYPE.LOG_OUT_REQUESTED })];
+            case 3:
+                // no refresh token, trigger log out
+                _a.sent();
+                _a.label = 4;
+            case 4: return [2 /*return*/];
         }
     });
 }
@@ -303,17 +317,21 @@ var getOAuthToken = function (modelName) {
                 if (modelName === 'getToken') {
                     return [2 /*return*/, null];
                 }
-                if (!(oauthToken && oauthToken['.expires'])) return [3 /*break*/, 2];
+                if (!(oauthToken && oauthToken['.expires'])) return [3 /*break*/, 4];
+                if (!(new Date(oauthToken['.expires']) <= new Date() && !oauthToken.refresh_token)) return [3 /*break*/, 2];
+                return [4 /*yield*/, effects_1.put({ type: actions_1.AUTH_ACTION_TYPE.LOG_OUT_REQUESTED })];
+            case 1:
+                _a.sent();
+                return [2 /*return*/, null];
+            case 2:
                 thirtySecondsFromNow = new Date();
                 thirtySecondsFromNow.setSeconds(thirtySecondsFromNow.getSeconds() + 30);
-                if (!(new Date(oauthToken['.expires']) < thirtySecondsFromNow)) return [3 /*break*/, 2];
-                // start a token refresh and wait for the success action in case another refresh is currently happening
+                if (!(new Date(oauthToken['.expires']) < thirtySecondsFromNow && oauthToken.refresh_token)) return [3 /*break*/, 4];
                 return [4 /*yield*/, effects_1.call(performTokenRefresh)];
-            case 1:
-                // start a token refresh and wait for the success action in case another refresh is currently happening
+            case 3:
                 _a.sent();
                 return [2 /*return*/, oauthToken];
-            case 2: return [2 /*return*/, oauthToken];
+            case 4: return [2 /*return*/, oauthToken];
         }
     });
 };

package/lib/types/net/TokenAccessFunction.d.ts

@@ -1,3 +1,3 @@
-import { CallEffect } from 'redux-saga/effects';
+import { CallEffect, PutEffect } from 'redux-saga/effects';
 import { OAuthTokenOrNull } from './OAuthTokenOrNull';
-export declare type TokenAccessFunction = (modelName: string) => IterableIterator<OAuthTokenOrNull | CallEffect>;
+export declare type TokenAccessFunction = (modelName: string) => IterableIterator<OAuthTokenOrNull | CallEffect | PutEffect>;

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "studiokit-scaffolding-js",
-	"version": "7.0.19",
+	"version": "7.0.20-alpha.1",
 	"description": "Common scaffolding for Studio apps at Purdue",
 	"repository": "https://gitlab.com/purdue-informatics/studiokit/studiokit-scaffolding-js",
 	"license": "MIT",