Support for application/json requests with primitive body types.

hpoul · Aug 27, 2024 · a268bf9 · a268bf9
1 parent 3eda589
commit a268bf9
Show file tree

Hide file tree

Showing 13 changed files with 179 additions and 59 deletions.
diff --git a/packages/openapi_base/CHANGELOG.md b/packages/openapi_base/CHANGELOG.md
@@ -1,6 +1,7 @@
-## 2.0.0-rc.1
+## 2.0.0
 
 * Use UTF-8 encoding by default for json responses.
+* Support for dynamic request bodys (instead of just `Map<String, dynamic>`).
 
 ## 1.3.2
 

diff --git a/packages/openapi_base/lib/src/openapi_base.dart b/packages/openapi_base/lib/src/openapi_base.dart
@@ -17,6 +17,8 @@ abstract class OpenApiRequest {
 
   Future<Map<String, dynamic>> readJsonBody();
 
+  Future<dynamic> readJsonBodyDynamic();
+
   Future<Map<String, List<String>>> readUrlEncodedBody();
 
   Future<Map<String, String>> readUrlEncodedBodyFlat() async =>

diff --git a/packages/openapi_base/lib/src/openapi_client_base.dart b/packages/openapi_base/lib/src/openapi_client_base.dart
@@ -168,7 +168,7 @@ abstract class OpenApiClientRequestBody {
 class OpenApiClientRequestBodyJson extends OpenApiClientRequestBody {
   OpenApiClientRequestBodyJson(this.jsonMap);
 
-  final Map<String, dynamic> jsonMap;
+  final /*Map<String, dynamic>*/ dynamic jsonMap;
 
   @override
   String encodeToString() => json.encode(jsonMap);

diff --git a/packages/openapi_base/lib/src/server/openapi_shelf_server.dart b/packages/openapi_base/lib/src/server/openapi_shelf_server.dart
@@ -200,6 +200,11 @@ class ShelfRequest extends OpenApiRequest {
         as Map<String, dynamic>?)!;
   }
 
+  @override
+  Future<dynamic> readJsonBodyDynamic() async {
+    return json.decode(await _request.readAsString());
+  }
+
   @override
   Future<Map<String, List<String>>> readUrlEncodedBody() async {
     final query = await _request.readAsString();

diff --git a/packages/openapi_base/pubspec.yaml b/packages/openapi_base/pubspec.yaml
@@ -1,6 +1,6 @@
 name: openapi_base
 description: Open API base implementation for client/server to be used with openapi_code_builder.
-version: 2.0.0-rc.1
+version: 2.0.0
 homepage: https://github.com/hpoul/openapi_dart/tree/master/packages/openapi_base
 
 environment:

diff --git a/packages/openapi_code_builder/CHANGELOG.md b/packages/openapi_code_builder/CHANGELOG.md
@@ -1,3 +1,7 @@
+## 1.3.3
+
+* Support for `application/json` requests with primitive body types.
+
 ## 1.3.2+1
 
 * Upgrade `openapi_base` dependency.

diff --git a/packages/openapi_code_builder/example/bin/example_server.dart b/packages/openapi_code_builder/example/bin/example_server.dart
@@ -57,4 +57,9 @@ class TestApiImpl extends TestApi {
     return UuidExampleMessageIdGetResponse.response200(
         UuidExampleMessageIdGetResponseBody200(id: messageId));
   }
+
+  @override
+  Future<HelloIntegerPutResponse> helloIntegerPut(int body) async {
+    return HelloIntegerPutResponse.response200();
+  }
 }
diff --git a/packages/openapi_code_builder/example/lib/src/api/petstore.openapi.dart b/packages/openapi_code_builder/example/lib/src/api/petstore.openapi.dart
diff --git a/packages/openapi_code_builder/example/lib/src/api/petstore.openapi.g.dart b/packages/openapi_code_builder/example/lib/src/api/petstore.openapi.g.dart
diff --git a/packages/openapi_code_builder/example/lib/src/api/testapi.openapi.dart b/packages/openapi_code_builder/example/lib/src/api/testapi.openapi.dart