IM-73 refactor:Change notVerifiedEmail by newEmail

integratedmodelling · Feb 16, 2024 · 2bf653b · 2bf653b
1 parent 1f9179d
commit 2bf653b
Show file tree

Hide file tree

Showing 3 changed files with 15 additions and 15 deletions.
diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/TokenVerifyEmailClickback.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/api/TokenVerifyEmailClickback.java
@@ -7,13 +7,13 @@
 public class TokenVerifyEmailClickback extends TokenClickback {
 
 	private static final long serialVersionUID = 2577854654763037014L;
-	private String notVerifiedEmail;
+	private String newEmail;
 
 
 
-	public TokenVerifyEmailClickback(String username, String notVerifiedEmail) {
+	public TokenVerifyEmailClickback(String username, String newEmail) {
 		super(username);
-		this.notVerifiedEmail = notVerifiedEmail;
+		this.newEmail = newEmail;
 	}
 
 
@@ -28,12 +28,12 @@ public ClickbackAction getClickbackAction() {
 		return ClickbackAction.changeEmail;
 	}
 
-	public String getNotVerifiedEmail() {
-		return notVerifiedEmail;
+	public String getNewEmail() {
+		return newEmail;
 	}	
 
-	public void setNotVerifiedEmail(String notVerifiedEmail) {
-		this.notVerifiedEmail = notVerifiedEmail;
+	public void setNewEmail(String newEmail) {
+		this.newEmail = newEmail;
 	}
 
 

diff --git a/klab.hub/src/main/java/org/integratedmodelling/klab/hub/payload/UpdateEmailResponse.java b/klab.hub/src/main/java/org/integratedmodelling/klab/hub/payload/UpdateEmailResponse.java
@@ -3,17 +3,17 @@
 public class UpdateEmailResponse {
 
 	private String email;
-	private String notVerifiedEmail;
+	private String newEmail;
 
 
 	public UpdateEmailResponse() {
 		super();
 	}
 
-	public UpdateEmailResponse(String email, String notVerifiedEmail) {
+	public UpdateEmailResponse(String email, String newEmail) {
 		super();
 		this.email = email;
-		this.notVerifiedEmail = notVerifiedEmail;
+		this.newEmail = newEmail;
 	}
 
 	public String getEmail() {
@@ -22,11 +22,11 @@ public String getEmail() {
 	public void setEmail(String email) {
 		this.email = email;
 	}
-	public String getNotVerifiedEmail() {
-		return notVerifiedEmail;
+	public String getNewEmail() {
+		return newEmail;
 	}
-	public void setNotVerifiedEmail(String notVerifiedEmail) {
-		this.notVerifiedEmail = notVerifiedEmail;
+	public void setNewEmail(String newEmail) {
+		this.newEmail = newEmail;
 	}
 
 

diff --git a/...c/main/java/org/integratedmodelling/klab/hub/users/controllers/UserProfileController.java b/...c/main/java/org/integratedmodelling/klab/hub/users/controllers/UserProfileController.java
@@ -144,7 +144,7 @@ public ResponseEntity<?> getUserDataByToken(@PathVariable String id,
 		}
 
 		ProfileResource profile = userService.getUserProfile(id);
-		UpdateEmailResponse response = new UpdateEmailResponse(profile.getEmail(), token.getNotVerifiedEmail());
+		UpdateEmailResponse response = new UpdateEmailResponse(profile.getEmail(), token.getNewEmail());
 		return new ResponseEntity<>(response, HttpStatus.OK);
 
 	}