@hostlink/nuxt-light 1.19.2 → 1.20.0

package/dist/module.json

@@ -1,7 +1,7 @@
 {
   "name": "light",
   "configKey": "light",
-  "version": "1.19.2",
+  "version": "1.20.0",
   "builder": {
     "@nuxt/module-builder": "0.8.4",
     "unbuild": "2.0.0"

package/dist/runtime/components/L/System/Setting/mail.vue

@@ -6,12 +6,6 @@ const $q = useQuasar()
 
 const emits = defineEmits(["submit"])
 
-const { authorizationUrl } = await q({
-    authorizationUrl: true
-})
-
-console.log(authorizationUrl);
-
 withDefaults(defineProps<{
     mail_driver: string,
     mail_host: string
@@ -29,14 +23,15 @@ withDefaults(defineProps<{
 
 const onLoginGmail = () => {
     let state = encodeURIComponent(window.self.location.origin + window.self.location.pathname + "?mail_driver=gmail");
-    let url = "https://accounts.google.com/o/oauth2/v2/auth?scope=openid%20email%20profile%20https%3A%2F%2Fmail.google.com%2F&access_type=offline&state=" + state + "&response_type=code&redirect_uri=https%3A%2F%2Fraymond4.hostlink.com.hk%2Flight%2Fgmail_notification%2Fredirect.php&client_id=790028313082-8qqnoqvkqtqssufto11k6qe6pnievcpv.apps.googleusercontent.com&prompt=consent";
+
+    let scope = encodeURIComponent("https://mail.google.com/");
+    let url = "https://accounts.google.com/o/oauth2/v2/auth?scope=" + scope + "&access_type=offline&state=" + state + "&response_type=code&redirect_uri=https%3A%2F%2Fraymond4.hostlink.com.hk%2Flight%2Fgmail_notification%2Fredirect.php&client_id=790028313082-8qqnoqvkqtqssufto11k6qe6pnievcpv.apps.googleusercontent.com&prompt=consent";
     window.open(url, "_blank");
 }
 
 </script>
 <template>
     <FormKit type="l-form" :bordered="false" :value="$props" @submit="$emit('submit', $event)" #default="{ value }">
-        {{ authorizationUrl }}
 
         <FormKit type="l-select" label="Mail Driver" name="mail_driver" :options="[{
             label: 'Mail', value: 'mail'

package/dist/runtime/components/L/System/Setting/security.vue

@@ -1,8 +1,5 @@
 <script setup lang="ts">
-import { q, m } from '#imports'
-import { useQuasar } from 'quasar'
-
-const $q = useQuasar()
+const emits = defineEmits(["submit"])
 
 export type LSystemSettingSecurityProps = {
     password_contains_uppercase: string
@@ -14,46 +11,30 @@ export type LSystemSettingSecurityProps = {
     auth_lockout_duration: string
     auth_lockout_attempts: string
     access_token_expire: string
+    password_expiration: string,
+    password_expiration_duration: string
 }
 
-const modelValue = defineModel<LSystemSettingSecurityProps>({
-    required: true
-})
-
-const onSubmit = async (d: LSystemSettingSecurityProps) => {
-    let data: { name: string, value: string }[] = []
+withDefaults(defineProps<LSystemSettingSecurityProps>(), {
+    password_contains_uppercase: "0",
+    password_contains_lowercase: "0",
+    password_contains_numeric: "0",
+    password_contains_symbol: "0",
+    password_min_length: "8",
+    two_factor_authentication: "0",
+    auth_lockout_duration: "15",
+    auth_lockout_attempts: "5",
+    access_token_expire: "28800",
+    password_expiration: "0",
+    password_expiration_duration: "90"
+});
 
-    Object.keys(d).forEach((key) => {
-        data.push({
-            name: key,
-            value: d[key as keyof LSystemSettingSecurityProps]
-        })
-    })
-    await m("updateAppConfigs", { data })
-    //update the modelValue
-    Object.keys(d).forEach((key) => {
-        modelValue.value[key as keyof LSystemSettingSecurityProps] = d[key as keyof LSystemSettingSecurityProps]
-    })
-
-    $q.notify({ message: "Settings saved", color: "positive" })
-}
 
 </script>
 
 <template>
 
-    <FormKit type="l-form" :bordered="false" :value="{
-        password_contains_uppercase: modelValue.password_contains_uppercase,
-        password_contains_lowercase: modelValue.password_contains_lowercase,
-        password_contains_numeric: modelValue.password_contains_numeric,
-        password_contains_symbol: modelValue.password_contains_symbol,
-        password_min_length: modelValue.password_min_length,
-        two_factor_authentication: modelValue.two_factor_authentication,
-        auth_lockout_duration: modelValue.auth_lockout_duration,
-        auth_lockout_attempts: modelValue.auth_lockout_attempts,
-        access_token_expire: modelValue.access_token_expire,
-
-    }" @submit="onSubmit">
+    <FormKit type="l-form" :bordered="false" :value="$props" @submit="$emit('submit',$event)">
         <q-field label="Password policy" stack-label :color="$light.color">
             <FormKit type="l-checkbox" label="Upper Case" name="password_contains_uppercase" true-value="1"
                 false-value="0" />
@@ -84,11 +65,9 @@ const onSubmit = async (d: LSystemSettingSecurityProps) => {
             validation="required" />
 
 
-        <!-- form-kit label="Password expiration" true-value="1" false-value="0" name="password_expiration"
+        <form-kit label="Password expiration" true-value="1" false-value="0" name="password_expiration"
             type="l-checkbox"></form-kit>
-
-
         <form-kit label="Password expiration duration" name="password_expiration_duration" type="l-input"
-            hint="The number of days before the password expires. Default is 90 days." validation="required"></form-kit -->
+            hint="The number of days before the password expires. Default is 90 days." validation="required"></form-kit>
     </FormKit>
 </template>

package/dist/runtime/components/l-login.vue

@@ -34,6 +34,39 @@ const data = reactive({
 
 const $q = useQuasar()
 
+const passwordExpiredProcess = (username: string, password: string) => {
+  $q.dialog({
+    title: t("Password expired"),
+    message: t("Your password has expired, please enter your new password"),
+    prompt: {
+      model: "",
+      type: "password",
+      required: true
+    },
+    cancel: true,
+    persistent: true
+  }).onOk(async newPassword => {
+    try {
+      await api.auth.changeExpiredPassword(username, password, newPassword);
+      $q.notify({
+        message: t("Your password has been changed successfully, please login again"),
+        color: "positive",
+        icon: "sym_o_check",
+      });
+    } catch (e) {
+      $q.notify({
+        message: e.message,
+        color: "negative",
+        icon: "sym_o_error",
+      });
+      passwordExpiredProcess(username, password);
+    }
+  });
+
+
+
+}
+
 const loginWithCode = (username: string, password: string) => {
   $q.dialog({
     title: t("Enter your code"),
@@ -58,9 +91,6 @@ const loading = ref(false);
 
 const submit = async () => {
   if (await form1.value.validate()) {
-
-
-
     try {
       loading.value = true;
       await api.auth.login(data.username, data.password, data.code)
@@ -71,11 +101,15 @@ const submit = async () => {
       data.code = "";
 
       if (e.message == "two factor authentication code is required") {
-
         loginWithCode(data.username, data.password);
         return;
       }
 
+      if (e.message == "password is expired") {
+        passwordExpiredProcess(data.username, data.password);
+        return;
+      }
+
       $q.notify({
         message: e.message,
         color: "negative",

package/dist/runtime/pages/EventLog/_eventlog_id/view.vue

@@ -1,6 +1,6 @@
 <script setup>
 import { getObject } from "#imports"
-const obj = await getObject(["eventlog_id", "class", "id", "action", "created_time", "username", "source", "target"]);
+const obj = await getObject(["eventlog_id", "class", "id", "action", "created_time", "username", "source", "target", "different"]);
 
 const splitterModel = 50;
 </script>
@@ -17,7 +17,7 @@ const splitterModel = 50;
 
             </l-list>
 
-            <q-splitter v-model="splitterModel" >
+            <q-splitter v-model="splitterModel">
                 <template v-slot:before>
                     <div class="q-pa-md">
                         <div class="text-h6 q-mb-md">{{ $t('Source') }}</div>
@@ -28,12 +28,16 @@ const splitterModel = 50;
                 <template v-slot:after>
                     <div class="q-pa-md">
                         <div class="text-h6 q-mb-md">{{ $t('Target') }}</div>
-                        <pre>{{ obj.target }}
-                    </pre>
-
+                        <pre>{{ obj.target }}</pre>
                     </div>
                 </template>
             </q-splitter>
+
+            <q-separator />
+            <div class="q-pa-md" style="overflow: auto;">
+                <div class="text-h6 q-mb-md">{{ $t('Different') }}</div>
+                <pre>{{ obj.different }}</pre>
+            </div>
         </l-card>
 
     </l-page>

package/dist/runtime/pages/System/index.vue

@@ -1,6 +1,10 @@
 <script setup>
 import { q } from '#imports'
-const system = await q("system", ["server"])
+const { system } = await q({
+    system: {
+        server: true
+    }
+})
 
 const columns = [
     {
@@ -18,6 +22,7 @@ const columns = [
 </script>
 <template>
     <l-page>
-        <l-table searchable :rows="system.server" :columns="columns" :rows-per-page-options="[0]" hide-pagination></l-table>
+        <l-table searchable :rows="system.server" :columns="columns" :rows-per-page-options="[0]"
+            hide-pagination></l-table>
     </l-page>
 </template>

package/dist/runtime/pages/System/mailtest.vue

@@ -1,8 +1,16 @@
 <script setup>
-import { m } from '#imports'
+import { m, q } from '#imports'
 import { useQuasar } from "quasar"
 const quasar = useQuasar();
 
+//get your email
+
+const { my } = await q({
+    my: {
+        email: true
+    }
+});
+
 const onSubmit = async (data) => {
     try {
         await m("mailTest", data)
@@ -26,6 +34,7 @@ const onSubmit = async (data) => {
 <template>
     <l-page>
         <form-kit type="l-form" @submit="onSubmit" :value="{
+            email: my.email,
             subject: 'Test email',
             content: 'Hello, this is a test email'
         }">

package/dist/runtime/pages/System/setting.vue

@@ -75,7 +75,7 @@ const onSubmit = async (d) => {
                 <template #after>
                     <l-system-setting-general v-if="tab == 'general'" v-model="obj" />
                     <l-system-setting-mail v-if="tab == 'mail'" v-bind="obj" @submit="onSubmit" />
-                    <l-system-setting-security v-if="tab == 'security'" v-model="obj" />
+                    <l-system-setting-security v-if="tab == 'security'" v-bind="obj" @submit="onSubmit" />
                     <l-system-setting-modules v-if="tab == 'Modules'" v-model="obj" />
                     <l-system-setting-developer v-if="tab == 'developer'" v-model="obj" />
                     <l-system-setting-forget-password v-if="tab == 'forget-password'" v-model="obj" />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.19.2",
+  "version": "1.20.0",
   "description": "HostLink Nuxt Light Framework",
   "repository": {
     "type": "git",
@@ -34,7 +34,7 @@
   "dependencies": {
     "@azure/msal-browser": "^3.26.1",
     "@formkit/drag-and-drop": "^0.1.6",
-    "@hostlink/light": "^2.1.0",
+    "@hostlink/light": "^2.2.0",
     "@nuxt/kit": "^3.7.4",
     "@nuxt/module-builder": "^0.8.3",
     "@quasar/extras": "^1.16.11",