fix: return safe aksk (#131)

Author: hunjixin

api/jiaozifs.gen.go

@@ -208,7 +208,7 @@ components:
         results:
           type: array
           items:
-            $ref: "#/components/schemas/Aksk"
+            $ref: "#/components/schemas/SafeAksk"
     Aksk:
       type: object
       required:
@@ -233,6 +233,27 @@ components:
         updated_at:
           type: integer
           format: int64
+    SafeAksk:
+      type: object
+      required:
+        - id
+        - access_key
+        - created_at
+        - updated_at
+      properties:
+        id:
+          type: string
+          format: uuid
+        access_key:
+          type: string
+        description:
+          type: string
+        created_at:
+          type: integer
+          format: int64
+        updated_at:
+          type: integer
+          format: int64
     BranchCreation:
       type: object
       required:
@@ -2451,7 +2472,7 @@ paths:
           content:
             application/json:
               schema:
-                $ref: "#/components/schemas/Aksk"
+                $ref: "#/components/schemas/SafeAksk"
         401:
           description: Unauthorized
         404:

api/swagger.yml

@@ -95,7 +95,7 @@ func (akskCtl AkSkController) GetAksk(ctx context.Context, w *api.JiaozifsRespon
 		w.Error(err)
 		return
 	}
-	w.JSON(utils.Silent(akskToDto(aksk)))
+	w.JSON(utils.Silent(akskToSafeDto(aksk)))
 }
 
 func (akskCtl AkSkController) DeleteAksk(ctx context.Context, w *api.JiaozifsResponse, _ *http.Request, params api.DeleteAkskParams) {
@@ -161,7 +161,7 @@ func (akskCtl AkSkController) ListAksks(ctx context.Context, w *api.JiaozifsResp
 		w.Error(err)
 		return
 	}
-	results := utils.Silent(utils.ArrMap(aksks, akskToDto))
+	results := utils.Silent(utils.ArrMap(aksks, akskToSafeDto))
 	pagMag := utils.PaginationFor(hasMore, results, "UpdatedAt")
 	pagination := api.Pagination{
 		HasMore:    pagMag.HasMore,
@@ -185,3 +185,13 @@ func akskToDto(in *models.AkSk) (api.Aksk, error) {
 		UpdatedAt:   in.UpdatedAt.UnixMilli(),
 	}, nil
 }
+
+func akskToSafeDto(in *models.AkSk) (api.SafeAksk, error) {
+	return api.SafeAksk{
+		AccessKey:   in.AccessKey,
+		CreatedAt:   in.CreatedAt.UnixMilli(),
+		Description: in.Description,
+		Id:          in.ID,
+		UpdatedAt:   in.UpdatedAt.UnixMilli(),
+	}, nil
+}

controller/aksk_ctl.go

@@ -61,7 +61,6 @@ func AkSkSpec(ctx context.Context, urlStr string) func(c convey.C) {
 				akskResult, err := api.ParseGetAkskResponse(resp)
 				convey.So(err, convey.ShouldBeNil)
 				convey.ShouldEqual(akskResult.JSON200.AccessKey, aksk.AccessKey)
-				convey.ShouldEqual(akskResult.JSON200.SecretKey, aksk.SecretKey)
 				convey.ShouldEqual(akskResult.JSON200.Description, aksk.Description)
 			})
 
@@ -73,7 +72,6 @@ func AkSkSpec(ctx context.Context, urlStr string) func(c convey.C) {
 				akskResult, err := api.ParseGetAkskResponse(resp)
 				convey.So(err, convey.ShouldBeNil)
 				convey.ShouldEqual(akskResult.JSON200.Id, aksk.Id)
-				convey.ShouldEqual(akskResult.JSON200.SecretKey, aksk.SecretKey)
 				convey.ShouldEqual(akskResult.JSON200.Description, aksk.Description)
 			})
 			c.Convey("get nothing by ak", func() {
@@ -134,7 +132,7 @@ func AkSkSpec(ctx context.Context, urlStr string) func(c convey.C) {
 				convey.So(resp.StatusCode, convey.ShouldEqual, http.StatusUnauthorized)
 			})
 
-			c.Convey("delete nothing by ak", func() {
+			c.Convey("list aksk success", func() {
 				resp, err := client.ListAksks(ctx, &api.ListAksksParams{})
 				convey.So(err, convey.ShouldBeNil)
 				convey.So(resp.StatusCode, convey.ShouldEqual, http.StatusOK)
@@ -145,7 +143,7 @@ func AkSkSpec(ctx context.Context, urlStr string) func(c convey.C) {
 			})
 		})
 
-		c.Convey("aksk usage", func(c convey.C) {
+		c.Convey("aksk user", func(c convey.C) {
 			c.Convey("success", func(c convey.C) {
 				aksk, err := createAksk(ctx, client)
 				convey.So(err, convey.ShouldBeNil)