@eeplatform/nuxt-layer-common 1.2.1 → 1.2.2

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @eeplatform/nuxt-layer-common
 
+## 1.2.2
+
+### Patch Changes
+
+- 49f4a58: Revise authentication implementation
+
 ## 1.2.1
 
 ### Patch Changes

package/composables/useLocal.ts

@@ -30,19 +30,19 @@ export default function useLocal() {
         title: "School",
         icon: "ph:building-bold",
         link: APP_SCHOOL as string,
-        landingPage: "home",
+        landingPage: "",
       },
       {
         title: "Division",
         icon: "ph:building-apartment-bold",
         link: APP_DIVISION as string,
-        landingPage: "home",
+        landingPage: "",
       },
       {
         title: "Region",
         icon: "ph:buildings-bold",
         link: APP_REGION as string,
-        landingPage: "home",
+        landingPage: "",
       },
     ];
   });

package/composables/useLocalAuth.ts

@@ -38,7 +38,7 @@ export default function useLocalAuth() {
   }
 
   async function login({ email = "", password = "", role = "" }) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/auth/login", {
+    return useNuxtApp().$api<Record<string, any>>("/api/auth/login", {
       method: "POST",
       body: JSON.stringify({ email, password, role }),
     });
@@ -78,19 +78,17 @@ export default function useLocalAuth() {
     }
   }
 
-  async function getCurrentUser() {
+  function getCurrentUser() {
     const user = useCookie("user", cookieConfig).value;
-    if (!user) return null;
-    try {
-      const _user = await useNuxtApp().$api<TUser>(`/api/users/id/${user}`, {
-        method: "GET",
-      });
+    const { data: userData } = useLazyAsyncData("get-current-user", () =>
+      useNuxtApp().$api<TUser>(`/api/users/id/${user}`)
+    );
 
-      currentUser.value = _user;
-      return _user;
-    } catch (error) {
-      console.log("Error fetching current user:", error);
-    }
+    watchEffect(() => {
+      if (userData.value) {
+        currentUser.value = userData.value;
+      }
+    });
   }
 
   async function forgotPassword(email: string) {
@@ -129,13 +127,13 @@ export default function useLocalAuth() {
   }
 
   function verify(id: string) {
-    return useNuxtApp().$api<TKeyValuePair>(`/api/auth/verify/${id}`, {
+    return useNuxtApp().$api<Record<string, any>>(`/api/auth/verify/${id}`, {
       method: "GET",
     });
   }
 
   function signUp(email: string, referral: string) {
-    return useNuxtApp().$api<TKeyValuePair>("/api/auth/sign-up", {
+    return useNuxtApp().$api<Record<string, any>>("/api/auth/sign-up", {
       method: "POST",
       body: { email, referral },
     });

package/composables/useLocalSetup.ts

@@ -1,14 +1,12 @@
 export function useLocalSetup(type: string, org?: string) {
-  const { currentUser } = useLocalAuth();
-
-  const userId = computed(() => currentUser.value?._id ?? "");
+  const userId = computed(() => useCookie("user").value ?? "");
 
   const { getByUserType } = useMember();
 
   const { data: userMemberData, error: userMemberError } = useLazyAsyncData(
     "get-member-by-id",
     () => getByUserType(userId.value, type, org),
-    { watch: [userId], immediate: false }
+    { watch: [userId] }
   );
 
   watchEffect(() => {
@@ -40,7 +38,10 @@ export function useLocalSetup(type: string, org?: string) {
     }
   });
 
+  const id = computed(() => userMemberData.value?.org ?? "id");
+
   return {
     userAppRole,
+    id,
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@eeplatform/nuxt-layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.2.1",
+  "version": "1.2.2",
   "main": "./nuxt.config.ts",
   "publishConfig": {
     "access": "public"