Skip to content
New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

fix fullPathRedirect #149

Merged
merged 2 commits into from
Apr 20, 2018
Merged

fix fullPathRedirect #149

Changes from 1 commit
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
a7c88dc
fix fullPathRedirect
Apr 18, 2018
167d0ea
make isRelativeURL match path with query and fragment
Apr 18, 2018
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions lib/core/auth.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -304,7 +304,7 @@ export default class Auth {
return
}

const from = this.options.fullPathRedirect ? this.ctx.route.path : this.ctx.route.fullPath
const from = this.options.fullPathRedirect ? this.ctx.route.fullPath : this.ctx.route.path

let to = this.options.redirect[name]
if (!to) {
Expand All @@ -313,7 +313,7 @@ export default class Auth {

// Apply rewrites
if (this.options.rewriteRedirects) {
if (name === 'login' && isRelativeURL(from) && !isSameURL(to, from)) {
if (name === 'login' && isRelativeURL(from.split('?')[0]) && !isSameURL(to, from)) {
Copy link
Contributor

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

Couldn't you change isRelativeURL to directly include that ?

this.$storage.setUniversal('redirect', from)
}

Expand Down