Write to Zookeeper before sending mail. Change API resource name

2 files changed, 2 insertions, 4 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/MailVerifier.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/MailVerifier.java
index 7c9c92c1e3a..a15e3d8df3f 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/MailVerifier.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/MailVerifier.java
@@ -38,8 +38,8 @@ public class MailVerifier {
         var verificationCode = UUID.randomUUID().toString();
         var verificationDeadline = clock.instant().plus(VERIFICATION_DEADLINE);
         var pendingMailVerification = new PendingMailVerification(tenantName, email, verificationCode, verificationDeadline, mailType);
-        mailer.sendVerificationMail(pendingMailVerification);
         writePendingVerification(pendingMailVerification);
+        mailer.sendVerificationMail(pendingMailVerification);
         return pendingMailVerification;
     }
 
@@ -98,8 +98,6 @@ public class MailVerifier {
     }
 
     private void writePendingVerification(PendingMailVerification pendingMailVerification) {
-        var tenant = requireCloudTenant(pendingMailVerification.getTenantName());
-
         try (var lock = curatorDb.lockPendingMailVerification(pendingMailVerification.getVerificationCode())) {
             curatorDb.writePendingMailVerification(pendingMailVerification);
         }
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
index a137cc6b1a5..7a8ef1d4ee6 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/user/UserApiHandler.java
@@ -112,7 +112,7 @@ public class UserApiHandler extends ThreadedHttpRequestHandler {
 
     private HttpResponse handlePOST(Path path, HttpRequest request) {
         if (path.matches("/user/v1/tenant/{tenant}")) return addTenantRoleMember(path.get("tenant"), request);
-        if (path.matches("/user/v1/email-verification")) return verifyEmail(request);
+        if (path.matches("/user/v1/email/verify")) return verifyEmail(request);
 
         return ErrorResponse.notFoundError(Text.format("No '%s' handler at '%s'", request.getMethod(),
                                                          request.getUri().getPath()));