Skip to content

Commit b2d6f26

Browse files
gmsdelmundogmsdelmundo
committed
Merged main
2 parents 9eb0d26 + 77c108c commit b2d6f26

13 files changed

+16
-532
lines changed

‎.github/workflows/check-stable-dependency.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,5 +3,5 @@ on: [pull_request, workflow_dispatch]
33

44
jobs:
55
check_dependency:
6-
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-check-stable-dependency.yaml@v2.0
6+
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-check-stable-dependency.yaml@v3
77
secrets: inherit

‎.github/workflows/publish-e2e-test-suites-docker-image.yaml‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -11,6 +11,10 @@ on:
1111
- Patch
1212
- Minor
1313
- Major
14+
version_number_input:
15+
description: If set, the version number will not be incremented and the given number will be used.
16+
type: string
17+
default: ''
1418
vulnerability_severity:
1519
description: The severity to fail the workflow if such vulnerability is detected. DO NOT override it unless a Jira ticket is raised.
1620
type: choice
@@ -24,6 +28,7 @@ jobs:
2428
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-publish-java-to-docker-versioned.yaml@v3
2529
with:
2630
release_type: ${{ inputs.release_type }}
31+
version_number_input: ${{ inputs.version_number_input }}
2732
vulnerability_severity: ${{ inputs.vulnerability_severity }}
2833
java_version: 21
2934
skip_tests: true

‎.github/workflows/validate-image.yaml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -16,7 +16,7 @@ on:
1616

1717
jobs:
1818
build-publish-docker-default:
19-
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v2.3.6
19+
uses: IABTechLab/uid2-shared-actions/.github/workflows/shared-validate-image.yaml@v3
2020
with:
2121
failure_severity: ${{ inputs.failure_severity || 'HIGH'}}
2222
fail_on_error: ${{ inputs.fail_on_error || true }}

‎pom.xml‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,7 @@
66

77
<groupId>com.uid2</groupId>
88
<artifactId>uid2-e2e</artifactId>
9-
<version>3.2.8</version>
9+
<version>3.3.11</version>
1010

1111
<properties>
1212
<maven.compiler.source>21</maven.compiler.source>

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

Lines changed: 0 additions & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -15,7 +15,6 @@
1515
import javax.crypto.spec.SecretKeySpec;
1616
import java.lang.reflect.Constructor;
1717
import java.lang.reflect.Method;
18-
import java.net.URLEncoder;
1918
import java.nio.ByteBuffer;
2019
import java.nio.charset.StandardCharsets;
2120
import java.security.*;
@@ -126,79 +125,6 @@ public Operator(String host, String name, Type type) {
126125
this(host, null, name, type);
127126
}
128127

129-
public JsonNode v0TokenGenerate(String type, String identity) throws Exception {
130-
String response = HttpClient.get(getBaseUrl() + "/token/generate?" + type + "=" + URLEncoder.encode(identity, StandardCharsets.UTF_8), CLIENT_API_KEY);
131-
return Mapper.OBJECT_MAPPER.readTree(response);
132-
}
133-
134-
public JsonNode v0TokenRefresh(String token) throws Exception {
135-
String response = HttpClient.get(getBaseUrl() + "/token/refresh?refresh_token=" + URLEncoder.encode(token, StandardCharsets.UTF_8), CLIENT_API_KEY);
136-
return Mapper.OBJECT_MAPPER.readTree(response);
137-
}
138-
139-
public JsonNode v0CheckedTokenRefresh(String token) {
140-
try {
141-
return v0TokenRefresh(token);
142-
} catch (Exception e) {
143-
return Mapper.OBJECT_MAPPER.createObjectNode();
144-
}
145-
}
146-
147-
public JsonNode v0TokenValidate(String type, String identity, String advertisingToken) throws Exception {
148-
String response = HttpClient.get(getBaseUrl() + "/token/validate?" + type + "=" + URLEncoder.encode(identity, StandardCharsets.UTF_8) + "&token=" + URLEncoder.encode(advertisingToken, StandardCharsets.UTF_8), CLIENT_API_KEY);
149-
return Mapper.OBJECT_MAPPER.readTree(response);
150-
}
151-
152-
public String v0TokenLogout(String type, String identity) throws Exception {
153-
return HttpClient.get(getBaseUrl() + "/token/logout?" + type + "=" + URLEncoder.encode(identity, StandardCharsets.UTF_8), CLIENT_API_KEY);
154-
}
155-
156-
public String v0IdentityMap(String type, String identity) throws Exception {
157-
return HttpClient.get(getBaseUrl() + "/identity/map?" + type + "=" + URLEncoder.encode(identity, StandardCharsets.UTF_8), CLIENT_API_KEY);
158-
}
159-
160-
public String v0StaticJsUid2Sdk() throws Exception {
161-
return HttpClient.get(getBaseUrl() + "/static/js/uid2-sdk-2.0.0.js", CLIENT_API_KEY);
162-
}
163-
164-
public JsonNode v1TokenGenerate(String type, String identity) throws Exception {
165-
String response = HttpClient.get(getBaseUrl() + "/v1/token/generate?" + type + "=" + URLEncoder.encode(identity, StandardCharsets.UTF_8), CLIENT_API_KEY);
166-
return Mapper.OBJECT_MAPPER.readTree(response);
167-
}
168-
169-
public JsonNode v1TokenRefresh(String token) throws Exception {
170-
String response = HttpClient.get(getBaseUrl() + "/v1/token/refresh?refresh_token=" + URLEncoder.encode(token, StandardCharsets.UTF_8), CLIENT_API_KEY);
171-
return Mapper.OBJECT_MAPPER.readTree(response);
172-
}
173-
174-
public JsonNode v1CheckedTokenRefresh(String token) {
175-
try {
176-
return v1TokenRefresh(token);
177-
} catch (Exception e) {
178-
return Mapper.OBJECT_MAPPER.createObjectNode();
179-
}
180-
}
181-
182-
public JsonNode v1TokenValidate(String type, String identity, String advertisingToken) throws Exception {
183-
String response = HttpClient.get(getBaseUrl() + "/v1/token/validate?" + type + "=" + URLEncoder.encode(identity, StandardCharsets.UTF_8) + "&token=" + URLEncoder.encode(advertisingToken, StandardCharsets.UTF_8), CLIENT_API_KEY);
184-
return Mapper.OBJECT_MAPPER.readTree(response);
185-
}
186-
187-
public JsonNode v1IdentityMap(String type, String identity) throws Exception {
188-
String response = HttpClient.get(getBaseUrl() + "/v1/identity/map?" + type + "=" + URLEncoder.encode(identity, StandardCharsets.UTF_8), CLIENT_API_KEY);
189-
return Mapper.OBJECT_MAPPER.readTree(response);
190-
}
191-
192-
public JsonNode v1IdentityMapBatch(String payload) throws Exception {
193-
String response = HttpClient.post(getBaseUrl() + "/v1/identity/map", payload, CLIENT_API_KEY);
194-
return Mapper.OBJECT_MAPPER.readTree(response);
195-
}
196-
197-
public JsonNode v1KeyLatest() throws Exception {
198-
String response = HttpClient.get(getBaseUrl() + "/v1/key/latest", CLIENT_API_KEY);
199-
return Mapper.OBJECT_MAPPER.readTree(response);
200-
}
201-
202128
public TokenGenerateResponse v2TokenGenerate(String type, String identity, boolean asOldParticipant) {
203129
TokenGenerateInput token;
204130

‎src/test/java/suite/E2ELocalFullTestSuite.java‎

Lines changed: 0 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -7,23 +7,17 @@
77
import suite.core.CoreTest;
88
import suite.operator.*;
99
import suite.optout.OptoutTest;
10-
import suite.validator.V0ApiValidatorTest;
11-
import suite.validator.V1ApiValidatorTest;
1210
import suite.validator.V2ApiValidatorTest;
1311

1412
@Suite
1513
@SelectClasses({
1614
BasicTest.class,
1715
CoreTest.class,
1816
CoreRefreshTest.class,
19-
V0ApiOperatorTest.class,
20-
V1ApiOperatorTest.class,
2117
V2ApiOperatorTest.class,
2218
V2ApiOperatorPublicOnlyTest.class,
2319
V2ApiOperatorLocalOnlyTest.class,
2420
OptoutTest.class,
25-
V0ApiValidatorTest.class,
26-
V1ApiValidatorTest.class,
2721
V2ApiValidatorTest.class
2822
})
2923
public class E2ELocalFullTestSuite {

‎src/test/java/suite/E2EPublicOperatorTestSuite.java‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
@Suite
1212
@SelectClasses({
1313
BasicTest.class,
14-
V0ApiOperatorTest.class,
15-
V1ApiOperatorTest.class,
14+
CoreTest.class,
15+
CoreRefreshTest.class,
1616
V2ApiOperatorTest.class,
1717
V2ApiOperatorPublicOnlyTest.class,
1818
V2ApiOperatorLocalOnlyTest.class,

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

Lines changed: 0 additions & 124 deletions
This file was deleted.

0 commit comments

Comments
 (0)