Skip to content

clean up v0/v1 endpoints related code #1871

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
lizk886 merged 11 commits into from
Jul 10, 2025
Merged

clean up v0/v1 endpoints related code #1871

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
11 commits
Select commit Hold shift + click to select a range
6a80abe
remove all presences of v1
lizk886 Jul 8, 2025
3aa5732
remove more presences of v1
lizk886 Jul 8, 2025
0b61ec7
remove more presences of v1
lizk886 Jul 8, 2025
0a2f2ee
remove more v0v1 related code
lizk886 Jul 8, 2025
6332142
remove more v0 related function code
lizk886 Jul 8, 2025
4b460e4
remove more v0 related function code
lizk886 Jul 8, 2025
8fddc77
more v0v1 related code removed
lizk886 Jul 9, 2025
ba7c470
rename jsonv1 to a better name
lizk886 Jul 9, 2025
5163949
rename createInputListv1
lizk886 Jul 9, 2025
22bf583
test
lizk886 Jul 9, 2025
d9a2c02
Update action.yaml
lizk886 Jul 9, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
1 change: 0 additions & 1 deletion scripts/aws/conf/euid-integ-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -12,6 +12,5 @@
"optout_api_uri": "https://optout.integ.euid.eu/optout/replicate",
"cloud_encryption_keys_metadata_path": "https://core.integ.euid.eu/cloud_encryption_keys/retrieve",
"optout_s3_folder": "optout/",
"allow_legacy_api": false,
"identity_scope": "euid"
}
1 change: 0 additions & 1 deletion scripts/aws/conf/euid-prod-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,7 +23,6 @@
"identity_token_expires_after_seconds": 259200,
"refresh_token_expires_after_seconds": 2592000,
"refresh_identity_token_after_seconds": 3600,
"allow_legacy_api": false,
"identity_scope": "euid",
"refresh_token_v3": true,
"enable_phone_support": true,
Expand Down
1 change: 0 additions & 1 deletion scripts/aws/conf/uid2-prod-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -24,7 +24,6 @@
"identity_token_expires_after_seconds": 259200,
"refresh_token_expires_after_seconds": 2592000,
"refresh_identity_token_after_seconds": 3600,
"allow_legacy_api": false,
"runtime_config_store": {
"type": "http",
"config" : {
Expand Down
1 change: 0 additions & 1 deletion scripts/azure-cc/conf/default-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"identity_token_expires_after_seconds": 86400,
"refresh_token_expires_after_seconds": 2592000,
"refresh_identity_token_after_seconds": 3600,
"allow_legacy_api": false,
"failure_shutdown_wait_hours": 120,
"sharing_token_expiry_seconds": 2592000,
"validate_service_links": false,
Expand Down
1 change: 0 additions & 1 deletion scripts/gcp-oidc/conf/default-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,7 +34,6 @@
"identity_token_expires_after_seconds": 86400,
"refresh_token_expires_after_seconds": 2592000,
"refresh_identity_token_after_seconds": 3600,
"allow_legacy_api": false,
"failure_shutdown_wait_hours": 120,
"sharing_token_expiry_seconds": 2592000,
"validate_service_links": false,
Expand Down
1 change: 0 additions & 1 deletion scripts/gcp/conf/integ-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"refresh_identity_token_after_seconds": 3600,
"enclave_platform": "gcp-vmid",
"service_instances": 16,
"allow_legacy_api": false,
"sharing_token_expiry_seconds": 2592000,
"operator_type": "private"
}
1 change: 0 additions & 1 deletion scripts/gcp/conf/prod-config.json
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -13,7 +13,6 @@
"refresh_identity_token_after_seconds": 3600,
"enclave_platform": "gcp-vmid",
"service_instances": 16,
"allow_legacy_api": false,
"sharing_token_expiry_seconds": 2592000,
"operator_type": "private"
}
1 change: 0 additions & 1 deletion src/main/java/com/uid2/operator/Const.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,6 @@ public class Config extends com.uid2.shared.Const.Config {
public static final String StorageMockProp = "storage_mock";
public static final String StatsCollectorEventBus = "StatsCollector";
public static final String FailureShutdownWaitHoursProp = "failure_shutdown_wait_hours";
public static final String AllowLegacyAPIProp = "allow_legacy_api";
public static final String SharingTokenExpiryProp = "sharing_token_expiry_seconds";
public static final String MaxBidstreamLifetimeSecondsProp = "max_bidstream_lifetime_seconds";
public static final String AllowClockSkewSecondsProp = "allow_clock_skew_seconds";
Expand Down
4 changes: 0 additions & 4 deletions src/main/java/com/uid2/operator/monitoring/TokenResponseStatsCollector.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -9,11 +9,7 @@

public class TokenResponseStatsCollector {
public enum Endpoint {
GenerateV0,
GenerateV1,
GenerateV2,
RefreshV0,
RefreshV1,
RefreshV2,
//it's the first version but the endpoint is v2/token/client-generate so we will call it v2
ClientSideTokenGenerateV2,
Expand Down
14 changes: 0 additions & 14 deletions src/main/java/com/uid2/operator/vertx/Endpoints.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -6,20 +6,6 @@

public enum Endpoints {
OPS_HEALTHCHECK("/ops/healthcheck"),
V0_KEY_LATEST("/key/latest"),
V0_TOKEN_GENERATE("/token/generate"),
V0_TOKEN_REFRESH("/token/refresh"),
V0_TOKEN_VALIDATE("/token/validate"),
V0_IDENTITY_MAP("/identity/map"),
V0_TOKEN_LOGOUT("/token/logout"),

V1_TOKEN_GENERATE("/v1/token/generate"),
V1_TOKEN_VALIDATE("/v1/token/validate"),
V1_TOKEN_REFRESH("/v1/token/refresh"),
V1_IDENTITY_BUCKETS("/v1/identity/buckets"),
V1_IDENTITY_MAP("/v1/identity/map"),
V1_KEY_LATEST("/v1/key/latest"),

V2_TOKEN_GENERATE("/v2/token/generate"),
V2_TOKEN_REFRESH("/v2/token/refresh"),
V2_TOKEN_VALIDATE("/v2/token/validate"),
Expand Down
575 changes: 11 additions & 564 deletions src/main/java/com/uid2/operator/vertx/UIDOperatorVerticle.java
View file
Open in desktop

Large diffs are not rendered by default.

Loading