@vc-shell/framework 1.0.278 → 1.0.280

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@vc-shell/framework",
-  "version": "1.0.278",
+  "version": "1.0.280",
   "type": "module",
   "main": "./dist/framework.js",
   "types": "./dist/index.d.ts",
@@ -61,9 +61,9 @@
   "devDependencies": {
     "@types/dompurify": "^3.0.5",
     "@types/quill": "^2.0.14",
-    "@vc-shell/api-client-generator": "^1.0.278",
-    "@vc-shell/config-generator": "^1.0.278",
-    "@vc-shell/ts-config": "^1.0.278",
+    "@vc-shell/api-client-generator": "^1.0.280",
+    "@vc-shell/config-generator": "^1.0.280",
+    "@vc-shell/ts-config": "^1.0.280",
     "@vitejs/plugin-vue": "^5.0.3",
     "cypress-signalr-mock": "^1.5.0",
     "sass": "^1.69.6",

package/shared/components/change-password/change-password.vue

@@ -2,11 +2,33 @@
   <VcPopup
     :title="t('COMPONENTS.CHANGE_PASSWORD.TITLE')"
     is-mobile-fullscreen
-    @close="$emit('close')"
+    @close="cancelChange"
   >
     <template #content>
       <!-- <div class="change-password tw-p-3 tw-overflow-scroll"> -->
       <VcForm class="tw-flex tw-flex-col tw-flex-auto">
+        <div
+          v-if="forced"
+          class="tw-mb-4"
+        >
+          <vc-status
+            extend
+            :outline="false"
+            variant="info-dark"
+          >
+            <div class="tw-flex tw-flex-row tw-items-center">
+              <VcIcon
+                icon="far fa-lightbulb"
+                size="l"
+                class="tw-mr-3"
+              />
+              <div>
+                <p>{{ t("COMPONENTS.CHANGE_PASSWORD.FORCED.LABEL") }}</p>
+              </div>
+            </div>
+          </vc-status>
+        </div>
+
         <Field
           v-slot="{ field, errorMessage, errors }"
           :label="t('COMPONENTS.CHANGE_PASSWORD.CURRENT_PASSWORD.LABEL')"
@@ -82,7 +104,7 @@
           <VcButton
             :outline="true"
             class="tw-mr-3"
-            @click="$emit('close')"
+            @click="cancelChange"
           >
             {{ t("COMPONENTS.CHANGE_PASSWORD.CANCEL") }}
           </VcButton>
@@ -117,6 +139,7 @@ import { VcInput, VcHint, VcButton, VcPopup, VcForm } from "./../../../ui/compon
 import { IIdentityError } from "./../../../core/api/platform";
 import { useUser } from "./../../../core/composables/useUser";
 import { useI18n } from "vue-i18n";
+import { useRouter } from "vue-router";
 
 interface IChangePassForm {
   isValid: boolean;
@@ -126,6 +149,13 @@ interface IChangePassForm {
   confirmPassword: string;
 }
 
+export interface Props {
+  forced?: boolean;
+  login?: string;
+}
+
+const props = defineProps<Props>();
+
 interface Emits {
   (event: "close"): void;
 }
@@ -136,6 +166,9 @@ const { changeUserPassword, loading, validatePassword } = useUser();
 useForm({ validateOnMount: false });
 const isValid = useIsFormValid();
 const isDirty = useIsFormDirty();
+const router = useRouter();
+const { signOut } = useUser();
+
 const form = reactive<IChangePassForm>({
   isValid: false,
   errors: [],
@@ -148,10 +181,23 @@ const isDisabled = computed(() => {
   return !isDirty.value || !isValid.value;
 });
 
+async function cancelChange() {
+  if (props.forced) {
+    await signOut();
+    await router.push("/login");
+  } else {
+    emit("close");
+  }
+}
+
 async function changePassword() {
   const result = await changeUserPassword(form.currentPassword, form.password);
   if (result?.succeeded) {
-    emit("close");
+    if (props.forced) {
+      await router.push("/");
+    } else {
+      emit("close");
+    }
   } else if (result?.errors) {
     form.errors = result?.errors;
     form.isValid = form.errors.length == 0;

package/shared/modules/dynamic/pages/dynamic-blade-list.vue

@@ -291,13 +291,13 @@ const { load, remove, items, loading, pagination, query, scope } = props.composa
     } as unknown as UseList<Record<string, any>[], Record<string, any>, ListBaseBladeScope>);
 
 const isBladeEditable = computed(() =>
-  "disabled" in toValue(scope || {}) ? !toValue(toValue(scope || {}).disabled) : false,
+  "disabled" in toValue(scope || {}) ? !toValue(toValue(scope || {})?.disabled) : false,
 );
 
 const selection = computed(
   () =>
     ("selectedIds" in toValue(scope || {}) &&
-      items.value?.filter((item) => toValue(toValue(scope || {}).selectedIds)?.includes(item.id))) ||
+      items.value?.filter((item) => toValue(toValue(scope || {})?.selectedIds)?.includes(item.id))) ||
     [],
 );
 

package/shared/pages/ChangePasswordPage/components/change-password/ChangePassword.vue

@@ -0,0 +1,30 @@
+<template>
+  <div
+    class="tw-w-full tw-h-full tw-box-border tw-flex tw-flex-col tw-items-center tw-justify-center"
+    :style="backgroundImageHandler"
+  >
+    <ChangePassword :forced="forced"> </ChangePassword>
+  </div>
+</template>
+
+<script lang="ts" setup>
+import { computed } from "vue";
+import { useRouter } from "vue-router";
+
+const router = useRouter();
+
+const forced = router.currentRoute.value.meta?.forced;
+
+import { ChangePassword } from "../../../../components/change-password";
+
+export interface Props {
+  background?: string;
+  userName?: string;
+}
+
+const props = defineProps<Props>();
+
+const backgroundImageHandler = computed(() => {
+  return `background: url('/assets/background.jpg') center / cover no-repeat`;
+});
+</script>

package/shared/pages/ChangePasswordPage/components/change-password/index.ts

@@ -0,0 +1,3 @@
+import _ChangePassword from "./ChangePassword.vue";
+
+export const ChangePasswordPage = _ChangePassword as typeof _ChangePassword;

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

@@ -0,0 +1 @@
+export * from "./change-password";

package/shared/pages/ChangePasswordPage/index.ts

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

package/shared/pages/ChangePasswordPage/plugin.ts

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

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

@@ -204,7 +204,7 @@ let useLogin;
 const signInResult = ref({ succeeded: true }) as Ref<SignInResult & { status?: number; error?: any }>;
 const requestPassResult = ref<RequestPasswordResult>({ succeeded: true });
 const forgotPasswordRequestSent = ref(false);
-const { signIn, loading, externalSignIn, getExternalLoginProviders } = useUser();
+const { signIn, loading, externalSignIn, getExternalLoginProviders, user } = useUser();
 const isLogin = ref(true);
 const isValid = useIsFormValid();
 const isDirty = useIsFormDirty();
@@ -258,21 +258,25 @@ const login = async () => {
       error?: any;
     };
 
-    if (signInResult.value.succeeded) {
-      const redirectTo = localStorage.getItem("redirectAfterLogin") || "/";
-      localStorage.removeItem("redirectAfterLogin");
-      await router.push(redirectTo);
+    if (signInResult.value.succeeded && user.value?.passwordExpired) {
+      await router.push({ name: "ChangePassword" });
     } else {
-      if (signInResult.value.status) {
-        if (signInResult.value.status === 401) {
-          signInResult.value.error = "The login or password is incorrect.";
-          form.password = "";
-          validateField("password");
+      if (signInResult.value.succeeded) {
+        const redirectTo = localStorage.getItem("redirectAfterLogin") || "/";
+        localStorage.removeItem("redirectAfterLogin");
+        await router.push(redirectTo);
+      } else {
+        if (signInResult.value.status) {
+          if (signInResult.value.status === 401) {
+            signInResult.value.error = "The login or password is incorrect.";
+            form.password = "";
+            validateField("password");
+          } else {
+            signInResult.value.error = "Authentication error (code: " + signInResult.value.status + ").";
+          }
         } else {
-          signInResult.value.error = "Authentication error (code: " + signInResult.value.status + ").";
+          signInResult.value.error = "Authentication error: " + signInResult.value.error;
         }
-      } else {
-        signInResult.value.error = "Authentication error: " + signInResult.value.error;
       }
     }
   }

package/shared/pages/index.ts

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

package/shared/pages/plugin.ts

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