api: Remove body from Unclaim request

TheThingsNetwork · Jul 6, 2023 · a96be30 · a96be30
1 parent 9219ac1
commit a96be30
Show file tree

Hide file tree

Showing 8 changed files with 119 additions and 128 deletions.
diff --git a/api/api.md b/api/api.md
@@ -2863,7 +2863,7 @@ and allows clients to claim end devices.
 | Method Name | Method | Pattern | Body |
 | ----------- | ------ | ------- | ---- |
 | `Claim` | `POST` | `/api/v3/edcs/claim` | `*` |
-| `Unclaim` | `DELETE` | `/api/v3/edcs/claim/{application_ids.application_id}/devices/{device_id}` | `*` |
+| `Unclaim` | `DELETE` | `/api/v3/edcs/claim/{application_ids.application_id}/devices/{device_id}` |  |
 | `GetInfoByJoinEUI` | `POST` | `/api/v3/edcs/claim/info` | `*` |
 | `GetClaimStatus` | `GET` | `/api/v3/edcs/claim/{application_ids.application_id}/devices/{device_id}` |  |
 | `AuthorizeApplication` | `POST` | `/api/v3/edcs/applications/{application_ids.application_id}/authorize` | `*` |

diff --git a/api/api.swagger.json b/api/api.swagger.json
@@ -7974,35 +7974,28 @@
             "type": "string"
           },
           {
-            "name": "body",
-            "in": "body",
-            "required": true,
-            "schema": {
-              "type": "object",
-              "properties": {
-                "application_ids": {
-                  "type": "object"
-                },
-                "dev_eui": {
-                  "type": "string",
-                  "format": "string",
-                  "example": "70B3D57ED000ABCD",
-                  "description": "The LoRaWAN DevEUI."
-                },
-                "join_eui": {
-                  "type": "string",
-                  "format": "string",
-                  "example": "70B3D57ED000ABCD",
-                  "description": "The LoRaWAN JoinEUI (AppEUI until LoRaWAN 1.0.3 end devices)."
-                },
-                "dev_addr": {
-                  "type": "string",
-                  "format": "string",
-                  "example": "2600ABCD",
-                  "description": "The LoRaWAN DevAddr."
-                }
-              }
-            }
+            "name": "dev_eui",
+            "description": "The LoRaWAN DevEUI.",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "format": "string"
+          },
+          {
+            "name": "join_eui",
+            "description": "The LoRaWAN JoinEUI (AppEUI until LoRaWAN 1.0.3 end devices).",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "format": "string"
+          },
+          {
+            "name": "dev_addr",
+            "description": "The LoRaWAN DevAddr.",
+            "in": "query",
+            "required": false,
+            "type": "string",
+            "format": "string"
           }
         ],
         "tags": [

diff --git a/api/deviceclaimingserver.proto b/api/deviceclaimingserver.proto
@@ -162,7 +162,6 @@ service EndDeviceClaimingServer {
   rpc Unclaim(EndDeviceIdentifiers) returns (google.protobuf.Empty) {
     option (google.api.http) = {
       delete: "/edcs/claim/{application_ids.application_id}/devices/{device_id}",
-      body: "*"
     };
   };
 

diff --git a/pkg/ttnpb/deviceclaimingserver.pb.go b/pkg/ttnpb/deviceclaimingserver.pb.go
diff --git a/pkg/ttnpb/deviceclaimingserver.pb.gw.go b/pkg/ttnpb/deviceclaimingserver.pb.gw.go
diff --git a/sdk/js/generated/api-definition.json b/sdk/js/generated/api-definition.json
@@ -2267,7 +2267,6 @@
         {
           "method": "delete",
           "pattern": "/edcs/claim/{application_ids.application_id}/devices/{device_id}",
-          "body": "*",
           "parameters": [
             "application_ids.application_id",
             "device_id"

diff --git a/sdk/js/generated/api.json b/sdk/js/generated/api.json
@@ -11101,8 +11101,7 @@
                   "rules": [
                     {
                       "method": "DELETE",
-                      "pattern": "/edcs/claim/{application_ids.application_id}/devices/{device_id}",
-                      "body": "*"
+                      "pattern": "/edcs/claim/{application_ids.application_id}/devices/{device_id}"
                     }
                   ]
                 }

diff --git a/tools/mage/proto.go b/tools/mage/proto.go
@@ -152,7 +152,7 @@ func (p Proto) fieldMask(context.Context) error {
 func (p Proto) grpcGateway(context.Context) error {
 	return withProtoc(grpcGatewayProtoImage, func(pCtx *protocContext, protoc func(...string) error) error {
 		if err := protoc(
-			fmt.Sprintf("--grpc-gateway_out=allow_delete_body=true:%s", protocOut),
+			fmt.Sprintf("--grpc-gateway_out=:%s", protocOut),
 			fmt.Sprintf("%s/api/*.proto", pCtx.WorkingDirectory),
 		); err != nil {
 			return fmt.Errorf("failed to generate protos: %w", err)
@@ -204,7 +204,6 @@ func (p Proto) Swagger(context.Context) error {
 	}
 	return withProtoc(openAPIv2ProtoImage, func(pCtx *protocContext, protoc func(...string) error) error {
 		if err := protoc(
-			"--openapiv2_opt allow_delete_body=true",
 			"--openapiv2_opt=json_names_for_fields=false",
 			fmt.Sprintf("--openapiv2_out=allow_merge,merge_file_name=api:%s/api", pCtx.WorkingDirectory),
 			fmt.Sprintf("%s/api/*.proto", pCtx.WorkingDirectory),