diff --git a/conf/integ-config.json b/conf/integ-config.json index 742f6f9..e4988a3 100644 --- a/conf/integ-config.json +++ b/conf/integ-config.json @@ -1,7 +1,6 @@ { "service_instances": 1, "storage_mock": true, - "enforce_https": false, "att_token_enc_key": "", "att_token_enc_salt": "", "optout_s3_folder": "optout/", diff --git a/conf/local-e2e-docker-config.json b/conf/local-e2e-docker-config.json index 47eb1ee..093cd8f 100644 --- a/conf/local-e2e-docker-config.json +++ b/conf/local-e2e-docker-config.json @@ -1,7 +1,6 @@ { "service_instances": 1, "storage_mock": false, - "enforce_https": false, "aws_s3_endpoint": "http://localstack:5001", "optout_s3_bucket": "test-optout-bucket", "pre_signed_url_expiry": 1800, diff --git a/pom.xml b/pom.xml index 7081f98..ca987a0 100644 --- a/pom.xml +++ b/pom.xml @@ -16,15 +16,23 @@ 4.3.8 1.1.0 - 6.1.0-649c2e7609 + 7.1.0-8e67b3a537 ${project.version} + + + snapshots-repo + https://s01.oss.sonatype.org/content/repositories/snapshots + false + true + + com.uid2 uid2-attestation-api - 1.4.0-e5df2e10aa + 2.0.0-f968aec0e3 com.uid2 diff --git a/src/main/java/com/uid2/optout/Main.java b/src/main/java/com/uid2/optout/Main.java index afcf070..40a8e12 100644 --- a/src/main/java/com/uid2/optout/Main.java +++ b/src/main/java/com/uid2/optout/Main.java @@ -121,9 +121,8 @@ public Main(Vertx vertx, JsonObject config) throws Exception { if (coreApiToken == null || coreApiToken.isBlank()) { LOGGER.warn("Core Attest URL set, but the API Token is not set"); } - boolean enforceHttps = this.config.getBoolean("enforce_https", true); var tokenRetriever = new AttestationTokenRetriever(vertx, coreAttestUrl, coreApiToken, appVersion, new NoAttestationProvider(), null, CloudUtils.defaultProxy); - UidCoreClient uidCoreClient = UidCoreClient.createNoAttest(coreApiToken, enforceHttps, tokenRetriever); + UidCoreClient uidCoreClient = UidCoreClient.createNoAttest(coreApiToken, tokenRetriever); if (useStorageMock) uidCoreClient.setAllowContentFromLocalFileSystem(true); this.fsOperatorKeyConfig = uidCoreClient; contentStorage = uidCoreClient.getContentStorage();