post publish v3.0.0-beta.13

maxmantz · Nov 21, 2017 · 3261460 · 3261460
1 parent b3908c0
commit 3261460
Show file tree

Hide file tree

Showing 6 changed files with 81 additions and 44 deletions.
diff --git a/dist/redux-oidc.js b/dist/redux-oidc.js
diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "redux-oidc",
-  "version": "3.0.0-beta.12",
+  "version": "3.0.0-beta.13",
   "description": "A package for managing OpenID Connect authentication in redux apps",
   "main": "dist/redux-oidc.js",
   "types": "./index.d.ts",

diff --git a/src/helpers/loadUser.js b/src/helpers/loadUser.js
@@ -1,4 +1,4 @@
-import { userFound, userExpired, loadUserError } from '../actions';
+import { userFound, userExpired, loadUserError, loadingUser } from '../actions';
 
 // stores the redux store here to be accessed by all functions
 let reduxStore;
@@ -17,7 +17,7 @@ export function getReduxStore() {
 export function getUserCallback(user) {
   if (user && !user.expired) {
     reduxStore.dispatch(userFound(user));
-  } else if (user && user.expired) {
+  } else if (!user || (user && user.expired)) {
     reduxStore.dispatch(userExpired());
   }
   return user;
@@ -41,8 +41,9 @@ export default function loadUser(store, userManager) {
   }
 
   reduxStore = store;
+  store.dispatch(loadingUser());
 
-  userManager.getUser()
+  return userManager.getUser()
     .then(getUserCallback)
     .catch(errorCallback);
 }
diff --git a/src/reducer/reducer-immutable.js b/src/reducer/reducer-immutable.js
@@ -12,43 +12,50 @@ import {
 let reducer;
 
 try {
-  const fromJS = require('immutable').fromJS;
+  const { fromJS, Seq } = require('immutable');
 
-  const initialState = fromJS({
-    user: null,
-    isLoadingUser: false
-  });
-
-  reducer = (state = initialState, action) => {
-    switch (action.type) {
-      case USER_EXPIRED:
-        return fromJS({
-          user: null,
-          isLoadingUser: false
-        });
-      case SILENT_RENEW_ERROR:
-        return fromJS({
-          user: null,
-          isLoadingUser: false
-        });
-      case SESSION_TERMINATED:
-      case USER_SIGNED_OUT:
-        return fromJS({
-          user: null,
-          isLoadingUser: false
-        });
-      case REDIRECT_SUCCESS:
-      case USER_FOUND:
-        return fromJS({
-          user: action.payload,
-          isLoadingUser: false
-        });
-      case LOADING_USER:
-        return state.set('isLoadingUser', true);
-      default:
-        return state;
+    const fromJSGreedy = (js) => {
+      return typeof js !== 'object' || js === null ? js :
+        Array.isArray(js) ?
+        Seq(js).map(fromJSGreedy).toList() :
+        Seq(js).map(fromJSGreedy).toMap();
     }
-  };
+
+    const initialState = fromJS({
+      user: null,
+      isLoadingUser: false
+    });
+
+    reducer = (state = initialState, action) => {
+      switch (action.type) {
+        case USER_EXPIRED:
+          return fromJS({
+            user: null,
+            isLoadingUser: false
+          });
+        case SILENT_RENEW_ERROR:
+          return fromJS({
+            user: null,
+            isLoadingUser: false
+          });
+        case SESSION_TERMINATED:
+        case USER_SIGNED_OUT:
+          return fromJS({
+            user: null,
+            isLoadingUser: false
+          });
+        case REDIRECT_SUCCESS:
+        case USER_FOUND:
+          return fromJSGreedy({
+            user: action.payload,
+            isLoadingUser: false
+          });
+        case LOADING_USER:
+          return state.set('isLoadingUser', true);
+        default:
+          return state;
+      }
+    };
 } catch (error) {
   reducer = () => {
     console.error("You must install immutable-js for the immutable reducer to work!");

diff --git a/tests/helpers/loadUser.test.js b/tests/helpers/loadUser.test.js
@@ -2,7 +2,7 @@ import '../setup';
 import sinon from 'sinon';
 import expect from 'expect';
 import loadUserHandler, { getUserCallback, errorCallback, setReduxStore, getReduxStore } from '../../src/helpers/loadUser';
-import { userExpired, userFound, loadUserError } from '../../src/actions';
+import { userExpired, userFound, loadUserError, loadingUser } from '../../src/actions';
 
 describe('helper - loadUser()', () => {
   let userManagerMock;
@@ -26,9 +26,7 @@ describe('helper - loadUser()', () => {
       dispatch: dispatchStub
     };
 
-    getUserStub.returns({
-      then: thenStub
-    });
+    getUserStub.returns(new Promise(() => {}));
 
     thenStub.returns({
       catch: catchStub
@@ -82,4 +80,21 @@ describe('helper - loadUser()', () => {
     const result2 = getUserCallback(expiredUser);
     expect(result2).toEqual(expiredUser);
   });
+
+  it ('loadUserCallback should dispatch USER_EXPIRED when the user returned is null', () => {
+    getUserCallback(null);
+    expect(dispatchStub.calledWith(userExpired())).toEqual(true);
+  });
+
+  it('loadUser should dispatch LOADING_USER', () => {
+    loadUserHandler(storeMock, userManagerMock);
+
+    expect(dispatchStub.calledWith(loadingUser())).toEqual(true);
+  });
+
+  it('loadUser should return a promise', () => {
+    const promise = loadUserHandler(storeMock, userManagerMock);
+
+    expect(promise).toBeA(Promise);
+  });
 });
diff --git a/tests/reducer/reducer-immutable.test.js b/tests/reducer/reducer-immutable.test.js
@@ -98,4 +98,18 @@ describe('immutable reducer', () => {
 
     expect(reducer(expectedResult, { type: 'UNKNOWN' })).toEqual(expectedResult);
   });
+
+  it('should handle USER_FOUND correctly when payload has non-object prototype', () => {
+      function NonObject() {
+        this.type = 'not-an-object'
+      }
+      const user = { some: 'user' };
+      const nonObjectUser = Object.setPrototypeOf({ some: 'user' }, new NonObject());
+      const expectedResult = fromJS({
+          user,
+          isLoadingUser: false
+      });
+
+      expect(reducer(fromJS(initialState), userFound(nonObjectUser))).toEqual(expectedResult);
+  });
 });