orc-shared 1.6.0-dev.7 → 1.6.0-dev.9

package/dist/reducers/request.js

@@ -46,7 +46,8 @@ var requestReducer = function requestReducer(state, action) {
   }
   if (action.type.endsWith("_FAILURE")) {
     var _requestName2 = action.type.replace(/_FAILURE$/, "");
-    if ((0, _utils.safeGet)(action, "payload", "status") === 403) {
+    var status = (0, _utils.safeGet)(action, "payload", "status");
+    if (status === 403 || status === 401) {
       return state.deleteIn(["actives", _requestName2]).set("logout", true);
     } else {
       return state.deleteIn(["actives", _requestName2]).set("error", _immutable.default.fromJS(action));

package/dist/reducers/scopes.js

@@ -31,6 +31,9 @@ var scopeReducer = function scopeReducer(state, action) {
       {
         var loadedScopes = state.toJS();
         var normalizedScopes = (0, _normalizr.normalize)(action.payload, _scopes.default);
+        if (action.meta && action.meta.reset) {
+          return _immutable.default.fromJS(normalizedScopes.entities.scopes);
+        }
         if (Object.keys(loadedScopes).length > 0) {
           var addedScope = {};
           Object.values(normalizedScopes.entities.scopes).forEach(function (scope) {

package/package.json

@@ -1,6 +1,6 @@
 {
 	"name": "orc-shared",
-	"version": "1.6.0-dev.7",
+	"version": "1.6.0-dev.9",
 	"description": "Shared code for Orckestra applications",
 	"main": "./src/index.js",
 	"exports": {

package/src/reducers/request.js

@@ -24,7 +24,8 @@ const requestReducer = (state = initialState, action) => {
 	}
 	if (action.type.endsWith("_FAILURE")) {
 		const requestName = action.type.replace(/_FAILURE$/, "");
-		if (safeGet(action, "payload", "status") === 403) {
+		const status = safeGet(action, "payload", "status");
+		if (status === 403 || status === 401) {
 			return state.deleteIn(["actives", requestName]).set("logout", true);
 		} else {
 			return state.deleteIn(["actives", requestName]).set("error", Immutable.fromJS(action));

package/src/reducers/request.test.js

@@ -125,4 +125,27 @@ describe("Request reducer", () => {
 			}),
 		);
 	});
+
+	it("clears activity flag and sets login flag when a request fails with status 401", () => {
+		const oldState = Immutable.fromJS({
+			actives: {
+				SOME_FLAG: true,
+				TEST_THIS: true,
+			},
+		});
+		const action = {
+			type: "TEST_THIS_FAILURE",
+			payload: { status: 401, message: "UnauthorizedAccessException" },
+		};
+		const newState = reducer(oldState, action);
+		expect(newState, "not to be", oldState).and(
+			"to equal",
+			Immutable.fromJS({
+				actives: {
+					SOME_FLAG: true,
+				},
+				[LOGOUT]: true,
+			}),
+		);
+	});
 });

package/src/reducers/scopes.js

@@ -10,6 +10,9 @@ const scopeReducer = (state = initialState, action) => {
 		case GET_SCOPES_SUCCESS: {
 			const loadedScopes = state.toJS();
 			const normalizedScopes = normalize(action.payload, scopeSchema);
+			if (action.meta && action.meta.reset) {
+				return Immutable.fromJS(normalizedScopes.entities.scopes);
+			}
 
 			if (Object.keys(loadedScopes).length > 0) {
 				const addedScope = {};

package/src/reducers/scopes.test.js

@@ -91,4 +91,51 @@ describe("scopes", () => {
 			}),
 		);
 	});
+
+	it("reset option should override previous state", () => {
+		const oldState = Immutable.Map({
+			Global: {
+				id: "Global",
+				isAuthorizedScope: true,
+				children: ["Child1", "Child2", "Child3"],
+				scopePath: ["Global"],
+			},
+			Child1: { id: "Child1", isAuthorizedScope: true, scopePath: ["Global", "Child1"], children: [] },
+			Child2: { id: "Child2", isAuthorizedScope: false, scopePath: ["Global", "Child2"], children: [] },
+			ChildOld: { id: "ChildOld", isAuthorizedScope: false, scopePath: ["Global", "ChildOld"], children: [] },
+		});
+
+		const action = {
+			type: GET_SCOPES_SUCCESS,
+			payload: {
+				id: "Global",
+				isAuthorizedScope: true,
+				children: [
+					{ id: "Child1", isAuthorizedScope: false, children: [], parentScopeId: "Global" },
+					{ id: "Child2", isAuthorizedScope: true, children: [], parentScopeId: "Global" },
+					{ id: "Child3", isAuthorizedScope: false, children: [], parentScopeId: "Global" },
+					{ id: "Child4", isAuthorizedScope: true, children: [], parentScopeId: "Global" },
+				],
+			},
+			meta: {
+				reset: true,
+			},
+		};
+		const newState = reducer(oldState, action);
+		return expect(newState, "not to be", oldState).and(
+			"to satisfy",
+			Immutable.fromJS({
+				Global: {
+					id: "Global",
+					isAuthorizedScope: true,
+					children: ["Child1", "Child2", "Child3", "Child4"],
+					scopePath: ["Global"],
+				},
+				Child1: { id: "Child1", isAuthorizedScope: false, scopePath: ["Global", "Child1"], children: [] },
+				Child2: { id: "Child2", isAuthorizedScope: true, scopePath: ["Global", "Child2"], children: [] },
+				Child3: { id: "Child3", isAuthorizedScope: false, scopePath: ["Global", "Child3"], children: [] },
+				Child4: { id: "Child4", isAuthorizedScope: true, scopePath: ["Global", "Child4"], children: [] },
+			}),
+		);
+	});
 });