Merge remote-tracking branch 'origin/master' into hermes/hermes-996d586b

server-rs/crates/shared-contracts/Cargo.toml

@@ -5,6 +5,6 @@ version.workspace = true
 license.workspace = true
 
 [dependencies]
-platform-oss = { path = "../platform-oss" }
-serde = { version = "1", features = ["derive"] }
-serde_json = "1"
+platform-oss = { workspace = true }
+serde = { workspace = true }
+serde_json = { workspace = true }

server-rs/crates/shared-contracts/src/assets.rs

@@ -525,9 +525,13 @@ pub struct DirectUploadTicketPayload {
 pub struct DirectUploadTicketFormFields {
     pub key: String,
     pub policy: String,
-    #[serde(rename = "OSSAccessKeyId")]
-    pub oss_access_key_id: String,
-    #[serde(rename = "Signature")]
+    #[serde(rename = "x-oss-signature-version")]
+    pub signature_version: String,
+    #[serde(rename = "x-oss-credential")]
+    pub credential: String,
+    #[serde(rename = "x-oss-date")]
+    pub date: String,
+    #[serde(rename = "x-oss-signature")]
     pub signature: String,
     #[serde(rename = "success_action_status")]
     pub success_action_status: String,
@@ -615,7 +619,9 @@ impl From<OssPostObjectFormFields> for DirectUploadTicketFormFields {
         Self {
             key: value.key,
             policy: value.policy,
-            oss_access_key_id: value.oss_access_key_id,
+            signature_version: value.signature_version,
+            credential: value.credential,
+            date: value.date,
             signature: value.signature,
             success_action_status: value.success_action_status,
             content_type: value.content_type,
@@ -703,7 +709,7 @@ mod tests {
     fn direct_upload_ticket_response_keeps_form_fields_shape() {
         let payload = serde_json::to_value(CreateDirectUploadTicketResponse {
             upload: DirectUploadTicketPayload::from(OssPostObjectResponse {
-                signature_version: "v1",
+                signature_version: "v4",
                 provider: "aliyun-oss",
                 bucket: "genarrative-assets".to_string(),
                 endpoint: "oss-cn-shanghai.aliyuncs.com".to_string(),
@@ -719,7 +725,9 @@ mod tests {
                 form_fields: OssPostObjectFormFields {
                     key: "generated-characters/hero/master.png".to_string(),
                     policy: "policy".to_string(),
-                    oss_access_key_id: "ak".to_string(),
+                    signature_version: "OSS4-HMAC-SHA256".to_string(),
+                    credential: "ak/20260507/cn-shanghai/oss/aliyun_v4_request".to_string(),
+                    date: "20260507T120000Z".to_string(),
                     signature: "sig".to_string(),
                     success_action_status: "200".to_string(),
                     content_type: Some("image/png".to_string()),
@@ -732,10 +740,14 @@ mod tests {
         })
         .expect("payload should serialize");
 
-        assert_eq!(payload["upload"]["signatureVersion"], json!("v1"));
+        assert_eq!(payload["upload"]["signatureVersion"], json!("v4"));
         assert_eq!(
-            payload["upload"]["formFields"]["OSSAccessKeyId"],
-            json!("ak")
+            payload["upload"]["formFields"]["x-oss-signature-version"],
+            json!("OSS4-HMAC-SHA256")
+        );
+        assert_eq!(
+            payload["upload"]["formFields"]["x-oss-credential"],
+            json!("ak/20260507/cn-shanghai/oss/aliyun_v4_request")
         );
         assert_eq!(
             payload["upload"]["formFields"]["x-oss-meta-asset-kind"],