diff --git a/service/config/sample.yml b/service/config/sample.yml index 31509a126..6e64bf459 100644 --- a/service/config/sample.yml +++ b/service/config/sample.yml @@ -45,10 +45,6 @@ adminEventLoggingConfiguration: { "key": "value" } - secondaryCredentials: | - { - "key": "value" - } projectId: some-project-id logName: some-log-name @@ -235,7 +231,6 @@ unidentifiedDelivery: recaptcha: projectPath: projects/example credentialConfigurationJson: "{ }" # service account configuration for backend authentication - secondaryCredentialConfigurationJson: "{ }" # service account configuration for backend authentication hCaptcha: apiKey: secret://hCaptcha.apiKey @@ -400,10 +395,6 @@ registrationService: { "example": "example" } - secondaryCredentialConfigurationJson: | - { - "example": "example" - } identityTokenAudience: https://registration.example.com registrationCaCertificate: | # Registration service TLS certificate trust root -----BEGIN CERTIFICATE----- diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java index 67989fd7a..f7c276504 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java @@ -39,7 +39,6 @@ import java.time.Duration; import java.util.Collections; import java.util.EnumSet; import java.util.List; -import java.util.Optional; import java.util.ServiceLoader; import java.util.concurrent.ArrayBlockingQueue; import java.util.concurrent.BlockingQueue; @@ -116,7 +115,6 @@ import org.whispersystems.textsecuregcm.controllers.VerificationController; import org.whispersystems.textsecuregcm.currency.CoinMarketCapClient; import org.whispersystems.textsecuregcm.currency.CurrencyConversionManager; import org.whispersystems.textsecuregcm.currency.FixerClient; -import org.whispersystems.textsecuregcm.grpc.ProfileGrpcService; import org.whispersystems.textsecuregcm.experiment.ExperimentEnrollmentManager; import org.whispersystems.textsecuregcm.filters.RemoteDeprecationFilter; import org.whispersystems.textsecuregcm.filters.RequestStatisticsFilter; @@ -124,6 +122,7 @@ import org.whispersystems.textsecuregcm.filters.TimestampResponseFilter; import org.whispersystems.textsecuregcm.grpc.GrpcServerManagedWrapper; import org.whispersystems.textsecuregcm.grpc.KeysAnonymousGrpcService; import org.whispersystems.textsecuregcm.grpc.KeysGrpcService; +import org.whispersystems.textsecuregcm.grpc.ProfileGrpcService; import org.whispersystems.textsecuregcm.grpc.UserAgentInterceptor; import org.whispersystems.textsecuregcm.limits.CardinalityEstimator; import org.whispersystems.textsecuregcm.limits.PushChallengeManager; @@ -283,10 +282,6 @@ public class WhisperServerService extends Application