diff --git a/service/config/sample.yml b/service/config/sample.yml index 93e939140..5ad344115 100644 --- a/service/config/sample.yml +++ b/service/config/sample.yml @@ -398,6 +398,3 @@ registrationService: ABCDEFGHIJKLMNOPQRSTUVWXYZ/0123456789+abcdefghijklmnopqrstuvwxyz AAAAAAAAAAAAAAAAAAAA -----END CERTIFICATE----- - -callLink: - userAuthenticationTokenSharedSecret: abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG= # base64-encoded secret shared with calling frontend to generate auth tokens for Signal users diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java index 397ff61f7..6e465fd5e 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerConfiguration.java @@ -20,7 +20,6 @@ import org.whispersystems.textsecuregcm.configuration.ArtServiceConfiguration; import org.whispersystems.textsecuregcm.configuration.AwsAttachmentsConfiguration; import org.whispersystems.textsecuregcm.configuration.BadgesConfiguration; import org.whispersystems.textsecuregcm.configuration.BraintreeConfiguration; -import org.whispersystems.textsecuregcm.configuration.CallLinkConfiguration; import org.whispersystems.textsecuregcm.configuration.CdnConfiguration; import org.whispersystems.textsecuregcm.configuration.DatadogConfiguration; import org.whispersystems.textsecuregcm.configuration.DirectoryV2Configuration; @@ -215,11 +214,6 @@ public class WhisperServerConfiguration extends Configuration { @JsonProperty private ArtServiceConfiguration artService; - @Valid - @NotNull - @JsonProperty - private CallLinkConfiguration callLink; - @Valid @NotNull @JsonProperty @@ -373,10 +367,6 @@ public class WhisperServerConfiguration extends Configuration { return datadog; } - public CallLinkConfiguration getCallLinkConfiguration() { - return callLink; - } - public UnidentifiedDeliveryConfiguration getDeliveryCertificate() { return unidentifiedDelivery; } diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/CallLinkConfiguration.java b/service/src/main/java/org/whispersystems/textsecuregcm/configuration/CallLinkConfiguration.java deleted file mode 100644 index 031cd6731..000000000 --- a/service/src/main/java/org/whispersystems/textsecuregcm/configuration/CallLinkConfiguration.java +++ /dev/null @@ -1,9 +0,0 @@ -package org.whispersystems.textsecuregcm.configuration; - -import com.fasterxml.jackson.annotation.JsonProperty; -import org.whispersystems.textsecuregcm.util.ExactlySize; -import javax.validation.constraints.NotEmpty; -import java.util.HexFormat; - -public record CallLinkConfiguration (@ExactlySize({32}) byte[] userAuthenticationTokenSharedSecret) { -}