Merge pull request #354 from gregcorbett/iris_regex_fix

Fix JS regex use to validate IRIS IAM strings
GOCDB · Nov 29, 2023 · 608e48a · 608e48a
2 parents bc68c0b + 927ede8
commit 608e48a
Showing 1 changed file with 3 additions and 3 deletions.
diff --git a/htdocs/web_portal/javascript/linking.js b/htdocs/web_portal/javascript/linking.js
@@ -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\/$/;
 
     // End with @egi.eu
     } else if (authType === "EGI Proxy IdP") {
@@ -270,4 +270,4 @@ function formatEmail() {
     } else if (empty) {
         $('#emailError').text("Please enter the account's email");
     }
-}
+}