Infisical is the open-source platform for securing secrets, certificates, access, and AI Agents.
TypeScript acmeagentsai-agentscertificate-managementdevsecopsenvironment-variableskubernetesopen-sourcepampkipostgresprivate-caprivileged-access-managementsecret-managementsecret-managersecretssecrets-managementsecuritysecurity-toolsvault
refactor(secrets): stop joining reminder recipients into the shared secret query
Calvind52b65236a6a
diff --git a/backend/e2e-test/routes/v1/secret-reminder.spec.ts b/backend/e2e-test/routes/v1/secret-reminder.spec.tsindex e6d2d51b86..f48a13d184 100644--- a/backend/e2e-test/routes/v1/secret-reminder.spec.ts+++ b/backend/e2e-test/routes/v1/secret-reminder.spec.ts@@ -136,11 +136,12 @@ describe("Secret reminders delivered through alerts", () => {});expect(res.statusCode).toBe(200);const [secret] = res.json().secrets as {- secretReminderRecipients: { user: { id: string } }[];secretReminderRepeatDays: number;+ reminder: { repeatDays: number; recipients: string[] };}[];expect(secret.secretReminderRepeatDays).toBe(30);- expect(secret.secretReminderRecipients.map((recipient) => recipient.user.id)).toEqual([member.userId]);+ expect(secret.reminder.repeatDays).toBe(30);+ expect(secret.reminder.recipients).toEqual([member.userId]);});test("moving a secret carries its reminder alert to the new secret", async () => {diff --git a/backend/src/server/routes/v1/dashboard-router.ts b/backend/src/server/routes/v1/dashboard-router.tsindex badc66e507..0aa5cf8a15 100644--- a/backend/src/server/routes/v1/dashboard-router.ts+++ b/backend/src/server/routes/v1/dashboard-router.ts@@ -21,7 +21,6 @@ import {SanitizedHoneyTokenSchema,SanitizedProxiedServiceSchema,SanitizedTagSchema,- SanitizedUserSchema,secretRawSchema} from "@app/server/routes/sanitizedSchemas";import { AuthMode } from "@app/services/auth/auth-type";@@ -934,12 +933,6 @@ export const registerDashboardRouter = async (server: FastifyZodProvider) => {.extend({isHoneyTokenSecret: z.boolean().optional(),isEmpty: z.boolean(),- secretReminderRecipients: z- .object({- user: SanitizedUserSchema.pick({ id: true, email: true, username: true }),- id: z.string()- })- .array(),secretValueHidden: z.boolean(),secretPath: z.string().optional(),secretMetadata: ResourceMetadataWithEncryptionSchema.optional(),diff --git a/backend/src/services/secret-import/secret-import-fns.ts b/backend/src/services/secret-import/secret-import-fns.tsindex 38a2eeeabf..707be7eade 100644--- a/backend/src/services/secret-import/secret-import-fns.ts+++ b/backend/src/services/secret-import/secret-import-fns.ts@@ -312,9 +312,8 @@ export const fnSecretsV2FromImports = async ({const processedImports: TSecretImportSecretsV2[] = [];- // `find` returns `projectId`, `findByFolderIds` returns `secretReminderRecipients`.- // Neither extra field is used downstream for imports, so we define a common base type- // by omitting both, allowing either result to be assigned without unsafe casts.+ // `find` returns `projectId` and `findByFolderIds` does not. Imports never read it, so a common+ // base type without it lets either result be assigned without unsafe casts.type TImportedSecret = Omit<Awaited<ReturnType<typeof secretDAL.find>>[number], "projectId">;while (stack.length) {diff --git a/backend/src/services/secret-reminder-recipients/secret-reminder-recipients-types.ts b/backend/src/services/secret-reminder-recipients/secret-reminder-recipients-types.tsdeleted file mode 100644index 49eb9bf0fa..0000000000--- a/backend/src/services/secret-reminder-recipients/secret-reminder-recipients-types.ts+++ /dev/null@@ -1,8 +0,0 @@-export type TSecretReminderRecipient = {- user: {- id: string;- username: string;- email?: string | null;- };- id: string;-};diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-dal.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-dal.tsindex 411cc49d2a..4a0373236c 100644--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-dal.ts+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-dal.ts@@ -16,9 +16,6 @@ import {TFindOpt} from "@app/lib/knex";import { OrderByDirection } from "@app/lib/types";-import { AlertChannelType } from "@app/services/alert/alert-channel-types";-import { AlertPrincipalType } from "@app/services/alert/alert-types";-import { SECRET_REMINDER_RESOURCE_TYPE } from "@app/services/reminder/reminder-events";import type { TFindSecretsByFolderIdsFilter } from "@app/services/secret-v2-bridge/secret-v2-bridge-types";export const SecretServiceCacheKeys = {@@ -101,17 +98,7 @@ export const secretV2BridgeDALFactory = ({ db, keyStore }: TSecretV2DalArg) => {`${TableName.SecretV2}.id`,`${TableName.HoneyTokenSecretMapping}.secretId`)- .leftJoin(- TableName.SecretReminderRecipients,- `${TableName.SecretV2}.id`,- `${TableName.SecretReminderRecipients}.secretId`- )- .leftJoin(TableName.Users, `${TableName.SecretReminderRecipients}.userId`, `${TableName.Users}.id`).select(selectAllTableCols(TableName.SecretV2))- .select(db.ref("id").withSchema(TableName.SecretReminderRecipients).as("reminderRecipientId"))- .select(db.ref("username").withSchema(TableName.Users).as("reminderRecipientUsername"))- .select(db.ref("email").withSchema(TableName.Users).as("reminderRecipientEmail"))- .select(db.ref("id").withSchema(TableName.Users).as("reminderRecipientUserId")).select(db.ref("id").withSchema(TableName.SecretTag).as("tagId")).select(db.ref("color").withSchema(TableName.SecretTag).as("tagColor")).select(db.ref("slug").withSchema(TableName.SecretTag).as("tagSlug"))@@ -137,23 +124,6 @@ export const secretV2BridgeDALFactory = ({ db, keyStore }: TSecretV2DalArg) => {slug,name: slug})- },- {- key: "reminderRecipientId",- label: "secretReminderRecipients" as const,- mapper: ({- reminderRecipientId,- reminderRecipientUsername,- reminderRecipientEmail,- reminderRecipientUserId- }) => ({- user: {- id: reminderRecipientUserId,- username: reminderRecipientUsername,- email: reminderRecipientEmail- },- id: reminderRecipientId- })}]});@@ -786,36 +756,6 @@ export const secretV2BridgeDALFactory = ({ db, keyStore }: TSecretV2DalArg) => {`${TableName.HoneyTokenSecretMapping}.secretId`).leftJoin(TableName.Reminder, `${TableName.SecretV2}.id`, `${TableName.Reminder}.secretId`)- // Reminder recipients live on the reminder's alert email channel.- .leftJoin(TableName.Alert, (bd) => {- void bd- .on(`${TableName.Alert}.resourceId`, db.raw(`"${TableName.SecretV2}"."id"::text`))- .andOn(`${TableName.Alert}.resourceType`, db.raw("?", [SECRET_REMINDER_RESOURCE_TYPE]));- })- .leftJoin(- TableName.AlertChannelMembership,- `${TableName.Alert}.id`,- `${TableName.AlertChannelMembership}.alertId`- )- .leftJoin(TableName.AlertChannel, (bd) => {- void bd- .on(`${TableName.AlertChannelMembership}.channelId`, `${TableName.AlertChannel}.id`)- .andOn(`${TableName.AlertChannel}.channelType`, db.raw("?", [AlertChannelType.EMAIL]));- })- .leftJoin(TableName.AlertChannelRecipient, (bd) => {- void bd- .on(`${TableName.AlertChannel}.id`, `${TableName.AlertChannelRecipient}.channelId`)- .andOn(`${TableName.AlertChannelRecipient}.principalType`, db.raw("?", [AlertPrincipalType.USER]));- })- // The CASE keeps the uuid cast off non-user principals and lets the join use the users primary key.- .leftJoin(TableName.Users, (bd) => {- void bd.on(- `${TableName.Users}.id`,- db.raw(- `CASE WHEN "${TableName.AlertChannelRecipient}"."principalId" ~* '^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$' THEN "${TableName.AlertChannelRecipient}"."principalId"::uuid END`- )- );- }).where((qb) => {if (filters?.metadataFilter && filters.metadataFilter.length > 0) {filters.metadataFilter.forEach((meta) => {@@ -843,10 +783,6 @@ export const secretV2BridgeDALFactory = ({ db, keyStore }: TSecretV2DalArg) => {.select(db.ref("message").withSchema(TableName.Reminder).as("reminderNote")).select(db.ref("repeatDays").withSchema(TableName.Reminder).as("reminderRepeatDays")).select(db.ref("nextReminderDate").withSchema(TableName.Reminder).as("nextReminderDate"))- .select(db.ref("id").withSchema(TableName.AlertChannelRecipient).as("reminderRecipientId"))- .select(db.ref("username").withSchema(TableName.Users).as("reminderRecipientUsername"))- .select(db.ref("email").withSchema(TableName.Users).as("reminderRecipientEmail"))- .select(db.ref("id").withSchema(TableName.Users).as("reminderRecipientUserId")).select(db.ref("id").withSchema(TableName.SecretTag).as("tagId")).select(db.ref("color").withSchema(TableName.SecretTag).as("tagColor")).select(db.ref("slug").withSchema(TableName.SecretTag).as("tagSlug"))@@ -912,23 +848,6 @@ export const secretV2BridgeDALFactory = ({ db, keyStore }: TSecretV2DalArg) => {isRotatedSecret: Boolean(el.rotationId)}),childrenMapper: [- {- key: "reminderRecipientId",- label: "secretReminderRecipients" as const,- mapper: ({- reminderRecipientId,- reminderRecipientUsername,- reminderRecipientEmail,- reminderRecipientUserId- }) => ({- user: {- id: reminderRecipientUserId,- username: reminderRecipientUsername,- email: reminderRecipientEmail- },- id: reminderRecipientId- })- },{key: "tagId",label: "tags" as const,diff --git a/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts b/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.tsindex b207c149b6..78c70ec647 100644--- a/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts+++ b/backend/src/services/secret-v2-bridge/secret-v2-bridge-fns.ts@@ -34,7 +34,6 @@ import { INFISICAL_SECRET_VALUE_HIDDEN_MASK } from "../secret/secret-fns";import { TSecretQueueFactory } from "../secret/secret-queue";import { TSecretFolderDALFactory } from "../secret-folder/secret-folder-dal";import { TSecretImportDALFactory } from "../secret-import/secret-import-dal";-import { TSecretReminderRecipient } from "../secret-reminder-recipients/secret-reminder-recipients-types";import { expandSecretReferencesFactory, getAllSecretReferences } from "./secret-reference-fns";import { TSecretV2BridgeDALFactory } from "./secret-v2-bridge-dal";import {@@ -711,7 +710,6 @@ export const reshapeBridgeSecret = (isRotatedSecret?: boolean;isHoneyTokenSecret?: boolean;rotationId?: string;- secretReminderRecipients?: TSecretReminderRecipient[];},secretValueHidden: boolean,// a personal override is only ever readable by its owner, so unmasking one requires proving who is asking@@ -748,7 +746,6 @@ export const reshapeBridgeSecret = (isRotatedSecret: secret.isRotatedSecret,isHoneyTokenSecret: secret.isHoneyTokenSecret,rotationId: secret.rotationId,- secretReminderRecipients: secret.secretReminderRecipients || [],...(secretValueHidden? {secretValue:diff --git a/backend/src/services/secret/secret-fns.ts b/backend/src/services/secret/secret-fns.tsindex 91b9a10279..57a4b5bfbf 100644--- a/backend/src/services/secret/secret-fns.ts+++ b/backend/src/services/secret/secret-fns.ts@@ -359,7 +359,6 @@ export const decryptSecretRaw = (id: secret.id,user: secret.userId,tags: secret.tags?.map((el) => ({ ...el, name: el.slug })),- secretReminderRecipients: [],skipMultilineEncoding: secret.skipMultilineEncoding,secretReminderRepeatDays: secret.secretReminderRepeatDays,secretReminderNote: secret.secretReminderNote,diff --git a/backend/src/services/secret/secret-service.ts b/backend/src/services/secret/secret-service.tsindex 690cec8481..d27837eb80 100644--- a/backend/src/services/secret/secret-service.ts+++ b/backend/src/services/secret/secret-service.ts@@ -741,7 +741,6 @@ export const secretServiceFactory = ({...secret,workspace: projectId,environment,- secretReminderRecipients: [],secretPath: groupedPaths[secret.folderId][0].path}))};diff --git a/frontend/src/hooks/api/secrets/queries.tsx b/frontend/src/hooks/api/secrets/queries.tsxindex dcd82a90f1..51cb16aa98 100644--- a/frontend/src/hooks/api/secrets/queries.tsx+++ b/frontend/src/hooks/api/secrets/queries.tsx@@ -132,7 +132,6 @@ export const mergePersonalSecrets = (rawSecrets: SecretV3Raw[]) => {comment: el.secretComment || "",reminderRepeatDays: el.secretReminderRepeatDays,reminderNote: el.secretReminderNote,- secretReminderRecipients: el.secretReminderRecipients,createdAt: el.createdAt,updatedAt: el.updatedAt,version: el.version,diff --git a/frontend/src/hooks/api/secrets/types.ts b/frontend/src/hooks/api/secrets/types.tsindex 4fc968eff7..d4822f8c1e 100644--- a/frontend/src/hooks/api/secrets/types.ts+++ b/frontend/src/hooks/api/secrets/types.ts@@ -9,15 +9,6 @@ export enum SecretType {Personal = "personal"}-export type SecretReminderRecipient = {- user: {- id: string;- username: string;- email: string;- };- id: string;-};-// both personal and shared secret stitched together for dashboardexport type SecretV3RawSanitized = {id: string;@@ -43,7 +34,6 @@ export type SecretV3RawSanitized = {isReminderEvent?: boolean;isRotatedSecret?: boolean;isHoneyTokenSecret?: boolean;- secretReminderRecipients?: SecretReminderRecipient[];rotationId?: string;isPending?: boolean;hasPendingValueChange?: boolean;@@ -77,7 +67,6 @@ export type SecretV3Raw = {isRotatedSecret?: boolean;isHoneyTokenSecret?: boolean;rotationId?: string;- secretReminderRecipients?: SecretReminderRecipient[];reminder?: Reminder;isEmpty?: boolean;revokedProjectFolderGrant?: boolean;