studiokit-scaffolding-js 5.2.0-next.2.8 → 5.2.0-next.2.9

package/lib/redux/actions/AuthAction.d.ts

@@ -2,7 +2,6 @@ import { Action } from 'redux';
 import { CasV1LoginRequestBody, IdentityProvider } from '../../types';
 import { LocalLoginRequestBody } from '../../types/auth/LocalLoginRequestBody';
 import { OAuthToken, OAuthTokenOrNull } from '../../types/net';
-import { BaseModelFetchRequestAction } from './ModelAction';
 export declare enum AUTH_ACTION_TYPE {
     CAS_LOGIN_REQUESTED = "auth/CAS_LOGIN_REQUESTED",
     LOGIN_REQUESTED = "auth/LOGIN_REQUESTED",
@@ -43,12 +42,12 @@ export interface AuthIdentityProviderRequestAction extends Action<AUTH_IDENTITY_
 export declare enum AUTH_CAS_V1_LOGIN_REQUEST_ACTION_TYPE {
     CAS_V1_LOGIN_REQUEST = "auth/CAS_V1_LOGIN_REQUEST"
 }
-export interface AuthCasV1LoginRequestAction extends Omit<BaseModelFetchRequestAction<AUTH_CAS_V1_LOGIN_REQUEST_ACTION_TYPE>, 'modelName' | 'pathParams'> {
+export interface AuthCasV1LoginRequestAction extends Action<AUTH_CAS_V1_LOGIN_REQUEST_ACTION_TYPE> {
     body: CasV1LoginRequestBody;
 }
 export declare enum AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE {
     LOCAL_LOGIN_REQUEST = "auth/LOCAL_LOGIN_REQUEST"
 }
-export interface AuthLocalLoginRequestAction extends Omit<BaseModelFetchRequestAction<AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE>, 'modelName' | 'pathParams'> {
+export interface AuthLocalLoginRequestAction extends Action<AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE> {
     body: LocalLoginRequestBody;
 }

package/lib/redux/sagas/authSaga.js

@@ -1,15 +1,4 @@
 "use strict";
-var __assign = (this && this.__assign) || function () {
-    __assign = Object.assign || function(t) {
-        for (var s, i = 1, n = arguments.length; i < n; i++) {
-            s = arguments[i];
-            for (var p in s) if (Object.prototype.hasOwnProperty.call(s, p))
-                t[p] = s[p];
-        }
-        return t;
-    };
-    return __assign.apply(this, arguments);
-};
 var __generator = (this && this.__generator) || function (thisArg, body) {
     var _ = { label: 0, sent: function() { if (t[0] & 1) throw t[1]; return t[1]; }, trys: [], ops: [] }, f, y, t, g;
     return g = { next: verb(0), "throw": verb(1), "return": verb(2) }, typeof Symbol === "function" && (g[Symbol.iterator] = function() { return this; }), g;
@@ -236,9 +225,16 @@ function credentialsLoginFlow(action, modelName) {
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                modelFetchRequestAction = __assign(__assign({}, action), { 
-                    // set required overrides
-                    type: actions_1.MODEL_FETCH_REQUEST_ACTION_TYPE.FETCH_REQUEST, modelName: modelName, noStore: true });
+                modelFetchRequestAction = {
+                    // set required defaults
+                    type: actions_1.MODEL_FETCH_REQUEST_ACTION_TYPE.FETCH_REQUEST,
+                    modelName: modelName,
+                    noStore: true,
+                    // force no retry
+                    noRetry: true,
+                    // pass thru body
+                    body: action.body
+                };
                 return [4 /*yield*/, effects_1.call(loginFlow, modelFetchRequestAction)];
             case 1: return [2 /*return*/, _a.sent()];
         }
@@ -323,7 +319,7 @@ var getOAuthToken = function (modelName) {
 };
 exports.getOAuthToken = getOAuthToken;
 function authSaga(clientCredentialsParam, tokenPersistenceServiceParam, ticketProviderService, codeProviderService) {
-    var casTicket, service, code, _a, casV1Action, localAction;
+    var casTicket, service, code, _a, casV1Action, localLoginAction;
     if (tokenPersistenceServiceParam === void 0) { tokenPersistenceServiceParam = tokenPersistenceService_1.tokenPersistenceService; }
     if (ticketProviderService === void 0) { ticketProviderService = ticketProviderService_1.ticketProviderService; }
     if (codeProviderService === void 0) { codeProviderService = codeProviderService_1.codeProviderService; }
@@ -381,10 +377,10 @@ function authSaga(clientCredentialsParam, tokenPersistenceServiceParam, ticketPr
                 if (!!oauthToken) return [3 /*break*/, 16];
                 return [4 /*yield*/, effects_1.race({
                         casV1Action: effects_1.take(actions_1.AUTH_CAS_V1_LOGIN_REQUEST_ACTION_TYPE.CAS_V1_LOGIN_REQUEST),
-                        localAction: effects_1.take(actions_1.AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE.LOCAL_LOGIN_REQUEST)
+                        localLoginAction: effects_1.take(actions_1.AUTH_LOCAL_LOGIN_REQUEST_ACTION_TYPE.LOCAL_LOGIN_REQUEST)
                     })];
             case 11:
-                _a = _b.sent(), casV1Action = _a.casV1Action, localAction = _a.localAction;
+                _a = _b.sent(), casV1Action = _a.casV1Action, localLoginAction = _a.localLoginAction;
                 return [4 /*yield*/, effects_1.put({ type: actions_1.AUTH_ACTION_TYPE.LOGIN_REQUESTED })];
             case 12:
                 _b.sent();
@@ -394,8 +390,8 @@ function authSaga(clientCredentialsParam, tokenPersistenceServiceParam, ticketPr
                 oauthToken = _b.sent();
                 return [3 /*break*/, 16];
             case 14:
-                if (!localAction) return [3 /*break*/, 16];
-                return [4 /*yield*/, effects_1.call(localLoginFlow, localAction)];
+                if (!localLoginAction) return [3 /*break*/, 16];
+                return [4 /*yield*/, effects_1.call(localLoginFlow, localLoginAction)];
             case 15:
                 oauthToken = _b.sent();
                 _b.label = 16;

package/lib/redux/sagas/modelFetchSaga.js

@@ -308,7 +308,7 @@ function modelFetch(modelFetchRequestAction) {
                 // log to the console
                 logger.error(error);
                 didFail = true;
-                // Do not continue to retry if the response is between 400-500 (except 408: request timeout)
+                // Do not retry if the response is between 400-500 (except 408: request timeout)
                 if (errorData.status >= types_1.HTTP_STATUS_CODE.BAD_REQUEST &&
                     errorData.status < types_1.HTTP_STATUS_CODE.INTERNAL_SERVER_ERROR &&
                     errorData.status !== types_1.HTTP_STATUS_CODE.REQUEST_TIMEOUT) {

package/package.json

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