modify core http_service

Author: FreeBono

lib/screens/home_page/editor_pane/details_card/request_pane/request_body.dart

@@ -74,7 +74,7 @@ class EditRequestBody extends ConsumerWidget {
 
                         ref
                             .read(collectionStateNotifierProvider.notifier)
-                            .update(body: removeJsonComments(value));
+                            .update(body: value);
                       },
                       hintText: kHintJson,
                     ),

lib/utils/convert_utils.dart

@@ -1,9 +1,7 @@
 import 'dart:typed_data';
 import 'dart:convert';
 import 'package:apidash_core/apidash_core.dart';
-import 'package:flutter/material.dart';
 import 'package:intl/intl.dart';
-import 'package:json5/json5.dart' as json5;
 
 String humanizeDate(DateTime? date) {
   if (date == null) {
@@ -84,12 +82,3 @@ Uint8List jsonMapToBytes(Map<String, dynamic>? map) {
     return bytes;
   }
 }
-
-String removeJsonComments(String json) {
-  try {
-    var parsed = json5.json5Decode(json);
-    return jsonEncode(parsed);
-  } catch (e) {
-    return json;
-  }
-}

packages/apidash_core/lib/services/http_service.dart

@@ -41,7 +41,10 @@ Future<(HttpResponse?, Duration?, String?)> sendHttpRequest(
         if (kMethodsWithBody.contains(requestModel.method)) {
           var requestBody = requestModel.body;
           if (requestBody != null && !isMultiPartRequest) {
-            var contentLength = utf8.encode(requestBody).length;
+            if (requestModel.hasJsonData) {
+              requestBody = removeJsonComments(requestBody);
+            }
+            var contentLength = utf8.encode(requestBody!).length;
             if (contentLength > 0) {
               body = requestBody;
               headers[HttpHeaders.contentLengthHeader] =

packages/apidash_core/lib/utils/http_request_utils.dart

@@ -1,8 +1,11 @@
+import 'dart:convert';
+
 import 'package:apidash_core/consts.dart';
 import 'package:collection/collection.dart';
 import 'package:seed/seed.dart';
 import '../models/models.dart';
 import 'graphql_utils.dart';
+import 'package:json5/json5.dart' as json5;
 
 Map<String, String>? rowsToMap(
   List<NameValueModel>? kvRows, {
@@ -101,3 +104,14 @@ String? getRequestBody(APIType type, HttpRequestModel httpRequestModel) {
     APIType.graphql => getGraphQLBody(httpRequestModel),
   };
 }
+
+String? removeJsonComments(String? json) {
+  try {
+    if (json == null) return null;
+
+    var parsed = json5.json5Decode(json);
+    return kJsonEncoder.convert(parsed);
+  } catch (e) {
+    return json;
+  }
+}

packages/apidash_core/pubspec.yaml

@@ -23,6 +23,7 @@ dependencies:
     path: ../insomnia_collection
   seed: ^0.0.3
   xml: ^6.3.0
+  json5: ^0.8.2
 
 dev_dependencies:
   flutter_test:

pubspec.lock

@@ -809,7 +809,7 @@ packages:
     source: hosted
     version: "0.7.1"
   json5:
-    dependency: "direct main"
+    dependency: transitive
     description:
       name: json5
       sha256: b67d6e06c9e225c8277d3c43f796677af7975a2a2b0669ff12ba38ff466a31f4

pubspec.yaml

@@ -66,7 +66,6 @@ dependencies:
       url: https://github.com/google/flutter-desktop-embedding.git
       path: plugins/window_size
   share_plus: ^10.1.4
-  json5: ^0.8.2
 
 dependency_overrides:
   extended_text_field: ^16.0.0