awatertrevi/infisical
1
0
Fork 0
mirror of https://github.com/awatertrevi/infisical.git synced 2026-09-22 13:39:35 +00:00
Code Issues Packages Projects Releases Wiki Activity

Address PR suggestions

Browse Source
This commit is contained in:
Carlos Monastyrski
2025-11-14 17:46:19 -03:00
parent abe4b127f9
commit 8d3b02e66d
2 changed files with 9 additions and 24 deletions
Download Patch File Download Diff File Expand all files Collapse all files

9
backend/src/ee/services/audit-log/audit-log-types.ts
View File

@@ -572,6 +572,7 @@ interface UserActorMetadata {
email?: string | null;
username: string;
permission?: Record<string, unknown>;
authMethod?: string;
}
interface ServiceActorMetadata {
@@ -2662,10 +2663,6 @@ interface OrgAdminBypassSSOEvent {
interface UserLoginEvent {
type: EventType.USER_LOGIN;
metadata: {
email: string;
userAgent: string;
ipAddress: string;
authMethod: string;
organizationId?: string;
organizationName?: string;
authProvider?: string;
@@ -2675,12 +2672,8 @@ interface UserLoginEvent {
interface SelectOrganizationEvent {
type: EventType.SELECT_ORGANIZATION;
metadata: {
email: string;
userAgent: string;
ipAddress: string;
organizationId: string;
organizationName: string;
authMethod: string;
};
}

24
backend/src/services/auth/auth-login-service.ts
View File

@@ -465,16 +465,14 @@ export const authLoginServiceFactory = ({
metadata: {
email: userEnc.email,
userId: userEnc.userId,
username: userEnc.username
username: userEnc.username,
authMethod
}
},
event: {
type: EventType.USER_LOGIN,
metadata: {
email,
userAgent,
ipAddress: ip,
authMethod
organizationId
}
}
});
@@ -682,18 +680,15 @@ export const authLoginServiceFactory = ({
metadata: {
email: user.email,
userId: user.id,
username: user.username
username: user.username,
authMethod: decodedToken.authMethod
}
},
event: {
type: EventType.SELECT_ORGANIZATION,
metadata: {
email: user.email || "",
userAgent,
ipAddress,
organizationId,
organizationName: selectedOrg.name,
authMethod: decodedToken.authMethod
organizationName: selectedOrg.name
}
}
});
@@ -1102,16 +1097,13 @@ export const authLoginServiceFactory = ({
metadata: {
email: userEnc.email,
userId: userEnc.userId,
username: userEnc.username
username: userEnc.username,
authMethod: decodedProviderToken.authMethod
}
},
event: {
type: EventType.USER_LOGIN,
metadata: {
email,
userAgent,
ipAddress: ip,
authMethod: decodedProviderToken.authMethod,
organizationId,
...(isAuthMethodSaml(decodedProviderToken.authMethod) && {
authProvider: decodedProviderToken.authMethod