studiokit-scaffolding-js 5.2.0-next.2.6 → 5.2.0-next.2.7

package/lib/components/HOC/ModelErrorRedirectComponent.js

@@ -46,6 +46,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 var react_1 = __importStar(require("react"));
 var react_router_dom_1 = require("react-router-dom");
 var modelStatus_1 = require("../../constants/modelStatus");
+var types_1 = require("../../types");
 /**
  * This component exists as a child to CollectionItemComponent to
  * redirect the user to a 404/500 page if errors occur while fetching data.
@@ -71,13 +72,13 @@ function modelErrorRedirectComponent(WrappedComponent) {
                 model._metadata &&
                 model._metadata.hasError &&
                 model._metadata.lastFetchErrorData &&
-                model._metadata.lastFetchErrorData.status === 404;
+                model._metadata.lastFetchErrorData.status === types_1.HTTP_STATUS_CODE.NOT_FOUND;
             var errorRoute = previousModelStatus === modelStatus_1.MODEL_STATUS.UNINITIALIZED &&
                 modelStatus === modelStatus_1.MODEL_STATUS.ERROR &&
                 model._metadata &&
                 model._metadata.hasError &&
                 model._metadata.lastFetchErrorData &&
-                model._metadata.lastFetchErrorData.status === 500;
+                model._metadata.lastFetchErrorData.status === types_1.HTTP_STATUS_CODE.INTERNAL_SERVER_ERROR;
             if (notFoundRoute) {
                 var pathname = window.location.pathname;
                 return (react_1.default.createElement(react_router_dom_1.Redirect, { to: {

package/lib/redux/sagas/authSaga.js

@@ -43,6 +43,7 @@ var effects_1 = require("redux-saga/effects");
 var codeProviderService_1 = require("../../services/codeProviderService");
 var ticketProviderService_1 = require("../../services/ticketProviderService");
 var tokenPersistenceService_1 = require("../../services/tokenPersistenceService");
+var types_1 = require("../../types");
 var logger_1 = require("../../utils/logger");
 var actions_1 = require("../actions");
 //#region Helpers
@@ -138,7 +139,8 @@ function getTokenFromRefreshToken(oauthTokenParam) {
                 // any error response
                 if (fetchErrorAction) {
                     // ignore server errors
-                    if (((_b = fetchErrorAction.errorData) === null || _b === void 0 ? void 0 : _b.status) && fetchErrorAction.errorData.status >= 500) {
+                    if (((_b = fetchErrorAction.errorData) === null || _b === void 0 ? void 0 : _b.status) &&
+                        fetchErrorAction.errorData.status >= types_1.HTTP_STATUS_CODE.INTERNAL_SERVER_ERROR) {
                         return [2 /*return*/, oauthTokenParam];
                     }
                     return [2 /*return*/, null];
@@ -285,7 +287,7 @@ function handleAuthFailure(action) {
     return __generator(this, function (_a) {
         switch (_a.label) {
             case 0:
-                if (!(oauthToken && action.errorData && action.errorData.status === 401)) return [3 /*break*/, 2];
+                if (!(oauthToken && action.errorData && action.errorData.status === types_1.HTTP_STATUS_CODE.UNAUTHORIZED)) return [3 /*break*/, 2];
                 logger.debug('token expired - refreshing');
                 return [4 /*yield*/, effects_1.call(performTokenRefresh)];
             case 1:

package/lib/redux/sagas/modelFetchSaga.js

@@ -308,8 +308,10 @@ 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: server timeout)
-                if (errorData.status >= 400 && errorData.status < 500 && errorData.status !== 408) {
+                // Do not continue to 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) {
                     tryCount = tryLimit;
                 }
                 if (!(tryCount < tryLimit)) return [3 /*break*/, 16];
@@ -340,7 +342,7 @@ function modelFetch(modelFetchRequestAction) {
                 // dispatch that the fetch failed, which updates `_metadata` (and `guid`, if provided) at the target redux `modelPath`
                 _a.sent();
                 // Send error to error handler, except for 401s
-                if (errorData.status !== 401) {
+                if (errorData.status !== types_1.HTTP_STATUS_CODE.UNAUTHORIZED) {
                     errorHandler(error, modelFetchRequestAction, fetchConfig, lastFetchResult, errorData);
                 }
                 _a.label = 20;

package/lib/services/fetchService.js

@@ -30,6 +30,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.sendFetch = exports.constructPath = exports.getApiRoot = exports.setApiRoot = void 0;
 var lodash_1 = require("lodash");
 var effects_1 = require("redux-saga/effects");
+var types_1 = require("../types");
 var error_1 = require("../utils/error");
 var apiRoot;
 /**
@@ -138,7 +139,7 @@ function sendFetch(config) {
                 isResponseJson = !!response_1.headers &&
                     response_1.headers.has('Content-Type') &&
                     isContentTypeJson(response_1.headers.get('Content-Type'));
-                if (!(response_1.status === 204)) return [3 /*break*/, 3];
+                if (!(response_1.status === types_1.HTTP_STATUS_CODE.NO_CONTENT)) return [3 /*break*/, 3];
                 result.data = isBodyJson ? config.body : undefined;
                 return [3 /*break*/, 8];
             case 3:

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

@@ -5,6 +5,7 @@ export declare enum HTTP_STATUS_CODE {
     BAD_REQUEST = 400,
     UNAUTHORIZED = 401,
     FORBIDDEN = 403,
+    NOT_FOUND = 404,
     REQUEST_TIMEOUT = 408,
     INTERNAL_SERVER_ERROR = 500
 }

package/lib/types/net/HTTPStatusCode.js

@@ -9,6 +9,7 @@ var HTTP_STATUS_CODE;
     HTTP_STATUS_CODE[HTTP_STATUS_CODE["BAD_REQUEST"] = 400] = "BAD_REQUEST";
     HTTP_STATUS_CODE[HTTP_STATUS_CODE["UNAUTHORIZED"] = 401] = "UNAUTHORIZED";
     HTTP_STATUS_CODE[HTTP_STATUS_CODE["FORBIDDEN"] = 403] = "FORBIDDEN";
+    HTTP_STATUS_CODE[HTTP_STATUS_CODE["NOT_FOUND"] = 404] = "NOT_FOUND";
     HTTP_STATUS_CODE[HTTP_STATUS_CODE["REQUEST_TIMEOUT"] = 408] = "REQUEST_TIMEOUT";
     HTTP_STATUS_CODE[HTTP_STATUS_CODE["INTERNAL_SERVER_ERROR"] = 500] = "INTERNAL_SERVER_ERROR";
 })(HTTP_STATUS_CODE = exports.HTTP_STATUS_CODE || (exports.HTTP_STATUS_CODE = {}));

package/package.json

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