Skip to content
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

Fix JS regex use to validate IRIS IAM strings #354

Merged
merged 1 commit into from
Nov 29, 2023
Merged

Fix JS regex use to validate IRIS IAM strings #354

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
6 changes: 3 additions & 3 deletions htdocs/web_portal/javascript/linking.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -84,8 +84,8 @@ function getRegExIdString() {

// End with @iris.iam.ac.uk
} else if (authType === "IRIS IAM - OIDC") {
// var regExIdString = /^([a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{12})@iris\-iam\.ac\.uk$/;
var regExIdString = /^.+@iris\-iam\.ac\.uk$/;
// var regExIdString = /^([a-f0-9]{8}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{4}\-[a-f0-9]{12})@iris\-iam\.stfc\.ac\.uk$/;
var regExIdString = /^.+@iris\-iam\.stfc\.ac\.uk\/$/;
gregcorbett marked this conversation as resolved.
Show resolved Hide resolved

// End with @egi.eu
} else if (authType === "EGI Proxy IdP") {
Expand Down Expand Up @@ -270,4 +270,4 @@ function formatEmail() {
} else if (empty) {
$('#emailError').text("Please enter the account's email");
}
}
}