@iservice365/layer-common 1.0.4 → 1.0.5

package/CHANGELOG.md

@@ -1,5 +1,11 @@
 # @iservice365/layer-common
 
+## 1.0.5
+
+### Patch Changes
+
+- f7ff2ae: Revision - member only data request adjustment
+
 ## 1.0.4
 
 ### Patch Changes

package/composables/useLocalSetup.ts

@@ -3,8 +3,11 @@ export function useLocalSetup() {
 
   const id = useState<string | null>("memberShipOrgId", () => null);
 
+  const orgNature = useState<string | null>("orgNature", () => null);
+
   return {
     userAppRole,
     id,
+    orgNature,
   };
 }

package/package.json

@@ -2,7 +2,7 @@
   "name": "@iservice365/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.0.4",
+  "version": "1.0.5",
   "main": "./nuxt.config.ts",
   "scripts": {
     "dev": "nuxi dev .playground",

package/plugins/secure-member.client.ts

@@ -2,21 +2,33 @@ export default defineNuxtPlugin(() => {
   const router = useRouter();
   const { getByUserType } = useMember();
   const { getRoleById } = useRole();
+  const { getById } = useOrg();
 
-  const { userAppRole, id } = useLocalSetup();
+  const { userAppRole, id, orgNature } = useLocalSetup();
 
   router.afterEach((to) => {
     const isMember = to.meta?.memberOnly;
-    if (!isMember) return;
+
+    if (typeof isMember === "boolean" && !isMember) {
+      navigateTo(
+        {
+          name: "index",
+        },
+        { replace: true }
+      );
+    }
 
     const APP = useRuntimeConfig().public.APP;
-    const org = (to.params.org as string) ?? "";
+    const org = computed(
+      () =>
+        (to.params.org as string) || (to.params.organization as string) || ""
+    );
 
     const userId = computed(() => useCookie("user").value ?? "");
 
     const { data: userMemberData, error: userMemberError } = useLazyAsyncData(
       "get-member-by-id",
-      () => getByUserType(userId.value, APP, org),
+      () => getByUserType(userId.value, APP, org.value),
       { watch: [userId] }
     );
 
@@ -37,6 +49,18 @@ export default defineNuxtPlugin(() => {
       }
     });
 
+    const { data: getOrgByIdReq } = useLazyAsyncData(
+      "get-org-by-id",
+      () => getById(org.value),
+      { watch: [org] }
+    );
+
+    watchEffect(() => {
+      if (getOrgByIdReq.value) {
+        orgNature.value = getOrgByIdReq.value.nature ?? "";
+      }
+    });
+
     const roleId = computed(() => userMemberData.value?.role ?? "");
 
     const { data: getRoleByIdReq } = useLazyAsyncData(