TS weirdness, continuing to error but ignore ts-expect-error

Currently, ThomasAribart/json-schema-to-ts#96 and microsoft/TypeScript#55638 point to the fact that this can't easily be completed at runtime. I'm going to explore moving more to the generated types. Signed-off-by: Aramis <sennyeyaramis@gmail.com>
sennyeya · Jan 17, 2024 · 4054c96 · 4054c96
1 parent 0b079d3
commit 4054c96
Show file tree

Hide file tree

Showing 3 changed files with 20 additions and 23 deletions.
diff --git a/plugins/permission-backend/src/schema/openapi.generated.ts b/plugins/permission-backend/src/schema/openapi.generated.ts
@@ -269,7 +269,7 @@ export const spec = {
           },
         },
         required: ['resourceType', 'rule'],
-        additionalProperties: true,
+        additionalProperties: false,
       },
       PermissionCriteria: {
         oneOf: [
@@ -279,38 +279,38 @@ export const spec = {
               allOf: {
                 type: 'array',
                 items: {
-                  $ref: '#/components/schemas/PermissionCondition',
+                  $ref: '#/components/schemas/PermissionCriteria',
                 },
                 minItems: 1,
               },
             },
-            additionalProperties: true,
+            additionalProperties: false,
           },
           {
             type: 'object',
             properties: {
               anyOf: {
                 type: 'array',
                 items: {
-                  $ref: '#/components/schemas/PermissionCondition',
+                  $ref: '#/components/schemas/PermissionCriteria',
                 },
                 minItems: 1,
               },
             },
-            additionalProperties: true,
+            additionalProperties: false,
           },
           {
             type: 'object',
             properties: {
               not: {
                 type: 'array',
                 items: {
-                  $ref: '#/components/schemas/PermissionCondition',
+                  $ref: '#/components/schemas/PermissionCriteria',
                 },
                 minItems: 1,
               },
             },
-            additionalProperties: true,
+            additionalProperties: false,
           },
           {
             $ref: '#/components/schemas/PermissionCondition',
@@ -352,7 +352,7 @@ export const spec = {
           },
         },
         required: ['result', 'id', 'pluginId', 'resourceType', 'conditions'],
-        additionalProperties: true,
+        additionalProperties: false,
       },
       EvaluatePermissionResponse: {
         oneOf: [

diff --git a/plugins/permission-backend/src/schema/openapi.yaml b/plugins/permission-backend/src/schema/openapi.yaml
@@ -21,7 +21,9 @@ paths:
                   items:
                     type: array
                     items:
-                      $ref: '#/components/schemas/EvaluatePermissionResponse'
+                      oneOf:
+                        - $ref: '#/components/schemas/ConditionalPolicyDecision'
+                        - $ref: '#/components/schemas/DefinitivePolicyDecision'
                 required:
                   - items
                 additionalProperties: false
@@ -185,36 +187,35 @@ components:
       required:
         - resourceType
         - rule
-      additionalProperties: true
+      additionalProperties: false
 
 
     PermissionCriteria:
-      # Restricting this to depth of 1, TS doesn't love recursive
       oneOf:
         - type: object
           properties:
             allOf:
               type: array
               items:
-                $ref: '#/components/schemas/PermissionCondition'
+                $ref: '#/components/schemas/PermissionCriteria'
               minItems: 1
-          additionalProperties: true
+          additionalProperties: false
         - type: object
           properties:
             anyOf:
               type: array
               items:
-                $ref: '#/components/schemas/PermissionCondition'
+                $ref: '#/components/schemas/PermissionCriteria'
               minItems: 1
-          additionalProperties: true
+          additionalProperties: false
         - type: object
           properties:
             not:
               type: array
               items:
-                $ref: '#/components/schemas/PermissionCondition'
+                $ref: '#/components/schemas/PermissionCriteria'
               minItems: 1
-          additionalProperties: true
+          additionalProperties: false
         - $ref: '#/components/schemas/PermissionCondition'
 
 
@@ -254,12 +255,7 @@ components:
         - pluginId
         - resourceType
         - conditions
-      additionalProperties: true
-
-    EvaluatePermissionResponse:
-      oneOf:
-        - $ref: '#/components/schemas/ConditionalPolicyDecision'
-        - $ref: '#/components/schemas/DefinitivePolicyDecision'
+      additionalProperties: false
 
     PostAuthorize400ResponseBody:
       type: object

diff --git a/plugins/permission-backend/src/service/router.ts b/plugins/permission-backend/src/service/router.ts
@@ -138,6 +138,7 @@ export async function createRouter(
     response.json({ status: 'ok' });
   });
 
+  // @ts-expect-error - https://github.com/ThomasAribart/json-schema-to-ts/issues/96
   router.post('/authorize', async (req, res) => {
     const user = await identity.getIdentity({ request: req });