feat: rewriteRedirects

README.md

@@ -150,6 +150,11 @@ If enabled, user will be auto fetched after login.
 
 If enabled, user will be automatically logged out if any error happens. (For example when token expired)
 
+### `rewriteRedirects`
+- Default: `true`
+
+If enabled, user will came back to the original guarded route instead of `redirects.home`. 
+
 ### `namespace`
 - Default: `auth`
 

lib/auth.js

@@ -3,6 +3,8 @@ import { parse as parseCookie } from 'cookie'
 import getProp from 'dotprop'
 import Vue from 'vue'
 
+const RELATIVE_URL_REGEX = /^\/[a-zA-Z0-9@\-%_~][\/a-zA-Z0-9@\-%_~]{1,200}$/
+
 export default class Auth {
   constructor (ctx, options) {
     this.ctx = ctx
@@ -54,10 +56,9 @@ export default class Auth {
       this.$store.watch(
         state => state[this.options.namespace]['loggedIn'],
         () => {
-          this.redirect()
+          this.redirect('home')
         }
       )
-
     return this._loggedInWatcher
   }
 
@@ -275,20 +276,32 @@ export default class Auth {
   }
 
   redirect (name) {
-    if (name === undefined) {
-      name = this.getState('loggedIn') ? 'home' : 'login'
-    }
-
     let to = this.options.redirect[name]
     const from = this.$route.path
 
-    // Prevent infinity redirects
-    if (to.split('?')[0] === from) {
+    if (!to) {
       return
     }
 
-    if (name === 'login' && to.indexOf('?') === -1) {
-      to = to + '?redirect=' + from
+    // Apply rewrites
+    if (this.options.rewriteRedirects) {
+      if (name === 'login') {
+        to = to + '?redirect=' + encodeURIComponent(from)
+      }
+
+      if (name === 'home' && this.$route.query.redirect) {
+        // Decode
+        const redirect = decodeURIComponent(this.$route.query.redirect)
+        // Validate
+        if (RELATIVE_URL_REGEX.test(redirect)) {
+          to = redirect
+        }
+      }
+    }
+
+    // Prevent infinity redirects
+    if (to.split('?')[0] === from) {
+      return
     }
 
     this.ctx.redirect(to)

lib/defaults.js

@@ -1,6 +1,7 @@
 module.exports = {
   fetchUserOnLogin: true,
   resetOnError: true,
+  rewriteRedirects: true,
   namespace: 'auth',
   endpoints: {
     login: { url: '/api/auth/login', method: 'post', propertyName: 'token' },