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

Fix: Re-add API key support

Browse Source
This commit is contained in:
Daniel Hougaard
2024-03-17 18:49:30 +01:00
parent 6e2f3800d4
commit 961a73f712
1 changed files with 22 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/server/plugins/auth/inject-identity.ts
+22 -14
View File
@@ -19,13 +19,14 @@ export type TAuthMode =
orgId?: string; orgId?: string;
authMethod: AuthMethod; authMethod: AuthMethod;
} }
// | { | {
// authMode: AuthMode.API_KEY; authMode: AuthMode.API_KEY;
// actor: ActorType.USER; authMethod: null;
// userId: string; actor: ActorType.USER;
// user: TUsers; userId: string;
// orgId?: string; user: TUsers;
// } orgId: string;
}
| { | {
authMode: AuthMode.SERVICE_TOKEN; authMode: AuthMode.SERVICE_TOKEN;
serviceToken: TServiceTokens & { createdByEmail: string }; serviceToken: TServiceTokens & { createdByEmail: string };
@@ -78,8 +79,8 @@ const extractAuth = async (req: FastifyRequest, jwtSecret: string) => {
actor: ActorType.USER actor: ActorType.USER
} as const; } as const;
case AuthTokenType.API_KEY: case AuthTokenType.API_KEY:
throw new Error("API Key auth is no longer supported."); // throw new Error("API Key auth is no longer supported.");
// return { authMode: AuthMode.API_KEY, token: decodedToken, actor: ActorType.USER } as const; return { authMode: AuthMode.API_KEY, token: decodedToken, actor: ActorType.USER } as const;
case AuthTokenType.IDENTITY_ACCESS_TOKEN: case AuthTokenType.IDENTITY_ACCESS_TOKEN:
return { return {
authMode: AuthMode.IDENTITY_ACCESS_TOKEN, authMode: AuthMode.IDENTITY_ACCESS_TOKEN,
@@ -148,11 +149,18 @@ export const injectIdentity = fp(async (server: FastifyZodProvider) => {
}; };
break; break;
} }
// case AuthMode.API_KEY: { case AuthMode.API_KEY: {
// const user = await server.services.apiKey.fnValidateApiKey(token as string); const user = await server.services.apiKey.fnValidateApiKey(token as string);
// req.auth = { authMode: AuthMode.API_KEY as const, userId: user.id, actor, user }; req.auth = {
// break; authMode: AuthMode.API_KEY as const,
// } userId: user.id,
actor,
user,
orgId: "API_KEY",
authMethod: null
}; // We set the orgId to an arbitrary value, since we can't link an API key to a specific org. We have to deprecate API keys soon!
break;
}
case AuthMode.SCIM_TOKEN: { case AuthMode.SCIM_TOKEN: {
const { orgId, scimTokenId } = await server.services.scim.fnValidateScimToken(token); const { orgId, scimTokenId } = await server.services.scim.fnValidateScimToken(token);
req.auth = { authMode: AuthMode.SCIM_TOKEN, actor, scimTokenId, orgId, authMethod: null }; req.auth = { authMode: AuthMode.SCIM_TOKEN, actor, scimTokenId, orgId, authMethod: null };