Merge branch 'dev' into dev

gondzo · web-flow · commit 9be60ce6d028 · 2017-01-07T12:12:24.000+01:00
diff --git a/src/routes/index.js b/src/routes/index.js
@@ -25,16 +25,19 @@ import ProviderDetailsRoute from './ProviderDetails';
 import ResetPasswordRoute from './ResetPassword';
 import {defaultAuth0Service} from '../services/AuthService';
 
+import {onSocialLoginSuccessAction} from 'store/modules/global';
+
 export const createRoutes = (store) => ({
   path: '/',
   name: 'CoreLayout',
   indexRoute: {
     onEnter: (nextState, replace, cb) => {
       // parse the hash if present
       if (nextState.location.hash) {
-        defaultAuth0Service.parseHash(nextState.location.hash);
-        replace('/dashboard');
-        cb();
+        defaultAuth0Service.parseHash(nextState.location.hash).then(() => {
+          store.dispatch(onSocialLoginSuccessAction());
+          cb();
+        });
       } else {
         replace('/dashboard');
         cb();
diff --git a/src/services/AuthService.js b/src/services/AuthService.js
@@ -61,24 +61,27 @@ class AuthService {
     const authResult = _self.auth0.parseHash(hash);
     if (authResult && authResult.idToken) {
       _self.setToken(authResult.idToken);
-      // get social profile
-      _self.getProfile((error, profile) => {
-        if (error) {
-          // remove the id token
-          _self.removeToken();
-          throw error;
-        } else {
-          userApi.registerSocialUser(profile.name, profile.email, _self.getToken()).then(
-            (authRes) => {
-              localStorage.setItem('userInfo', JSON.stringify(authRes));
-            }).catch((reason) => {
+      return new Promise((resolve) => {
+        _self.getProfile((error, profile) => {
+          if (error) {
             // remove the id token
-              _self.removeToken();
-              throw reason;
-            });
-        }
+            _self.removeToken();
+            throw error;
+          } else {
+            return userApi.registerSocialUser(profile.name, profile.email, _self.getToken()).then(
+              (authResult2) => {
+                localStorage.setItem('userInfo', JSON.stringify(authResult2));
+                resolve(authResult2);
+              }).catch((reason) => {
+              // remove the id token
+                _self.removeToken();
+                throw reason;
+              });
+          }
+        });
       });
     }
+    return Promise.reject(new Error('Social login failure'));
   }
 
   /**
diff --git a/src/store/modules/global.js b/src/store/modules/global.js
@@ -72,6 +72,11 @@ export const loginAction = (data) => (dispatch) => {
   });
 };
 
+export const onSocialLoginSuccessAction = () => (dispatch) => {
+  dispatch({type: LOGIN_ACTION_SUCCESS});
+  browserHistory.push(LOGIN_REDIRECT[loadUserInfo().user.role]);
+};
+
 export const logoutAction = () => (dispatch) => {
   browserHistory.push('/home');
   dispatch({
