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

Add cloud check on github add user to default org

Browse Source
This commit is contained in:
carlosmonastyrski
2025-05-02 12:58:36 -03:00
parent 365b4b975e
commit e12f4ad253
3 changed files with 3 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/server/routes/v1/sso-router.ts
+1 -1
View File
@@ -347,7 +347,7 @@ export const registerSsoRouter = async (server: FastifyZodProvider) => {
const serverCfg = await getServerCfg(); const serverCfg = await getServerCfg();
return res.redirect( return res.redirect(
`${appCfg.SITE_URL}/signup/sso?token=${encodeURIComponent(req.passportUser.providerAuthToken)}${ `${appCfg.SITE_URL}/signup/sso?token=${encodeURIComponent(req.passportUser.providerAuthToken)}${
serverCfg.defaultAuthOrgId ? `&defaultOrgAllowed=true` : "" serverCfg.defaultAuthOrgId && !appCfg.isCloud ? `&defaultOrgAllowed=true` : ""
}` }`
); );
} }
backend/src/services/auth/auth-login-service.ts
+1 -1
View File
@@ -724,7 +724,7 @@ export const authLoginServiceFactory = ({
isGhost: false isGhost: false
}); });
if (authMethod === AuthMethod.GITHUB && serverCfg.defaultAuthOrgId) { if (authMethod === AuthMethod.GITHUB && serverCfg.defaultAuthOrgId && !appCfg.isCloud) {
let orgId = ""; let orgId = "";
const defaultOrg = await orgDAL.findOrgById(serverCfg.defaultAuthOrgId); const defaultOrg = await orgDAL.findOrgById(serverCfg.defaultAuthOrgId);
if (!defaultOrg) { if (!defaultOrg) {
backend/src/services/auth/auth-signup-service.ts
+1 -1
View File
@@ -295,7 +295,7 @@ export const authSignupServiceFactory = ({
if (!organizationId) { if (!organizationId) {
let orgId = ""; let orgId = "";
if (useDefaultOrg && serverCfg.defaultAuthOrgId) { if (useDefaultOrg && serverCfg.defaultAuthOrgId && !appCfg.isCloud) {
const defaultOrg = await orgDAL.findOrgById(serverCfg.defaultAuthOrgId); const defaultOrg = await orgDAL.findOrgById(serverCfg.defaultAuthOrgId);
if (!defaultOrg) throw new BadRequestError({ message: "Failed to find default organization" }); if (!defaultOrg) throw new BadRequestError({ message: "Failed to find default organization" });
orgId = defaultOrg.id; orgId = defaultOrg.id;