fix: Fixed setup flow for protected login

bahattincinic · Jun 5, 2024 · 1dab8bb · 1dab8bb
1 parent 50bc617
commit 1dab8bb
Show file tree

Hide file tree

Showing 3 changed files with 5 additions and 4 deletions.
diff --git a/README.md b/README.md
@@ -136,7 +136,7 @@ Updating Swagger
 Add the following environment variables to your web service:
 
 ```
-DATABASE_TYPE=postgres
+DATABASE_TYPE=postgresql
 DATABASE_DSN=host=<host> user=<username> password=<password> dbname=<dbname> port=5432
 ```
 

diff --git a/ui/src/pages/SetupPage.vue b/ui/src/pages/SetupPage.vue
@@ -126,7 +126,9 @@ export default {
         });
 
         this.user.setConfig(resp);
-        this.user.setSetupCompleted(this.loginType, true);
+        this.user.setSetupCompleted(
+          this.loginType.code, true
+        );
 
         if (loginType === loginTypeEnum.anonymous) {
           this.$router.push('/');

diff --git a/ui/src/router/index.js b/ui/src/router/index.js
@@ -85,8 +85,7 @@ router.beforeEach(async (to, from, next) => {
 
   // Authentication Check
   const loginNeeded = userStore.loginNeeded();
-
-  if (!loginNeeded) {
+  if (userStore.setupCompleted && !loginNeeded) {
     const resp = await getUserConfig("");
     userStore.setConfig(resp);
   } else if (!userStore.isAuthenticated() && accessToken) {