fix: login redirects

jsdelivr · Aug 27, 2024 · cec6cef · cec6cef
1 parent ef95d7e
commit cec6cef
Show file tree

Hide file tree

Showing 2 changed files with 14 additions and 3 deletions.
diff --git a/middleware/auth.global.ts b/middleware/auth.global.ts
@@ -9,11 +9,11 @@ export default defineNuxtRouteMiddleware(async (to) => {
 
  if (auth.isLoggedIn && to?.name === 'login') {
  abortNavigation();
- return navigateTo('/');
+ return navigateTo(auth.getRedirectUrl(), { external: true });
  }
 
  if (!auth.isLoggedIn && to?.name !== 'login') {
  abortNavigation();
- return navigateTo('/login');
+ return navigateTo(`/login?redirect=${encodeURIComponent(location.href)}`);
  }
 });
diff --git a/store/auth.ts b/store/auth.ts
@@ -43,9 +43,20 @@ export const useAuth = defineStore('auth', {
  },
 
  actions: {
+ getRedirectUrl () {
+ const url = new URL(location.href);
+ const redirect = url.searchParams.get('redirect') || '/';
+ const redirectUrl = new URL(redirect, url.origin);
+
+ if (redirectUrl.origin !== url.origin) {
+ return url.origin;
+ }
+
+ return redirectUrl.toString();
+ },
  async login () {
  const config = useRuntimeConfig();
- const redirect = `${window.location.origin}${'/'}`;
+ const redirect = this.getRedirectUrl();
  await navigateTo(`${config.public.directusUrl}/auth/login/github?redirect=${encodeURIComponent(redirect)}`, { external: true });
  },
  async logout () {