Skip to content

Commit ac6d188

Browse files
cYKatherinecYKatherine
committed
Remove old participant
1 parent addd000 commit ac6d188

File tree

6 files changed

+32
-64
lines changed

6 files changed

+32
-64
lines changed

‎src/test/java/app/component/Operator.java‎

Lines changed: 11 additions & 22 deletions
Original file line numberDiff line numberDiff line change
@@ -95,7 +95,6 @@ private record V2Envelope(String envelope, byte[] nonce) {
9595
@Getter
9696
private final Type type;
9797
private final PublisherUid2Client publisherClient;
98-
private final PublisherUid2Client oldPublisherClient;
9998
private final UID2Client dspClient;
10099

101100
public Operator(String host, Integer port, String name, Type type) {
@@ -125,7 +124,7 @@ public Operator(String host, String name, Type type) {
125124
this(host, null, name, type);
126125
}
127126

128-
public TokenGenerateResponse v2TokenGenerate(String type, String identity, boolean asOldParticipant) {
127+
public TokenGenerateResponse v2TokenGenerate(String type, String identity) {
129128
TokenGenerateInput token;
130129

131130
if ("email".equals(type)) {
@@ -140,18 +139,8 @@ public TokenGenerateResponse v2TokenGenerate(String type, String identity, boole
140139
token = token.withTransparencyAndConsentString(TC_STRING);
141140
}
142141

143-
if (!asOldParticipant) {
144-
token = token.doNotGenerateTokensForOptedOut();
145-
return publisherClient.generateTokenResponse(token);
146-
} else {
147-
return oldPublisherClient.generateTokenResponse(token);
148-
}
149-
}
150-
151-
public JsonNode v2TokenGenerateUsingPayload(String payload, boolean asOldParticipant) throws Exception {
152-
V2Envelope envelope = v2CreateEnvelope(payload, getClientApiSecret(asOldParticipant));
153-
String encryptedResponse = HttpClient.post(getBaseUrl() + "/v2/token/generate", envelope.envelope(), getClientApiKey(asOldParticipant));
154-
return v2DecryptEncryptedResponse(encryptedResponse, envelope.nonce(), getClientApiSecret(asOldParticipant));
142+
token = token.doNotGenerateTokensForOptedOut();
143+
return publisherClient.generateTokenResponse(token);
155144
}
156145

157146
public JsonNode v2ClientSideTokenGenerate(String requestBody, boolean useValidOrigin) throws Exception {
@@ -277,10 +266,10 @@ public DecryptionResponse v2TokenDecrypt(String token) throws UID2ClientExceptio
277266
return dspClient.decrypt(token);
278267
}
279268

280-
public JsonNode v2IdentityMap(String payload, boolean asOldParticipant) throws Exception {
281-
V2Envelope envelope = v2CreateEnvelope(payload, getClientApiSecret(asOldParticipant));
282-
String encryptedResponse = HttpClient.post(getBaseUrl() + "/v2/identity/map", envelope.envelope(), getClientApiKey(asOldParticipant));
283-
return v2DecryptEncryptedResponse(encryptedResponse, envelope.nonce(), getClientApiSecret(asOldParticipant));
269+
public JsonNode v2IdentityMap(String payload) throws Exception {
270+
V2Envelope envelope = v2CreateEnvelope(payload, getClientApiSecret());
271+
String encryptedResponse = HttpClient.post(getBaseUrl() + "/v2/identity/map", envelope.envelope(), getClientApiKey());
272+
return v2DecryptEncryptedResponse(encryptedResponse, envelope.nonce(), getClientApiSecret());
284273
}
285274

286275
public JsonNode v2IdentityBuckets(String payload) throws Exception {
@@ -301,12 +290,12 @@ public JsonNode v2KeySharing() throws Exception {
301290
return v2DecryptEncryptedResponse(encryptedResponse, envelope.nonce(), CLIENT_API_SECRET);
302291
}
303292

304-
private String getClientApiKey(boolean asOldParticipant) {
305-
return asOldParticipant ? CLIENT_API_KEY_BEFORE_OPTOUT_CUTOFF : CLIENT_API_KEY;
293+
private String getClientApiKey() {
294+
return CLIENT_API_KEY;
306295
}
307296

308-
private String getClientApiSecret(boolean asOldParticipant) {
309-
return asOldParticipant ? CLIENT_API_SECRET_BEFORE_OPTOUT_CUTOFF : CLIENT_API_SECRET;
297+
private String getClientApiSecret() {
298+
return CLIENT_API_SECRET;
310299
}
311300

312301
private V2Envelope v2CreateEnvelope(String payload, String secret) throws Exception {

‎src/test/java/suite/operator/V2ApiOperatorLocalOnlyTest.java‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -66,7 +66,7 @@ public void testSharing(TestData.Client sender, Operator senderOperator, TestDat
6666
"suite.operator.TestData#tokenEmailArgsLocalMockOptout"
6767
})
6868
public void testV2TokenGenerateLocalMockOptout(String label, Operator operator, String operatorName, String type, String identity) {
69-
TokenGenerateResponse tokenGenerateResponse = operator.v2TokenGenerate(type, identity, false);
69+
TokenGenerateResponse tokenGenerateResponse = operator.v2TokenGenerate(type, identity);
7070
IdentityTokens currentIdentity = tokenGenerateResponse.getIdentity();
7171

7272
assertThat(currentIdentity).isNull();

‎src/test/java/suite/operator/V2ApiOperatorPublicOnlyTest.java‎

Lines changed: 7 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -30,7 +30,7 @@ public void testV2SpecialRefreshOptoutOldParticipant(String label, Operator oper
3030
return;
3131
}
3232

33-
IdentityTokens currentIdentity = operator.v2TokenGenerate(type, identity, true).getIdentity();
33+
IdentityTokens currentIdentity = operator.v2TokenGenerate(type, identity).getIdentity();
3434
TokenRefreshResponse refreshed = operator.v2TokenRefresh(currentIdentity);
3535

3636
assertTrue(refreshed.isOptout());
@@ -41,13 +41,13 @@ public void testV2SpecialRefreshOptoutOldParticipant(String label, Operator oper
4141
"suite.operator.TestData#tokenEmailArgsSpecialOptout",
4242
"suite.operator.TestData#tokenPhoneArgsSpecialOptout"
4343
})
44-
public void testV2IdentityMapSpecialOptoutParamTrue(String label, Operator operator, String operatorName, String type, String identity, boolean asOldParticipant) throws Exception {
44+
public void testV2IdentityMapSpecialOptoutParamTrue(String label, Operator operator, String operatorName, String type, String identity) throws Exception {
4545
if (isPrivateOperator(operator)) {
4646
return;
4747
}
4848

4949
String payload = "{\"" + type + "\": [\"" + identity + "\"], \"optout_check\":1}";
50-
JsonNode response = operator.v2IdentityMap(payload, asOldParticipant);
50+
JsonNode response = operator.v2IdentityMap(payload);
5151

5252
assertThat(response.get("body").get("unmapped").get(0).get("reason").asText()).isEqualTo("optout");
5353
}
@@ -57,13 +57,13 @@ public void testV2IdentityMapSpecialOptoutParamTrue(String label, Operator opera
5757
"suite.operator.TestData#tokenEmailArgsSpecialOptout",
5858
"suite.operator.TestData#tokenPhoneArgsSpecialOptout"
5959
})
60-
public void testV2IdentityMapSpecialOptoutParamFalse(String label, Operator operator, String operatorName, String type, String identity, boolean asOldParticipant) throws Exception {
60+
public void testV2IdentityMapSpecialOptoutParamFalse(String label, Operator operator, String operatorName, String type, String identity) throws Exception {
6161
if (isPrivateOperator(operator)) {
6262
return;
6363
}
6464

6565
String payload = "{\"" + type + "\": [\"" + identity + "\"], \"optout_check\":0}";
66-
JsonNode response = operator.v2IdentityMap(payload, asOldParticipant);
66+
JsonNode response = operator.v2IdentityMap(payload);
6767

6868
assertThat(response.get("body").get("unmapped").get(0).get("reason").asText()).isEqualTo("optout");
6969
}
@@ -73,13 +73,13 @@ public void testV2IdentityMapSpecialOptoutParamFalse(String label, Operator oper
7373
"suite.operator.TestData#tokenEmailArgsSpecialOptout",
7474
"suite.operator.TestData#tokenPhoneArgsSpecialOptout"
7575
})
76-
public void testV2IdentityMapSpecialOptoutNoParam(String label, Operator operator, String operatorName, String type, String identity, boolean asOldParticipant) throws Exception {
76+
public void testV2IdentityMapSpecialOptoutNoParam(String label, Operator operator, String operatorName, String type, String identity) throws Exception {
7777
if (isPrivateOperator(operator)) {
7878
return;
7979
}
8080

8181
String payload = "{\"" + type + "\": [\"" + identity + "\"]}";
82-
JsonNode response = operator.v2IdentityMap(payload, asOldParticipant);
82+
JsonNode response = operator.v2IdentityMap(payload);
8383

8484
assertThat(response.get("body").get("unmapped").get(0).get("reason").asText()).isEqualTo("optout");
8585
}

‎src/test/java/suite/operator/V2ApiOperatorTest.java‎

Lines changed: 8 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -33,7 +33,7 @@ public class V2ApiOperatorTest {
3333
"suite.operator.TestData#tokenPhoneArgs"
3434
})
3535
public void testV2TokenGenerate(String label, Operator operator, String operatorName, String type, String identity) throws Exception {
36-
TokenGenerateResponse tokenGenerateResponse = operator.v2TokenGenerate(type, identity, false);
36+
TokenGenerateResponse tokenGenerateResponse = operator.v2TokenGenerate(type, identity);
3737
IdentityTokens currentIdentity = tokenGenerateResponse.getIdentity();
3838
DecryptionResponse decrypted = operator.v2TokenDecrypt(currentIdentity.getAdvertisingToken());
3939

@@ -45,8 +45,8 @@ public void testV2TokenGenerate(String label, Operator operator, String operator
4545
"suite.operator.TestData#tokenEmailArgsSpecialOptout",
4646
"suite.operator.TestData#tokenPhoneArgsSpecialOptout"
4747
})
48-
public void testV2TokenGenerateSpecialOptout(String label, Operator operator, String operatorName, String type, String identity, boolean asOldParticipant) {
49-
TokenGenerateResponse tokenGenerateResponse = operator.v2TokenGenerate(type, identity, false);
48+
public void testV2TokenGenerateSpecialOptout(String label, Operator operator, String operatorName, String type, String identity) {
49+
TokenGenerateResponse tokenGenerateResponse = operator.v2TokenGenerate(type, identity);
5050

5151
assertTrue(tokenGenerateResponse.isOptout());
5252
}
@@ -57,7 +57,7 @@ public void testV2TokenGenerateSpecialOptout(String label, Operator operator, St
5757
"suite.operator.TestData#tokenPhoneArgs"
5858
})
5959
public void testV2TokenRefresh(String label, Operator operator, String operatorName, String type, String identity) throws Exception {
60-
IdentityTokens currentIdentity = operator.v2TokenGenerate(type, identity, false).getIdentity();
60+
IdentityTokens currentIdentity = operator.v2TokenGenerate(type, identity).getIdentity();
6161
TokenRefreshResponse refreshed = operator.v2TokenRefresh(currentIdentity);
6262
DecryptionResponse decrypted = operator.v2TokenDecrypt(refreshed.getIdentity().getAdvertisingToken());
6363

@@ -70,7 +70,7 @@ public void testV2TokenRefresh(String label, Operator operator, String operatorN
7070
"suite.operator.TestData#tokenPhoneArgsSpecialRefreshOptout"
7171
})
7272
public void testV2SpecialRefreshOptout(String label, Operator operator, String operatorName, String type, String identity) {
73-
IdentityTokens currentIdentity = operator.v2TokenGenerate(type, identity, false).getIdentity();
73+
IdentityTokens currentIdentity = operator.v2TokenGenerate(type, identity).getIdentity();
7474
TokenRefreshResponse refreshed = operator.v2TokenRefresh(currentIdentity);
7575

7676
assertTrue(refreshed.isOptout());
@@ -82,7 +82,7 @@ public void testV2SpecialRefreshOptout(String label, Operator operator, String o
8282
"suite.operator.TestData#tokenValidatePhoneArgs"
8383
})
8484
public void testV2TokenValidate(String label, Operator operator, String operatorName, String type, String identity) throws Exception {
85-
IdentityTokens currentIdentity = operator.v2TokenGenerate(type, identity, false).getIdentity();
85+
IdentityTokens currentIdentity = operator.v2TokenGenerate(type, identity).getIdentity();
8686
String advertisingToken = currentIdentity.getAdvertisingToken();
8787
JsonNode response = operator.v2TokenValidate(type, identity, advertisingToken);
8888

@@ -97,7 +97,7 @@ public void testV2TokenValidate(String label, Operator operator, String operator
9797
"suite.operator.TestData#identityMapBatchBadPhoneArgs"
9898
})
9999
public void testV2IdentityMap(String label, Operator operator, String operatorName, String payload) throws Exception {
100-
JsonNode response = operator.v2IdentityMap(payload, false);
100+
JsonNode response = operator.v2IdentityMap(payload);
101101

102102
// TODO: Assert the value
103103
assertThat(response.at("/status").asText()).isEqualTo("success");
@@ -110,7 +110,7 @@ public void testV2IdentityMap(String label, Operator operator, String operatorNa
110110
})
111111
public void testV2IdentityMapValidateArgs(String label, Operator operator, String operatorName, String type, String identity) throws Exception {
112112
String payload = "{\"" + type + "\": [\"" + identity + "\"], \"optout_check\":1}";
113-
JsonNode response = operator.v2IdentityMap(payload, false);
113+
JsonNode response = operator.v2IdentityMap(payload);
114114

115115
assertThat(response.get("body").get("mapped").get(0).get("advertising_id").asText()).isNotNull();
116116
}

‎src/test/java/suite/optout/OptoutTest.java‎

Lines changed: 2 additions & 23 deletions
Original file line numberDiff line numberDiff line change
@@ -43,7 +43,7 @@ public static void setupAll() {
4343
})
4444
@Order(1)
4545
public void testV2LogoutWithV2TokenGenerate(String label, Operator operator, String operatorName, String type, String identity) throws Exception {
46-
IdentityTokens generateResponse = operator.v2TokenGenerate(type, identity, false).getIdentity();
46+
IdentityTokens generateResponse = operator.v2TokenGenerate(type, identity).getIdentity();
4747
Thread.sleep(OPTOUT_DELAY_MS);
4848
JsonNode logoutResponse = operator.v2TokenLogout(type, identity);
4949
assertThat(logoutResponse).isEqualTo(Mapper.OBJECT_MAPPER.readTree("{\"body\":{\"optout\":\"OK\"},\"status\":\"success\"}"));
@@ -57,35 +57,14 @@ public void testV2LogoutWithV2TokenGenerate(String label, Operator operator, Str
5757
);
5858
}
5959

60-
@ParameterizedTest(name = "/v2/token/logout with /v2/token/generate - {0} - {2}")
61-
@MethodSource({
62-
"suite.optout.TestData#optoutTokenEmailArgs",
63-
"suite.optout.TestData#optoutTokenPhoneArgs"
64-
})
65-
@Order(2)
66-
public void testV2LogoutWithV2TokenGenerateOldParticipant(String label, Operator operator, String operatorName, String type, String identity) throws Exception {
67-
IdentityTokens generateResponse = operator.v2TokenGenerate(type, identity, true).getIdentity();
68-
Thread.sleep(OPTOUT_DELAY_MS);
69-
JsonNode logoutResponse = operator.v2TokenLogout(type, identity);
70-
assertThat(logoutResponse).isEqualTo(Mapper.OBJECT_MAPPER.readTree("{\"body\":{\"optout\":\"OK\"},\"status\":\"success\"}"));
71-
addToken(
72-
"old participant " + label,
73-
operator,
74-
"v2",
75-
"v2",
76-
generateResponse.getRefreshToken(),
77-
Mapper.OBJECT_MAPPER.readTree(generateResponse.getJsonString()).at("/refresh_response_key").asText()
78-
);
79-
}
80-
8160
@ParameterizedTest(name = "/v2/token/logout with /v2/identity/map - DII {0} - toOptOut {5} - {2}")
8261
@MethodSource({
8362
"suite.optout.TestData#identityMapEmailArgs",
8463
"suite.optout.TestData#identityMapPhoneArgs"
8564
})
8665
@Order(3)
8766
public void testV2LogoutWithV2IdentityMap(String label, Operator operator, String operatorName, String type, String emailOrPhone, boolean toOptOut) throws Exception {
88-
JsonNode identityMapResponseNode = operator.v2IdentityMap("{\""+ type + "\":[\"" + emailOrPhone + "\"]}", false);
67+
JsonNode identityMapResponseNode = operator.v2IdentityMap("{\""+ type + "\":[\"" + emailOrPhone + "\"]}");
8968
assertThat(identityMapResponseNode.at("/status").asText()).isEqualTo("success");
9069
String rawUID = identityMapResponseNode.get("body").get("mapped").get(0).get(TestData.ADVERTISING_ID).asText();
9170
long beforeOptOutTimestamp = Instant.now().toEpochMilli();

‎src/test/java/suite/validator/V2ApiValidatorTest.java‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -18,7 +18,7 @@ public class V2ApiValidatorTest extends ValidatorTestBase {
1818
})
1919
public void testV2TokenGenerateViaMetrics(String label, Operator operator, String operatorName, Prometheus prometheus, String prometheusName, String type, String identity) throws Exception {
2020
assertThat(compareMetricValues(prometheus, Metric.MATCH_METRIC_NAME, "/v2/token/generate", HttpClient.HttpMethod.POST, () ->
21-
operator.v2TokenGenerate(type, identity, false)
21+
operator.v2TokenGenerate(type, identity)
2222
)).isTrue();
2323
}
2424

@@ -29,7 +29,7 @@ public void testV2TokenGenerateViaMetrics(String label, Operator operator, Strin
2929
})
3030
public void testV2TokenRefreshViaMetrics(String label, Operator operator, String operatorName, Prometheus prometheus, String prometheusName, String type, String identity) throws Exception {
3131
assertThat(compareMetricValues(prometheus, Metric.MATCH_METRIC_NAME, "/v2/token/refresh", HttpClient.HttpMethod.POST, () -> {
32-
IdentityTokens currentIdentity = operator.v2TokenGenerate(type, identity, false).getIdentity();
32+
IdentityTokens currentIdentity = operator.v2TokenGenerate(type, identity).getIdentity();
3333
operator.v2TokenRefresh(currentIdentity);
3434
})).isTrue();
3535
}
@@ -43,7 +43,7 @@ public void testV2TokenRefreshViaMetrics(String label, Operator operator, String
4343
})
4444
public void testV2IdentityMapViaMetrics(String label, Operator operator, String operatorName, Prometheus prometheus, String prometheusName, String payload) throws Exception {
4545
assertThat(compareMetricValues(prometheus, Metric.MATCH_METRIC_NAME, "/v2/identity/map", HttpClient.HttpMethod.POST, () ->
46-
operator.v2IdentityMap(payload, false)
46+
operator.v2IdentityMap(payload)
4747
)).isTrue();
4848
}
4949

0 commit comments

Comments
 (0)