SKU SDK: use new item / request specific credential APIs (uplift to 1.62.x)

components/skus/browser/rs/lib/BUILD.gn

@@ -36,7 +36,7 @@ rust_static_library("rust_lib") {
     "//brave/third_party/rust/sha2/v0_9:lib",
     "//brave/third_party/rust/tracing/v0_1:lib",
     "//brave/third_party/rust/urlencoding/v1:lib",
-    "//brave/third_party/rust/uuid/v0_8:lib",
+    "//brave/third_party/rust/uuid/v1:lib",
     "//third_party/rust/base64/v0_13:lib",
     "//third_party/rust/serde/v1:lib",
     "//third_party/rust/serde_json/v1:lib",

components/skus/browser/rs/lib/Cargo.toml

@@ -22,7 +22,7 @@ tracing = { version = "0.1", default-features = false }
 bigdecimal = { version = "0.1", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 chrono = { version = "0.4", default-features = false, features = ["clock", "serde"] }
-uuid = { version = "0.8", features = ["serde"] }
+uuid = { version = "1", features = ["v4"] }
 challenge-bypass-ristretto = { version = "1.0.1", features = ["serde_base64"] }
 futures-retry = "0.5.0"
 urlencoding = "1.1.1"

components/skus/browser/rs/lib/src/models.rs

@@ -252,6 +252,7 @@ pub struct TimeLimitedV2Credentials {
     pub creds: Vec<Token>,
     pub unblinded_creds: Option<Vec<TimeLimitedV2Credential>>,
     pub state: CredentialState,
+    pub request_id: Option<String>,
 }
 
 #[derive(Serialize, Deserialize, Debug)]

components/skus/browser/rs/lib/src/storage/kv.rs

@@ -286,6 +286,7 @@ where
     async fn upsert_time_limited_v2_item_creds(
         &self,
         item_id: &str,
+        request_id: &str,
         creds: Vec<Token>,
     ) -> Result<(), InternalError> {
         let mut store = self.get_store()?;
@@ -311,6 +312,7 @@ where
                 let tlv2_vec = Vec::new();
                 let tlv2_creds = Credentials::TimeLimitedV2(TimeLimitedV2Credentials {
                     item_id: item_id.to_string(),
+                    request_id: Some(request_id.to_string()),
                     creds,
                     unblinded_creds: Some(tlv2_vec),
                     state: CredentialState::GeneratedCredentials,

components/skus/browser/rs/lib/src/storage/mod.rs

@@ -36,6 +36,7 @@ pub trait StorageClient {
     async fn upsert_time_limited_v2_item_creds(
         &self,
         item_id: &str,
+        request_id: &str,
         creds: Vec<Token>,
     ) -> Result<(), InternalError>;
     async fn append_time_limited_v2_item_unblinded_creds(

third_party/rust/Cargo.toml

@@ -202,8 +202,8 @@ version = "0.1"
 build-script-outputs = ["tables.rs"]
 
 [dependencies.uuid]
-version = "0.8"
-features = ["serde"]
+version = "1"
+features = ["v4"]
 [patch.crates-io.adblock_v0_8]
 path = "adblock/v0_8/crate"
 package = "adblock"
@@ -1308,10 +1308,6 @@ package = "urlencoding"
 path = "utf_8/v0_7/crate"
 package = "utf-8"
 
-[patch.crates-io.uuid_v0_8]
-path = "uuid/v0_8/crate"
-package = "uuid"
-
 [patch.crates-io.uuid_v1]
 path = "uuid/v1/crate"
 package = "uuid"

third_party/rust/third_party.toml

@@ -108,7 +108,7 @@ data-encoding = "2.1.2"
 bigdecimal = { version = "0.1", features = ["serde"] }
 serde = { version = "1.0", features = ["derive"] }
 chrono = { version = "0.4", default-features = false, features = ["clock", "serde"] }
-uuid = { version = "0.8", features = ["serde"] }
+uuid = { version = "1", features = ["v4"] }
 futures-retry = "0.5.0"
 urlencoding = "1.1.1"
 hmac = "0.10"