JCLOUDS-1519: Fix the authorization error with b2 application keys

apache · Feb 19, 2024 · 41d842d · 41d842d
1 parent 2a773c2
commit 41d842d
Show file tree

Hide file tree

Showing 6 changed files with 7 additions and 5 deletions.
diff --git a/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java b/providers/b2/src/main/java/org/jclouds/b2/filters/RequestAuthorization.java
@@ -50,9 +50,11 @@ public HttpRequest filter(HttpRequest request) throws HttpException {
             endpoint.getPath() +
             (endpoint.getQuery() == null ? "" : "?" + endpoint.getQuery()));
 
+      String updatedRequestBody = request.getPayload().getRawContent().toString().replaceAll("\"accountId\":.?\".*\"", "\"accountId\":\"" + auth.accountId() + "\"");
       request = request.toBuilder()
             .endpoint(endpoint)
             .replaceHeader(HttpHeaders.AUTHORIZATION, auth.authorizationToken())
+            .payload(updatedRequestBody)
             .build();
       return request;
    }

diff --git a/providers/b2/src/test/java/org/jclouds/b2/features/B2TestUtils.java b/providers/b2/src/test/java/org/jclouds/b2/features/B2TestUtils.java
@@ -120,7 +120,7 @@ static void assertRequest(RecordedRequest request, String method, String path, S
     * @see RecordedRequest
     */
    private static void assertContentTypeIsJson(RecordedRequest request) {
-      assertThat(request.getHeaders().values("Content-Type")).contains("application/json");
+      assertThat(request.getHeaders().values("Content-Type")).contains("application/unknown");
    }
 
    /**

diff --git a/providers/b2/src/test/resources/create_bucket_request.json b/providers/b2/src/test/resources/create_bucket_request.json
@@ -1,5 +1,5 @@
 {
-    "accountId": "ACCOUNT_ID",
+    "accountId": "YOUR_ACCOUNT_ID",
     "bucketName": "any_name_you_pick",
     "bucketType": "allPrivate"
 }
diff --git a/providers/b2/src/test/resources/delete_bucket_request.json b/providers/b2/src/test/resources/delete_bucket_request.json
@@ -1,4 +1,4 @@
 {
-    "accountId": "ACCOUNT_ID",
+    "accountId": "YOUR_ACCOUNT_ID",
     "bucketId": "4a48fe8875c6214145260818"
 }
diff --git a/providers/b2/src/test/resources/list_buckets_request.json b/providers/b2/src/test/resources/list_buckets_request.json
@@ -1,3 +1,3 @@
 {
-    "accountId": "ACCOUNT_ID"
+    "accountId": "YOUR_ACCOUNT_ID"
 }
diff --git a/providers/b2/src/test/resources/update_bucket_request.json b/providers/b2/src/test/resources/update_bucket_request.json
@@ -1,5 +1,5 @@
 {
-    "accountId": "ACCOUNT_ID",
+    "accountId": "YOUR_ACCOUNT_ID",
     "bucketId": "4a48fe8875c6214145260818",
     "bucketType": "allPrivate"
 }