@goweekdays/layer-common 1.2.1 → 1.2.3

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @goweekdays/layer-common
 
+## 1.2.3
+
+### Patch Changes
+
+- 1d892be: Fix useLocalAuth
+
+## 1.2.2
+
+### Patch Changes
+
+- 14e48f2: Fix getAll() in useApp() composable
+
 ## 1.2.1
 
 ### Patch Changes

package/composables/useApps.ts

@@ -24,10 +24,11 @@ export default function useApps() {
     limit = 10,
     search = "",
     status = "active",
+    type = "standard",
   } = {}) {
     return $fetch<Record<string, any>>(resource, {
       method: "GET",
-      query: { page, limit, search, status },
+      query: { page, limit, search, status, type },
     });
   }
 

package/composables/useLocalAuth.ts

@@ -2,6 +2,15 @@ export default function useLocalAuth() {
   const { cookieConfig } = useRuntimeConfig().public;
 
   const currentUser = useState<TUser | null>("currentUser", () => null);
+  const membership = useState<TMember | null>("membership", () => null);
+  const permissions = useState<string[]>("permissions", () => []);
+
+  const hasPermission = (permissionKey: string): ComputedRef<boolean> => {
+    return computed(() => {
+      if (!permissions.value.length) return false;
+      return permissions.value.some((perm) => perm === permissionKey);
+    });
+  };
 
   function authenticate() {
     if (currentUser.value) {
@@ -30,7 +39,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 }),
     });
@@ -106,13 +115,16 @@ export default function useLocalAuth() {
   }
 
   return {
+    currentUser,
+    membership,
+    permissions,
+    hasPermission,
     authenticate,
     login,
     logout,
     getCurrentUser,
     forgotPassword,
     resetPassword,
-    currentUser,
     verify,
     signUp,
   };

package/middleware/org.ts

@@ -5,12 +5,9 @@ const hexSchema = z
   .regex(/^[0-9a-fA-F]{24}$/, "Invalid organization ID");
 
 export default defineNuxtRouteMiddleware((to) => {
-  const organization = (to.params.organization as string) ?? "";
+  const org = (to.params.org as string) ?? "";
 
-  if (organization && !hexSchema.safeParse(organization).success) {
-    return navigateTo(
-      { name: "require-organization-membership" },
-      { replace: true }
-    );
+  if (org && !hexSchema.safeParse(org).success) {
+    return navigateTo({ name: "require-organization" }, { replace: true });
   }
 });

package/package.json

@@ -2,7 +2,7 @@
   "name": "@goweekdays/layer-common",
   "license": "MIT",
   "type": "module",
-  "version": "1.2.1",
+  "version": "1.2.3",
   "main": "./nuxt.config.ts",
   "publishConfig": {
     "access": "public"
@@ -19,7 +19,7 @@
     "@changesets/cli": "^2.27.9",
     "@nuxt/eslint": "latest",
     "eslint": "^9.14.0",
-    "nuxt": "^3.13.2",
+    "nuxt": "^3.19.2",
     "typescript": "^5.6.3",
     "vite-plugin-vuetify": "^2.0.4",
     "vue": "latest",

package/plugins/member.client.ts

@@ -0,0 +1,66 @@
+export default defineNuxtPlugin(() => {
+  const router = useRouter();
+  const { getByUserType } = useMember();
+  const { getRoleById } = useRole();
+  const { membership, permissions } = useLocalAuth();
+
+  router.afterEach((to) => {
+    const isSecured = to.meta?.member;
+    if (!isSecured) return;
+
+    const APP = useRuntimeConfig().public.APP;
+    const org = (to.params.org as string) ?? "";
+
+    const userId = useCookie("user").value ?? "";
+
+    const {
+      data: userMemberData,
+      error: userMemberError,
+      refresh: refreshUserMemberData,
+    } = useLazyAsyncData(
+      "plugin-get-member-by-id" + userId,
+      () => getByUserType(userId, APP, org),
+      { immediate: false }
+    );
+
+    if (!membership.value) {
+      refreshUserMemberData();
+    }
+
+    watchEffect(() => {
+      if (userMemberError.value) {
+        navigateTo({
+          name: "index",
+        });
+      }
+    });
+
+    watchEffect(() => {
+      if (userMemberData.value) {
+        membership.value = userMemberData.value;
+      }
+    });
+
+    const roleId = computed(() => membership.value?.role ?? "");
+
+    const { data: roleData, refresh: refreshRoleData } = useLazyAsyncData(
+      "plugin-get-role-by-id" + roleId.value,
+      () => getRoleById(roleId.value),
+      { immediate: false }
+    );
+
+    watchEffect(() => {
+      if (roleId.value) {
+        if (!permissions.value.length) {
+          refreshRoleData();
+        }
+      }
+    });
+
+    watchEffect(() => {
+      if (roleData.value) {
+        permissions.value = roleData.value.permissions ?? [];
+      }
+    });
+  });
+});

package/plugins/secure.client.ts

@@ -0,0 +1,34 @@
+export default defineNuxtPlugin(() => {
+  const router = useRouter();
+  const { cookieConfig } = useRuntimeConfig().public;
+  const { currentUser } = useLocalAuth();
+
+  router.afterEach((to) => {
+    const isSecured = to.meta?.secured;
+    if (!isSecured) return;
+
+    const user = useCookie("user", cookieConfig).value;
+
+    if (currentUser.value) {
+      return;
+    }
+
+    const { data: getCurrentUserReq, error: getCurrentUserErr } =
+      useLazyAsyncData("get-current-user", () =>
+        useNuxtApp().$api<TUser>(`/api/users/id/${user}`)
+      );
+
+    watchEffect(() => {
+      if (getCurrentUserReq.value) {
+        currentUser.value = getCurrentUserReq.value;
+      }
+    });
+
+    watchEffect(() => {
+      if (getCurrentUserErr.value) {
+        // Redirect to login page if user authentication fails
+        navigateTo({ name: "index" });
+      }
+    });
+  });
+});