@goweekdays/layer-common 1.3.0 → 1.3.2

package/composables/useLocalAuth.ts

@@ -12,32 +12,6 @@ export default function useLocalAuth() {
     });
   };
 
-  function authenticate() {
-    if (currentUser.value) {
-      return;
-    }
-
-    const user = useCookie("user", cookieConfig).value;
-
-    const { data: getCurrentUserReq, error: getCurrentUserErr } =
-      useLazyAsyncData("get-current-user", () =>
-        $fetch<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" });
-      }
-    });
-  }
-
   async function login({ email = "", password = "", role = "" }) {
     return $fetch<Record<string, any>>("/api/auth/login", {
       method: "POST",
@@ -107,11 +81,8 @@ export default function useLocalAuth() {
     });
   }
 
-  function signUp(email: string, referral: string) {
-    return $fetch<TKeyValuePair>("/api/auth/sign-up", {
-      method: "POST",
-      body: { email, referral },
-    });
+  function loggedInUser() {
+    return useCookie("user", cookieConfig).value ?? "";
   }
 
   return {
@@ -119,13 +90,12 @@ export default function useLocalAuth() {
     membership,
     permissions,
     hasPermission,
-    authenticate,
     login,
     logout,
     getCurrentUser,
     forgotPassword,
     resetPassword,
     verify,
-    signUp,
+    loggedInUser,
   };
 }

package/composables/useMember.ts

@@ -1,25 +1,19 @@
 export default function useMember() {
-  const members = useState<Array<TMember>>("members", () => []);
-  const page = useState("page", () => 1);
-  const pages = useState("pages", () => 0);
-  const pageRange = useState("pageRange", () => "-- - -- of --");
-
-  const member = useState<TMember>("member", () => ({
-    _id: "",
+  const member = ref<TMember>({
     org: "",
     orgName: "",
-    roleName: "",
     name: "",
     user: "",
     role: "",
-    type: "",
-    customerOrgId: "",
-    customerSiteId: "",
-    status: "",
-    createdAt: "",
-    updatedAt: "",
-    deletedAt: "",
-  }));
+  });
+
+  const invitation = ref<TMemberInvitation>({
+    _id: "",
+    email: "",
+    app: "",
+    org: "",
+    role: "",
+  });
 
   function getByUserId(user: string) {
     return $fetch<TMember>(`/api/members/user/${user}`);
@@ -32,18 +26,25 @@ export default function useMember() {
     });
   }
 
+  function getByApp({ app = "", user = "", org = "" } = {}) {
+    return $fetch<TMember>(`/api/members/app/${app}/user/${user}`, {
+      method: "GET",
+      query: { org },
+    });
+  }
+
   async function getAll({
     page = 1,
     search = "",
     limit = 10,
     user = "",
     org = "",
-    type = "",
+    app = "",
     status = "active",
   } = {}) {
-    return $fetch<Record<string, any>>("/api/members", {
+    return $fetch<Record<string, any>>(`/api/members/app/${app}`, {
       method: "GET",
-      query: { page, limit, search, user, org, type, status },
+      query: { page, limit, search, user, org, status },
     });
   }
   function createUserByVerification(
@@ -70,32 +71,38 @@ export default function useMember() {
     );
   }
 
-  function updateMemberRole(
-    id: string,
-    role: string,
-    type: string,
-    org: string
-  ) {
-    return $fetch<Record<string, any>>(
-      `/api/members/id/${id}/role/${role}/type/${type}/org/${org}`,
-      {
-        method: "PUT",
-      }
-    );
+  function updateRoleById(id: string, role: string) {
+    return $fetch<Record<string, any>>(`/api/members/role/id/${id}`, {
+      method: "PATCH",
+      body: { role },
+    });
   }
+
+  function updateStatusById(id: string, status: string) {
+    return $fetch<Record<string, any>>(`/api/members/status/id/${id}`, {
+      method: "PATCH",
+      body: { status },
+    });
+  }
+
+  function deleteById(id: string) {
+    return $fetch<Record<string, any>>(`/api/members/id/${id}`, {
+      method: "DELETE",
+    });
+  }
+
   return {
-    members,
     member,
-    page,
-    pages,
-    pageRange,
-
+    invitation,
     getAll,
     getByUserId,
     createUserByVerification,
     createMemberInvite,
     getByUserType,
+    getByApp,
     updateMemberStatus,
-    updateMemberRole,
+    updateRoleById,
+    updateStatusById,
+    deleteById,
   };
 }

package/composables/useRole.ts

@@ -1,5 +1,7 @@
 export default function useRole() {
-  function add(value: Pick<TRole, "name" | "permissions" | "type" | "org">) {
+  function add(
+    value: Pick<TRole, "name" | "permissions" | "app" | "org" | "createdBy">
+  ) {
     return $fetch("/api/roles", {
       method: "POST",
       body: value,
@@ -10,12 +12,12 @@ export default function useRole() {
     search = "",
     page = 1,
     limit = 20,
-    type = "",
+    app = "",
     org = "",
   } = {}) {
     return $fetch<Record<string, any>>("/api/roles", {
       method: "GET",
-      query: { search, page, limit, type, org },
+      query: { search, page, limit, app, org },
     });
   }
 
@@ -56,7 +58,7 @@ export default function useRole() {
     name: "",
     org: "",
     permissions: [],
-    type: "",
+    app: "",
     description: "",
   });
 

package/composables/useVerification.ts

@@ -13,7 +13,35 @@ export default function useUser() {
     });
   }
 
+  function inviteMember(value: {
+    email: string;
+    app: string;
+    org: string;
+    role: string;
+  }) {
+    return $fetch<Record<string, any>>("/api/verifications/member", {
+      method: "POST",
+      body: value,
+    });
+  }
+
+  function signUp(email: string) {
+    return $fetch<Record<string, any>>("/api/verifications/sign-up", {
+      method: "POST",
+      body: { email },
+    });
+  }
+
+  function cancelInvite(id: string) {
+    return $fetch<Record<string, any>>(`/api/verifications/invite/id/${id}`, {
+      method: "DELETE",
+    });
+  }
+
   return {
     getVerifications,
+    inviteMember,
+    signUp,
+    cancelInvite,
   };
 }

package/nuxt.config.ts

@@ -45,6 +45,36 @@ export default defineNuxtConfig({
     },
   ],
 
+  routeRules: {
+    "/api/apps/**": { proxy: `${process.env.API_CORE}/api/apps/**` },
+    "/api/auth/**": { proxy: `${process.env.API_CORE}/api/auth/**` },
+    "/api/users/**": { proxy: `${process.env.API_CORE}/api/users/**` },
+    "/api/apps/**": { proxy: `${process.env.API_CORE}/api/apps/**` },
+    "/api/permissions/**": {
+      proxy: `${process.env.API_CORE}/api/permissions/**`,
+    },
+    "/api/organizations/**": {
+      proxy: `${process.env.API_CORE}/api/organizations/**`,
+    },
+    "/api/members/**": { proxy: `${process.env.API_CORE}/api/members/**` },
+    "/api/teams/**": { proxy: `${process.env.API_CORE}/api/teams/**` },
+    "/api/entities/**": { proxy: `${process.env.API_CORE}/api/entities/**` },
+    "/api/workflows/**": { proxy: `${process.env.API_CORE}/api/workflows/**` },
+    "/api/roles/**": { proxy: `${process.env.API_CORE}/api/roles/**` },
+    "/api/promo-codes/**": {
+      proxy: `${process.env.API_CORE}/api/promo-codes/**`,
+    },
+    "/api/verifications/**": {
+      proxy: `${process.env.API_CORE}/api/verifications/**`,
+    },
+    "/api/files/**": {
+      proxy: `${process.env.API_CORE}/api/files/**`,
+    },
+    "/api/public/**": {
+      proxy: `${process.env.S3_BUCKET_ENDPOINT}/**`,
+    },
+  },
+
   vite: {
     vue: {
       template: {

package/package.json

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

package/pages/forgot-password.vue

@@ -0,0 +1,76 @@
+<template>
+  <v-row no-gutters class="fill-height" justify="center" align-content="center">
+    <v-col cols="12" class="mb-6">
+      <v-row no-gutters justify="center">
+        <nuxt-link
+          class="text-h2 font-weight-bold text-decoration-none"
+          style="color: unset"
+          :to="{ name: 'index' }"
+        >
+          GoWeekdays
+        </nuxt-link>
+      </v-row>
+    </v-col>
+
+    <v-col cols="12" lg="3" md="4" sm="6">
+      <v-form v-model="isValid" @submit.prevent="submit(email)">
+        <v-row no-gutters>
+          <v-col cols="12">
+            <v-row no-gutters>
+              <v-col cols="12" class="text-h6 font-weight-bold"> Email </v-col>
+              <v-col cols="12">
+                <v-text-field
+                  v-model="email"
+                  :rules="[requiredRule, emailRule]"
+                ></v-text-field>
+              </v-col>
+            </v-row>
+          </v-col>
+
+          <v-col v-if="message" cols="12" class="my-2 text-center font-italic">
+            {{ message }}
+          </v-col>
+
+          <v-col cols="12">
+            <v-row no-gutters justify="center">
+              <v-btn
+                type="submit"
+                variant="tonal"
+                :disabled="!isValid"
+                rounded="xl"
+                size="large"
+              >
+                submit
+              </v-btn>
+            </v-row>
+          </v-col>
+
+          <v-col cols="12" class="mt-2 text-center">
+            All good? <nuxt-link :to="{ name: 'login' }">Login</nuxt-link>
+          </v-col>
+        </v-row>
+      </v-form>
+    </v-col>
+  </v-row>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "plain",
+});
+const { requiredRule, emailRule } = useUtils();
+const email = ref("");
+const isValid = ref(false);
+
+const { forgotPassword } = useLocalAuth();
+const message = ref("");
+
+async function submit(email = "") {
+  try {
+    const result: any = await forgotPassword(email);
+    message.value = result.message;
+  } catch (error: any) {
+    message.value = error.message;
+  }
+}
+</script>

package/pages/login.vue

@@ -0,0 +1,156 @@
+<template>
+  <v-row
+    no-gutters
+    class="fill-height pa-8"
+    justify="center"
+    align-content="center"
+  >
+    <v-col cols="12" lg="3" md="4" sm="6">
+      <v-form
+        v-model="isValid"
+        @submit.prevent="submit({ email, password })"
+        :disabled="loading"
+      >
+        <v-row no-gutters>
+          <v-col cols="12">
+            <v-row no-gutters justify="center">
+              <nuxt-link
+                class="text-h3 text-sm-h2 text-md-h2 text-lg-h2 text-xl-h2 font-weight-bold text-decoration-none"
+                style="color: unset"
+                :to="{ name: 'index' }"
+              >
+                GoWeekdays
+              </nuxt-link>
+            </v-row>
+          </v-col>
+
+          <v-col cols="12" class="mt-6">
+            <v-row no-gutters>
+              <v-col cols="12" class="text-h6 font-weight-bold"> Email </v-col>
+              <v-col cols="12">
+                <v-text-field
+                  v-model="email"
+                  :rules="[requiredRule, emailRule]"
+                ></v-text-field>
+              </v-col>
+            </v-row>
+          </v-col>
+
+          <v-col cols="12">
+            <v-row no-gutters>
+              <v-col cols="12" class="text-h6 font-weight-bold">
+                Password
+              </v-col>
+              <v-col cols="12">
+                <InputPassword v-model="password" :rules="[requiredRule]" />
+              </v-col>
+            </v-row>
+          </v-col>
+
+          <v-col v-if="message" cols="12" class="my-2 text-center font-italic">
+            {{ message }}
+          </v-col>
+
+          <v-col cols="12" class="mt-4">
+            <v-row no-gutters justify="center">
+              <v-btn
+                block
+                type="submit"
+                variant="tonal"
+                :disabled="!isValid"
+                rounded="xl"
+                size="large"
+                class="text-none"
+                :loading="loading"
+              >
+                Login
+              </v-btn>
+            </v-row>
+          </v-col>
+
+          <v-col cols="12" class="text-center font-weight-bold mt-4">
+            <nuxt-link
+              :to="{ name: 'forgot-password' }"
+              class="text-decoration-none text-primary"
+            >
+              Forgot password?
+            </nuxt-link>
+          </v-col>
+
+          <v-col cols="12" class="my-4">
+            <v-divider></v-divider>
+          </v-col>
+
+          <v-col cols="12">
+            <v-row no-gutters justify="center">
+              <v-btn
+                block
+                variant="flat"
+                color="black"
+                rounded="xl"
+                size="large"
+                class="text-none"
+                :to="{ name: 'sign-up' }"
+              >
+                Create new account
+              </v-btn>
+            </v-row>
+          </v-col>
+        </v-row>
+      </v-form>
+    </v-col>
+  </v-row>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "plain",
+});
+const { requiredRule, emailRule } = useUtils();
+const email = ref("");
+const password = ref("");
+const isValid = ref(false);
+
+const { login } = useLocalAuth();
+
+const message = ref("");
+
+const loading = ref(false);
+
+const { APP, cookieConfig } = useRuntimeConfig().public;
+
+const { getByApp } = useMember();
+
+async function submit({ email = "", password = "" } = {}) {
+  loading.value = true;
+  try {
+    await login({ email, password });
+
+    if (APP === "main") {
+      await navigateTo({ name: "feed" });
+      return;
+    }
+
+    if (APP === "admin") {
+      await navigateTo({ name: "home" });
+      return;
+    }
+
+    const userId = (useCookie("user", cookieConfig).value as string) ?? "";
+
+    const memberData = await getByApp({ app: APP, user: userId });
+
+    if (memberData && memberData.org) {
+      navigateTo({
+        name: "org-dashboard",
+        params: { org: memberData.org },
+      });
+      return;
+    }
+  } catch (error: any) {
+    message.value = error.response._data.message;
+  } finally {
+    loading.value = false;
+  }
+}
+</script>

package/pages/logout.vue

@@ -0,0 +1,18 @@
+<template>
+  <v-row no-gutters class="fill-height" justify="center" align-content="center">
+    <v-col cols="12" class="mt-2 text-center font-weight-bold">
+      You have been logged out.
+      <nuxt-link :to="{ name: 'login' }">Login</nuxt-link>
+    </v-col>
+  </v-row>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "plain",
+});
+
+const { logout } = useLocalAuth();
+
+logout();
+</script>

package/pages/member-suspended.vue

@@ -0,0 +1,44 @@
+<template>
+  <v-row no-gutters class="fill-height" justify="center" align-content="center">
+    <v-col cols="12" class="mb-4">
+      <v-row justify="center" class="pa-4">
+        <span class="text-h5 font-weight-medium"> Member Suspended </span>
+      </v-row>
+    </v-col>
+
+    <span class="text-subtitle-2">
+      Your membership has been suspended. Please contact your organization
+      administrator for more information.
+    </span>
+
+    <v-col cols="12" class="mt-6">
+      <v-row no-gutters justify="center">
+        <v-btn
+          size="large"
+          class="text-none"
+          variant="flat"
+          color="black"
+          rounded
+          @click="navigateTo({ name: 'index' })"
+        >
+          Return to Landing Page
+        </v-btn>
+      </v-row>
+    </v-col>
+  </v-row>
+</template>
+
+<script setup lang="ts">
+definePageMeta({
+  layout: "plain",
+});
+
+function createOrg() {
+  const { APP, APP_ORG } = useRuntimeConfig().public;
+  if (APP === "organization") {
+    navigateTo({ name: "organizations-create" });
+  } else {
+    navigateTo(`${APP_ORG}/organizations/create`, { external: true });
+  }
+}
+</script>