From 8b5a2f04a0c7ccec09d3f215d36af9ca360de0a1 Mon Sep 17 00:00:00 2001
From: walle233 <2310005663@qq.com>
Date: Fri, 15 Apr 2022 00:28:21 +0800
Subject: [PATCH] fix(oss): fix error of setBucketPolicy api;

---
 packages/system-server/http/oss.http                 | 12 ++++++++++++
 .../system-server/src/router/oss/delete-bucket.ts    |  2 +-
 .../system-server/src/router/oss/update-bucket.ts    |  4 ++--
 3 files changed, 15 insertions(+), 3 deletions(-)

diff --git a/packages/system-server/http/oss.http b/packages/system-server/http/oss.http
index 19a8c2c475..65e0205048 100644
--- a/packages/system-server/http/oss.http
+++ b/packages/system-server/http/oss.http
@@ -28,10 +28,22 @@ Authorization: Bearer {{token}}
 
 {
   "bucket": "test-for-create-bucket",
+  "mode": "private"
+}
+
+
+### Set bucket policy
+
+PUT  {{base_url}}/sys-api/apps/{{appid}}/oss/buckets/test-for-create-bucket
+Authorization: Bearer {{token}}
+Content-Type: application/json
+
+{
   "mode": "public-read"
 }
 
 
+
 ### Delete a bucket
 
 DELETE  {{base_url}}/sys-api/apps/{{appid}}/oss/buckets/test-for-create-bucket
diff --git a/packages/system-server/src/router/oss/delete-bucket.ts b/packages/system-server/src/router/oss/delete-bucket.ts
index bd015df181..01d00dac5f 100644
--- a/packages/system-server/src/router/oss/delete-bucket.ts
+++ b/packages/system-server/src/router/oss/delete-bucket.ts
@@ -32,7 +32,7 @@ export async function handleDeleteBucket(req: Request, res: Response) {
   const internalName = `${app.appid}-${bucketName}`
   const ret = await oss.deleteBucket(internalName)
   if (ret?.$metadata?.httpStatusCode !== 204) {
-    return res.send(ret?.$metadata)
+    return res.send({ code: 'ERROR', data: ret?.$metadata})
   }
 
   // delete bucket from app
diff --git a/packages/system-server/src/router/oss/update-bucket.ts b/packages/system-server/src/router/oss/update-bucket.ts
index 75b15dc32b..b39ec9db9f 100644
--- a/packages/system-server/src/router/oss/update-bucket.ts
+++ b/packages/system-server/src/router/oss/update-bucket.ts
@@ -41,8 +41,8 @@ export async function handleSetBucketPolicy(req: Request, res: Response) {
   const oss = await MinioAgent.New()
   const internalName = `${app.appid}-${bucketName}`
   const ret = await oss.setBucketACL(internalName, mode)
-  if (ret?.$metadata?.httpStatusCode !== 200) {
-    return res.send(ret?.$metadata)
+  if (ret?.$metadata?.httpStatusCode !== 204) {
+    return res.send({ code: 'ERROR', data: ret?.$metadata})
   }
 
   // update bucket to app