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

feat(infisical-pg): added global error handler, try catch in oauth passport

Browse Source
This commit is contained in:
Akhil Mohan
2024-01-27 12:38:23 +05:30
parent 4f619d7e48
commit bb6d482ff9
6 changed files with 76 additions and 27 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend-pg/src/server/routes/v1/sso-router.ts
+35 -25
View File
@@ -7,6 +7,7 @@ import { z } from "zod";
import { getConfig } from "@app/lib/config/env";
import { BadRequestError } from "@app/lib/errors";
import { logger } from "@app/lib/logger";
import { fetchGithubEmails } from "@app/lib/requests/github";
import { AuthMethod } from "@app/services/auth/auth-type";
@@ -50,6 +51,7 @@ export const registerSsoRouter = async (server: FastifyZodProvider) => {
});
cb(null, { isUserCompleted, providerAuthToken });
} catch (error) {
logger.error(error);
cb(null, false);
}
}
@@ -72,20 +74,23 @@ export const registerSsoRouter = async (server: FastifyZodProvider) => {
scope: ["user:email"]
},
async (req, accessToken, _refreshToken, profile, cb) => {
const serverCfg = server.services.superAdmin.getServerCfg();
const ghEmails = await fetchGithubEmails(accessToken);
const { email } = ghEmails.filter((gitHubEmail) => gitHubEmail.primary)[0];
const { isUserCompleted, providerAuthToken } = await server.services.login.oauth2Login({
email,
firstName: profile.displayName,
lastName: "",
authMethod: AuthMethod.GITHUB,
callbackPort: req.query.state as string,
isSignupAllowed: Boolean(serverCfg.allowSignUp)
});
return cb(null, { isUserCompleted, providerAuthToken });
try {
const ghEmails = await fetchGithubEmails(accessToken);
const { email } = ghEmails.filter((gitHubEmail) => gitHubEmail.primary)[0];
const serverCfg = server.services.superAdmin.getServerCfg();
const { isUserCompleted, providerAuthToken } = await server.services.login.oauth2Login({
email,
firstName: profile.displayName,
lastName: "",
authMethod: AuthMethod.GITHUB,
callbackPort: req.query.state as string,
isSignupAllowed: Boolean(serverCfg.allowSignUp),
});
return cb(null, { isUserCompleted, providerAuthToken });
} catch (error) {
logger.error(error);
cb(null, false);
}
}
)
);
@@ -108,18 +113,23 @@ export const registerSsoRouter = async (server: FastifyZodProvider) => {
baseURL: appCfg.CLIENT_GITLAB_LOGIN_URL
},
async (req: any, _accessToken: string, _refreshToken: string, profile: any, cb: any) => {
const serverCfg = server.services.superAdmin.getServerCfg();
const email = profile.emails[0].value;
const { isUserCompleted, providerAuthToken } = await server.services.login.oauth2Login({
email,
firstName: profile.displayName,
lastName: "",
authMethod: AuthMethod.GITLAB,
callbackPort: req.query.state as string,
isSignupAllowed: Boolean(serverCfg.allowSignUp)
});
try {
const email = profile.emails[0].value;
const serverCfg = server.services.superAdmin.getServerCfg();
const { isUserCompleted, providerAuthToken } = await server.services.login.oauth2Login({
email,
firstName: profile.displayName,
lastName: "",
authMethod: AuthMethod.GITLAB,
callbackPort: req.query.state as string,
isSignupAllowed: Boolean(serverCfg.allowSignUp),
});
return cb(null, { isUserCompleted, providerAuthToken });
return cb(null, { isUserCompleted, providerAuthToken });
} catch (error) {
logger.error(error);
cb(null, false);
}
}
)
);
backend-pg/src/server/routes/v3/secret-router.ts
+2 -1
View File
@@ -470,7 +470,8 @@ export const registerSecretRouter = async (server: FastifyZodProvider) => {
skipMultilineEncoding: z.boolean().optional()
}),
params: z.object({
secretName: z.string().trim()
secretName: z.string().trim(),
test: z.string()
}),
response: {
200: z.union([