Merge branch 'master' of github.com:prose-im/prose-pod-dashboard

prose-im · Jan 6, 2025 · 21e1850 · 21e1850
2 parents 78fec48 + 191501a
commit 21e1850
Show file tree

Hide file tree

Showing 51 changed files with 1,170 additions and 965 deletions.
diff --git a/index.html b/index.html
@@ -1,4 +1,4 @@
-<!doctype html>
+<!DOCTYPE html>
 <html lang="en">
   <head>
     <meta charset="UTF-8" />

diff --git a/package-lock.json b/package-lock.json
diff --git a/package.json b/package.json
@@ -47,6 +47,7 @@
     "typescript": "4.9.x",
     "vite": "5.4.x",
     "vite-plugin-pug-transformer": "1.0.x",
-    "vite-plugin-svg-icons": "2.0.x"
+    "vite-plugin-svg-icons": "2.0.x",
+    "vue-tsc": "1.8.x"
   }
 }
diff --git a/src/api/index.ts b/src/api/index.ts
@@ -16,6 +16,8 @@ import CONFIG from "@/commons/config";
 
 // PROJECT: STORES
 import store from "@/store";
+import BaseAlert from "@/components/base/BaseAlert.vue";
+import router from "@/router";
 
 /**************************************************************************
  * CONSTANTS
@@ -44,10 +46,33 @@ class API {
         // Do something with response data
         return response;
       },
-      function (error) {
-        if (error.status === 403) {
-          store.$account.logout();
+      async function (error) {
+        // Check if the error response status is 403 before logging out
+        if (error.response && error.response.status === 403) {
+          try {
+            // Logout from account
+            await store.$account.logout();
+
+            // Redirect to login page
+            console.log("router", router.instance());
+
+            router
+              .instance()
+              .push("/start/login")
+              .catch(err => {
+                // Handle redundant navigation error
+                console.error("error reroute:", err);
+              });
+
+            // Acknowledge logout success
+            BaseAlert.info("Logged out", "Logged out of your dashboard");
+          } catch (_) {
+            console.error("router error", _);
+            BaseAlert.error("Could not log out", "Maybe try again?");
+          }
         }
+        // Handle other errors globally if needed
+
         return Promise.reject(error);
       }
     );

diff --git a/src/api/providers/advancedSecurity.ts b/src/api/providers/advancedSecurity.ts
@@ -16,11 +16,11 @@ import Api from "@/api";
  * ************************************************************************* */
 
 interface WorkspaceNameResponse {
-  name: string
+  name: string;
 }
 
 interface WorkspaceIconResponse {
-  icon: string
+  icon: string;
 }
 
 interface WorkspaceDetailsCardResponse {
@@ -29,15 +29,14 @@ interface WorkspaceDetailsCardResponse {
 }
 
 interface WorkspaceColorResponse {
-  color: string
+  color: string;
 }
 
 /**************************************************************************
  * API
  * ************************************************************************* */
 
 export class APIAdvancedSecurity {
-
   /**  WORKSPACE PROFILE **/
 
   async getWorkspaceName(): Promise<WorkspaceNameResponse> {

diff --git a/src/api/providers/customizationWorkspace.ts b/src/api/providers/customizationWorkspace.ts
@@ -12,15 +12,15 @@
 import Api from "@/api";
 
 /**************************************************************************
- * INTERFACES  
+ * INTERFACES
  * ************************************************************************* */
 
 interface WorkspaceNameResponse {
-  name: string
+  name: string;
 }
 
 interface WorkspaceIconResponse {
-  icon: string
+  icon: string;
 }
 
 interface WorkspaceDetailsCardResponse {
@@ -29,14 +29,18 @@ interface WorkspaceDetailsCardResponse {
 }
 
 interface WorkspaceColorResponse {
-  color: string
+  color: string;
 }
 
 /**************************************************************************
- * TYPES  
+ * TYPES
  * ************************************************************************* */
 
-type WorkspaceConfigResponse = [WorkspaceNameResponse, WorkspaceIconResponse, WorkspaceColorResponse]
+type WorkspaceConfigResponse = [
+  WorkspaceNameResponse,
+  WorkspaceIconResponse,
+  WorkspaceColorResponse
+];
 
 /**************************************************************************
  * API
@@ -51,7 +55,6 @@ export class APICustomizationWorkspace {
       this.getWorkspaceIcon(),
       this.getWorkspaceColor()
     ]);
-
   }
 
   /**  WORKSPACE PROFILE **/
@@ -72,7 +75,7 @@ export class APICustomizationWorkspace {
 
   async setWorkspaceIcon(newIcon: string): Promise<void> {
     await Api.client.put("/workspace/icon", {
-      method: 'put',
+      method: "put",
       image: newIcon
     });
   }
@@ -87,7 +90,7 @@ export class APICustomizationWorkspace {
     });
   }
 
-  /**  APPEARANCE  **/ 
+  /**  APPEARANCE  **/
 
   async getWorkspaceColor(): Promise<WorkspaceColorResponse> {
     return (await Api.client.get("/workspace/accent-color")).data;