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

package/components/FeedbackMain.vue

@@ -721,9 +721,9 @@ const {
     _getFeedbacks({
       page: page.value,
       site: route.params.site as string,
-      provider: currentUser.value.serviceProvider,
-      ...(currentUser.value.type != "site" && {
-        userId: currentUser.value._id,
+      provider: currentUser.value?.serviceProvider,
+      ...(currentUser.value?.type != "site" && {
+        userId: currentUser.value?._id,
       }),
       service: "Security",
       dateFrom: moment(startDate.value, "DD/MM/YYYY").startOf("day"),
@@ -998,9 +998,9 @@ async function handleAccept() {
         _id: feedbackData.value._id,
         statusUpdate: {
           status: "In-Progress",
-          updatedById: currentUser.value._id,
-          updatedByName: `${currentUser.value.givenName} ${currentUser.value.surname}`,
-          assignee: currentUser.value._id,
+          updatedById: currentUser.value?._id,
+          updatedByName: `${currentUser.value?.givenName} ${currentUser.value?.surname}`,
+          assignee: currentUser.value?._id,
           provider: currentUser.value?.serviceProvider,
         },
       };
@@ -1158,7 +1158,7 @@ async function submit() {
     isSubmitting.value = true;
 
     const result = await createFeedback({
-      createdBy: currentUser.value._id,
+      createdBy: currentUser.value?._id,
       description: _feedback.value.description,
       attachments: _feedback.value.attachments,
       site: route.params.site as string,

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"
@@ -1707,7 +1707,7 @@ async function handleVisitorDataFromScannedQRCodeCheckInOut(
           site: visitorData.site ?? siteId,
         },
         update: {
-          updatedBy: currentUser.value._id,
+          updatedBy: currentUser.value?._id,
           visitorPass: visitorPass.find(
             (i: Record<string, any>) => i.keyId === null
           )

package/composables/useComment.ts

@@ -89,13 +89,13 @@ export default function useComment() {
 
       comments.value = _comments.items
         .map((comment: any) => {
-          if (comment.createdBy === currentUser.value._id) {
+          if (comment.createdBy === currentUser.value?._id) {
             comment.justify = "end";
           } else {
             comment.justify = "start";
             if (
               ((Array.isArray(comment.seenBy) &&
-                !comment.seenBy.includes(currentUser.value._id)) ||
+                !comment.seenBy.includes(currentUser.value?._id)) ||
                 !comment?.seenBy) &&
               comment?._id
             ) {
@@ -111,7 +111,7 @@ export default function useComment() {
         );
 
       if (Array.isArray(updateSeenIds) && updateSeenIds.length > 0) {
-        const seenBy = await updateSeenBy(updateSeenIds, currentUser.value._id);
+        const seenBy = await updateSeenBy(updateSeenIds, currentUser.value?._id);
       }
     } catch (error) {
       console.log("error :", error);

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.71",
+  "version": "3.2.1-staging.73",
   "author": "7365admin1",
   "main": "./nuxt.config.ts",
   "publishConfig": {