Refactored login flow. Promise reject bubbles up to the main app.

GetStream · Nov 6, 2016 · 5e22d9c · 5e22d9c
1 parent 0e281c0
commit 5e22d9c
Show file tree

Hide file tree

Showing 3 changed files with 21 additions and 26 deletions.
diff --git a/assets/js/actions/App.js b/assets/js/actions/App.js
@@ -19,9 +19,7 @@ export const init = () => dispatch => dispatch(Topics.load())
                 ]).then(data => Promise.resolve([...data])), err => {
                     return Promise.reject(err)
                 })
-    ).catch(err => {
-        Promise.reject(err)
-    })
+    ).catch(err => Promise.reject(err))
 
 export const reload = () => dispatch => {
     return Promise.all([

diff --git a/assets/js/actions/User.js b/assets/js/actions/User.js
@@ -4,7 +4,8 @@ import * as TopicActions from 'actions/Topics'
 export const ME = 'USER_ME'
 export const me = () => dispatch => {
 
-    if (!localStorage.getItem('token')) return Promise.reject(new Error('No JWT Token'))
+    if (!localStorage.getItem('token'))
+        return Promise.reject(new Error('No JWT Token'))
 
     return dispatch({
         type: ME,

diff --git a/assets/js/index.js b/assets/js/index.js
@@ -59,27 +59,23 @@ const isReady = (nextState, replace, callback) => {
     })
 }
 
-new Promise(() => {
-
-    const renderApp = () =>
-        render((
-            <Provider store={store}>
-                <Router history={history}>
-                    <Route path="/app/getting-started" component={GetStarted} onEnter={isReady} />
-                    <Route path="/app" component={App} onEnter={isReady}>
-                        <Route path="personalization-feed" component={Home}/>
-                        <Route path="subscriptions" component={Subscriptions}>
-                            <IndexRoute component={SubscriptionLanding} />
-                            <Route path=":id" component={SubscriptionFeed} />
-                        </Route>
+const renderApp = () =>
+    render((
+        <Provider store={store}>
+            <Router history={history}>
+                <Route path="/app/getting-started" component={GetStarted} onEnter={isReady} />
+                <Route path="/app" component={App} onEnter={isReady}>
+                    <Route path="personalization-feed" component={Home}/>
+                    <Route path="subscriptions" component={Subscriptions}>
+                        <IndexRoute component={SubscriptionLanding} />
+                        <Route path=":id" component={SubscriptionFeed} />
                     </Route>
-                </Router>
-            </Provider>
-        ), document.getElementById('root'))
-
-    loading.then(
-        () => renderApp(),
-        () => renderApp()
-    )
+                </Route>
+            </Router>
+        </Provider>
+    ), document.getElementById('root'))
 
-}).catch(e => console.warn('err:', e))
+loading.then(
+    () => renderApp(),
+    () => renderApp()
+)