feat(infisical-pg): completed checklist run for dashboard

backend-pg/src/server/routes/index.ts

@@ -173,16 +173,6 @@ export const registerRoutes = async (
     userDal,
     samlConfigDal
   });
-  const sarService = secretApprovalRequestServiceFactory({
-    permissionService,
-    folderDal,
-    secretDal,
-    sarSecretDal,
-    sarReviewerDal,
-    secretVersionDal,
-    secretBlindIndexDal,
-    secretApprovalRequestDal
-  });
 
   const tokenService = tokenServiceFactory({ tokenDal: authTokenDal });
   const userService = userServiceFactory({ userDal });
@@ -282,6 +272,17 @@ export const registerRoutes = async (
   });
   const projectBotService = projectBotServiceFactory({ permissionService, projectBotDal });
 
+  const sarService = secretApprovalRequestServiceFactory({
+    permissionService,
+    folderDal,
+    sarSecretDal,
+    sarReviewerDal,
+    secretVersionDal,
+    secretBlindIndexDal,
+    secretApprovalRequestDal,
+    secretService,
+    snapshotService
+  });
   const secretRotationQueue = secretRotationQueueFactory({
     secretRotationDal,
     queue: queueService,

backend-pg/src/server/routes/v1/invite-org-router.ts

@@ -52,7 +52,6 @@ export const registerInviteOrgRouter = async (server: FastifyZodProvider) => {
         })
       }
     },
-    onRequest: verifyAuth([AuthMode.JWT]),
     handler: async (req) => {
       const { user, token } = await server.services.org.verifyUserToOrg({
         orgId: req.body.organizationId,

backend-pg/src/server/routes/v1/organization-router.ts

@@ -4,7 +4,6 @@ import {
   IncidentContactsSchema,
   OrganizationsSchema,
   OrgMembershipsSchema,
-  UserEncryptionKeysSchema,
   UsersSchema
 } from "@app/db/schemas";
 import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
@@ -67,7 +66,7 @@ export const registerOrgRouter = async (server: FastifyZodProvider) => {
                 firstName: true,
                 lastName: true,
                 id: true
-              }).merge(UserEncryptionKeysSchema.pick({ publicKey: true }))
+              }).merge(z.object({ publicKey: z.string().nullable() }))
             })
           )
             .omit({ createdAt: true, updatedAt: true })

backend-pg/src/server/routes/v1/project-env-router.ts

@@ -63,7 +63,8 @@ export const registerProjectEnvRouter = async (server: FastifyZodProvider) => {
       }),
       body: z.object({
         slug: z.string().trim().optional(),
-        name: z.string().trim().optional()
+        name: z.string().trim().optional(),
+        position: z.number().optional()
       }),
       response: {
         200: z.object({
@@ -91,8 +92,10 @@ export const registerProjectEnvRouter = async (server: FastifyZodProvider) => {
           metadata: {
             oldName: old.name,
             oldSlug: old.slug,
-            newName: old.name,
-            newSlug: old.slug
+            oldPos: old.position,
+            newName: environment.name,
+            newSlug: environment.slug,
+            newPos: environment.position
           }
         }
       });

backend-pg/src/server/routes/v3/secret-router.ts

@@ -1,6 +1,11 @@
 import { z } from "zod";
 
-import { SecretApprovalRequestsSchema, SecretsSchema, SecretType } from "@app/db/schemas";
+import {
+  SecretApprovalRequestsSchema,
+  SecretsSchema,
+  SecretTagsSchema,
+  SecretType
+} from "@app/db/schemas";
 import { EventType } from "@app/ee/services/audit-log/audit-log-types";
 import { CommitType } from "@app/ee/services/secret-approval-request/secret-approval-request-types";
 import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
@@ -22,7 +27,18 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
       }),
       response: {
         200: z.object({
-          secrets: SecretsSchema.omit({ secretBlindIndex: true }).array()
+          secrets: SecretsSchema.omit({ secretBlindIndex: true })
+            .merge(
+              z.object({
+                tags: SecretTagsSchema.pick({
+                  id: true,
+                  slug: true,
+                  name: true,
+                  color: true
+                }).array()
+              })
+            )
+            .array()
         })
       }
     },