Fix parsing non-object JSON response in CapacitorHttp plugin (#6224)

Co-authored-by: Mark Anderson <[email protected]>
ionic-team · Mar 22, 2023 · ed47333 · ed47333
1 parent fd225e5
commit ed47333
Show file tree

Hide file tree

Showing 5 changed files with 18 additions and 13 deletions.
diff --git a/android/capacitor/src/main/assets/native-bridge.js b/android/capacitor/src/main/assets/native-bridge.js
@@ -384,7 +384,7 @@ var nativeBridge = (function (exports) {
                                 data: (options === null || options === void 0 ? void 0 : options.body) ? options.body : undefined,
                                 headers: headers,
                             });
-                            let data = typeof nativeResponse.data === 'string'
+                            let data = !nativeResponse.headers['Content-Type'].startsWith('application/json')
                                 ? nativeResponse.data
                                 : JSON.stringify(nativeResponse.data);
                             // use null data for 204 No Content HTTP response
@@ -526,7 +526,7 @@ var nativeBridge = (function (exports) {
                                     this.status = nativeResponse.status;
                                     this.response = nativeResponse.data;
                                     this.responseText =
-                                        typeof nativeResponse.data === 'string'
+                                        !nativeResponse.headers['Content-Type'].startsWith('application/json')
                                             ? nativeResponse.data
                                             : JSON.stringify(nativeResponse.data);
                                     this.responseURL = nativeResponse.url;

diff --git a/android/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java b/android/capacitor/src/main/java/com/getcapacitor/plugin/util/HttpRequestHandler.java
@@ -308,6 +308,9 @@ public static Object parseJSON(String input) throws JSONException {
                 return new JSONObject().put("flag", "false");
             } else if (input.trim().length() <= 0) {
                 return "";
+            } else if (input.trim().matches("^\".*\"$")) {
+                // a string enclosed in " " is a json value, return the string without the quotes
+                return input.trim().substring(1, input.trim().length() - 1);
             } else {
                 try {
                     return new JSObject(input);

diff --git a/core/native-bridge.ts b/core/native-bridge.ts
@@ -437,10 +437,11 @@ const initBridge = (w: any): void => {
               },
             );
 
-            let data =
-              typeof nativeResponse.data === 'string'
-                ? nativeResponse.data
-                : JSON.stringify(nativeResponse.data);
+            let data = !nativeResponse.headers['Content-Type'].startsWith(
+              'application/json',
+            )
+              ? nativeResponse.data
+              : JSON.stringify(nativeResponse.data);
 
             // use null data for 204 No Content HTTP response
             if (nativeResponse.status === 204) {
@@ -612,10 +613,11 @@ const initBridge = (w: any): void => {
                   this._headers = nativeResponse.headers;
                   this.status = nativeResponse.status;
                   this.response = nativeResponse.data;
-                  this.responseText =
-                    typeof nativeResponse.data === 'string'
-                      ? nativeResponse.data
-                      : JSON.stringify(nativeResponse.data);
+                  this.responseText = !nativeResponse.headers[
+                    'Content-Type'
+                  ].startsWith('application/json')
+                    ? nativeResponse.data
+                    : JSON.stringify(nativeResponse.data);
                   this.responseURL = nativeResponse.url;
                   this.readyState = 4;
                   this.dispatchEvent(new Event('load'));

diff --git a/ios/Capacitor/Capacitor/Plugins/HttpRequestHandler.swift b/ios/Capacitor/Capacitor/Plugins/HttpRequestHandler.swift
@@ -31,7 +31,7 @@ public enum ResponseType: String {
 /// - Returns: The parsed value or an error
 func tryParseJson(_ data: Data) -> Any {
     do {
-        return try JSONSerialization.jsonObject(with: data, options: .mutableContainers)
+        return try JSONSerialization.jsonObject(with: data, options: [.mutableContainers, .fragmentsAllowed])
     } catch {
         return error.localizedDescription
     }

diff --git a/ios/Capacitor/Capacitor/assets/native-bridge.js b/ios/Capacitor/Capacitor/assets/native-bridge.js
@@ -384,7 +384,7 @@ var nativeBridge = (function (exports) {
                                 data: (options === null || options === void 0 ? void 0 : options.body) ? options.body : undefined,
                                 headers: headers,
                             });
-                            let data = typeof nativeResponse.data === 'string'
+                            let data = !nativeResponse.headers['Content-Type'].startsWith('application/json')
                                 ? nativeResponse.data
                                 : JSON.stringify(nativeResponse.data);
                             // use null data for 204 No Content HTTP response
@@ -526,7 +526,7 @@ var nativeBridge = (function (exports) {
                                     this.status = nativeResponse.status;
                                     this.response = nativeResponse.data;
                                     this.responseText =
-                                        typeof nativeResponse.data === 'string'
+                                        !nativeResponse.headers['Content-Type'].startsWith('application/json')
                                             ? nativeResponse.data
                                             : JSON.stringify(nativeResponse.data);
                                     this.responseURL = nativeResponse.url;