awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-10-06 23:27:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

feat: resolved PR feedbacks

Browse Source
This commit is contained in:
=
2025-03-17 23:38:24 +05:30
parent 2ef77c737a
commit c4da1ce32d
5 changed files with 32 additions and 26 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/server/plugins/auth/inject-identity.ts
+6 -4
View File
@@ -138,10 +138,12 @@ export const injectIdentity = fp(async (server: FastifyZodProvider) => {
identityName: identity.name, identityName: identity.name,
authMethod: null authMethod: null
}; };
requestContext.set("identityAuthInfo", { if (token?.identityAuth?.oidc) {
identityId: identity.identityId, requestContext.set("identityAuthInfo", {
oidc: token?.identityAuth?.oidc identityId: identity.identityId,
}); oidc: token?.identityAuth?.oidc
});
}
break; break;
} }
case AuthMode.SERVICE_TOKEN: { case AuthMode.SERVICE_TOKEN: {
backend/src/server/routes/v1/identity-oidc-auth-router.ts
+2 -2
View File
@@ -105,7 +105,7 @@ export const registerIdentityOidcAuthRouter = async (server: FastifyZodProvider)
boundIssuer: z.string().min(1).describe(OIDC_AUTH.ATTACH.boundIssuer), boundIssuer: z.string().min(1).describe(OIDC_AUTH.ATTACH.boundIssuer),
boundAudiences: validateOidcAuthAudiencesField.describe(OIDC_AUTH.ATTACH.boundAudiences), boundAudiences: validateOidcAuthAudiencesField.describe(OIDC_AUTH.ATTACH.boundAudiences),
boundClaims: validateOidcBoundClaimsField.describe(OIDC_AUTH.ATTACH.boundClaims), boundClaims: validateOidcBoundClaimsField.describe(OIDC_AUTH.ATTACH.boundClaims),
claimMetadataMapping: validateOidcBoundClaimsField.describe(OIDC_AUTH.ATTACH.claimMetadataMapping), claimMetadataMapping: validateOidcBoundClaimsField.describe(OIDC_AUTH.ATTACH.claimMetadataMapping).optional(),
boundSubject: z.string().optional().default("").describe(OIDC_AUTH.ATTACH.boundSubject), boundSubject: z.string().optional().default("").describe(OIDC_AUTH.ATTACH.boundSubject),
accessTokenTrustedIps: z accessTokenTrustedIps: z
.object({ .object({
@@ -203,7 +203,7 @@ export const registerIdentityOidcAuthRouter = async (server: FastifyZodProvider)
boundIssuer: z.string().min(1).describe(OIDC_AUTH.UPDATE.boundIssuer), boundIssuer: z.string().min(1).describe(OIDC_AUTH.UPDATE.boundIssuer),
boundAudiences: validateOidcAuthAudiencesField.describe(OIDC_AUTH.UPDATE.boundAudiences), boundAudiences: validateOidcAuthAudiencesField.describe(OIDC_AUTH.UPDATE.boundAudiences),
boundClaims: validateOidcBoundClaimsField.describe(OIDC_AUTH.UPDATE.boundClaims), boundClaims: validateOidcBoundClaimsField.describe(OIDC_AUTH.UPDATE.boundClaims),
claimMetadataMapping: validateOidcBoundClaimsField.describe(OIDC_AUTH.UPDATE.claimMetadataMapping), claimMetadataMapping: validateOidcBoundClaimsField.describe(OIDC_AUTH.UPDATE.claimMetadataMapping).optional(),
boundSubject: z.string().optional().default("").describe(OIDC_AUTH.UPDATE.boundSubject), boundSubject: z.string().optional().default("").describe(OIDC_AUTH.UPDATE.boundSubject),
accessTokenTrustedIps: z accessTokenTrustedIps: z
.object({ .object({
backend/src/services/identity-oidc-auth/identity-oidc-auth-types.ts
+1 -1
View File
@@ -7,7 +7,7 @@ export type TAttachOidcAuthDTO = {
boundIssuer: string; boundIssuer: string;
boundAudiences: string; boundAudiences: string;
boundClaims: Record<string, string>; boundClaims: Record<string, string>;
claimMetadataMapping: Record<string, string>; claimMetadataMapping?: Record<string, string>;
boundSubject: string; boundSubject: string;
accessTokenTTL: number; accessTokenTTL: number;
accessTokenMaxTTL: number; accessTokenMaxTTL: number;
frontend/src/hooks/api/identities/types.ts
+2 -2
View File
@@ -193,7 +193,7 @@ export type IdentityOidcAuth = {
boundIssuer: string; boundIssuer: string;
boundAudiences: string; boundAudiences: string;
boundClaims: Record<string, string>; boundClaims: Record<string, string>;
claimMetadataMapping: Record<string, string>; claimMetadataMapping?: Record<string, string>;
boundSubject: string; boundSubject: string;
accessTokenTTL: number; accessTokenTTL: number;
accessTokenMaxTTL: number; accessTokenMaxTTL: number;
@@ -209,7 +209,7 @@ export type AddIdentityOidcAuthDTO = {
boundIssuer: string; boundIssuer: string;
boundAudiences: string; boundAudiences: string;
boundClaims: Record<string, string>; boundClaims: Record<string, string>;
claimMetadataMapping: Record<string, string>; claimMetadataMapping?: Record<string, string>;
boundSubject: string; boundSubject: string;
accessTokenTTL: number; accessTokenTTL: number;
accessTokenMaxTTL: number; accessTokenMaxTTL: number;
frontend/src/pages/organization/AccessManagementPage/components/OrgIdentityTab/components/IdentitySection/IdentityOidcAuthForm.tsx
+21 -17
View File
@@ -52,12 +52,15 @@ const schema = z.object({
value: z.string() value: z.string()
}) })
), ),
claimMetadataMapping: z.array( claimMetadataMapping: z
z.object({ .array(
key: z.string(), z.object({
value: z.string() key: z.string(),
}) value: z.string()
), })
)
.optional()
.nullable(),
boundSubject: z.string().optional().default("") boundSubject: z.string().optional().default("")
}); });
@@ -105,7 +108,6 @@ export const IdentityOidcAuthForm = ({
accessTokenTrustedIps: [{ ipAddress: "0.0.0.0/0" }, { ipAddress: "::/0" }] accessTokenTrustedIps: [{ ipAddress: "0.0.0.0/0" }, { ipAddress: "::/0" }]
} }
}); });
const { const {
fields: boundClaimsFields, fields: boundClaimsFields,
append: appendBoundClaimField, append: appendBoundClaimField,
@@ -141,10 +143,12 @@ export const IdentityOidcAuthForm = ({
key, key,
value value
})), })),
claimMetadataMapping: Object.entries(data.claimMetadataMapping).map(([key, value]) => ({ claimMetadataMapping: data?.claimMetadataMapping
key, ? Object.entries(data.claimMetadataMapping).map(([key, value]) => ({
value key,
})), value
}))
: undefined,
boundSubject: data.boundSubject, boundSubject: data.boundSubject,
accessTokenTTL: String(data.accessTokenTTL), accessTokenTTL: String(data.accessTokenTTL),
accessTokenMaxTTL: String(data.accessTokenMaxTTL), accessTokenMaxTTL: String(data.accessTokenMaxTTL),
@@ -200,9 +204,9 @@ export const IdentityOidcAuthForm = ({
boundIssuer, boundIssuer,
boundAudiences, boundAudiences,
boundClaims: Object.fromEntries(boundClaims.map((entry) => [entry.key, entry.value])), boundClaims: Object.fromEntries(boundClaims.map((entry) => [entry.key, entry.value])),
claimMetadataMapping: Object.fromEntries( claimMetadataMapping: claimMetadataMapping
claimMetadataMapping.map((entry) => [entry.key, entry.value]) ? Object.fromEntries(claimMetadataMapping.map((entry) => [entry.key, entry.value]))
), : undefined,
boundSubject, boundSubject,
accessTokenTTL: Number(accessTokenTTL), accessTokenTTL: Number(accessTokenTTL),
accessTokenMaxTTL: Number(accessTokenMaxTTL), accessTokenMaxTTL: Number(accessTokenMaxTTL),
@@ -217,9 +221,9 @@ export const IdentityOidcAuthForm = ({
boundIssuer, boundIssuer,
boundAudiences, boundAudiences,
boundClaims: Object.fromEntries(boundClaims.map((entry) => [entry.key, entry.value])), boundClaims: Object.fromEntries(boundClaims.map((entry) => [entry.key, entry.value])),
claimMetadataMapping: Object.fromEntries( claimMetadataMapping: claimMetadataMapping
claimMetadataMapping.map((entry) => [entry.key, entry.value]) ? Object.fromEntries(claimMetadataMapping.map((entry) => [entry.key, entry.value]))
), : undefined,
boundSubject, boundSubject,
organizationId: orgId, organizationId: orgId,
accessTokenTTL: Number(accessTokenTTL), accessTokenTTL: Number(accessTokenTTL),