@drax/identity-vue 0.7.2 → 0.7.3

package/package.json

@@ -3,7 +3,7 @@
   "publishConfig": {
     "access": "public"
   },
-  "version": "0.7.2",
+  "version": "0.7.3",
   "type": "module",
   "main": "./src/index.ts",
   "module": "./src/index.ts",
@@ -24,11 +24,11 @@
     "format": "prettier --write src/"
   },
   "dependencies": {
-    "@drax/common-front": "^0.7.2",
-    "@drax/common-vue": "^0.7.2",
+    "@drax/common-front": "^0.7.3",
+    "@drax/common-vue": "^0.7.3",
     "@drax/crud-front": "^0.7.0",
     "@drax/crud-share": "^0.7.0",
-    "@drax/crud-vue": "^0.7.2",
+    "@drax/crud-vue": "^0.7.3",
     "@drax/identity-share": "^0.7.0"
   },
   "peerDependencies": {
@@ -66,5 +66,5 @@
     "vue-tsc": "^2.1.6",
     "vuetify": "^3.7.1"
   },
-  "gitHead": "16cc1a89246c498860bd155c457d3c2388337352"
+  "gitHead": "70c45f96366ae8752cc9708856d194b6940fe2c7"
 }

package/src/composables/useAuth.ts

@@ -1,6 +1,6 @@
 import {useAuthStore} from "../stores/auth/AuthStore";
-import {AuthHelper, AuthSystem} from "@drax/identity-front";
-import {inject} from "vue";
+import {AuthHelper, AuthSystemFactory} from "@drax/identity-front";
+import type {AuthSystem} from "@drax/identity-front";
 import {useRouter} from 'vue-router'
 
 export function useAuth() {
@@ -8,7 +8,7 @@ export function useAuth() {
     const authStore = useAuthStore()
     const router = useRouter()
 
-    const authSystem = inject('AuthSystem') as AuthSystem
+    const authSystem: AuthSystem = AuthSystemFactory.getInstance()
 
     const login = async (username: string, password: string) => {
         const {accessToken} = await authSystem.login(username, password)
@@ -22,7 +22,7 @@ export function useAuth() {
     }
 
     const changeAvatar = async (file: File) => {
-        if(file){
+        if (file) {
             await authSystem.changeAvatar(file)
             await fetchAuthUser()
             return

package/src/composables/useRole.ts

@@ -1,13 +1,14 @@
-import {inject, ref} from "vue";
-import  {RoleSystem} from "@drax/identity-front";
+import {ref} from "vue";
+import type {RoleSystem} from "@drax/identity-front";
+import {RoleSystemFactory} from "@drax/identity-front";
 import type {IRole, IRoleBase} from "@drax/identity-share";
 import {ClientError} from "@drax/common-front";
-import type { IClientInputError} from "@drax/common-front";
+import type {IClientInputError} from "@drax/common-front";
 
 
 export function useRole() {
 
-    const roleSystem = inject('RoleSystem') as RoleSystem
+    const roleSystem: RoleSystem = RoleSystemFactory.getInstance()
 
     let roleError = ref<string>('')
     let inputErrors = ref<IClientInputError>()
@@ -27,7 +28,7 @@ export function useRole() {
         return roles
     }
 
-    async function paginateRole({page= 1, limit= 5, orderBy="", order=false, search = ""}) {
+    async function paginateRole({page = 1, limit = 5, orderBy = "", order = false, search = ""}) {
         loading.value = true
         let paginatedrole = roleSystem.paginate({page, limit, orderBy, order, search})
         loading.value = false
@@ -37,16 +38,17 @@ export function useRole() {
     async function createRole(roleData: IRoleBase) {
         try {
             loading.value = true
-            let role: IRole =  await roleSystem.create(roleData)
+            let role: IRole = await roleSystem.create(roleData)
             return role
         } catch (err) {
             if (err instanceof ClientError) {
                 inputErrors.value = err.inputErrors
-            }if(err instanceof Error) {
+            }
+            if (err instanceof Error) {
                 roleError.value = err.message
             }
             throw err
-        }finally {
+        } finally {
             loading.value = false
         }
 
@@ -62,11 +64,11 @@ export function useRole() {
             if (err instanceof ClientError) {
                 inputErrors.value = err.inputErrors
             }
-            if(err instanceof Error) {
+            if (err instanceof Error) {
                 roleError.value = err.message
             }
             throw err
-        }finally {
+        } finally {
             loading.value = false
         }
     }
@@ -76,19 +78,29 @@ export function useRole() {
             loading.value = true
             await roleSystem.delete(id)
         } catch (err) {
-            console.log("composable delete error: ", err, )
+            console.log("composable delete error: ", err,)
             if (err instanceof ClientError) {
                 inputErrors.value = err.inputErrors
             }
-            if(err instanceof Error) {
+            if (err instanceof Error) {
                 roleError.value = err.message
             }
             throw err
-        }finally {
+        } finally {
             loading.value = false
         }
     }
 
-    return {fetchRole, fetchPermissions, paginateRole, createRole, editRole, deleteRole, loading, roleError, inputErrors}
+    return {
+        fetchRole,
+        fetchPermissions,
+        paginateRole,
+        createRole,
+        editRole,
+        deleteRole,
+        loading,
+        roleError,
+        inputErrors
+    }
 
 }

package/src/composables/useTenant.ts

@@ -1,13 +1,14 @@
-import {inject, ref} from "vue";
+import {ref} from "vue";
 import type {ITenant, ITenantBase} from "@drax/identity-share";
 import type { TenantSystem} from "@drax/identity-front";
+import { TenantSystemFactory} from "@drax/identity-front";
 import {ClientError} from "@drax/common-front";
 import type { IClientInputError} from "@drax/common-front";
 
 
 export function useTenant() {
 
-    const tenantSystem = inject('TenantSystem') as TenantSystem
+    const tenantSystem : TenantSystem = TenantSystemFactory.getInstance()
 
     let tenantError = ref<string>('')
     let inputErrors = ref<IClientInputError>()

package/src/composables/useUser.ts

@@ -1,5 +1,6 @@
 import {inject, ref} from "vue";
 import type {UserSystem} from "@drax/identity-front";
+import  {UserSystemFactory} from "@drax/identity-front";
 import type {IClientInputError} from "@drax/common-front";
 import {ClientError} from "@drax/common-front";
 import type {IUser, IUserCreate, IUserUpdate} from "@drax/identity-share";
@@ -7,7 +8,7 @@ import type {IUser, IUserCreate, IUserUpdate} from "@drax/identity-share";
 
 export function useUser() {
 
-    const userSystem = inject('UserSystem') as UserSystem
+    const userSystem: UserSystem = UserSystemFactory.getInstance()
 
     let userError = ref<string>('')
     let inputErrors = ref<IClientInputError>()

package/src/composables/useUserApiKey.ts

@@ -1,13 +1,13 @@
-import {inject, ref} from "vue";
+import {ref} from "vue";
 import type {IUserApiKey, IUserApiKeyBase} from "@drax/identity-share";
-import type { UserApiKeySystem} from "@drax/identity-front";
+import { UserApiKeySystemFactory} from "@drax/identity-front";
 import {ClientError} from "@drax/common-front";
 import type { IClientInputError} from "@drax/common-front";
 
 
 export function useUserApiKey() {
 
-    const userApiKeySystem = inject('UserApiKeySystem') as UserApiKeySystem
+    const userApiKeySystem = UserApiKeySystemFactory.getInstance()
 
     let userApiKeyError = ref<string>('')
     let inputErrors = ref<IClientInputError>()