fix: align frontend policy typing after OpenAPI regen

Signed-off-by: Vitor Mattos <[email protected]>

Author: vitormattos

lib/ResponseDefinitions.php

@@ -361,7 +361,7 @@
  *
  * Validation and progress contracts
  *
- * @psalm-type LibresignEffectivePolicyValue = null|bool|int|float|string|array<array-key, mixed>
+ * @psalm-type LibresignEffectivePolicyValue = null|bool|int|float|string|array<string, mixed>
  * @psalm-type LibresignEffectivePolicyState = array{
  *     policyKey: string,
  *     effectiveValue: LibresignEffectivePolicyValue,

openapi-administration.json

@@ -464,6 +464,12 @@
                     },
                     {
                         "type": "string"
+                    },
+                    {
+                        "type": "object",
+                        "additionalProperties": {
+                            "type": "object"
+                        }
                     }
                 ]
             },
@@ -556,7 +562,8 @@
                     "template",
                     "isDefault",
                     "preview_width",
-                    "preview_height"
+                    "preview_height",
+                    "preview_zoom"
                 ],
                 "properties": {
                     "template": {
@@ -572,6 +579,10 @@
                     "preview_height": {
                         "type": "integer",
                         "format": "int64"
+                    },
+                    "preview_zoom": {
+                        "type": "integer",
+                        "format": "int64"
                     }
                 }
             },

openapi-full.json

@@ -1070,6 +1070,12 @@
                     },
                     {
                         "type": "string"
+                    },
+                    {
+                        "type": "object",
+                        "additionalProperties": {
+                            "type": "object"
+                        }
                     }
                 ]
             },
@@ -1557,7 +1563,8 @@
                     "template",
                     "isDefault",
                     "preview_width",
-                    "preview_height"
+                    "preview_height",
+                    "preview_zoom"
                 ],
                 "properties": {
                     "template": {
@@ -1573,6 +1580,10 @@
                     "preview_height": {
                         "type": "integer",
                         "format": "int64"
+                    },
+                    "preview_zoom": {
+                        "type": "integer",
+                        "format": "int64"
                     }
                 }
             },

openapi.json

@@ -724,6 +724,12 @@
                     },
                     {
                         "type": "string"
+                    },
+                    {
+                        "type": "object",
+                        "additionalProperties": {
+                            "type": "object"
+                        }
                     }
                 ]
             },

src/types/index.ts

@@ -54,7 +54,7 @@ export type SignatureFlowValue = SignatureFlowMode | 0 | 1 | 2
 export type EffectivePoliciesResponse = ApiOcsResponseData<ApiOperations['policy-effective'], 200>
 export type EffectivePoliciesState = EffectivePoliciesResponse['policies']
 export type EffectivePolicyState = ApiRecordValue<EffectivePoliciesState>
-export type EffectivePolicyValue = Exclude<ApiRequestJsonBody<AdminOperations['policy-set-system']>['value'], undefined>
+export type EffectivePolicyValue = Exclude<EffectivePolicyState['effectiveValue'], undefined>
 export type GroupPolicyResponse = ApiOcsResponseData<ApiOperations['policy-get-group'], 200>
 export type GroupPolicyState = GroupPolicyResponse['policy']
 
@@ -75,9 +75,14 @@ export type UserPolicyState = Omit<OpenApiUserPolicyState, 'value'> & {
 export type UserPolicyResponse = {
 	policy: UserPolicyState
 }
-export type GroupPolicyWritePayload = ApiRequestJsonBody<ApiOperations['policy-set-group']>
+export type GroupPolicyWritePayload = {
+	value: EffectivePolicyValue
+	allowChildOverride: boolean
+}
 export type GroupPolicyWriteResponse = ApiOcsResponseData<ApiOperations['policy-set-group'], 200>
-export type SystemPolicyWritePayload = ApiRequestJsonBody<AdminOperations['policy-set-system']>
+export type SystemPolicyWritePayload = {
+	value: EffectivePolicyValue
+}
 export type SystemPolicyWriteResponse = ApiOcsResponseData<AdminOperations['policy-set-system'], 200>
 export type SystemPolicyWriteErrorResponse = ApiOcsResponseData<AdminOperations['policy-set-system'], 400>
 export type NewFilePayload = ApiComponents['schemas']['NewFile']

src/types/openapi/openapi-administration.ts

@@ -634,7 +634,9 @@ export type components = {
             /** Format: int64 */
             userCount: number;
         };
-        EffectivePolicyValue: (boolean | number | string) | null;
+        EffectivePolicyValue: (boolean | number | string | {
+            [key: string]: Record<string, never>;
+        }) | null;
         EngineHandler: {
             configPath: string;
             cfsslUri?: string;
@@ -664,6 +666,8 @@ export type components = {
             preview_width: number;
             /** Format: int64 */
             preview_height: number;
+            /** Format: int64 */
+            preview_zoom: number;
         };
         HasRootCertResponse: {
             hasRootCert: boolean;

src/types/openapi/openapi-full.ts

@@ -1897,7 +1897,9 @@ export type components = {
             /** Format: int64 */
             userCount: number;
         };
-        EffectivePolicyValue: (boolean | number | string) | null;
+        EffectivePolicyValue: (boolean | number | string | {
+            [key: string]: Record<string, never>;
+        }) | null;
         EngineHandler: {
             configPath: string;
             cfsslUri?: string;
@@ -2038,6 +2040,8 @@ export type components = {
             preview_width: number;
             /** Format: int64 */
             preview_height: number;
+            /** Format: int64 */
+            preview_zoom: number;
         };
         GroupPolicyResponse: {
             policy: components["schemas"]["GroupPolicyState"];

src/types/openapi/openapi.ts

@@ -1293,7 +1293,9 @@ export type components = {
             /** Format: int64 */
             userCount: number;
         };
-        EffectivePolicyValue: (boolean | number | string) | null;
+        EffectivePolicyValue: (boolean | number | string | {
+            [key: string]: Record<string, never>;
+        }) | null;
         ErrorItem: {
             message: string;
             title?: string;