Skip to content
Merged
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
11 changes: 1 addition & 10 deletions src/auth/groupAssignments.ts
Original file line number Diff line number Diff line change
@@ -1,4 +1,3 @@
import validator from 'validator'
import {
IUserInfo,
requestGroups,
Expand All @@ -14,10 +13,6 @@ export async function assignUserToGroups(userInfo: IUserInfo): Promise<IUserInfo
return userInfo
}

if (!validator.isEmail(userInfo.email)) {
return userInfo
}

const settings = await getSettings()
const domainGroups = settings.domain_groups
const autoDomainGroups = settings.auto_domain_groups
Expand All @@ -36,11 +31,7 @@ export async function assignUserToGroups(userInfo: IUserInfo): Promise<IUserInfo
)

const sessionGroups = userInfo.groups
const parsedDomains = userInfo.email.split('@')
const emailDomain = parsedDomains[parsedDomains.length - 1]?.toLowerCase()
const emailDomainGroups = assignGroups.filter(
(dg) => emailDomain === dg.domain.toLowerCase()
)
const emailDomainGroups = assignGroups.filter((dg) => userInfo.email.endsWith(dg.domain))
const groupAssignments = uniq(flatten(emailDomainGroups.map(({ groups }) => groups)))
const assignToGroups = difference(groupAssignments, sessionGroups)

Expand Down