Fix auth redirect

G4brym · Nov 5, 2023 · 5b19986 · 5b19986
1 parent 74e272c
commit 5b19986
Show file tree

Hide file tree

Showing 3 changed files with 4 additions and 6 deletions.
diff --git a/packages/dashboard-v2/src/boot/auth.js b/packages/dashboard-v2/src/boot/auth.js
@@ -10,6 +10,6 @@ export default boot(async () => {
 
   if (authResp === false) {  // No auth token stored, try to fetch without auth or redirect
     const mainStore = useMainStore()
-    await mainStore.loadServerConfigs()
+    await mainStore.loadServerConfigs(true)
   }
 });
diff --git a/packages/dashboard-v2/src/stores/main-store.js b/packages/dashboard-v2/src/stores/main-store.js
@@ -1,6 +1,5 @@
 import { defineStore } from 'pinia';
 import { api } from "boot/axios";
-import router from "src/router";
 
 export const useMainStore = defineStore('main', {
   state: () => ({
@@ -26,7 +25,6 @@ export const useMainStore = defineStore('main', {
           }
         })
 
-        console.log(response.data.config)
         this.configurations = response.data.config;
 
       } catch (error) {
@@ -41,8 +39,8 @@ export const useMainStore = defineStore('main', {
         if (handleError) {
           // console.log(error)
           if (error.response?.status === 401) {
-            router.push({ name: 'login' })
-          } else if (error.response.status === 302) {
+            await this.router.push({ name: 'login' })
+            return
           }
 
         } else {

diff --git a/worker/dev/index.ts b/worker/dev/index.ts
@@ -4,7 +4,7 @@ export default R2Explorer({
   readonly: false,
   cors: true,
   showHiddenFiles: true,
-  dashboardUrl: "https://dev.r2-explorer-dashboard.pages.dev/",
+  dashboardUrl: "https://dashboard-v2.r2-explorer-dashboard.pages.dev/",
   basicAuth: [{
     username: 'teste',
     password: 'abc'