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

Add minor improvements to Github SSO users added to default organization on signup

Browse Source
This commit is contained in:
carlosmonastyrski
2025-05-02 08:22:47 -03:00
parent 63279280fd
commit 365b4b975e
2 changed files with 6 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
backend/src/server/lib/schemas.ts
View File

@@ -50,8 +50,7 @@ export const SecretNameSchema = BaseSecretNameSchema.refine(
.refine((el) => !el.includes("/"), "Secret name cannot contain forward slash."); .refine((el) => !el.includes("/"), "Secret name cannot contain forward slash.");
const DefaultOrgSchema = z.object({ const DefaultOrgSchema = z.object({
useDefaultOrg: z.literal(true), useDefaultOrg: z.literal(true)
organizationName: z.string().trim().optional()
}); });
const CustomOrgSchema = z.object({ const CustomOrgSchema = z.object({

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

@@ -727,7 +727,11 @@ export const authLoginServiceFactory = ({
if (authMethod === AuthMethod.GITHUB && serverCfg.defaultAuthOrgId) { if (authMethod === AuthMethod.GITHUB && serverCfg.defaultAuthOrgId) {
let orgId = ""; let orgId = "";
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 with ID ${serverCfg.defaultAuthOrgId}`
});
}
orgId = defaultOrg.id; orgId = defaultOrg.id;
const [orgMembership] = await orgDAL.findMembership({ const [orgMembership] = await orgDAL.findMembership({
[`${TableName.OrgMembership}.userId` as "userId"]: user.id, [`${TableName.OrgMembership}.userId` as "userId"]: user.id,