refactor(auth): get user data after login

src/auth/auth.action.js

@@ -1,7 +1,7 @@
 import { AsyncStorage } from 'react-native';
 
 import uniqby from 'lodash.uniqby';
-import { delay, resetNavigationTo, configureLocale, saveLocale } from 'utils';
+import { delay, configureLocale, saveLocale } from 'utils';
 
 import {
   fetchAccessToken,
@@ -21,18 +21,16 @@ import {
   GET_AUTH_STAR_COUNT,
 } from './auth.type';
 
-export const auth = (code, state, navigation) => {
+export const auth = (code, state) => {
   return dispatch => {
     dispatch({ type: LOGIN.PENDING });
 
-    delay(fetchAccessToken(code, state), 2000)
+    return delay(fetchAccessToken(code, state), 2000)
       .then(data => {
         dispatch({
           type: LOGIN.SUCCESS,
           payload: data.access_token,
         });
-
-        resetNavigationTo('Main', navigation);
       })
       .catch(error => {
         dispatch({
@@ -68,7 +66,7 @@ export const getUser = () => {
 
     dispatch({ type: GET_AUTH_USER.PENDING });
 
-    fetchAuthUser(accessToken)
+    return fetchAuthUser(accessToken)
       .then(data => {
         dispatch({
           type: GET_AUTH_USER.SUCCESS,

src/auth/screens/events.screen.js

@@ -9,7 +9,7 @@ import moment from 'moment/min/moment-with-locales.min';
 import { LoadingUserListItem, UserListItem, ViewContainer } from 'components';
 import { colors, fonts, normalize } from 'config';
 import { emojifyText, translate } from 'utils';
-import { getUserEvents, getUser } from 'auth';
+import { getUserEvents } from 'auth';
 import { getNotificationsCount } from 'notifications';
 
 const mapStateToProps = state => ({
@@ -25,7 +25,6 @@ const mapDispatchToProps = dispatch =>
     {
       getUserEvents,
       getNotificationsCount,
-      getUser,
     },
     dispatch
   );
@@ -79,13 +78,7 @@ const styles = StyleSheet.create({
 
 class Events extends Component {
   componentDidMount() {
-    const { user: { login }, getUser } = this.props;
-
-    if (login) {
-      this.getUserEvents();
-    } else {
-      getUser();
-    }
+    this.getUserEvents();
   }
 
   componentWillReceiveProps(nextProps) {
@@ -173,13 +166,9 @@ class Events extends Component {
             }
           );
         } else if (action === 'edited') {
-          return translate(
-            'auth.events.pullRequestReviewEditedEvent',
-            locale,
-            {
-              action: translate(`auth.events.actions.${action}`, locale),
-            }
-          );
+          return translate('auth.events.pullRequestReviewEditedEvent', locale, {
+            action: translate(`auth.events.actions.${action}`, locale),
+          });
         } else if (action === 'deleted') {
           return translate(
             'auth.events.pullRequestReviewDeletedEvent',

src/auth/screens/login.screen.js

@@ -21,21 +21,23 @@ import CookieManager from 'react-native-cookies';
 import { ViewContainer } from 'components';
 import { colors, fonts, normalize } from 'config';
 import { CLIENT_ID } from 'api';
-import { auth } from 'auth';
-import { translate } from 'utils';
+import { auth, getUser } from 'auth';
+import { translate, resetNavigationTo } from 'utils';
 
 let stateRandom = Math.random().toString();
 
 const mapStateToProps = state => ({
   locale: state.auth.locale,
   isLoggingIn: state.auth.isLoggingIn,
   isAuthenticated: state.auth.isAuthenticated,
+  hasInitialUser: state.auth.hasInitialUser,
 });
 
 const mapDispatchToProps = dispatch =>
   bindActionCreators(
     {
       auth,
+      getUser,
     },
     dispatch
   );
@@ -149,8 +151,10 @@ class Login extends Component {
   props: {
     isAuthenticated: boolean,
     isLoggingIn: boolean,
+    hasInitialUser: boolean,
     locale: string,
     auth: Function,
+    getUser: Function,
     navigation: Object,
   };
 
@@ -214,7 +218,7 @@ class Login extends Component {
     if (url && url.substring(0, 11) === 'gitpoint://') {
       const [, queryStringFromUrl] = url.match(/\?(.*)/);
       const { state, code } = queryString.parse(queryStringFromUrl);
-      const { auth, navigation } = this.props;
+      const { auth, getUser, navigation } = this.props;
 
       if (stateRandom === state) {
         this.setState({
@@ -226,7 +230,11 @@ class Login extends Component {
         stateRandom = Math.random().toString();
 
         CookieManager.clearAll().then(() => {
-          auth(code, state, navigation);
+          auth(code, state).then(() => {
+            getUser().then(() => {
+              resetNavigationTo('Main', navigation);
+            });
+          });
         });
       }
     }
@@ -248,7 +256,7 @@ class Login extends Component {
   }
 
   render() {
-    const { locale, isLoggingIn } = this.props;
+    const { locale, isLoggingIn, hasInitialUser } = this.props;
 
     return (
       <ViewContainer barColor="light">
@@ -362,18 +370,19 @@ class Login extends Component {
             </View>
           </Modal>
         )}
-        {isLoggingIn && (
-          <View style={styles.browserLoader}>
-            <Text style={styles.browserLoadingLabel}>
-              {this.state.loaderText}
-            </Text>
-            <ActivityIndicator
-              animating={isLoggingIn}
-              color={colors.white}
-              size="large"
-            />
-          </View>
-        )}
+        {isLoggingIn &&
+          !hasInitialUser && (
+            <View style={styles.browserLoader}>
+              <Text style={styles.browserLoadingLabel}>
+                {this.state.loaderText}
+              </Text>
+              <ActivityIndicator
+                animating={isLoggingIn}
+                color={colors.white}
+                size="large"
+              />
+            </View>
+          )}
       </ViewContainer>
     );
   }