فهرست منبع

post refactoring import fixes

Olivier Massot 2 سال پیش
والد
کامیت
66f8eaf400
3فایلهای تغییر یافته به همراه12 افزوده شده و 7 حذف شده
  1. 2 2
      composables/utils/useRedirectToLogout.ts
  2. 2 2
      layouts/error.vue
  3. 8 3
      services/rights/abilityBuilder.ts

+ 2 - 2
composables/utils/useRedirectToLogout.ts

@@ -1,5 +1,5 @@
 import {navigateTo, useRuntimeConfig} from "#app";
-import Url from "~/services/utils/url";
+import UrlUtils from "~/services/utils/urlUtils";
 
 export const useRedirectToLogout = () => {
     const runtimeConfig = useRuntimeConfig()
@@ -8,6 +8,6 @@ export const useRedirectToLogout = () => {
         if (!runtimeConfig.baseUrlAdminLegacy) {
             throw new Error('Configuration error : no redirection target')
         }
-        navigateTo(Url.join(runtimeConfig.baseUrlAdminLegacy, '#/logout'), {external: true})
+        navigateTo(UrlUtils.join(runtimeConfig.baseUrlAdminLegacy, '#/logout'), {external: true})
     }
 }

+ 2 - 2
layouts/error.vue

@@ -8,7 +8,7 @@
 
 <script setup lang="ts">
   import {navigateTo} from "#app";
-  import Url from "~/services/utils/url";
+  import UrlUtils from "~/services/utils/urlUtils";
 
   const props = defineProps({
     error: {
@@ -19,7 +19,7 @@
 
   if(process.client && props.error.statusCode === 404 && process.env.NODE_ENV === 'production') {
     const runtimeConfig = useRuntimeConfig()
-    navigateTo(Url.join(runtimeConfig.baseUrlAdminLegacy, 'dashboard'), {external: true})
+    navigateTo(UrlUtils.join(runtimeConfig.baseUrlAdminLegacy, 'dashboard'), {external: true})
   }
 
   const otherError = ref('Une erreur est parvenue')

+ 8 - 3
services/rights/abilityBuilder.ts

@@ -1,8 +1,9 @@
 import RoleUtils from '~/services/rights/roleUtils'
 import {AbilitiesType} from '~/types/interfaces'
-import YamlDenormalizer from "~/services/data/serializer/denormalizer/yamlDenormalizer";
 import {MongoAbility} from "@casl/ability/dist/types/Ability";
 import {ABILITIES} from "~/types/enum/enums";
+import YamlEncoder from "~/services/encoder/yamlEncoder";
+import {read} from "yaml-import";
 
 interface Condition {
     function: string
@@ -19,7 +20,7 @@ class AbilityBuilder {
     private readonly accessProfile: any
     private readonly organizationProfile: any
 
-    private readonly configDir = './config/abilities/config.yaml'
+    private readonly configFile = './config/abilities/config.yaml'
 
     private abilities: Array<AbilitiesType> = []
 
@@ -96,7 +97,11 @@ class AbilityBuilder {
     buildAbilitiesFromConfig() {
         const abilitiesByConfig: Array<AbilitiesType> = []
 
-        const doc = YamlDenormalizer.denormalize({path: this.configDir})
+        const doc = YamlEncoder.decode(read(this.configFile))
+        if (doc === null) {
+            throw new Error('Error while reading abilities config file')
+        }
+
         const fromConfig = doc.abilities
 
         useEach(fromConfig, (ability: { action: ABILITIES, conditions: Array<Condition> }, subject: string) => {