Skip to content

email validation update #129

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
ahjyrkia merged 1 commit into from
Nov 2, 2025
Merged

email validation update #129

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
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
4 changes: 3 additions & 1 deletion package.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -79,7 +79,8 @@
"react-dom": "^16.8.6",
"ts-node": "^8.5.2",
"typescript": "4.2.4",
"uuid": "^7.0.3"
"uuid": "^7.0.3",
"validator": "^13.15.20"
},
"devDependencies": {
"@graphql-codegen/cli": "^1.21.8",
Expand All @@ -93,6 +94,7 @@
"@types/jest": "^24.0.11",
"@types/lodash": "^4.14.122",
"@types/node": "^14.17.1",
"@types/validator": "^13.15.4",
"concurrently": "^4.1.0",
"husky": "^1.3.1",
"jest": "^24.3.1",
Expand Down
11 changes: 10 additions & 1 deletion src/auth/groupAssignments.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,3 +1,4 @@
import validator from 'validator'
import {
IUserInfo,
requestGroups,
Expand All @@ -13,6 +14,10 @@ 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 @@ -31,7 +36,11 @@ export async function assignUserToGroups(userInfo: IUserInfo): Promise<IUserInfo
)

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

Expand Down
10 changes: 10 additions & 0 deletions yarn.lock
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -2300,6 +2300,11 @@
resolved "https://registry.yarnpkg.com/@types/unist/-/unist-2.0.3.tgz#9c088679876f374eb5983f150d4787aa6fb32d7e"
integrity sha512-FvUupuM3rlRsRtCN+fDudtmytGO6iHJuuRKS1Ss0pG5z8oX0diNEw94UEL7hgDbpN94rgaK5R7sWm6RrSkZuAQ==

"@types/validator@^13.15.4":
version "13.15.4"
resolved "https://registry.yarnpkg.com/@types/validator/-/validator-13.15.4.tgz#38a97ae54747416f745afdfc678f041713082635"
integrity sha512-LSFfpSnJJY9wbC0LQxgvfb+ynbHftFo0tMsFOl/J4wexLnYMmDSPaj2ZyDv3TkfL1UePxPrxOWJfbiRS8mQv7A==

"@types/[email protected]":
version "1.0.2"
resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.2.tgz#d2855c6a312b7da73ed16ba6781815bf30c6187a"
Expand Down Expand Up @@ -10939,6 +10944,11 @@ validate-npm-package-license@^3.0.1:
spdx-correct "^3.0.0"
spdx-expression-parse "^3.0.0"

validator@^13.15.20:
version "13.15.20"
resolved "https://registry.yarnpkg.com/validator/-/validator-13.15.20.tgz#054e9238109538a1bf46ae3e1290845a64fa2186"
integrity sha512-KxPOq3V2LmfQPP4eqf3Mq/zrT0Dqp2Vmx2Bn285LwVahLc+CsxOM0crBHczm8ijlcjZ0Q5Xd6LW3z3odTPnlrw==

[email protected]:
version "1.0.11"
resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140"
Expand Down
Loading