@drax/identity-vue 0.29.0 → 0.30.0

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.29.0",
+  "version": "0.30.0",
   "type": "module",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
@@ -24,12 +24,12 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@drax/common-front": "^0.29.0",
-    "@drax/common-vue": "^0.29.0",
-    "@drax/crud-front": "^0.29.0",
-    "@drax/crud-share": "^0.29.0",
-    "@drax/crud-vue": "^0.29.0",
-    "@drax/identity-share": "^0.29.0"
+    "@drax/common-front": "^0.30.0",
+    "@drax/common-vue": "^0.30.0",
+    "@drax/crud-front": "^0.30.0",
+    "@drax/crud-share": "^0.30.0",
+    "@drax/crud-vue": "^0.30.0",
+    "@drax/identity-share": "^0.30.0"
   },
   "peerDependencies": {
     "pinia": "^2.2.2",
@@ -66,5 +66,5 @@
     "vue-tsc": "^2.1.6",
     "vuetify": "^3.7.1"
   },
-  "gitHead": "0a3f69beb23eb8768ebe7a3d41d61d4a6d40b104"
+  "gitHead": "f7f06578327be29f20dcb7e2c8a2eac9e9145cab"
 }

package/src/combobox/TenantCombobox.vue

@@ -8,6 +8,7 @@ defineProps({
   errorMessages: {type: String as PropType<string | string[] | undefined>,},
   clearable: {type: Boolean, default: false},
   readonly: {type: Boolean, default: false},
+  hideDetails: {type: Boolean, default: false},
   itemTitle: {type: String, default: "name"},
   itemValue: {type: String, default: "_id"},
   rules: {type: Array as PropType<any[]>, default: () => []},
@@ -40,6 +41,8 @@ onMounted(async () => {
       :clearable="clearable"
       :rules="rules"
       :readonly="readonly"
+      :hide-details="hideDetails"
+      :density="density"
   ></v-select>
 </template>
 

package/src/components/SwitchTenant/SwitchTenant.vue

@@ -0,0 +1,35 @@
+<script setup lang="ts">
+import {ref} from "vue"
+import TenantCombobox from "../../combobox/TenantCombobox.vue";
+import {useAuth} from "../../composables/useAuth"
+import {useAuthStore} from "../../stores/auth/AuthStore"
+import {useI18n} from "vue-i18n"
+
+const authStore = useAuthStore()
+const {switchTenant, hasPermission} = useAuth()
+
+const {t} = useI18n()
+const tenant = ref();
+
+async function changeTenant() {
+  await switchTenant(tenant.value)
+  window.location.reload();
+}
+
+</script>
+
+<template>
+  <v-toolbar v-if="hasPermission('user:switchTenant')">
+    <v-toolbar-title>
+      <b>{{t('tenant.current')}}:</b> {{authStore.authUser?.tenant ? authStore.authUser?.tenant?.name : '-'}}
+    </v-toolbar-title>
+    <v-spacer></v-spacer>
+    <tenant-combobox v-model="tenant" hide-details variant="outlined" density="compact" clearable ></tenant-combobox>
+    <v-btn size="small" @click="changeTenant">{{t('action.change')}}</v-btn>
+  </v-toolbar>
+
+</template>
+
+<style scoped>
+
+</style>

package/src/composables/useAuth.ts

@@ -17,6 +17,14 @@ export function useAuth() {
         authStore.setAuthUser(authUser)
     }
 
+
+    const switchTenant = async (tenantId: string) => {
+        const {accessToken} = await authSystem.switchTenant(tenantId)
+        authStore.setAccessToken(accessToken)
+        const authUser = await authSystem.me()
+        authStore.setAuthUser(authUser)
+    }
+
     const loginWithToken = async (token: string) => {
         authStore.setAccessToken(token)
         if(tokenIsValid()){
@@ -76,10 +84,9 @@ export function useAuth() {
     }
 
     function isAuthenticated() {
-        if (tokenIsValid()) {
+        if (authStore.authUser && tokenIsValid()) {
             return true
         } else {
-            clearAuth()
             return false
         }
 
@@ -91,7 +98,7 @@ export function useAuth() {
         isAuthenticated, fetchAuthUser,
         changeOwnPassword, changeAvatar,
         recoveryPasswordRequest, recoveryPasswordComplete,
-        register
+        register, switchTenant
     }
 
 }

package/src/cruds/role-crud/RoleForm.vue

@@ -67,7 +67,7 @@ const {
               prepend-inner-icon="mdi-card-account-details"
               :variant="variant"
               :error-messages="$ta(store.inputErrors?.name)"
-              :rules="[v => !!v || 'validation.required']"
+              :rules="[v => !!v || t('validation.required')]"
               density="default"
               :readonly="readonly"
               :clearable="false"

package/src/index.ts

@@ -3,6 +3,7 @@ import IdentityProfileAvatar from "./components/IdentityProfileAvatar/IdentityPr
 import IdentityProfileDrawer from "./components/IdentityProfileDrawer/IdentityProfileDrawer.vue";
 import IdentityProfileView from "./components/IdentityProfileView/IdentityProfileView.vue";
 import IdentityProfileAvatarEdit from "./components/IdentityProfileAvatarEdit/IdentityProfileAvatarEdit.vue";
+import SwitchTenant from "./components/SwitchTenant/SwitchTenant.vue";
 
 import UserCrudPage from "./pages/crud/UserCrudPage.vue";
 import UserForm from "./cruds/user-crud/UserForm.vue";
@@ -56,6 +57,7 @@ export {
     IdentityProfileView,
     IdentityProfileDrawer,
     IdentityProfileAvatarEdit,
+    SwitchTenant,
 
     //Pages
     LoginPage,