init i18n and pre authentication in parallel, fix jwt selector

FredericHeem · Aug 27, 2016 · 82849d2 · 82849d2
1 parent 0641862
commit 82849d2
Show file tree

Hide file tree

Showing 2 changed files with 20 additions and 14 deletions.
diff --git a/client/src/app/app.js b/client/src/app/app.js
@@ -46,6 +46,21 @@ export default function() {
 
     rest.setJwtSelector(jwt.selector(store));
 
+    async function i18nInit() {
+      const language = await i18n.load();
+      context.formatter.setLocale(language);
+      store.dispatch(parts.core.actions.setLocale(language))
+      await intl(language);
+    }
+
+    async function preAuth() {
+      let token = localStorage.getItem("JWT");
+      if (token) {
+        store.dispatch(parts.auth.actions.setToken(token))
+        await store.dispatch(parts.auth.actions.me())
+      }
+    }
+
     return {
         parts,
         store,
@@ -54,12 +69,10 @@ export default function() {
         },
         async start() {
             debug("start");
-            const language = await i18n.load();
-            context.formatter.setLocale(language);
-            store.dispatch(parts.core.actions.setLocale(language))
-            await intl(language);
-            jwt.loadJWT(parts);
-            store.dispatch(parts.auth.actions.me())
+            return Promise.all([
+              i18nInit(),
+              preAuth()
+            ]);
         }
     };
 }
diff --git a/client/src/app/utils/jwt.js b/client/src/app/utils/jwt.js
@@ -1,14 +1,7 @@
 export default function(store) {
     return {
-        loadJWT(parts) {
-            let token = localStorage.getItem("JWT");
-            if (token) {
-                store.dispatch(parts.auth.actions.setToken(token))
-            }
-            return token;
-        },
         selector() {
-            return () => store.getState().auth.token
+            return () => store.getState().auth.auth.token
         }
     }
 }