fix(http): return xhr response headers case insensitive

ionic-team · Sep 21, 2023 · 687b6b1 · 687b6b1
1 parent f9be9f5
commit 687b6b1
Show file tree

Hide file tree

Showing 3 changed files with 23 additions and 8 deletions.
diff --git a/android/capacitor/src/main/assets/native-bridge.js b/android/capacitor/src/main/assets/native-bridge.js
@@ -595,7 +595,7 @@ var nativeBridge = (function (exports) {
                                             }
                                             else if (this.responseType === 'blob') {
                                                 this.response = new Blob([responseString], {
-                                                    type: "application/json",
+                                                    type: 'application/json',
                                                 });
                                             }
                                             else if (this.responseType === 'arraybuffer') {
@@ -668,7 +668,7 @@ var nativeBridge = (function (exports) {
                             }
                             let returnString = '';
                             for (const key in this._headers) {
-                                if (key != 'Set-Cookie') {
+                                if (key.toLowerCase() !== 'set-cookie') {
                                     returnString += key + ': ' + this._headers[key] + '\r\n';
                                 }
                             }
@@ -679,7 +679,12 @@ var nativeBridge = (function (exports) {
                             if (isRelativeURL(this._url)) {
                                 return win.CapacitorWebXMLHttpRequest.getResponseHeader.call(this, name);
                             }
-                            return this._headers[name];
+                            for (const key in this._headers) {
+                                if (key.toLowerCase() === name.toLowerCase()) {
+                                    return this._headers[key];
+                                }
+                            }
+                            return null;
                         };
                         Object.setPrototypeOf(xhr, prototype);
                         return xhr;

diff --git a/core/native-bridge.ts b/core/native-bridge.ts
@@ -787,7 +787,7 @@ const initBridge = (w: any): void => {
 
             let returnString = '';
             for (const key in this._headers) {
-              if (key != 'Set-Cookie') {
+              if (key.toLowerCase() !== 'set-cookie') {
                 returnString += key + ': ' + this._headers[key] + '\r\n';
               }
             }
@@ -802,7 +802,12 @@ const initBridge = (w: any): void => {
                 name,
               );
             }
-            return this._headers[name];
+            for (const key in this._headers) {
+              if (key.toLowerCase() === name.toLowerCase()) {
+                return this._headers[key];
+              }
+            }
+            return null;
           };
 
           Object.setPrototypeOf(xhr, prototype);

diff --git a/ios/Capacitor/Capacitor/assets/native-bridge.js b/ios/Capacitor/Capacitor/assets/native-bridge.js
@@ -595,7 +595,7 @@ var nativeBridge = (function (exports) {
                                             }
                                             else if (this.responseType === 'blob') {
                                                 this.response = new Blob([responseString], {
-                                                    type: "application/json",
+                                                    type: 'application/json',
                                                 });
                                             }
                                             else if (this.responseType === 'arraybuffer') {
@@ -668,7 +668,7 @@ var nativeBridge = (function (exports) {
                             }
                             let returnString = '';
                             for (const key in this._headers) {
-                                if (key != 'Set-Cookie') {
+                                if (key.toLowerCase() !== 'set-cookie') {
                                     returnString += key + ': ' + this._headers[key] + '\r\n';
                                 }
                             }
@@ -679,7 +679,12 @@ var nativeBridge = (function (exports) {
                             if (isRelativeURL(this._url)) {
                                 return win.CapacitorWebXMLHttpRequest.getResponseHeader.call(this, name);
                             }
-                            return this._headers[name];
+                            for (const key in this._headers) {
+                                if (key.toLowerCase() === name.toLowerCase()) {
+                                    return this._headers[key];
+                                }
+                            }
+                            return null;
                         };
                         Object.setPrototypeOf(xhr, prototype);
                         return xhr;