From 8011935a3ba2b8b805cc1ef51b6b3b7e4ef6f72f Mon Sep 17 00:00:00 2001
From: Ehren Kret <ehren@signal.org>
Date: Fri, 17 Sep 2021 11:35:40 -0500
Subject: [PATCH] Fix compilation issues created by constructor changes

---
 .../textsecuregcm/WhisperServerService.java   |  4 ++-
 .../controllers/ProfileControllerTest.java    | 34 +++++++++++++------
 2 files changed, 26 insertions(+), 12 deletions(-)

diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
index 84f6ee5bc..f02fa0e62 100644
--- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
+++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java
@@ -248,6 +248,8 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
   public void run(WhisperServerConfiguration config, Environment environment)
       throws Exception {
 
+    final Clock clock = Clock.systemUTC();
+
     UncaughtExceptionHandler.register();
 
     SharedMetricRegistries.add(Constants.METRICS_NAME, environment.metrics());
@@ -590,7 +592,7 @@ public class WhisperServerService extends Application<WhisperServerConfiguration
         new DonationController(donationExecutor, config.getDonationConfiguration()),
         new MessageController(rateLimiters, messageSender, receiptSender, accountsManager, messagesManager, unsealedSenderRateLimiter, apnFallbackManager, dynamicConfigurationManager, rateLimitChallengeManager, reportMessageManager, metricsCluster, declinedMessageReceiptExecutor, multiRecipientMessageExecutor),
         new PaymentsController(currencyManager, paymentsCredentialsGenerator),
-        new ProfileController(rateLimiters, accountsManager, profilesManager, usernamesManager, dynamicConfigurationManager, profileBadgeConverter, cdnS3Client, profileCdnPolicyGenerator, profileCdnPolicySigner, config.getCdnConfiguration().getBucket(), zkProfileOperations, isZkEnabled),
+        new ProfileController(clock, rateLimiters, accountsManager, profilesManager, usernamesManager, dynamicConfigurationManager, profileBadgeConverter, config.getBadges(), cdnS3Client, profileCdnPolicyGenerator, profileCdnPolicySigner, config.getCdnConfiguration().getBucket(), zkProfileOperations),
         new ProvisioningController(rateLimiters, provisioningManager),
         new RemoteConfigController(remoteConfigsManager, config.getRemoteConfigConfiguration().getAuthorizedTokens(), config.getRemoteConfigConfiguration().getGlobalConfig()),
         new SecureBackupController(backupCredentialsGenerator),
diff --git a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ProfileControllerTest.java b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ProfileControllerTest.java
index cfb751586..21f6f5ea2 100644
--- a/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ProfileControllerTest.java
+++ b/service/src/test/java/org/whispersystems/textsecuregcm/tests/controllers/ProfileControllerTest.java
@@ -23,6 +23,7 @@ import io.dropwizard.testing.junit5.DropwizardExtensionsSupport;
 import io.dropwizard.testing.junit5.ResourceExtension;
 import java.net.MalformedURLException;
 import java.net.URL;
+import java.time.Clock;
 import java.util.Collections;
 import java.util.List;
 import java.util.Optional;
@@ -44,6 +45,8 @@ import org.signal.zkgroup.profiles.ProfileKeyCommitment;
 import org.signal.zkgroup.profiles.ServerZkProfileOperations;
 import org.whispersystems.textsecuregcm.auth.AuthenticatedAccount;
 import org.whispersystems.textsecuregcm.auth.DisabledPermittedAuthenticatedAccount;
+import org.whispersystems.textsecuregcm.configuration.BadgeConfiguration;
+import org.whispersystems.textsecuregcm.configuration.BadgesConfiguration;
 import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicConfiguration;
 import org.whispersystems.textsecuregcm.configuration.dynamic.DynamicPaymentsConfiguration;
 import org.whispersystems.textsecuregcm.controllers.ProfileController;
@@ -72,6 +75,7 @@ import software.amazon.awssdk.services.s3.model.DeleteObjectRequest;
 @ExtendWith(DropwizardExtensionsSupport.class)
 class ProfileControllerTest {
 
+  private static Clock clock = mock(Clock.class);
   private static AccountsManager  accountsManager     = mock(AccountsManager.class );
   private static ProfilesManager  profilesManager     = mock(ProfilesManager.class);
   private static UsernamesManager usernamesManager    = mock(UsernamesManager.class);
@@ -89,6 +93,14 @@ class ProfileControllerTest {
 
   private Account profileAccount;
 
+  private static URL makeURL(String url) {
+    try {
+      return new URL(url);
+    } catch (MalformedURLException e) {
+      throw new AssertionError(e);
+    }
+  }
+
   private static final ResourceExtension resources = ResourceExtension.builder()
       .addProvider(AuthHelper.getAuthFilter())
       .addProvider(new PolymorphicAuthValueFactoryProvider.Binder<>(
@@ -96,26 +108,26 @@ class ProfileControllerTest {
       .setMapper(SystemMapper.getMapper())
       .setTestContainerFactory(new GrizzlyWebTestContainerFactory())
       .addResource(new ProfileController(
+          clock,
           rateLimiters,
           accountsManager,
           profilesManager,
           usernamesManager,
           dynamicConfigurationManager,
-          (acceptableLanguages, accountBadges) -> {
-            try {
-              return List.of(
-                  new Badge("TEST1", "other", new URL("https://example.com/badge/1"), "Test Badge", "This badge is in unit tests.")
-              );
-            } catch (MalformedURLException e) {
-              throw new AssertionError(e);
-            }
-          },
+          (acceptableLanguages, accountBadges) -> List.of(
+              new Badge("TEST", "other", makeURL("https://example.com/badge/test"), "Test Badge", "This badge is in unit tests.")
+          ),
+          new BadgesConfiguration(List.of(
+              new BadgeConfiguration("TEST", makeURL("https://example.com/badge/test"), "other"),
+              new BadgeConfiguration("TEST1", makeURL("https://example.com/badge/1"), "testing"),
+              new BadgeConfiguration("TEST2", makeURL("https://example.com/badge/2"), "testing"),
+              new BadgeConfiguration("TEST3", makeURL("https://example.com/badge/3"), "testing")
+          ), List.of("TEST1")),
           s3client,
           postPolicyGenerator,
           policySigner,
           "profilesBucket",
-          zkProfileOperations,
-          true))
+          zkProfileOperations))
       .build();
 
   @BeforeEach