fix(auth): handle mounted errors during init (#234)

nuxt-community · Nov 1, 2018 · 03dba23 · 03dba23
1 parent eb7dc9e
commit 03dba23
Showing 1 changed file with 15 additions and 11 deletions.
diff --git a/lib/core/auth.js b/lib/core/auth.js
@@ -44,17 +44,21 @@ export default class Auth {
         return Promise.resolve()
       }
     }
-
-    // Call mounted for active strategy on initial load
-    await this.mounted()
-
-    // Watch for loggedIn changes only in client side
-    if (process.browser && this.options.watchLoggedIn) {
-      this.$storage.watchState('loggedIn', loggedIn => {
-        if (!routeOption(this.ctx.route, 'auth', false)) {
-          this.redirect(loggedIn ? 'home' : 'logout')
-        }
-      })
+
+    try {
+      // Call mounted for active strategy on initial load
+      await this.mounted()
+    } catch (error) {
+      this.callOnError(error)
+    } finally {
+      // Watch for loggedIn changes only in client side
+      if (process.client && this.options.watchLoggedIn) {
+        this.$storage.watchState('loggedIn', loggedIn => {
+          if (!routeOption(this.ctx.route, 'auth', false)) {
+            this.redirect(loggedIn ? 'home' : 'logout')
+          }
+        })
+      }
     }
   }