1 files changed, 16 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 afb0b61c23a..9ff3206ee06 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
@@ -1,27 +1,26 @@
-// Copyright Yahoo. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
+// Copyright Vespa.ai. Licensed under the terms of the Apache 2.0 license. See LICENSE in the project root.
 package com.yahoo.vespa.hosted.controller.application;
 
 import com.yahoo.config.provision.TenantName;
 import com.yahoo.vespa.hosted.controller.LockedTenant;
 import com.yahoo.vespa.hosted.controller.TenantController;
+import com.yahoo.vespa.hosted.controller.api.integration.ConsoleUrls;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.Mail;
 import com.yahoo.vespa.hosted.controller.api.integration.organization.Mailer;
+import com.yahoo.vespa.hosted.controller.notification.MailTemplating;
 import com.yahoo.vespa.hosted.controller.persistence.CuratorDb;
 import com.yahoo.vespa.hosted.controller.tenant.CloudTenant;
+import com.yahoo.vespa.hosted.controller.tenant.PendingMailVerification;
 import com.yahoo.vespa.hosted.controller.tenant.Tenant;
 import com.yahoo.vespa.hosted.controller.tenant.TenantContacts;
 import com.yahoo.vespa.hosted.controller.tenant.TenantInfo;
-import com.yahoo.vespa.hosted.controller.tenant.PendingMailVerification;
 
-import java.net.URI;
 import java.time.Clock;
 import java.time.Duration;
 import java.util.List;
 import java.util.Optional;
 import java.util.UUID;
 
-import static com.yahoo.yolean.Exceptions.uncheck;
-
 
 /**
  * @author olaa
@@ -34,14 +33,14 @@ public class MailVerifier {
     private final Mailer mailer;
     private final CuratorDb curatorDb;
     private final Clock clock;
-    private final URI dashboardUri;
+    private final MailTemplating mailTemplating;
 
-    public MailVerifier(URI dashboardUri, TenantController tenantController, Mailer mailer, CuratorDb curatorDb, Clock clock) {
+    public MailVerifier(ConsoleUrls consoleUrls, TenantController tenantController, Mailer mailer, CuratorDb curatorDb, Clock clock) {
         this.tenantController = tenantController;
         this.mailer = mailer;
         this.curatorDb = curatorDb;
         this.clock = clock;
-        this.dashboardUri = dashboardUri;
+        this.mailTemplating = new MailTemplating(consoleUrls);
     }
 
     public PendingMailVerification sendMailVerification(TenantName tenantName, String email, PendingMailVerification.MailType mailType) {
@@ -86,6 +85,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 +111,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);
@@ -125,12 +132,7 @@ public class MailVerifier {
     }
 
     private Mail mailOf(PendingMailVerification pendingMailVerification) {
-        var classLoader = this.getClass().getClassLoader();
-        var template = uncheck(() -> classLoader.getResourceAsStream("mail/mail-verification.tmpl").readAllBytes());
-        var message = new String(template)
-                .replaceAll("%\\{consoleUrl}", dashboardUri.getHost())
-                .replaceAll("%\\{email}", pendingMailVerification.getMailAddress())
-                .replaceAll("%\\{code}", pendingMailVerification.getVerificationCode());
+        var message = mailTemplating.generateMailVerificationHtml(pendingMailVerification);
         return new Mail(List.of(pendingMailVerification.getMailAddress()), "Please verify your email", "", message);
     }