Merge pull request #63 from hypersign-protocol/develop

Develop

Author: varsha766

src/App.vue

@@ -362,7 +362,8 @@ export default {
   const userDetails = localStorage.getItem("user");
   if (userDetails) {
     try {
-      this.userDetails = JSON.parse(userDetails);
+       const parsed = JSON.parse(userDetails);
+      Object.assign(this.userDetails, parsed);
       this.user = this.userDetails;
       this.loggedInUserEmailId = this.user?.accessAccount?.email;
       this.setIsLoggedOut(true);
@@ -483,7 +484,8 @@ export default {
       try {
             const userDetails = localStorage.getItem("user");
         if (userDetails) {
-            this.userDetails = JSON.parse(userDetails);
+            const parsed = JSON.parse(userDetails);
+            Object.assign(this.userDetails, parsed);
             this.parseAuthToken= this.userDetails
            this.setIsLoggedOut(true)
            const redirectPath=localStorage.getItem("postLoginRedirect")||'/studio/dashboard'
@@ -666,7 +668,7 @@ export default {
     },
   async logout() {
       try{
-      await RequestHandler(`${config.studioServer.BASE_URL}api/v1/logout`, 'POST', {})
+      await RequestHandler(`${config.studioServer.BASE_URL}api/v1/auth/logout`, 'POST', {})
       }catch(e){
         console.error('Logout error:', e); 
       }

src/assets/css/gblStyle.css

@@ -146,11 +146,18 @@ a {
     background-color: #fff;
     background-clip: border-box;
     border: 1px solid rgba(0, 0, 0, .125);
-}  
-
+    max-height: 80vh;
+    overflow-y: auto;
+    }
+    
+.serviceCard.v-card,
+.serviceCard.v-sheet {
+        border-radius: 8px !important;
+        box-shadow: 0 0 2rem 0 rgba(136, 152, 170, 0.15) !important;
+    }
 .dropDownPopup {
     box-shadow: var(--dropdown-menu-elevation, 0 1px 10px 0 rgba(0, 0, 0, .25));
     border-radius: 8px;
     border: 0px solid grey;
 }
-  
+

src/router.js

@@ -211,10 +211,8 @@ router.beforeEach(async (to, from, next) => {
   }
   if (to.matched.some(record => record.meta.requiresAuth)) {
     document.title = to.meta.title;
-    const url = `${config.studioServer.BASE_URL}api/v1/auth`
     try {
-
-      const response = await fetch(url, {
+      const response = await fetch(`${config.studioServer.BASE_URL}api/v1/auth`, {
         method: "POST",
         credentials: "include",
       });
@@ -225,20 +223,34 @@ router.beforeEach(async (to, from, next) => {
         localStorage.setItem("user", JSON.stringify(json.message));
         store.commit('playgroundStore/addUserDetailsToProfile', json.message)
         next()
-      } else {
-        throw new Error("Unexpected response");
       }
     } catch (e) {
-      console.log(e)
-      store.commit('mainStore/setMainSideNavBar', false)
-      next({
-        path: '/studio/login',
-        query: { redirect: to.fullPath }
-      })
-
+      try {
+        const refreshResponse = await fetch(`${config.studioServer.BASE_URL}api/v1/auth/refresh`, {
+          method: "POST",
+          credentials: "include",
+        });
+        if (!refreshResponse.ok) {
+          throw new Error('Refresh failed');
+        }
+        const authResponse = await fetch(`${config.studioServer.BASE_URL}api/v1/auth`, {
+          method: "POST",
+          credentials: "include",
+        });
+        if (authResponse.ok) {
+          const user = await authResponse.json();
+          localStorage.setItem("user", JSON.stringify(user.message));
+          store.commit('playgroundStore/addUserDetailsToProfile', user.message);
+          next();
+        } else {
+          throw new Error('Refresh token invalid');
+        }
+      } catch (refreshError) {
+        store.commit('mainStore/setMainSideNavBar', false);
+        next({ path: '/studio/login', query: { redirect: to.fullPath } });
+      }
     }
   } else {
-    console.log(to.path)
     if (to.path === '/studio/login') {
       store.commit('mainStore/setIsLoggedOut', false)
     }