Merge pull request #3321 from AtlasOfLivingAustralia/feature/issue3316

commit update email check #3316
AtlasOfLivingAustralia · Sep 9, 2024 · 9e3cd22 · 9e3cd22
2 parents cac51f3 + 68b7d5f
commit 9e3cd22
Show file tree

Hide file tree

Showing 2 changed files with 3 additions and 3 deletions.
diff --git a/grails-app/controllers/au/org/ala/merit/AdminController.groovy b/grails-app/controllers/au/org/ala/merit/AdminController.groovy
@@ -92,8 +92,8 @@ class AdminController {
         String emailAddress = params.emailAddress
         def result = authService.getUserForEmailAddress(emailAddress)
         Map userDetails
-        if (result != null && result.userName == emailAddress){
-            userDetails = [userId: result.userId, emailAddress: result.userName, firstName: result.firstName, lastName: result.lastName]
+        if (result != null && result.email == emailAddress){
+            userDetails = [userId: result.userId, emailAddress: result.email, firstName: result.firstName, lastName: result.lastName]
         }else{
             userDetails = [error: "error", emailAddress: emailAddress]
         }

diff --git a/src/test/groovy/au/org/ala/merit/AdminControllerSpec.groovy b/src/test/groovy/au/org/ala/merit/AdminControllerSpec.groovy
@@ -29,7 +29,7 @@ class AdminControllerSpec extends Specification implements ControllerUnitTest<Ad
         setup:
         String email = "[email protected]"
         params.emailAddress = email
-        Map userDetails = [userId: "12345", userName: email, firstName: "Test", lastName: "Testing"]
+        Map userDetails = [userId: "12345", userName: "userTest", firstName: "Test", lastName: "Testing", email:email]
 
         when:
         controller.searchUserDetails()