🐛 fixed response data as JSON (#140)

* fixed issue invalid json response body at https://appleid.apple.com/auth/revoke

* fixed issue invalid json response body at https://appleid.apple.com/auth/revoke

* fixed issue invalid json response body at https://appleid.apple.com/auth/revoke

* populate response as json if can be

* - populate response data as json if not empty
- add test case for each functions

Co-authored-by: Anh Nguyen <anh.nguyen@kilo.vn>

__tests__/index.test.js

@@ -35,3 +35,58 @@ describe('appleSignin test', () => {
     expect(_getApplePublicKeys).toBeTruthy();
   });
 });
+
+describe('test for each functions', () => {
+  describe('test revokeAuthorizationToken functions', () => {
+    const token = 'test token';
+    const option = {
+      clientID: 'clientID',
+      clientSecret: 'clientSecret',
+      tokenHintType: 'refresh_token',
+    };
+    it('Should not throw error when response is empty', async () => {
+      const result = await appleSignin.revokeAuthorizationToken(token, option);
+      expect(result).toEqual('');
+    });
+  });
+
+  describe('test getAuthorizationToken functions', () => {
+    const code = 'test code';
+    const option = {
+      clientID: 'clientID',
+      clientSecret: 'clientSecret',
+      tokenHintType: 'refresh_token',
+    };
+    it('Should not throw error when response is empty', async () => {
+      const result = await appleSignin.getAuthorizationToken(code, option);
+      expect(result).toEqual({
+        error: 'invalid_client',
+      });
+    });
+  });
+
+  describe('test refreshAuthorizationToken functions', () => {
+    const refreshToken = 'test refreshToken';
+    const option = {
+      clientID: 'clientID',
+      clientSecret: 'clientSecret',
+      tokenHintType: 'refresh_token',
+    };
+    it('Should not throw error when response is empty', async () => {
+      const result = await appleSignin.refreshAuthorizationToken(
+        refreshToken,
+        option,
+      );
+      expect(result).toEqual({
+        error: 'invalid_client',
+      });
+    });
+  });
+
+  describe('test _getApplePublicKeys functions', () => {
+    it('Should not throw error when response is empty', async () => {
+      const result = await appleSignin._getApplePublicKeys();
+      expect(result).not.toBeNull();
+    });
+  });
+});

package.json

@@ -1,6 +1,6 @@
 {
   "name": "apple-signin-auth",
-  "version": "1.7.2",
+  "version": "1.7.3",
   "description": " Apple signin for node.",
   "author": {
     "name": "Ahmed Tarek",

src/index.js

@@ -193,8 +193,13 @@ const getClientSecret = (
  *
  * populate response as json if can be
  */
-const _populateDResAsJson = (res) =>
-  typeof res?.json === 'function' ? res.json() : res;
+const _populateResAsJson = async (res) => {
+  const data = await res.text();
+  if (!data) {
+    return data;
+  }
+  return JSON.parse(data);
+};
 
 /** Gets an Apple authorization token */
 const getAuthorizationToken = async (
@@ -228,7 +233,7 @@ const getAuthorizationToken = async (
   return fetch(url.toString(), {
     method: 'POST',
     body: params,
-  }).then((res) => _populateDResAsJson(res));
+  }).then((res) => _populateResAsJson(res));
 };
 
 /** Refreshes an Apple authorization token */
@@ -258,7 +263,7 @@ const refreshAuthorizationToken = async (
   return fetch(url.toString(), {
     method: 'POST',
     body: params,
-  }).then((res) => _populateDResAsJson(res));
+  }).then((res) => _populateResAsJson(res));
 };
 
 /** Revoke Apple authorization token */
@@ -286,10 +291,12 @@ const revokeAuthorizationToken = async (
   params.append('token', token);
   params.append('token_hint_type', options.tokenHintType);
 
-  return fetch(url.toString(), {
+  const result = await fetch(url.toString(), {
     method: 'POST',
     body: params,
-  }).then((res) => _populateDResAsJson(res));
+  });
+
+  return _populateResAsJson(result);
 };
 
 /** Gets an Array of Apple Public Keys that can be used to decode Apple's id tokens */
@@ -305,7 +312,7 @@ const _getApplePublicKeys = async ({
     headers: {
       'Content-Type': 'application/json',
     },
-  }).then((res) => _populateDResAsJson(res));
+  }).then((res) => _populateResAsJson(res));
 
   // Reset cache - will be refilled below
   APPLE_KEYS_CACHE = {};