Merge pull request #353 from coralproject/bugfix-user-state

Refetching on login and logout.

client/coral-admin/src/actions/auth.js

@@ -28,7 +28,7 @@ const logOutFailure = () => ({type: actions.LOGOUT_FAILURE});
 
 export const logout = () => dispatch => {
   dispatch(logOutRequest());
-  coralApi('/auth', {method: 'DELETE'})
+  return coralApi('/auth', {method: 'DELETE'})
     .then(() => dispatch(logOutSuccess()))
     .catch(error => dispatch(logOutFailure(error)));
 };

client/coral-embed-stream/src/Embed.js

@@ -118,7 +118,7 @@ class Embed extends Component {
             <Tab>{lang.t('profile')}</Tab>
             <Tab restricted={!isAdmin}>Configure Stream</Tab>
           </TabBar>
-          {loggedIn && <UserBox user={user} logout={this.props.logout}  changeTab={this.changeTab}/>}
+          {loggedIn && <UserBox user={user} logout={() => this.props.logout().then(refetch)}  changeTab={this.changeTab}/>}
           <TabContent show={activeTab === 0}>
             {
               openStream
@@ -159,7 +159,10 @@ class Embed extends Component {
                  </div>
                : <p>{asset.settings.closedMessage}</p>
             }
-            {!loggedIn && <SignInContainer requireEmailConfirmation={asset.settings.requireEmailConfirmation} offset={signInOffset}/>}
+            {!loggedIn && <SignInContainer
+              requireEmailConfirmation={asset.settings.requireEmailConfirmation}
+              refetch={refetch}
+              offset={signInOffset}/>}
             {loggedIn &&  user && <ChangeUsernameContainer loggedIn={loggedIn} offset={signInOffset} user={user} />}
             {
               highlightedComment &&
@@ -192,7 +195,6 @@ class Embed extends Component {
               updateCountCache={this.props.updateCountCache}
               />
             <Stream
-              refetch={refetch}
               addNotification={this.props.addNotification}
               postItem={this.props.postItem}
               setActiveReplyBox={this.setActiveReplyBox}

client/coral-framework/actions/auth.js

@@ -46,7 +46,7 @@ const signInFailure = error => ({type: actions.FETCH_SIGNIN_FAILURE, error});
 
 export const fetchSignIn = (formData) => (dispatch) => {
   dispatch(signInRequest());
-  coralApi('/auth/local', {method: 'POST', body: formData})
+  return coralApi('/auth/local', {method: 'POST', body: formData})
     .then(({user}) => {
       const isAdmin = !!user.roles.filter(i => i === 'ADMIN').length;
       dispatch(signInSuccess(user, isAdmin));
@@ -148,7 +148,7 @@ const logOutFailure = () => ({type: actions.LOGOUT_FAILURE});
 
 export const logout = () => dispatch => {
   dispatch(logOutRequest());
-  coralApi('/auth', {method: 'DELETE'})
+  return coralApi('/auth', {method: 'DELETE'})
     .then(() => dispatch(logOutSuccess()))
     .catch(error => dispatch(logOutFailure(error)));
 };

client/coral-sign-in/containers/SignInContainer.js

@@ -147,7 +147,8 @@ class SignInContainer extends Component {
 
   handleSignIn(e) {
     e.preventDefault();
-    this.props.fetchSignIn(this.state.formData);
+    this.props.fetchSignIn(this.state.formData)
+      .then(this.props.refetch);
   }
 
   render() {