File tree Expand file tree Collapse file tree
Expand file tree Collapse file tree Original file line number Diff line number Diff line change 1- import validator from 'validator'
21import {
32 IUserInfo ,
43 requestGroups ,
@@ -14,10 +13,6 @@ export async function assignUserToGroups(userInfo: IUserInfo): Promise<IUserInfo
1413 return userInfo
1514 }
1615
17- if ( ! validator . isEmail ( userInfo . email ) ) {
18- return userInfo
19- }
20-
2116 const settings = await getSettings ( )
2217 const domainGroups = settings . domain_groups
2318 const autoDomainGroups = settings . auto_domain_groups
@@ -36,11 +31,7 @@ export async function assignUserToGroups(userInfo: IUserInfo): Promise<IUserInfo
3631 )
3732
3833 const sessionGroups = userInfo . groups
39- const parsedDomains = userInfo . email . split ( '@' )
40- const emailDomain = parsedDomains [ parsedDomains . length - 1 ] ?. toLowerCase ( )
41- const emailDomainGroups = assignGroups . filter (
42- ( dg ) => emailDomain === dg . domain . toLowerCase ( )
43- )
34+ const emailDomainGroups = assignGroups . filter ( ( dg ) => userInfo . email . endsWith ( dg . domain ) )
4435 const groupAssignments = uniq ( flatten ( emailDomainGroups . map ( ( { groups } ) => groups ) ) )
4536 const assignToGroups = difference ( groupAssignments , sessionGroups )
4637
You can’t perform that action at this time.
0 commit comments