feat(infisical-pg): added secret version api, fixed pass reset flow, smtp connection issue fixed

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

@@ -251,7 +251,6 @@ export const registerRoutes = async (
   const apiKeyService = apiKeyServiceFactory({ apiKeyDal, userDal });
 
   const secretScanningQueue = secretScanningQueueFactory({
-    userDal,
     smtpService,
     secretScanningDal,
     queueService,

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

@@ -31,6 +31,8 @@ export const sapPubSchema = SecretApprovalPoliciesSchema.merge(
 export const secretRawSchema = z.object({
   id: z.string(),
   _id: z.string(),
+  workspace: z.string(),
+  environment: z.string(),
   version: z.number(),
   type: z.string(),
   secretKey: z.string(),

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

@@ -1,8 +1,9 @@
 import { z } from "zod";
 
-import { BackupPrivateKeySchema } from "@app/db/schemas";
+import { BackupPrivateKeySchema, UsersSchema } from "@app/db/schemas";
 import { getConfig } from "@app/lib/config/env";
 import { verifyAuth } from "@app/server/plugins/auth/verify-auth";
+import { validateSignUpAuthorization } from "@app/services/auth/auth-fns";
 import { AuthMode } from "@app/services/auth/auth-type";
 
 export const registerPasswordRouter = async (server: FastifyZodProvider) => {
@@ -66,6 +67,58 @@ export const registerPasswordRouter = async (server: FastifyZodProvider) => {
     }
   });
 
+  server.route({
+    method: "POST",
+    url: "/email/password-reset",
+    schema: {
+      body: z.object({
+        email: z.string().email().trim()
+      }),
+      response: {
+        200: z.object({
+          message: z.string()
+        })
+      }
+    },
+    handler: async (req) => {
+      await server.services.password.sendPasswordResetEmail(req.body.email);
+
+      return {
+        message: "If an account exists with this email, a password reset link has been sent"
+      };
+    }
+  });
+
+  server.route({
+    method: "POST",
+    url: "/email/password-reset-verify",
+    schema: {
+      body: z.object({
+        email: z.string().email().trim(),
+        code: z.string().trim()
+      }),
+      response: {
+        200: z.object({
+          message: z.string(),
+          user: UsersSchema,
+          token: z.string()
+        })
+      }
+    },
+    handler: async (req) => {
+      const { token, user } = await server.services.password.verifyPasswordResetEmail(
+        req.body.email,
+        req.body.code
+      );
+
+      return {
+        message: "Successfully verified email",
+        user,
+        token
+      };
+    }
+  });
+
   server.route({
     method: "POST",
     url: "/backup-private-key",
@@ -87,9 +140,10 @@ export const registerPasswordRouter = async (server: FastifyZodProvider) => {
       }
     },
     handler: async (req) => {
+      const token = validateSignUpAuthorization(req.headers.authorization as string, "",false)!
       const backupPrivateKey = await server.services.password.createBackupPrivateKey({
         ...req.body,
-        userId: req.permission.id
+        userId: token.userId,
       });
       if (!backupPrivateKey) throw new Error("Failed to create backup key");
 
@@ -100,7 +154,6 @@ export const registerPasswordRouter = async (server: FastifyZodProvider) => {
   server.route({
     method: "GET",
     url: "/backup-private-key",
-    onRequest: verifyAuth([AuthMode.JWT]),
     schema: {
       response: {
         200: z.object({
@@ -110,8 +163,9 @@ export const registerPasswordRouter = async (server: FastifyZodProvider) => {
       }
     },
     handler: async (req) => {
+      const token = validateSignUpAuthorization(req.headers.authorization as string, "",false)!
       const backupPrivateKey = await server.services.password.getBackupPrivateKeyOfUser(
-        req.permission.id
+        token.userId
       );
       if (!backupPrivateKey) throw new Error("Failed to find backup key");
 
@@ -121,8 +175,7 @@ export const registerPasswordRouter = async (server: FastifyZodProvider) => {
 
   server.route({
     method: "POST",
-    url: "/email/password-reset",
-    onRequest: verifyAuth([AuthMode.JWT]),
+    url: "/password-reset",
     schema: {
       body: z.object({
         protectedKey: z.string().trim(),
@@ -141,9 +194,10 @@ export const registerPasswordRouter = async (server: FastifyZodProvider) => {
       }
     },
     handler: async (req) => {
+      const token = validateSignUpAuthorization(req.headers.authorization as string, "",false)!
       await server.services.password.resetPasswordByBackupKey({
         ...req.body,
-        userId: req.permission.id
+        userId: token.userId,
       });
 
       return { message: "Successfully updated backup private key" };

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

@@ -65,7 +65,7 @@ export const registerSignupRouter = async (server: FastifyZodProvider) => {
         encryptedPrivateKeyTag: z.string().trim(),
         salt: z.string().trim(),
         verifier: z.string().trim(),
-        organizationName: z.string().trim(),
+        organizationName: z.string().trim().min(1),
         providerAuthToken: z.string().trim().optional().nullish(),
         attributionSource: z.string().trim().optional()
       }),