Merge branch 'dev' into feat/resource-policies

server/routers/policy/setResourcePolicyAccessControl.ts

@@ -35,7 +35,7 @@ registry.registerPath({
     path: "/resource-policy/{resourceId}/access-control",
     description:
         "Set access control users for a resource policy, including SSO, users, roles, Identity provider.",
-    tags: [OpenAPITags.Resource, OpenAPITags.User],
+    tags: [OpenAPITags.Policy, OpenAPITags.User],
     request: {
         params: setResourcePolicyAccessControlParamsSchema,
         body: {

server/routers/policy/setResourcePolicyHeaderAuth.ts

@@ -29,7 +29,7 @@ registry.registerPath({
     path: "/resource-policy/{resourcePolicyId}/header-auth",
     description:
         "Set or update the header authentication for a resource policy. If user and password is not provided, it will remove the header authentication.",
-    tags: [OpenAPITags.Resource],
+    tags: [OpenAPITags.Policy],
     request: {
         params: setResourcePolicyHeaderAuthParamsSchema,
         body: {

server/routers/policy/setResourcePolicyPassword.ts

@@ -24,7 +24,7 @@ registry.registerPath({
     path: "/resource-policy/{resourcePolicyId}/password",
     description:
         "Set the password for a resource policy. Setting the password to null will remove it.",
-    tags: [OpenAPITags.Resource],
+    tags: [OpenAPITags.Policy],
     request: {
         params: setResourcePolicyPasswordParamsSchema,
         body: {

server/routers/policy/setResourcePolicyPincode.ts

@@ -27,7 +27,7 @@ registry.registerPath({
     path: "/resource-policy/{resourcePolicyId}/pincode",
     description:
         "Set the PIN code for a resource policy. Setting the PIN code to null will remove it.",
-    tags: [OpenAPITags.Resource],
+    tags: [OpenAPITags.Policy],
     request: {
         params: setResourcePolicyPincodeParamsSchema,
         body: {
@@ -78,10 +78,7 @@ export async function setResourcePolicyPincode(
             await trx
                 .delete(resourcePolicyPincode)
                 .where(
-                    eq(
-                        resourcePolicyPincode.resourcePolicyId,
-                        resourcePolicyId
-                    )
+                    eq(resourcePolicyPincode.resourcePolicyId, resourcePolicyId)
                 );
 
             if (pincode) {

server/routers/policy/setResourcePolicyWhitelist.ts

@@ -32,7 +32,7 @@ registry.registerPath({
     path: "/resource-policy/{resourcePolicyId}/whitelist",
     description:
         "Set email whitelist for a resource policy. This will replace all existing emails.",
-    tags: [OpenAPITags.Resource],
+    tags: [OpenAPITags.Policy],
     request: {
         params: setResourcePolicyWhitelistParamsSchema,
         body: {