@7365admin1/layer-common 3.2.1-staging.72 → 3.2.1-staging.73

package/components/VisitorManagement.vue

@@ -588,7 +588,7 @@
         :org="orgId"
         :site="siteId"
         :visitor-data="selectedVisitorDataObject"
-        :current-user="currentUser._id"
+        :current-user="currentUser?._id"
         :type="activeVisitorFormType"
         :enable-unregistered="enableUnregistered"
         @back="handleClickBack"

package/composables/useLocalAuth.ts

@@ -1,36 +1,7 @@
 export default function useLocalAuth() {
   const { cookieConfig } = useRuntimeConfig().public;
 
-  const _address = {
-    country: "",
-    address1: "",
-    address2: "",
-    city: "",
-    province: "",
-    postalCode: "",
-  };
-
-  const user = {
-    _id: "",
-    givenName: "",
-    middleName: "",
-    surname: "",
-    address: _address,
-    email: "",
-    password: "",
-    type: "",
-    createdAt: "",
-    organization: "",
-    role: "",
-    primaryPhone: "",
-    mobilePhone: "",
-    serviceProviders: [],
-  };
-
-  const currentUser = useState(
-    "currentUser",
-    (): TUser | null => JSON.parse(JSON.stringify(user))
-  );
+  const currentUser = useState<TUser | null>("currentUser", () => null);
 
   async function authenticate() {
     const user = useCookie("user", cookieConfig).value;
@@ -41,9 +12,7 @@ export default function useLocalAuth() {
       );
 
     watchEffect(() => {
-      if (getCurrentUserReq.value) {
-        currentUser.value = getCurrentUserReq.value as TUser;
-      }
+      currentUser.value = (getCurrentUserReq.value as TUser | null) ?? null;
     });
 
     watchEffect(() => {
@@ -70,6 +39,7 @@ export default function useLocalAuth() {
     useCookie("sid", cookieConfig).value = null;
     useCookie("user", cookieConfig).value = null;
     useCookie("organization", cookieConfig).value = null;
+    currentUser.value = null;
   }
 
   async function logout() {
@@ -79,17 +49,20 @@ export default function useLocalAuth() {
         await useNuxtApp().$api(`/api/auth/${sid}`, {
           method: "DELETE",
         });
-
-        clearCookies();
       } catch (error) {
         console.error("Logout failed:", error);
       }
+
+      clearCookies();
     }
   }
 
   async function getCurrentUser() {
     const user = useCookie("user", cookieConfig).value;
-    if (!user) return null;
+    if (!user) {
+      currentUser.value = null;
+      return null;
+    }
     const _user = await useNuxtApp().$api<TUser>(`/api/users/id/${user}`, {
       method: "GET",
     });

package/package.json

@@ -2,7 +2,7 @@
   "name": "@7365admin1/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "3.2.1-staging.72",
+  "version": "3.2.1-staging.73",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {