fix(sys): fix oss sts config;

labring · Apr 16, 2022 · 3a15d32 · 3a15d32
1 parent e8639b0
commit 3a15d32
Show file tree

Hide file tree

Showing 3 changed files with 14 additions and 3 deletions.
diff --git a/packages/system-server/http/oss.http b/packages/system-server/http/oss.http
@@ -43,6 +43,12 @@ Content-Type: application/json
 }
 
 
+### Get a bucket
+
+GET  {{base_url}}/sys-api/apps/{{appid}}/oss/buckets/test-for-create-bucket
+Content-Type: application/json
+Authorization: Bearer {{token}}
+
 
 ### Delete a bucket
 

diff --git a/packages/system-server/src/api/oss.ts b/packages/system-server/src/api/oss.ts
@@ -64,10 +64,10 @@ export class MinioAgent {
    */
   public getApplicationSTSClient(app: ApplicationStruct) {
     return new STSClient({
-      endpoint: Config.MINIO_CONFIG.endpoint.external,
+      endpoint: Config.MINIO_CONFIG.endpoint.internal,
       credentials: {
         accessKeyId: app.appid,
-        secretAccessKey: app.config.server_secret_salt,
+        secretAccessKey: app.config.oss_access_secret,
       },
       region: 'us-east-1'
     })

diff --git a/packages/system-server/src/router/oss/get-buckets.ts b/packages/system-server/src/router/oss/get-buckets.ts
@@ -60,7 +60,12 @@ export async function handleGetOneBucket(req: Request, res: Response) {
   const data = {
     name,
     mode: bucket.mode,
-    sts: sts
+    credentials: {
+      accessKeyId: sts.Credentials?.AccessKeyId,
+      secretAccessKey: sts.Credentials?.SecretAccessKey,
+      sessionToken: sts.Credentials?.SessionToken,
+      expiration: sts.Credentials?.Expiration
+    }
   }
 
   return res.send({