From 4f619d7e4835cfed8869b6a27d246acb441ed4e9 Mon Sep 17 00:00:00 2001 From: Daniel Hougaard <62331820+DanielHougaard@users.noreply.github.com> Date: Tue, 16 Jan 2024 17:26:47 +0400 Subject: [PATCH] Fixed signup for gitlab and github --- backend-pg/src/server/routes/v1/sso-router.ts | 8 ++++++-- 1 file changed, 6 insertions(+), 2 deletions(-) diff --git a/backend-pg/src/server/routes/v1/sso-router.ts b/backend-pg/src/server/routes/v1/sso-router.ts index a5655298a..5a09968ad 100644 --- a/backend-pg/src/server/routes/v1/sso-router.ts +++ b/backend-pg/src/server/routes/v1/sso-router.ts @@ -72,6 +72,7 @@ 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]; @@ -80,7 +81,8 @@ export const registerSsoRouter = async (server: FastifyZodProvider) => { firstName: profile.displayName, lastName: "", authMethod: AuthMethod.GITHUB, - callbackPort: req.query.state as string + callbackPort: req.query.state as string, + isSignupAllowed: Boolean(serverCfg.allowSignUp) }); return cb(null, { isUserCompleted, providerAuthToken }); @@ -106,13 +108,15 @@ 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 + callbackPort: req.query.state as string, + isSignupAllowed: Boolean(serverCfg.allowSignUp) }); return cb(null, { isUserCompleted, providerAuthToken });