@hostlink/nuxt-light 1.19.0 → 1.19.1

package/dist/module.json

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

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

@@ -8,6 +8,7 @@ export interface LSystemSettingAuthenticationProps {
     authentication_google_client_id: string,
     authentication_facebook_app_id: string,
     authentication_microsoft_client_id: string,
+    authentication_microsoft_tenant_id: string
 }
 
 
@@ -15,7 +16,8 @@ withDefaults(defineProps<LSystemSettingAuthenticationProps>(), {
     authentication_password_based: "1",
     authentication_google_client_id: "",
     authentication_facebook_app_id: "",
-    authentication_microsoft_client_id: ""
+    authentication_microsoft_client_id: "",
+    authentication_microsoft_tenant_id: "",
 })
 
 const emits = defineEmits(["submit"])
@@ -50,5 +52,6 @@ const onSubmit = async (d: LSystemSettingAuthenticationProps) => {
         <form-kit label="Facebook App ID" type="l-input" name="authentication_facebook_app_id" />
 
         <form-kit label="Microsoft Client ID" type="l-input" name="authentication_microsoft_client_id" />
+        <form-kit label="Microsoft Tenant ID" type="l-input" name="authentication_microsoft_tenant_id" />
     </form-kit>
 </template>

package/dist/runtime/components/l-app-main.vue

@@ -1,4 +1,4 @@
-<script setup>
+<script setup lang="ts">
 import { useRoute, useRouter } from 'vue-router';
 import { useLight, q, m } from "#imports";
 import { useQuasar } from 'quasar';
@@ -7,15 +7,12 @@ import { ref, computed, reactive, provide, watch, toRaw } from 'vue';
 import { useRuntimeConfig } from 'nuxt/app';
 import { api } from '#imports';
 
-const { t } = useI18n();
-
 const emits = defineEmits(["logout"]);
 const $q = useQuasar();
 $q.loading.show()
 
 const config = useRuntimeConfig();
 
-
 const appVersion = config.public.appVersion ?? '0.0.1';
 
 const tt = await q({
@@ -113,10 +110,9 @@ if (my && my.roles.indexOf('Administrators') != -1) {
     light.isAdmin = true;
 }
 
-const menuOverlayHeader = ref(false)
 const layoutView = computed(() => {
     let s = ''
-    s += menuOverlayHeader.value ? 'l' : 'h'
+    s += style.menuOverlayHeader ? 'l' : 'h'
     s += 'Hh LpR lFr'
     return s
 })
@@ -124,7 +120,8 @@ const layoutView = computed(() => {
 const style = reactive({
     miniState: my.styles?.miniState || false,
     dense: my.styles?.dense || false,
-    footer: my.styles?.footer || false
+    footer: my.styles?.footer || false,
+    menuOverlayHeader: my.styles?.menuOverlayHeader || false
 });
 
 const isMouseOnDrawer = ref(false)
@@ -176,6 +173,10 @@ watch(() => light.theme, async () => {
     $q.dark.set(light.isDarkMode());
 })
 
+watch(() => style.menuOverlayHeader, async (value) => {
+    await light.setStyle("menuOverlayHeader", value)
+})
+
 watch(() => style.miniState, async (value) => {
     await m("updateMyStyle", {
         name: "miniState",

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

@@ -23,9 +23,10 @@ try {
             companyLogo: true,
             logged: true,
             twoFactorAuthentication: true,
-            googleClientId: true,
             forgetPasswordEnabled: true,
+            googleClientId: true,
             microsoftClientId: true,
+            microsoftTenantId: true,
             passwordBasedEnabled: true,
             facebookAppId: true,
         }
@@ -78,7 +79,7 @@ if (app.value.facebookAppId) {
         </q-page-container>
     </q-layout>
 
-    <l-app-main v-else @logout="app.logged = false">
+    <l-app-main v-else @logout="app.logged = false" v-bind="app">
         <template #header>
             <slot name="header"></slot>
         </template>

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

@@ -1,7 +1,7 @@
-<script setup>
-import { ref, reactive, onMounted } from 'vue'
+<script setup lang="ts">
+import { ref, reactive, onMounted, resolveComponent } from 'vue'
 import { useQuasar } from 'quasar';
-import { api, useHead, m, useLight } from '#imports';
+import { api, useHead, m } from '#imports';
 import { useI18n } from 'vue-i18n';
 
 
@@ -9,16 +9,19 @@ const { t } = useI18n();
 
 const emits = defineEmits(["login"]);
 
-const props = defineProps({
-  twoFactorAuthentication: Boolean,
-  googleClientId: String | undefined,
-  forgetPasswordEnabled: Boolean,
-  company: String,
-  companyLogo: String,
-  microsoftClientId: String | undefined,
-  passwordBasedEnabled: Boolean,
-  facebookAppId: String | undefined,
-})
+export interface LLoginProps {
+  company: string,
+  companyLogo: string,
+  twoFactorAuthentication: boolean,
+  forgetPasswordEnabled: boolean,
+  passwordBasedEnabled: boolean,
+  googleClientId?: string,
+  microsoftClientId?: string,
+  microsoftTenantId?: string,
+  facebookAppId?: string
+}
+
+const props = defineProps<LLoginProps>();
 
 useHead({
   title: props.company
@@ -31,11 +34,12 @@ const data = reactive({
 
 const $q = useQuasar()
 
-const loginWithCode = (username, password) => {
+const loginWithCode = (username: string, password: string) => {
   $q.dialog({
     title: t("Enter your code"),
     message: t("Please enter your two factor authentication code (If you lost your authenticator, please contact your administrator)"),
     prompt: {
+      model: "",
       type: "text",
       required: true
     },
@@ -85,7 +89,7 @@ const submit = async () => {
   }
 }
 
-const resetPassword = (username, code) => {
+const resetPassword = (username: string, code: string) => {
   $q.dialog({
     title: t("Reset password"),
     message: t("Please enter your new password"),
@@ -127,6 +131,7 @@ const forgetPassword = async () => {
       title: t("Enter your code"),
       message: t("Please enter the code sent to your email, your code will expire in 10 minutes"),
       prompt: {
+        model: "",
         type: "text",
         required: true
       },
@@ -155,8 +160,12 @@ const bioLogin = async () => {
   try {
     await api.auth.WebAuthn.login(localStorage.getItem("username"));
     window.self.location.reload();
-  } catch (e) {
-    notify(e.message, "negative");
+  } catch (e: any) {
+    $q.notify({
+      message: e.message,
+      color: "negative",
+      icon: "sym_o_error",
+    });
   }
 
 }
@@ -164,8 +173,12 @@ const handleGoogleCredentialResponse = async (response) => {
   try {
     await api.auth.googleLogin(response.credential);
     window.self.location.reload();
-  } catch (e) {
-    notify(e.message, "negative");
+  } catch (e: any) {
+    $q.notify({
+      message: e.message,
+      color: "negative",
+      icon: "sym_o_error",
+    });
   }
 }
 
@@ -282,7 +295,8 @@ const facebookLogin = (accessToken) => {
     </q-card-actions>
 
     <q-card-actions v-if="microsoftClientId">
-      <l-microsoft-button :client-id="microsoftClientId" @login="microsoftLogin"></l-microsoft-button>
+      <l-microsoft-button :client-id="microsoftClientId" :tenant-id="microsoftTenantId"
+        @login="microsoftLogin"></l-microsoft-button>
     </q-card-actions>
 
     <q-card-actions v-if="facebookAppId">

package/dist/runtime/components/l-microsoft-button.vue

@@ -8,6 +8,7 @@ const props = defineProps({
         type: String,
         required: true
     },
+    tenantId: String
 })
 
 const emits = defineEmits(["login"]);
@@ -16,7 +17,7 @@ const onClick = async () => {
     const myMSALObject = new PublicClientApplication({
         auth: {
             clientId: props.clientId,
-            authority: "https://login.microsoftonline.com/common",
+            authority: "https://login.microsoftonline.com/" + props.tenantId,
             redirectUri: window.location.origin,
         },
         cache: {

package/dist/runtime/pages/User/setting/open_id.vue

@@ -11,6 +11,7 @@ let { app, my } = await q({
     app: {
         googleClientId: true,
         microsoftClientId: true,
+        microsoftTenantId: true,
         facebookAppId: true,
     }, my: {
         google: true,
@@ -201,7 +202,8 @@ const onUnlinkFacebook = async () => {
                 <template v-else>
                     <div>{{ $t('Click the button below to link your Microsoft account.') }}</div>
                     <div>
-                        <l-microsoft-button :client-id="app.microsoftClientId" @login="onLinkMicrosoft" />
+                        <l-microsoft-button :client-id="app.microsoftClientId" :tenant-id="app.microsoftTenantId"
+                            @login="onLinkMicrosoft" />
                     </div>
                 </template>
             </template>

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@hostlink/nuxt-light",
-  "version": "1.19.0",
+  "version": "1.19.1",
   "description": "HostLink Nuxt Light Framework",
   "repository": {
     "type": "git",