Billing mail verification

3 files changed, 28 insertions, 14 deletions

diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/MailVerifier.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/MailVerifier.java
index 4d29abaa212..ecdfc5990c0 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/MailVerifier.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/application/MailVerifier.java
@@ -86,6 +86,7 @@ public class MailVerifier {
                         case NOTIFICATIONS -> withTenantContacts(oldTenantInfo, pendingMailVerification);
                         case TENANT_CONTACT -> oldTenantInfo.withContact(oldTenantInfo.contact()
                                 .withEmail(oldTenantInfo.contact().email().withVerification(true)));
+                        case BILLING -> withVerifiedBillingMail(oldTenantInfo);
                     };
 
                     tenantController.lockOrThrow(tenant.name(), LockedTenant.Cloud.class, lockedTenant -> {
@@ -111,6 +112,13 @@ public class MailVerifier {
         return oldInfo.withContacts(new TenantContacts(newContacts));
     }
 
+    private TenantInfo withVerifiedBillingMail(TenantInfo oldInfo) {
+        var verifiedMail = oldInfo.billingContact().contact().email().withVerification(true);
+        var billingContact = oldInfo.billingContact()
+                .withContact(oldInfo.billingContact().contact().withEmail(verifiedMail));
+        return oldInfo.withBilling(billingContact);
+    }
+
     private void writePendingVerification(PendingMailVerification pendingMailVerification) {
         try (var lock = curatorDb.lockPendingMailVerification(pendingMailVerification.getVerificationCode())) {
             curatorDb.writePendingMailVerification(pendingMailVerification);
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
index 381a5eaaa26..4404063456c 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/persistence/TenantSerializer.java
@@ -282,10 +282,13 @@ public class TenantSerializer {
     }
 
     private TenantBilling tenantInfoBillingContactFromSlime(Inspector billingObject) {
+        //TODO: Remove validity check once emailVerified has been written for all tenants
+        var emailVerified = billingObject.field("emailVerified").valid() ?
+                billingObject.field("emailVerified").asBool() : true;
         return TenantBilling.empty()
                 .withContact(TenantContact.from(
                         billingObject.field("name").asString(),
-                        new Email(billingObject.field("email").asString(), true),
+                        new Email(billingObject.field("email").asString(), emailVerified),
                         billingObject.field("phone").asString()))
                 .withAddress(tenantInfoAddressFromSlime(billingObject.field("address")));
     }
@@ -344,11 +347,12 @@ public class TenantSerializer {
     private void toSlime(TenantBilling billingContact, Cursor parentCursor) {
         if (billingContact.isEmpty()) return;
 
-        Cursor addressCursor = parentCursor.setObject("billingContact");
-        addressCursor.setString("name", billingContact.contact().name());
-        addressCursor.setString("email", billingContact.contact().email().getEmailAddress());
-        addressCursor.setString("phone", billingContact.contact().phone());
-        toSlime(billingContact.address(), addressCursor);
+        Cursor billingCursor = parentCursor.setObject("billingContact");
+        billingCursor.setString("name", billingContact.contact().name());
+        billingCursor.setString("email", billingContact.contact().email().getEmailAddress());
+        billingCursor.setBool("emailVerified", billingContact.contact().email().isVerified());
+        billingCursor.setString("phone", billingContact.contact().phone());
+        toSlime(billingContact.address(), billingCursor);
     }
 
     private void toSlime(List<TenantSecretStore> tenantSecretStores, Cursor parentCursor) {
diff --git a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
index d274d59c417..1cf1f35493d 100644
--- a/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
+++ b/controller-server/src/main/java/com/yahoo/vespa/hosted/controller/restapi/application/ApplicationApiHandler.java
@@ -779,11 +779,12 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
     private void toSlime(TenantBilling billingContact, Cursor parentCursor) {
         if (billingContact.isEmpty()) return;
 
-        Cursor addressCursor = parentCursor.setObject("billingContact");
-        addressCursor.setString("name", billingContact.contact().name());
-        addressCursor.setString("email", billingContact.contact().email().getEmailAddress());
-        addressCursor.setString("phone", billingContact.contact().phone());
-        toSlime(billingContact.address(), addressCursor);
+        Cursor billingCursor = parentCursor.setObject("billingContact");
+        billingCursor.setString("name", billingContact.contact().name());
+        billingCursor.setString("email", billingContact.contact().email().getEmailAddress());
+        billingCursor.setBool("emailVerified", billingContact.contact().email().isVerified());
+        billingCursor.setString("phone", billingContact.contact().phone());
+        toSlime(billingContact.address(), billingCursor);
     }
 
     private void toSlime(TenantContacts contacts, Cursor parentCursor) {
@@ -898,9 +899,9 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         var mergedEmail = optional("email", insp)
                 .filter(address -> !address.equals(oldContact.email().getEmailAddress()))
                 .map(address -> {
-                    if (isBillingContact)
-                        return new Email(address, true);
-                    controller.mailVerifier().sendMailVerification(tenantName, address, PendingMailVerification.MailType.TENANT_CONTACT);
+                    var mailType = isBillingContact ? PendingMailVerification.MailType.BILLING :
+                            PendingMailVerification.MailType.TENANT_CONTACT;
+                    controller.mailVerifier().sendMailVerification(tenantName, address, mailType);
                     return new Email(address, false);
                 })
                 .orElse(oldContact.email());
@@ -1700,6 +1701,7 @@ public class ApplicationApiHandler extends AuditLoggingRequestHandler {
         var mailType = switch (type) {
             case "contact" -> PendingMailVerification.MailType.TENANT_CONTACT;
             case "notifications" -> PendingMailVerification.MailType.NOTIFICATIONS;
+            case "billing" -> PendingMailVerification.MailType.BILLING;
             default -> throw new IllegalArgumentException("Unknown mail type " + type);
         };