Skip to content

Commit 92f7ec0

Browse files
authored
Merge pull request #1871 from IABTechLab/wzh-5234-cleanup-v0v1-api-code
clean up v0/v1 endpoints related code
2 parents 66ed0fa + d9a2c02 commit 92f7ec0

File tree

12 files changed

+77
-950
lines changed

12 files changed

+77
-950
lines changed

scripts/aws/conf/euid-integ-config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,6 +12,5 @@
1212
"optout_api_uri": "https://optout.integ.euid.eu/optout/replicate",
1313
"cloud_encryption_keys_metadata_path": "https://core.integ.euid.eu/cloud_encryption_keys/retrieve",
1414
"optout_s3_folder": "optout/",
15-
"allow_legacy_api": false,
1615
"identity_scope": "euid"
1716
}

scripts/aws/conf/euid-prod-config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -23,7 +23,6 @@
2323
"identity_token_expires_after_seconds": 259200,
2424
"refresh_token_expires_after_seconds": 2592000,
2525
"refresh_identity_token_after_seconds": 3600,
26-
"allow_legacy_api": false,
2726
"identity_scope": "euid",
2827
"refresh_token_v3": true,
2928
"enable_phone_support": true,

scripts/aws/conf/uid2-prod-config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,7 +24,6 @@
2424
"identity_token_expires_after_seconds": 259200,
2525
"refresh_token_expires_after_seconds": 2592000,
2626
"refresh_identity_token_after_seconds": 3600,
27-
"allow_legacy_api": false,
2827
"runtime_config_store": {
2928
"type": "http",
3029
"config" : {

scripts/azure-cc/conf/default-config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"identity_token_expires_after_seconds": 86400,
3535
"refresh_token_expires_after_seconds": 2592000,
3636
"refresh_identity_token_after_seconds": 3600,
37-
"allow_legacy_api": false,
3837
"failure_shutdown_wait_hours": 120,
3938
"sharing_token_expiry_seconds": 2592000,
4039
"validate_service_links": false,

scripts/gcp-oidc/conf/default-config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -34,7 +34,6 @@
3434
"identity_token_expires_after_seconds": 86400,
3535
"refresh_token_expires_after_seconds": 2592000,
3636
"refresh_identity_token_after_seconds": 3600,
37-
"allow_legacy_api": false,
3837
"failure_shutdown_wait_hours": 120,
3938
"sharing_token_expiry_seconds": 2592000,
4039
"validate_service_links": false,

scripts/gcp/conf/integ-config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"refresh_identity_token_after_seconds": 3600,
1414
"enclave_platform": "gcp-vmid",
1515
"service_instances": 16,
16-
"allow_legacy_api": false,
1716
"sharing_token_expiry_seconds": 2592000,
1817
"operator_type": "private"
1918
}

scripts/gcp/conf/prod-config.json

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -13,7 +13,6 @@
1313
"refresh_identity_token_after_seconds": 3600,
1414
"enclave_platform": "gcp-vmid",
1515
"service_instances": 16,
16-
"allow_legacy_api": false,
1716
"sharing_token_expiry_seconds": 2592000,
1817
"operator_type": "private"
1918
}

src/main/java/com/uid2/operator/Const.java

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,7 +11,6 @@ public class Config extends com.uid2.shared.Const.Config {
1111
public static final String StorageMockProp = "storage_mock";
1212
public static final String StatsCollectorEventBus = "StatsCollector";
1313
public static final String FailureShutdownWaitHoursProp = "failure_shutdown_wait_hours";
14-
public static final String AllowLegacyAPIProp = "allow_legacy_api";
1514
public static final String SharingTokenExpiryProp = "sharing_token_expiry_seconds";
1615
public static final String MaxBidstreamLifetimeSecondsProp = "max_bidstream_lifetime_seconds";
1716
public static final String AllowClockSkewSecondsProp = "allow_clock_skew_seconds";

src/main/java/com/uid2/operator/monitoring/TokenResponseStatsCollector.java

Lines changed: 0 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -9,11 +9,7 @@
99

1010
public class TokenResponseStatsCollector {
1111
public enum Endpoint {
12-
GenerateV0,
13-
GenerateV1,
1412
GenerateV2,
15-
RefreshV0,
16-
RefreshV1,
1713
RefreshV2,
1814
//it's the first version but the endpoint is v2/token/client-generate so we will call it v2
1915
ClientSideTokenGenerateV2,

src/main/java/com/uid2/operator/vertx/Endpoints.java

Lines changed: 0 additions & 14 deletions
Original file line numberDiff line numberDiff line change
@@ -6,20 +6,6 @@
66

77
public enum Endpoints {
88
OPS_HEALTHCHECK("/ops/healthcheck"),
9-
V0_KEY_LATEST("/key/latest"),
10-
V0_TOKEN_GENERATE("/token/generate"),
11-
V0_TOKEN_REFRESH("/token/refresh"),
12-
V0_TOKEN_VALIDATE("/token/validate"),
13-
V0_IDENTITY_MAP("/identity/map"),
14-
V0_TOKEN_LOGOUT("/token/logout"),
15-
16-
V1_TOKEN_GENERATE("/v1/token/generate"),
17-
V1_TOKEN_VALIDATE("/v1/token/validate"),
18-
V1_TOKEN_REFRESH("/v1/token/refresh"),
19-
V1_IDENTITY_BUCKETS("/v1/identity/buckets"),
20-
V1_IDENTITY_MAP("/v1/identity/map"),
21-
V1_KEY_LATEST("/v1/key/latest"),
22-
239
V2_TOKEN_GENERATE("/v2/token/generate"),
2410
V2_TOKEN_REFRESH("/v2/token/refresh"),
2511
V2_TOKEN_VALIDATE("/v2/token/validate"),

0 commit comments

Comments
 (0)