Merge remote-tracking branch 'origin/main' into vse-UID2-6322-allow-any-dii-token-validate

vishalegbert-ttd · vishalegbert-ttd · commit e6cd193d2649 · 2025-12-02T13:30:50.000+11:00
diff --git a/pom.xml b/pom.xml
@@ -6,8 +6,8 @@
 
     <groupId>com.uid2</groupId>
     <artifactId>uid2-operator</artifactId>
-    <version>5.61.18-alpha-264-SNAPSHOT</version>
-  
+    <version>5.61.28</version>
+
     <properties>
         <project.build.sourceEncoding>UTF-8</project.build.sourceEncoding>
         <vertx.version>4.5.21</vertx.version>
diff --git a/scripts/aws/conf/default-config.json b/scripts/aws/conf/default-config.json
@@ -40,5 +40,6 @@
   "refresh_identity_token_after_seconds": 3600,
   "operator_type": "private",
   "enable_remote_config": true,
-  "uid_instance_id_prefix": "unknown"
+  "uid_instance_id_prefix": "unknown",
+  "encrypted_files": false
 }
diff --git a/scripts/aws/conf/euid-integ-config.json b/scripts/aws/conf/euid-integ-config.json
@@ -14,11 +14,5 @@
   "runtime_config_metadata_path": "https://core.integ.euid.eu/operator/config",
   "optout_s3_folder": "optout/",
   "identity_scope": "euid",
-  "runtime_config_store": {
-    "type": "http",
-    "config" : {
-      "url": "https://core.integ.euid.eu/operator/config"
-    },
-    "config_scan_period_ms": 300000
-  }
+  "encrypted_files": true
 }
diff --git a/scripts/aws/conf/euid-prod-config.json b/scripts/aws/conf/euid-prod-config.json
@@ -29,11 +29,5 @@
   "enable_phone_support": true,
   "enable_v1_phone_support": false,
   "enable_v2_encryption": true,
-  "runtime_config_store": {
-    "type": "http",
-    "config" : {
-      "url": "https://core.prod.euid.eu/operator/config"
-    },
-    "config_scan_period_ms": 300000
-  }
+  "encrypted_files": true
 }
diff --git a/scripts/aws/conf/uid2-integ-config.json b/scripts/aws/conf/uid2-integ-config.json
@@ -14,10 +14,5 @@
   "runtime_config_metadata_path": "https://core-integ.uidapi.com/operator/config",
   "optout_s3_folder": "uid-optout-integ/",
   "identity_scope": "uid2",
-  "runtime_config_store": {
-    "type": "http",
-    "config" : {
-      "url": "https://core-integ.uidapi.com/operator/config"
-    },
-    "config_scan_period_ms": 300000
-  }}
+  "encrypted_files": true
+}
diff --git a/scripts/aws/conf/uid2-prod-config.json b/scripts/aws/conf/uid2-prod-config.json
@@ -25,11 +25,5 @@
   "identity_token_expires_after_seconds": 259200,
   "refresh_token_expires_after_seconds": 2592000,
   "refresh_identity_token_after_seconds": 3600,
-  "runtime_config_store": {
-    "type": "http",
-    "config" : {
-      "url": "https://core-prod.uidapi.com/operator/config"
-    },
-    "config_scan_period_ms": 300000
-  }
+  "encrypted_files": true
 }
diff --git a/scripts/azure-cc/conf/default-config.json b/scripts/azure-cc/conf/default-config.json
@@ -40,5 +40,6 @@
   "validate_service_links": false,
   "operator_type": "private",
   "enable_remote_config": true,
-  "uid_instance_id_prefix": "unknown"
+  "uid_instance_id_prefix": "unknown",
+  "encrypted_files": false
 }
diff --git a/scripts/azure-cc/conf/integ-uid2-config.json b/scripts/azure-cc/conf/integ-uid2-config.json
@@ -14,11 +14,5 @@
   "runtime_config_metadata_path": "https://core.uidapi.com/operator/config",
   "optout_s3_folder": "uid-optout-integ/",
   "uid_instance_id_prefix": "unknown",
-  "runtime_config_store": {
-    "type": "http",
-    "config" : {
-      "url": "https://core.uidapi.com/operator/config"
-    },
-    "config_scan_period_ms": 300000
-  }
+  "encrypted_files": true
 }
diff --git a/scripts/azure-cc/conf/prod-uid2-config.json b/scripts/azure-cc/conf/prod-uid2-config.json
@@ -15,11 +15,5 @@
   "optout_s3_folder": "optout-v2/",
   "identity_token_expires_after_seconds": 259200,
   "uid_instance_id_prefix": "unknown",
-  "runtime_config_store": {
-    "type": "http",
-    "config" : {
-      "url": "https://core.uidapi.com/operator/config"
-    },
-    "config_scan_period_ms": 300000
-  }
+  "encrypted_files": true
 }
diff --git a/scripts/gcp-oidc/conf/default-config.json b/scripts/gcp-oidc/conf/default-config.json
@@ -40,5 +40,6 @@
     "validate_service_links": false,
     "operator_type": "private",
     "enable_remote_config": true,
-    "uid_instance_id_prefix": "unknown"
+    "uid_instance_id_prefix": "unknown",
+    "encrypted_files": false
 }
diff --git a/scripts/gcp-oidc/conf/integ-config.json b/scripts/gcp-oidc/conf/integ-config.json
@@ -14,11 +14,5 @@
     "optout_api_uri": "https://optout.uidapi.com/optout/replicate",
     "uid_instance_id_prefix": "unknown",
     "optout_s3_folder": "uid-optout-integ/",
-    "runtime_config_store": {
-        "type": "http",
-        "config" : {
-            "url": "https://core.uidapi.com/operator/config"
-        },
-        "config_scan_period_ms": 300000
-    }
+    "encrypted_files": true
 }
diff --git a/scripts/gcp-oidc/conf/prod-config.json b/scripts/gcp-oidc/conf/prod-config.json
@@ -15,11 +15,5 @@
   "optout_s3_folder": "optout-v2/",
   "identity_token_expires_after_seconds": 259200,
   "uid_instance_id_prefix": "unknown",
-  "runtime_config_store": {
-    "type": "http",
-    "config" : {
-      "url": "https://core.uidapi.com/operator/config"
-    },
-    "config_scan_period_ms": 300000
-  }
+  "encrypted_files": true
 }

Original file line number	Diff line number	Diff line change
`@@ -40,5 +40,6 @@`
`40`	`40`	`"refresh_identity_token_after_seconds": 3600,`
`41`	`41`	`"operator_type": "private",`
`42`	`42`	`"enable_remote_config": true,`
`43`		`- "uid_instance_id_prefix": "unknown"`
	`43`	`+ "uid_instance_id_prefix": "unknown",`
	`44`	`+ "encrypted_files": false`
`44`	`45`	`}`