@vc-shell/framework 1.0.327 → 1.0.328-0

package/shared/pages/LoginPage/components/login/Login.vue

@@ -81,6 +81,16 @@
 
         <ExternalProviders :providers="loginProviders" />
       </div>
+
+      <!-- Extensions after form -->
+      <template
+        v-for="extension in afterLoginFormExtensions"
+        :key="extension.id"
+      >
+        <div class="vc-login-page__extension">
+          <component :is="extension.component" />
+        </div>
+      </template>
     </template>
     <template v-else>
       <template v-if="!forgotPasswordRequestSent">
@@ -162,7 +172,7 @@
 
 <!-- eslint-disable @typescript-eslint/no-explicit-any -->
 <script lang="ts" setup>
-import { ref, reactive, computed, onMounted, Ref } from "vue";
+import { ref, reactive, computed, onMounted, Ref, inject } from "vue";
 import { useRouter } from "vue-router";
 import { useIsFormValid, Field, useIsFormDirty, useForm } from "vee-validate";
 import { useSettings, useUser } from "./../../../../../core/composables";
@@ -171,6 +181,7 @@ import { ExternalSignInProviderInfo, SignInResult } from "./../../../../../core/
 import { useI18n } from "vue-i18n";
 import { default as ExternalProviders } from "./../../../../../shared/components/sign-in/external-providers.vue";
 import { useExternalProvider } from "./../../../../../shared/components/sign-in/useExternalProvider";
+import { Extension, ExtensionPoint, extensionsHelperSymbol } from "./../../../../../core/plugins";
 
 type ForgotPasswordFunc = (args: { loginOrEmail: string }) => Promise<void>;
 
@@ -203,6 +214,12 @@ const loadingForgotPassword = ref(false);
 const loginProviders = ref<ExternalSignInProviderInfo[]>();
 let forgotPassword: ForgotPasswordFunc;
 
+const extensionsHelper = inject(extensionsHelperSymbol);
+
+const afterLoginFormExtensions = computed(
+  (): ExtensionPoint[] => (extensionsHelper?.getOutboundExtensions("login-after-form") as ExtensionPoint[]) || [],
+);
+
 if (props.composable && typeof props.composable === "function") {
   useLogin = props.composable;
 
@@ -251,6 +268,10 @@ const login = async () => {
         localStorage.removeItem("redirectAfterLogin");
         await router.push(redirectTo);
       } else {
+        signInResult.value.error = "The login or password is incorrect.";
+        form.password = "";
+        validateField("password");
+
         if (signInResult.value.status) {
           if (signInResult.value.status === 401) {
             signInResult.value.error = "The login or password is incorrect.";
@@ -320,6 +341,10 @@ console.debug("Init login-page");
     @apply tw-w-28;
   }
 
+  &__extension {
+    @apply tw-mt-6 tw-pt-6 tw-border-t tw-border-t-[color:var(--login-separator)] tw-flex tw-justify-center;
+  }
+
   &__separator {
     @apply tw-mt-4;
   }

package/shared/pages/LoginPage/components/login/README.md

@@ -0,0 +1,52 @@
+# Login Component Extension Guide
+
+The Login component can be extended through the dynamic modules system. This guide explains how to add custom functionality to the login page.
+
+## Extension Points
+
+Currently, the Login component supports the following extension points:
+
+- `login-after-form` - Allows adding content after the login form
+
+## How to Add Extensions
+
+### 1. Create Your Extension Component
+
+First, create your custom component:
+```vue
+<!-- MyLoginExtension.vue -->
+<template>
+<div class="my-login-extension">
+<!-- Your custom content -->
+</div>
+</template>
+<script lang="ts" setup>
+// Your component logic
+</script>
+```
+
+### 2. Register Extension in Your Module
+
+In your module's entry point, register the extension:
+
+```typescript
+import MyLoginExtension from './components/MyLoginExtension.vue';
+export default {
+  install(app) {
+  // Module installation logic
+  },
+extensions: {
+    'login-after-form': [{id: 'MyLoginExtension', component: MyLoginExtensionComponent}]
+  }
+}
+```
+
+## Extension Points Details
+
+### login-after-form
+
+This extension point appears after the login form and before any error messages. Extensions will be rendered with:
+- A horizontal separator line above
+- Centered alignment
+- Proper spacing from the login form
+

package/shared/pages/LoginPage/components/login/index.ts

@@ -1,3 +1,3 @@
-import _Login from "./Login.vue";
-
-export const Login = _Login as typeof _Login;
+import _Login from "./Login.vue";
+
+export const Login = _Login as typeof _Login;

package/shared/pages/LoginPage/index.ts

@@ -1 +1 @@
-export * from "./components";
+export * from "./components";

package/shared/pages/LoginPage/plugin.ts

@@ -1,4 +1,4 @@
-import { createModule } from "./../../../core/plugins";
-import * as components from "./components";
-
-export const LoginPage = createModule(components);
+import { createModule } from "./../../../core/plugins";
+import * as components from "./components";
+
+export const LoginPage = createModule(components);

package/shared/pages/ResetPasswordPage/components/index.ts

@@ -1 +1 @@
-export * from "./reset-password";
+export * from "./reset-password";

package/shared/pages/ResetPasswordPage/components/reset-password/ResetPassword.vue

@@ -1,218 +1,218 @@
-<template>
-  <div class="vc-reset-password-page">
-    <VcLoading
-      v-if="loading"
-      active
-    ></VcLoading>
-
-    <VcLoginForm
-      :logo="customization.logo"
-      :background="background"
-      :title="t('PASSWORDRESET.TITLE')"
-      class="vc-reset-password-page__login-form"
-    >
-      <VcForm>
-        <Field
-          v-slot="{ field, errorMessage, handleChange, errors }"
-          :label="t('PASSWORDRESET.FIELDS.PASSWORD.LABEL')"
-          name="password"
-          :model-value="form.password"
-          rules="required"
-        >
-          <VcInput
-            v-bind="field"
-            ref="passwordField"
-            v-model="form.password"
-            class="vc-reset-password-page__input"
-            :label="t('PASSWORDRESET.FIELDS.PASSWORD.LABEL')"
-            :placeholder="t('PASSWORDRESET.FIELDS.PASSWORD.PLACEHOLDER')"
-            type="password"
-            :disabled="!form.tokenIsValid"
-            required
-            :error="!!errors.length"
-            :error-message="errorMessage"
-            @update:model-value="
-              (e) => {
-                handleChange(e);
-                validate();
-              }
-            "
-          />
-        </Field>
-        <Field
-          v-slot="{ field, errorMessage, handleChange, errors }"
-          :label="t('PASSWORDRESET.FIELDS.CONFIRM_PASSWORD.LABEL')"
-          name="confirm_password"
-          :model-value="form.confirmPassword"
-          rules="required"
-        >
-          <VcInput
-            v-bind="field"
-            ref="confirmPasswordField"
-            v-model="form.confirmPassword"
-            class="vc-reset-password-page__input-small"
-            :label="t('PASSWORDRESET.FIELDS.CONFIRM_PASSWORD.LABEL')"
-            :placeholder="t('PASSWORDRESET.FIELDS.CONFIRM_PASSWORD.PLACEHOLDER')"
-            :disabled="!form.tokenIsValid"
-            type="password"
-            required
-            :error="!!errors.length"
-            :error-message="errorMessage"
-            @update:model-value="
-              (e) => {
-                handleChange(e);
-                validate();
-              }
-            "
-            @keyup.enter="resetPassword"
-          >
-          </VcInput>
-        </Field>
-        <div class="vc-reset-password-page__button-container">
-          <span
-            v-if="$isDesktop.value"
-            class="vc-reset-password-page__spacer"
-          ></span>
-          <vc-button
-            :disabled="disableButton"
-            class="vc-reset-password-page__submit-button"
-            @click="resetPassword"
-          >
-            {{ t("PASSWORDRESET.SAVE_PASSWORD") }}
-          </vc-button>
-        </div>
-
-        <VcHint
-          v-for="error in form.errors"
-          :key="error"
-          class="vc-reset-password-page__error-hint"
-          style="color: #f14e4e"
-        >
-          <!-- TODO: stylizing-->
-          {{ t(`PASSWORDRESET.ERRORS.${error}`) }}
-        </VcHint>
-      </VcForm>
-    </VcLoginForm>
-  </div>
-</template>
-
-<script lang="ts" setup>
-import { reactive, onMounted, computed } from "vue";
-import { useRouter } from "vue-router";
-import { Field, useForm } from "vee-validate";
-import { useUser, useSettings } from "./../../../../../core/composables";
-import { useI18n } from "vue-i18n";
-
-const props = withDefaults(
-  defineProps<{
-    userId: string;
-    userName: string;
-    token: string;
-    logo: string;
-    background: string;
-  }>(),
-  {
-    background: "/assets/background.jpg",
-    logo: "/assets/logo-white.svg",
-  },
-);
-
-const { validateToken, validatePassword, resetPasswordByToken, signIn, loading } = useUser();
-const router = useRouter();
-const { t } = useI18n({ useScope: "global" });
-const { validate: veeValidate } = useForm({ validateOnMount: false });
-const { uiSettings, loading: customizationLoading } = useSettings();
-
-const form = reactive<{
-  isValid: boolean;
-  tokenIsValid: boolean;
-  errors: string[];
-  password: string;
-  confirmPassword: string;
-}>({
-  isValid: false,
-  tokenIsValid: false,
-  errors: [],
-  password: "",
-  confirmPassword: "",
-});
-
-onMounted(async () => {
-  form.tokenIsValid = await validateToken(props.userId, props.token);
-  if (!form.tokenIsValid) {
-    form.errors.push("Invalid-token");
-  }
-});
-
-const disableButton = computed(() => {
-  return loading.value || !form.password || !form.confirmPassword || (!form.isValid && form.tokenIsValid);
-});
-
-const validate = async () => {
-  if (form.tokenIsValid) {
-    const errors = (await validatePassword(form.password)).errors;
-    form.errors = errors?.map((x) => x.code) as string[];
-    if (form.confirmPassword !== form.password) {
-      form.errors.push("Repeat-password");
-    }
-    form.isValid = form.errors.length == 0;
-  }
-};
-
-const resetPassword = async () => {
-  const { valid } = await veeValidate();
-  if (valid) {
-    const result = await resetPasswordByToken(props.userId, form.password, props.token);
-    if (result.succeeded) {
-      const loginResult = await signIn(props.userName, form.password);
-      if (loginResult.succeeded) {
-        router.push("/");
-      } else {
-        form.errors = ("error" in loginResult && [loginResult.error as string]) || [];
-      }
-    } else {
-      form.errors = result.errors as string[];
-    }
-  }
-};
-
-const customization = computed(() => {
-  return {
-    logo: !customizationLoading.value ? uiSettings.value?.logo || props.logo : "",
-  };
-});
-</script>
-
-<style lang="scss">
-:root {
-  --reset-password-error-color: var(--base-error-color, var(--danger-500));
-}
-
-.vc-reset-password-page {
-  @apply tw-w-full tw-h-full tw-box-border tw-flex tw-flex-col tw-m-0;
-}
-
-.vc-reset-password-page__input {
-  @apply tw-mb-4 tw-mt-1;
-}
-
-.vc-reset-password-page__input-small {
-  @apply tw-mb-4;
-}
-
-.vc-reset-password-page__button-container {
-  @apply tw-flex tw-justify-center tw-items-center tw-pt-2;
-}
-
-.vc-reset-password-page__spacer {
-  @apply tw-grow tw-basis-0;
-}
-
-.vc-reset-password-page__submit-button {
-  @apply tw-w-28;
-}
-
-.vc-reset-password-page__error-hint {
-  @apply tw-mt-3 tw-text-[color:var(--reset-password-error-color)] #{!important};
-}
-</style>
+<template>
+  <div class="vc-reset-password-page">
+    <VcLoading
+      v-if="loading"
+      active
+    ></VcLoading>
+
+    <VcLoginForm
+      :logo="customization.logo"
+      :background="background"
+      :title="t('PASSWORDRESET.TITLE')"
+      class="vc-reset-password-page__login-form"
+    >
+      <VcForm>
+        <Field
+          v-slot="{ field, errorMessage, handleChange, errors }"
+          :label="t('PASSWORDRESET.FIELDS.PASSWORD.LABEL')"
+          name="password"
+          :model-value="form.password"
+          rules="required"
+        >
+          <VcInput
+            v-bind="field"
+            ref="passwordField"
+            v-model="form.password"
+            class="vc-reset-password-page__input"
+            :label="t('PASSWORDRESET.FIELDS.PASSWORD.LABEL')"
+            :placeholder="t('PASSWORDRESET.FIELDS.PASSWORD.PLACEHOLDER')"
+            type="password"
+            :disabled="!form.tokenIsValid"
+            required
+            :error="!!errors.length"
+            :error-message="errorMessage"
+            @update:model-value="
+              (e) => {
+                handleChange(e);
+                validate();
+              }
+            "
+          />
+        </Field>
+        <Field
+          v-slot="{ field, errorMessage, handleChange, errors }"
+          :label="t('PASSWORDRESET.FIELDS.CONFIRM_PASSWORD.LABEL')"
+          name="confirm_password"
+          :model-value="form.confirmPassword"
+          rules="required"
+        >
+          <VcInput
+            v-bind="field"
+            ref="confirmPasswordField"
+            v-model="form.confirmPassword"
+            class="vc-reset-password-page__input-small"
+            :label="t('PASSWORDRESET.FIELDS.CONFIRM_PASSWORD.LABEL')"
+            :placeholder="t('PASSWORDRESET.FIELDS.CONFIRM_PASSWORD.PLACEHOLDER')"
+            :disabled="!form.tokenIsValid"
+            type="password"
+            required
+            :error="!!errors.length"
+            :error-message="errorMessage"
+            @update:model-value="
+              (e) => {
+                handleChange(e);
+                validate();
+              }
+            "
+            @keyup.enter="resetPassword"
+          >
+          </VcInput>
+        </Field>
+        <div class="vc-reset-password-page__button-container">
+          <span
+            v-if="$isDesktop.value"
+            class="vc-reset-password-page__spacer"
+          ></span>
+          <vc-button
+            :disabled="disableButton"
+            class="vc-reset-password-page__submit-button"
+            @click="resetPassword"
+          >
+            {{ t("PASSWORDRESET.SAVE_PASSWORD") }}
+          </vc-button>
+        </div>
+
+        <VcHint
+          v-for="error in form.errors"
+          :key="error"
+          class="vc-reset-password-page__error-hint"
+          style="color: #f14e4e"
+        >
+          <!-- TODO: stylizing-->
+          {{ t(`PASSWORDRESET.ERRORS.${error}`) }}
+        </VcHint>
+      </VcForm>
+    </VcLoginForm>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { reactive, onMounted, computed } from "vue";
+import { useRouter } from "vue-router";
+import { Field, useForm } from "vee-validate";
+import { useUser, useSettings } from "./../../../../../core/composables";
+import { useI18n } from "vue-i18n";
+
+const props = withDefaults(
+  defineProps<{
+    userId: string;
+    userName: string;
+    token: string;
+    logo: string;
+    background: string;
+  }>(),
+  {
+    background: "/assets/background.jpg",
+    logo: "/assets/logo-white.svg",
+  },
+);
+
+const { validateToken, validatePassword, resetPasswordByToken, signIn, loading } = useUser();
+const router = useRouter();
+const { t } = useI18n({ useScope: "global" });
+const { validate: veeValidate } = useForm({ validateOnMount: false });
+const { uiSettings, loading: customizationLoading } = useSettings();
+
+const form = reactive<{
+  isValid: boolean;
+  tokenIsValid: boolean;
+  errors: string[];
+  password: string;
+  confirmPassword: string;
+}>({
+  isValid: false,
+  tokenIsValid: false,
+  errors: [],
+  password: "",
+  confirmPassword: "",
+});
+
+onMounted(async () => {
+  form.tokenIsValid = await validateToken(props.userId, props.token);
+  if (!form.tokenIsValid) {
+    form.errors.push("Invalid-token");
+  }
+});
+
+const disableButton = computed(() => {
+  return loading.value || !form.password || !form.confirmPassword || (!form.isValid && form.tokenIsValid);
+});
+
+const validate = async () => {
+  if (form.tokenIsValid) {
+    const errors = (await validatePassword(form.password)).errors;
+    form.errors = errors?.map((x) => x.code) as string[];
+    if (form.confirmPassword !== form.password) {
+      form.errors.push("Repeat-password");
+    }
+    form.isValid = form.errors.length == 0;
+  }
+};
+
+const resetPassword = async () => {
+  const { valid } = await veeValidate();
+  if (valid) {
+    const result = await resetPasswordByToken(props.userId, form.password, props.token);
+    if (result.succeeded) {
+      const loginResult = await signIn(props.userName, form.password);
+      if (loginResult.succeeded) {
+        router.push("/");
+      } else {
+        form.errors = ("error" in loginResult && [loginResult.error as string]) || [];
+      }
+    } else {
+      form.errors = result.errors as string[];
+    }
+  }
+};
+
+const customization = computed(() => {
+  return {
+    logo: !customizationLoading.value ? uiSettings.value?.logo || props.logo : "",
+  };
+});
+</script>
+
+<style lang="scss">
+:root {
+  --reset-password-error-color: var(--base-error-color, var(--danger-500));
+}
+
+.vc-reset-password-page {
+  @apply tw-w-full tw-h-full tw-box-border tw-flex tw-flex-col tw-m-0;
+}
+
+.vc-reset-password-page__input {
+  @apply tw-mb-4 tw-mt-1;
+}
+
+.vc-reset-password-page__input-small {
+  @apply tw-mb-4;
+}
+
+.vc-reset-password-page__button-container {
+  @apply tw-flex tw-justify-center tw-items-center tw-pt-2;
+}
+
+.vc-reset-password-page__spacer {
+  @apply tw-grow tw-basis-0;
+}
+
+.vc-reset-password-page__submit-button {
+  @apply tw-w-28;
+}
+
+.vc-reset-password-page__error-hint {
+  @apply tw-mt-3 tw-text-[color:var(--reset-password-error-color)] #{!important};
+}
+</style>

package/shared/pages/ResetPasswordPage/components/reset-password/index.ts

@@ -1,3 +1,3 @@
-import _ResetPassword from "./ResetPassword.vue";
-
-export const ResetPassword = _ResetPassword as typeof _ResetPassword;
+import _ResetPassword from "./ResetPassword.vue";
+
+export const ResetPassword = _ResetPassword as typeof _ResetPassword;

package/shared/pages/ResetPasswordPage/index.ts

@@ -1 +1 @@
-export * from "./components";
+export * from "./components";

package/shared/pages/ResetPasswordPage/plugin.ts

@@ -1,4 +1,4 @@
-import { createModule } from "./../../../core/plugins";
-import * as components from "./components";
-
-export const ResetPasswordPage = createModule(components);
+import { createModule } from "./../../../core/plugins";
+import * as components from "./components";
+
+export const ResetPasswordPage = createModule(components);

package/shared/pages/index.ts

@@ -1,4 +1,4 @@
-export * from "./InvitePage";
-export * from "./LoginPage";
-export * from "./ResetPasswordPage";
-export * from "./ChangePasswordPage";
+export * from "./InvitePage";
+export * from "./LoginPage";
+export * from "./ResetPasswordPage";
+export * from "./ChangePasswordPage";

package/shared/pages/plugin.ts

@@ -1,4 +1,4 @@
-export * from "./InvitePage/plugin";
-export * from "./LoginPage/plugin";
-export * from "./ResetPasswordPage/plugin";
-export * from "./ChangePasswordPage/plugin";
+export * from "./InvitePage/plugin";
+export * from "./LoginPage/plugin";
+export * from "./ResetPasswordPage/plugin";
+export * from "./ChangePasswordPage/plugin";