From 85b8329a6d608e7a36cfff5bdcc8bdc959d4d584 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Jyrki=C3=A4inen?= Date: Tue, 28 Oct 2025 11:55:28 +0200 Subject: [PATCH 1/3] fixed package.json --- package.json | 3 ++- yarn.lock | 5 +++++ 2 files changed, 7 insertions(+), 1 deletion(-) diff --git a/package.json b/package.json index 944be51..bee5b88 100644 --- a/package.json +++ b/package.json @@ -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", diff --git a/yarn.lock b/yarn.lock index 4a2b441..b459636 100644 --- a/yarn.lock +++ b/yarn.lock @@ -10939,6 +10939,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== + value-or-promise@1.0.11: version "1.0.11" resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140" From 5b939d851258734fc07f978e234ff1363fb0cded Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Jyrki=C3=A4inen?= Date: Tue, 28 Oct 2025 12:00:52 +0200 Subject: [PATCH 2/3] types added for validator --- package.json | 1 + yarn.lock | 5 +++++ 2 files changed, 6 insertions(+) diff --git a/package.json b/package.json index bee5b88..582cf9e 100644 --- a/package.json +++ b/package.json @@ -94,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", diff --git a/yarn.lock b/yarn.lock index b459636..f64de2b 100644 --- a/yarn.lock +++ b/yarn.lock @@ -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/websocket@1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.2.tgz#d2855c6a312b7da73ed16ba6781815bf30c6187a" From c964e69ad90b7a0d44450e348ab4d6df9d1883e1 Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Anton=20Jyrki=C3=A4inen?= Date: Tue, 28 Oct 2025 12:29:47 +0200 Subject: [PATCH 3/3] revert validator --- package.json | 4 +--- src/auth/groupAssignments.ts | 11 +---------- yarn.lock | 10 ---------- 3 files changed, 2 insertions(+), 23 deletions(-) diff --git a/package.json b/package.json index 582cf9e..944be51 100644 --- a/package.json +++ b/package.json @@ -79,8 +79,7 @@ "react-dom": "^16.8.6", "ts-node": "^8.5.2", "typescript": "4.2.4", - "uuid": "^7.0.3", - "validator": "^13.15.20" + "uuid": "^7.0.3" }, "devDependencies": { "@graphql-codegen/cli": "^1.21.8", @@ -94,7 +93,6 @@ "@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", diff --git a/src/auth/groupAssignments.ts b/src/auth/groupAssignments.ts index d798d74..8788dda 100644 --- a/src/auth/groupAssignments.ts +++ b/src/auth/groupAssignments.ts @@ -1,4 +1,3 @@ -import validator from 'validator' import { IUserInfo, requestGroups, @@ -14,10 +13,6 @@ export async function assignUserToGroups(userInfo: IUserInfo): Promise 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) diff --git a/yarn.lock b/yarn.lock index f64de2b..4a2b441 100644 --- a/yarn.lock +++ b/yarn.lock @@ -2300,11 +2300,6 @@ 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/websocket@1.0.2": version "1.0.2" resolved "https://registry.yarnpkg.com/@types/websocket/-/websocket-1.0.2.tgz#d2855c6a312b7da73ed16ba6781815bf30c6187a" @@ -10944,11 +10939,6 @@ 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== - value-or-promise@1.0.11: version "1.0.11" resolved "https://registry.yarnpkg.com/value-or-promise/-/value-or-promise-1.0.11.tgz#3e90299af31dd014fe843fe309cefa7c1d94b140"