update the casl ability type and acl check hook

Author: shyqerigashi

package.json

@@ -1,6 +1,6 @@
 {
   "name": "@povio/openapi-codegen-cli",
-  "version": "2.0.4-rc.1",
+  "version": "2.0.4-rc.2",
   "keywords": [
     "codegen",
     "openapi",

src/generators/generate/generateAcl.ts

@@ -15,7 +15,7 @@ export function generateAcl({ resolver, data, tag }: GenerateTypeParams) {
   const caslAbilityTupleImport: Import = {
     bindings: [
       CASL_ABILITY_BINDING.abilityTuple,
-      ...(hasAdditionalAbilityImports ? [CASL_ABILITY_BINDING.subject] : []),
+      ...(hasAdditionalAbilityImports ? [CASL_ABILITY_BINDING.forcedSubject, CASL_ABILITY_BINDING.subject] : []),
     ],
     from: CASL_ABILITY_IMPORT.from,
   };

src/generators/templates/acl-check.hbs

@@ -1,8 +1,11 @@
-import { useCallback } from "react";
-{{! Ability context import }}
-{{{genImport abilityContextImport}}}
+{{! CASL ability import }}
+{{{genImport abilityTupleImport}}}
 {{! Error handling import }}
 {{{genImport errorHandlingImport}}}
+{{! Ability context import }}
+{{{genImport abilityContextImport}}}
+import { useCallback } from "react";
+
 {{! App abilities import }}
 {{{genImport appAbilitiesImport}}}
 
@@ -13,11 +16,14 @@ interface UseAclCheckProps {
 export function {{aclCheckHook}}({ errorHandler }: UseAclCheckProps = {}) {
   const ability = {{abilityContext}}.useAbility{{#if hasGenericAppAbilities}}<{{appAbilities}}>{{/if}}();
 
-  const checkAcl = useCallback((appAbility: {{appAbilities}}) => {
-    if (!ability.can(...appAbility)) {
-      (errorHandler ?? {{sharedErrorHandler}}).rethrowError(new Error("ACL check failed"));
-    }
-  }, [ability, errorHandler]);
+  const checkAcl = useCallback(
+    (appAbility: {{appAbilities}}) => {
+      if (!ability.can(...(appAbility as {{abilityTuple}}))) {
+        (errorHandler ?? {{sharedErrorHandler}}).rethrowError(new Error("ACL check failed"));
+      }
+    },
+    [ability, errorHandler],
+  );
 
   return { checkAcl };
 }

src/generators/templates/partials/casl-ability-type.hbs

@@ -1 +1 @@
-{{abilityTuple}}<"{{ablityAction endpoint}}", "{{ablitySubject endpoint}}">
+{{abilityTuple}}<"{{ablityAction endpoint}}", {{{union (abilitySubjectTypes endpoint)}}}>