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

Jump to bottom

Checks for auth token on app refresh #2793

Merged
merged 9 commits into from
Jan 10, 2023
Merged

Checks for auth token on app refresh #2793

Changes from all commits
Commits
Show all changes
9 commits
Select commit Hold shift + click to select a range
7b8a9c0
check for auth token on app refresh
vindex10 Dec 30, 2022
88cd083
fix linting
vindex10 Jan 5, 2023
eb5931e
Merge branch 'master' into bug/logout_on_refresh_basic_auth
mvilanova Jan 5, 2023
73ab48d
Merge branch 'master' into bug/logout_on_refresh_basic_auth
kevgliss Jan 9, 2023
e19e4bf
Revert "fix linting"
vindex10 Jan 10, 2023
02c1738
Revert "check for auth token on app refresh"
vindex10 Jan 10, 2023
b122e41
make basic auth provider default in vue
vindex10 Jan 10, 2023
945d765
Merge branch 'master' into bug/logout_on_refresh_basic_auth
kevgliss Jan 10, 2023
2929586
Merge branch 'master' into bug/logout_on_refresh_basic_auth
kevgliss Jan 10, 2023
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: 3 additions & 1 deletion src/dispatch/static/dispatch/src/router/index.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -18,6 +18,9 @@ const router = new Router({
routes: routes,
})

const authProviderSlug =
import.meta.env.VITE_DISPATCH_AUTHENTICATION_PROVIDER_SLUG || "dispatch-auth-provider-basic"

const originalPush = Router.prototype.push
Router.prototype.push = function push(location, onResolve, onReject) {
if (onResolve || onReject) return originalPush.call(this, location, onResolve, onReject)
Expand All @@ -36,7 +39,6 @@ router.beforeEach((to, from, next) => {
store.dispatch("app/setLoading", true)
if (to.matched.some((record) => record.meta.requiresAuth)) {
if (!store.state.auth.currentUser.loggedIn) {
let authProviderSlug = import.meta.env.VITE_DISPATCH_AUTHENTICATION_PROVIDER_SLUG
if (authProviderSlug === "dispatch-auth-provider-basic") {
basicAuthProvider.login(to, from, next)
} else if (authProviderSlug === "dispatch-auth-provider-pkce") {
Expand Down