Postpone first query until checked login

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

@@ -3,6 +3,8 @@ import {compose, gql, graphql} from 'react-apollo';
 import {connect} from 'react-redux';
 import {bindActionCreators} from 'redux';
 import isEqual from 'lodash/isEqual';
+import branch from 'recompose/branch';
+import renderComponent from 'recompose/renderComponent';
 
 import {Spinner} from 'coral-ui';
 import {authActions, assetActions, pym} from 'coral-framework';
@@ -19,7 +21,6 @@ class EmbedContainer extends React.Component {
 
   componentDidMount() {
     pym.sendMessage('childReady');
-    this.props.checkLogin();
   }
 
   componentWillReceiveProps(nextProps) {
@@ -108,6 +109,10 @@ const mapDispatchToProps = dispatch =>
 
 export default compose(
   connect(mapStateToProps, mapDispatchToProps),
+  branch(
+    props => !props.auth.checkedInitialLogin,
+    renderComponent(Spinner),
+  ),
   withQuery,
 )(EmbedContainer);
 

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

@@ -3,6 +3,7 @@ import {render} from 'react-dom';
 import {ApolloProvider} from 'react-apollo';
 
 import {client} from 'coral-framework/services/client';
+import {checkLogin} from 'coral-framework/actions/auth';
 
 import reducers from './reducers';
 import localStore, {injectReducers} from 'coral-framework/services/store';
@@ -12,6 +13,11 @@ injectReducers(reducers);
 
 const store = (window.opener && window.opener.coralStore) ? window.opener.coralStore : localStore;
 
+// Don't run this in the popup.
+if (store === localStore) {
+  store.dispatch(checkLogin());
+}
+
 render(
   <ApolloProvider client={client} store={store}>
     <AppRouter />

client/coral-framework/reducers/auth.js

@@ -8,6 +8,7 @@ const initialState = Map({
   user: null,
   showSignInDialog: false,
   showCreateUsernameDialog: false,
+  checkedInitialLogin: false,
   view: 'SIGNIN',
   error: '',
   passwordRequestSuccess: null,
@@ -71,10 +72,12 @@ export default function auth (state = initialState, action) {
       .set('isLoading', true);
   case actions.CHECK_LOGIN_FAILURE:
     return state
+      .set('checkedInitialLogin', true)
       .set('loggedIn', false)
       .set('user', null);
   case actions.CHECK_LOGIN_SUCCESS:
     return state
+      .set('checkedInitialLogin', true)
       .set('loggedIn', true)
       .set('isAdmin', action.isAdmin)
       .set('user', purge(action.user));
@@ -114,7 +117,11 @@ export default function auth (state = initialState, action) {
       .set('isLoading', false)
       .set('successSignUp', true);
   case actions.LOGOUT_SUCCESS:
-    return initialState;
+    return state
+      .set('user', null)
+      .set('isLoading', false)
+      .set('loggedIn', false)
+      .set('isAdmin', false);
   case actions.INVALID_FORM:
     return state
       .set('error', action.error);

package.json

@@ -96,11 +96,12 @@
     "prop-types": "^15.5.8",
     "react-apollo": "^1.1.0",
     "react-recaptcha": "^2.2.6",
+    "recompose": "^0.23.1",
     "redis": "^2.7.1",
-    "uuid": "^3.0.1",
-    "simplemde": "^1.11.2",
     "resolve": "^1.3.2",
-    "semver": "^5.3.0"
+    "semver": "^5.3.0",
+    "simplemde": "^1.11.2",
+    "uuid": "^3.0.1"
   },
   "devDependencies": {
     "apollo-client": "^1.0.4",
@@ -179,8 +180,8 @@
     "redux-thunk": "^2.1.0",
     "regenerator": "^0.8.46",
     "selenium-standalone": "^5.11.2",
-    "subscriptions-transport-ws": "^0.5.5-alpha.0",
     "style-loader": "^0.16.0",
+    "subscriptions-transport-ws": "^0.5.5-alpha.0",
     "supertest": "^2.0.1",
     "timeago.js": "^2.0.3",
     "webpack": "^2.3.1"