@iservice365/layer-common 0.2.0 → 0.2.2

package/CHANGELOG.md

@@ -1,5 +1,17 @@
 # @iservice365/layer-common
 
+## 0.2.2
+
+### Patch Changes
+
+- c627e9b: Switch to session based auth
+
+## 0.2.1
+
+### Patch Changes
+
+- ff09e54: Breaking change - switched to session based authentication
+
 ## 0.2.0
 
 ### Minor Changes

package/composables/useLocalAuth.ts

@@ -4,14 +4,6 @@ export default function useLocalAuth() {
   const currentUser = useState<TUser | null>("currentUser", () => null);
 
   function authenticate() {
-    // Get access token from cookies
-    const accessToken = useCookie("accessToken", cookieConfig).value;
-
-    if (!accessToken) {
-      // Redirect to login page if no access token
-      navigateTo({ name: "index" });
-    }
-
     const user = useCookie("user", cookieConfig).value;
 
     const { data: getCurrentUserReq, error: getCurrentUserErr } =
@@ -40,15 +32,13 @@ export default function useLocalAuth() {
     });
   }
 
-  function setToken({ refreshToken = "", accessToken = "", user = "" }) {
-    useCookie("accessToken", cookieConfig).value = accessToken;
-    useCookie("refreshToken", cookieConfig).value = refreshToken;
+  function setSession({ sid = "", user = "" }) {
+    useCookie("sid", cookieConfig).value = sid;
     useCookie("user", cookieConfig).value = user;
   }
 
   function clearCookies() {
-    useCookie("accessToken", cookieConfig).value = null;
-    useCookie("refreshToken", cookieConfig).value = null;
+    useCookie("sid", cookieConfig).value = null;
     useCookie("user", cookieConfig).value = null;
     useCookie("organization", cookieConfig).value = null;
   }
@@ -134,10 +124,10 @@ export default function useLocalAuth() {
   return {
     authenticate,
     login,
+    setSession,
     logout,
     clearCookies,
     getCurrentUser,
-    setToken,
     forgotPassword,
     resetPassword,
     currentUser,

package/composables/useLocalSetup.ts

@@ -1,52 +1,13 @@
-export function useLocalSetup(type: string) {
-  const { currentUser } = useLocalAuth();
-
-  const userId = computed(() => currentUser.value?._id ?? "");
-
-  const { getByUserIdType } = useMember();
-
-  const { data: userMemberData } = useAsyncData(
-    "get-member-by-id",
-    () => getByUserIdType(userId.value, type),
-    { watch: [userId], lazy: true }
+export function useLocalSetup() {
+  const userAppRole = useState<Record<string, any> | null>(
+    "userAppRole",
+    () => null
   );
 
-  const { getRoleById } = useRole();
-
-  const roleId = computed(() => userMemberData.value?.role ?? "");
-  const orgId = computed(() => userMemberData.value?.org ?? "");
-
-  const userAppRole = useState<TRole | null>("userAppRole", () => null);
-
-  const { data: getRoleByIdReq } = useAsyncData(
-    "get-role-by-id",
-    () => getRoleById(roleId.value),
-    { watch: [roleId], immediate: false, lazy: true }
-  );
-
-  watchEffect(() => {
-    if (getRoleByIdReq.value) {
-      userAppRole.value = getRoleByIdReq.value;
-    }
-  });
-
-  const { getByServiceProviderOrgIdType } = useServiceProvider();
-
-  const { data: serviceProvider } = useAsyncData(
-    "get-all-service-providers",
-    () =>
-      getByServiceProviderOrgIdType({
-        id: orgId.value,
-        type: "property_management_agency",
-      }),
-    {
-      watch: [orgId],
-      lazy: true,
-    }
-  );
+  const id = useState<string | null>("memberShipOrgId", () => null);
 
   return {
     userAppRole,
-    serviceProvider,
+    id,
   };
 }

package/composables/useMember.ts

@@ -29,6 +29,13 @@ export default function useMember() {
     return useNuxtApp().$api<TMember>(`/api/members/user/${user}/app/${type}`);
   }
 
+  function getByUserType(user: string, type: string, org?: string) {
+    return useNuxtApp().$api<TMember>(`/api/members/user/${user}/app/${type}`, {
+      method: "GET",
+      query: { org },
+    });
+  }
+
   async function getAll({
     page = 1,
     search = "",
@@ -92,7 +99,7 @@ export default function useMember() {
     page,
     pages,
     pageRange,
-
+    getByUserType,
     getAll,
     getByUserId,
     createUserByVerification,

package/middleware/01.auth.ts

@@ -2,9 +2,9 @@ export default defineNuxtRouteMiddleware(async () => {
   const { cookieConfig } = useRuntimeConfig().public;
 
   // Get access token from cookies
-  const accessToken = useCookie("accessToken", cookieConfig).value;
+  const sid = useCookie("sid", cookieConfig).value;
 
-  if (!accessToken) {
+  if (!sid) {
     // Redirect to login page if no access token
     return navigateTo({ name: "index" });
   }

package/middleware/member.ts

@@ -0,0 +1,4 @@
+export default defineNuxtRouteMiddleware(() => {
+  if (import.meta.server) return;
+  const adminMember = useCookie("admin-member").value ?? "";
+});

package/nuxt.config.ts

@@ -13,6 +13,7 @@ export default defineNuxtConfig({
         secure: true,
         maxAge: 30 * 24 * 60 * 60,
       },
+      APP: (process.env.APP as string) ?? "App",
       API_DO_STORAGE_ENDPOINT:
         (process.env.API_DO_STORAGE_ENDPOINT as string) ?? "",
       APP_NAME: (process.env.APP_NAME as string) ?? "App",

package/package.json

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

package/plugins/API.ts

@@ -7,29 +7,8 @@ export default defineNuxtPlugin(() => {
     retryStatusCodes: [401],
     retryDelay: 500,
     onRequest({ options }) {
-      const accessToken = useCookie("accessToken", cookieConfig).value;
-      options.headers.set("Authorization", `Bearer ${accessToken}`);
-    },
-
-    async onResponseError({ response }) {
-      if (response.status === 401) {
-        await $fetch("/api/auth", {
-          baseURL: "/",
-          method: "PUT",
-          server: false,
-          credentials: "include",
-          body: JSON.stringify({
-            token: useCookie("refreshToken", cookieConfig).value,
-          }),
-
-          onResponse({ response }) {
-            if (response.status === 200) {
-              useCookie("accessToken", cookieConfig).value =
-                response._data.token;
-            }
-          },
-        });
-      }
+      const sid = useCookie("sid", cookieConfig).value ?? "";
+      options.headers.set("Authorization", sid);
     },
   });
 

package/plugins/secure-member.client.ts

@@ -0,0 +1,54 @@
+export default defineNuxtPlugin(() => {
+  const router = useRouter();
+  const { getByUserType } = useMember();
+  const { getRoleById } = useRole();
+
+  const { userAppRole, id } = useLocalSetup();
+
+  router.afterEach((to) => {
+    const isMember = to.meta?.memberOnly;
+    if (!isMember) return;
+
+    const APP = useRuntimeConfig().public.APP;
+    const org = (to.params.org as string) ?? "";
+
+    const userId = computed(() => useCookie("user").value ?? "");
+
+    const { data: userMemberData, error: userMemberError } = useLazyAsyncData(
+      "get-member-by-id",
+      () => getByUserType(userId.value, APP, org),
+      { watch: [userId] }
+    );
+
+    watchEffect(() => {
+      if (userMemberError.value) {
+        navigateTo(
+          {
+            name: "index",
+          },
+          { replace: true }
+        );
+      }
+    });
+
+    watchEffect(() => {
+      if (userMemberData.value) {
+        id.value = userMemberData.value.org ?? "";
+      }
+    });
+
+    const roleId = computed(() => userMemberData.value?.role ?? "");
+
+    const { data: getRoleByIdReq } = useLazyAsyncData(
+      "get-role-by-id",
+      () => getRoleById(roleId.value),
+      { watch: [roleId], immediate: false }
+    );
+
+    watchEffect(() => {
+      if (getRoleByIdReq.value) {
+        userAppRole.value = getRoleByIdReq.value;
+      }
+    });
+  });
+});

package/types/local.d.ts

@@ -14,6 +14,7 @@ declare type TNavigationItem = {
   icon?: string;
   route?: TNavigationRoute;
   children?: TNavigationItem[];
+  link?: string
 };
 
 declare type TKeyValuePair<