diff --git a/service/config/sample-secrets-bundle.yml b/service/config/sample-secrets-bundle.yml index 7e7ae4cad..a24017343 100644 --- a/service/config/sample-secrets-bundle.yml +++ b/service/config/sample-secrets-bundle.yml @@ -4,9 +4,6 @@ stripe.idempotencyKeyGenerator: abcdefg12345678= # base64 for creating request i braintree.publicKey: unset braintree.privateKey: unset -googlePlayBilling.credentialsJson: | - { "json": true } - appleAppStore.encodedKey: unset directoryV2.client.userAuthenticationTokenSharedSecret: abcdefghijklmnopqrstuvwxyz0123456789ABCDEFG= # base64-encoded secret shared with CDS to generate auth tokens for Signal users diff --git a/service/config/sample.yml b/service/config/sample.yml index e6b3427e6..fe3381807 100644 --- a/service/config/sample.yml +++ b/service/config/sample.yml @@ -48,7 +48,10 @@ braintree: } googlePlayBilling: - credentialsJson: secret://googlePlayBilling.credentialsJson + credentialsJson: | + { + "credential": "configuration" + } packageName: package.name applicationName: test productIdToLevel: {} diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java index 0aad2b95b..5679db64f 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/WhisperServerService.java @@ -768,7 +768,7 @@ public class WhisperServerService extends Application productIdToLevel) {} diff --git a/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java b/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java index f9cbe6322..0a45ac89d 100644 --- a/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java +++ b/service/src/main/java/org/whispersystems/textsecuregcm/workers/CommandDependencies.java @@ -326,7 +326,7 @@ public record CommandDependencies( final ServerSecretParams zkSecretParams = new ServerSecretParams(configuration.getZkConfig().serverSecret().value()); final ServerZkReceiptOperations zkReceiptOperations = new ServerZkReceiptOperations(zkSecretParams); GooglePlayBillingManager googlePlayBillingManager = new GooglePlayBillingManager( - new ByteArrayInputStream(configuration.getGooglePlayBilling().credentialsJson().value().getBytes(StandardCharsets.UTF_8)), + new ByteArrayInputStream(configuration.getGooglePlayBilling().credentialsJson().getBytes(StandardCharsets.UTF_8)), configuration.getGooglePlayBilling().packageName(), configuration.getGooglePlayBilling().applicationName(), configuration.getGooglePlayBilling().productIdToLevel()); diff --git a/service/src/test/resources/config/test.yml b/service/src/test/resources/config/test.yml index acd47dcbb..01cb0ac80 100644 --- a/service/src/test/resources/config/test.yml +++ b/service/src/test/resources/config/test.yml @@ -46,7 +46,16 @@ braintree: type: stub googlePlayBilling: - credentialsJson: secret://googlePlayBilling.credentialsJson + credentialsJson: | + { + "type": "external_account", + "credential_source": { + "file": "/tmp/my-token" + }, + "subject_token_type": "urn:ietf:params:oauth:token-type:jwt", + "audience": "//iam.googleapis.com/abc", + "token_url": "https://sts.googleapis.com/v1/token" + } packageName: package.name applicationName: test productIdToLevel: {}