Merge branch 'develop'

birdofpreyru · birdofpreyru · commit c69401c3cf2d · 2018-05-31T19:18:18.000+02:00
diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -28,7 +28,7 @@
     "lint:js": "./node_modules/.bin/eslint --ext .js,.jsx .",
     "test": "npm run lint && npm run jest"
   },
-  "version": "0.0.6",
+  "version": "0.0.7",
   "dependencies": {
     "isomorphic-fetch": "^2.2.1",
     "le_node": "^1.7.0",
@@ -42,7 +42,7 @@
     "redux": "^3.6.0",
     "redux-actions": "^2.0.1",
     "tc-accounts": "https://github.com/appirio-tech/accounts-app.git#dev",
-    "topcoder-react-utils": "^0.3.11"
+    "topcoder-react-utils": "^0.3.12"
   },
   "devDependencies": {
     "autoprefixer": "^8.2.0",
diff --git a/src/reducers/auth.js b/src/reducers/auth.js
@@ -73,18 +73,19 @@ function create(initialState) {
  * @returns {Promise}
  * @resolves {Function(state, action): state} New reducer.
  */
-export function factory(options = {}) {
+export async function factory(options = {}) {
   const state = {
     tokenV2: _.get(options.auth, 'tokenV2'),
     tokenV3: _.get(options.auth, 'tokenV3'),
   };
 
   if (state.tokenV3) {
     state.user = decodeToken(state.tokenV3);
-    return redux.resolveAction(actions.auth.loadProfile(state.tokenV3))
-      .then(res => create(onProfileLoaded(state, res), options.mergeReducers));
+    let a = actions.auth.loadProfile(state.tokenV3);
+    a = await redux.resolveAction(a);
+    return create(onProfileLoaded(state, a));
   }
-  return Promise.resolve(create(state, options.mergeReducers));
+  return create(state);
 }
 
 /**
