Merge pull request #40 from sajanv88/bug_fix_tenant_id_login

Issue(39): Fixed login with tenant

Author: sajanv88

components/admin/AdminHeader.vue

@@ -34,6 +34,13 @@ const fullName = computed(() => {
   return config.value?.currentUser?.userName;
 });
 
+const showTenant = computed(() => {
+  if (config.value?.currentTenant?.id) {
+    return config.value?.currentTenant?.name + "\\";
+  }
+  return "";
+});
+
 const onMenuClickEvent = () => {
   navStore.toggleSideNavbar();
   emit("toggleNav");
@@ -57,7 +64,7 @@ const onMenuClickEvent = () => {
           <h1
             class="hidden md:block text-lg tracking-tight font-semibold capitalize md:text-xl lg:text-2xl"
           >
-            {{ fullName }}
+            {{ showTenant }}{{ fullName }}
           </h1>
           <IconButton @click="onMenuClickEvent" classname="inline md:hidden">
             <Icon icon="menu" />

middleware/router.global.ts

@@ -8,12 +8,14 @@ const navCallback = (nav: INavigation): string | string[] => {
   return nav.link;
 };
 let validPaths = navList.map(navCallback).filter(Boolean).flat(2);
-validPaths = [...validPaths, "/admin/profile", "/error/notfound"];
 
+validPaths = [...validPaths, "/admin/profile", "/error/notfound"];
+console.log(...validPaths, "validPaths");
 export default defineNuxtRouteMiddleware((to) => {
   if (to.fullPath === "/") {
     return;
   }
+
   if (!validPaths.includes(to.fullPath)) {
     return navigateTo("/error/notfound");
   }

server/api/abpServiceProxy/[...].ts

@@ -2,10 +2,13 @@ import { joinURL } from "ufo";
 
 export default defineEventHandler(async (event) => {
   const config = useRuntimeConfig();
-  const session = await getSession(event, { password: config.sessionSecret });
-  const { data } = session;
+  const authSessions = getCookie(event, "auth_session");
+  if(!authSessions) {
+    throw new Error("Unauthorized: Please login.");
+  }
+  const auth = JSON.parse(authSessions);
 
-  if (!data.tokenSet) {
+  if (!auth.tokenSet) {
     setResponseStatus(event, 401, "Unauthorized");
     return {
       status: 401,
@@ -18,7 +21,7 @@ export default defineEventHandler(async (event) => {
 
   const verificationToken = getCookie(event, "XSRF-TOKEN");
   const headers = new Headers();
-  headers.set("Authorization", `Bearer ${data.tokenSet.access_token}`);
+  headers.set("Authorization", `Bearer ${auth.tokenSet.access_token}`);
   if (verificationToken) {
     headers.set("RequestVerificationToken", verificationToken);
   }
@@ -57,6 +60,6 @@ export default defineEventHandler(async (event) => {
     };
   }
 
-  const jsonData = await response.json();
-  return jsonData;
+  return await response.json();
+
 });

server/api/auth/[...].ts

@@ -61,15 +61,24 @@ export default defineEventHandler(async (event) => {
           },
         );
         const claims = tokenSet.claims();
-        await updateSession(
+        const sessions = await useSession(
           event,
-          { password: config.sessionSecret },
-          {
-            tokenSet: tokenSet,
-            user: claims,
-          },
+          { password: config.sessionSecret }
         );
-
+        await sessions.update({
+          tokenSet: tokenSet,
+          user: claims,
+        });
+        setCookie(event, "auth_session", JSON.stringify({tokenSet: tokenSet, user: claims}), {
+          httpOnly: true,
+          secure: process.env.NODE_ENV === "production",
+        });
+        if(claims.tenantid) {
+          setCookie(event, "__tenant", JSON.stringify(claims.tenantid), {
+            httpOnly: true,
+            secure: process.env.NODE_ENV === "production",
+          });
+        }
         await sendRedirect(event, "/admin");
       } catch (e: unknown) {
         if (e instanceof Error) {
@@ -80,13 +89,17 @@ export default defineEventHandler(async (event) => {
     } else if (event.path == "/api/auth/signup") {
       await sendRedirect(event, `${config.openiddict.issuer}/Account/Register`);
     } else if (event.path == "/api/auth/signout") {
-      await getSession(event, { password: config.sessionSecret });
       const logoutUrl = client.endSessionUrl({
         client_id: config.openiddict.clientId,
+        post_logout_redirect_uri: config.openiddict.postLogoutRedirectUrl,
       });
-      await sendRedirect(event, logoutUrl);
+      console.log("Logging out: ", logoutUrl);
+      deleteCookie(event, "auth_session");
+      await sendRedirect(event, "/");
+
     } else if (event.path == `/${config.openiddict.postLogoutRedirectUrl}`) {
-      await clearSession(event, { password: config.sessionSecret });
+      // Todo: check and remove this
+      deleteCookie(event, "auth_session");
       await sendRedirect(event, "/");
     } else {
       await sendRedirect(event, "/error/notfound", 404);

server/api/jwt.ts

@@ -1,15 +1,18 @@
 export default defineEventHandler(async (event) => {
-  const config = useRuntimeConfig();
-  const session = await getSession(event, { password: config.sessionSecret });
+  const authSessions = getCookie(event, "auth_session");
+  if(!authSessions) {
+    throw new Error("Unauthorized: Please login.");
+  }
+  const auth = JSON.parse(authSessions);
 
-  if (Object.keys(session.data).length === 0) {
+  if (!auth || !auth.tokenSet.access_token) {
     setResponseStatus(event, 401, "Unauthorized");
     return {
       status: 401,
       message: "Unauthorized: Please login.",
     };
   }
 
-  const tokenSet = session.data.tokenSet;
+  const tokenSet = auth.tokenSet;
   return { jwt: tokenSet };
 });

server/api/user.ts

@@ -1,19 +1,27 @@
 export default defineEventHandler(async (event) => {
   const config = useRuntimeConfig();
-  const session = await getSession(event, { password: config.sessionSecret });
+  const authSessions = getCookie(event, "auth_session");
+  if(!authSessions) {
+    throw new Error("Unauthorized: Please login.");
+  }
+  const auth = JSON.parse(authSessions);
+  const token = auth.tokenSet.access_token;
+
   const abpUrl = config.abpApiEndpoint + "/account/my-profile";
 
-  if (Object.keys(session.data).length === 0) {
+
+  if (!auth || !token) {
     setResponseStatus(event, 401, "Unauthorized");
 
     return {
       status: 401,
       message: "Unauthorized: Please login.",
     };
   }
+
   const profile = await fetch(abpUrl, {
     headers: {
-      Authorization: `Bearer ${session.data.tokenSet.access_token}`,
+      Authorization: `Bearer ${token}`
     },
   });
 

store/emailingStore.ts

@@ -52,6 +52,14 @@ export const useEmailing = defineStore("emailing", {
           statusCode: error.value.statusCode ?? 500,
           message: error.value.message,
         };
+        const toast = useToast();
+        toast.show({
+          message: "Error fetching email settings",
+          type: "destructive",
+          show: true,
+          autoClose: true,
+          dismissible: true,
+        });
         this.isLoading = false;
         throw error.value;
       }

store/state.ts

@@ -71,6 +71,7 @@ const useAbpConfiguration = defineStore("abpConfiguration", {
     async fetch() {
       const url = `${getAbpServiceProxy("/abp/application-configuration")}`;
       const { data, error } = await useFetch(url);
+      console.log(data, "abp configuration response");
 
       if (error.value) {
         this.error = {