Merge pull request #174 from intuit/release-4.1.3

Fixed issue: #171
intuit · Nov 6, 2024 · caf8831 · caf8831
2 parents d6c2f73 + 110759d
commit caf8831
Show file tree

Hide file tree

Showing 4 changed files with 18 additions and 9 deletions.
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -1,5 +1,14 @@
 # Changelog
 
+## [4.1.3](https://github.com/intuit/oauth-jsclient/tree/4.1.3)
+#### Features 
+- None
+#### Issues Fixed
+- [minor fixes OAuthClient.js](https://github.com/intuit/oauth-jsclient/pull/171)
+
+## [4.1.2](https://github.com/intuit/oauth-jsclient/tree/4.1.2)
+#### Issues Fixed
+- [fixed Error converting authResponse to JSON string](https://github.com/intuit/oauth-jsclient/pull/165)
 
 ## [4.1.1](https://github.com/intuit/oauth-jsclient/tree/4.1.1)
 #### Features 

diff --git a/package.json b/package.json
@@ -1,6 +1,6 @@
 {
   "name": "intuit-oauth",
-  "version": "4.1.2",
+  "version": "4.1.3",
   "description": "Intuit Node.js client for OAuth2.0 and OpenIDConnect",
   "main": "./src/OAuthClient.js",
   "scripts": {

diff --git a/sample/app.js b/sample/app.js
@@ -59,7 +59,7 @@ app.get('/authUri', urlencodedParser, function (req, res) {
   });
 
   const authUri = oauthClient.authorizeUri({
-    scope: [OAuthClient.scopes.Accounting],
+    scope: [OAuthClient.scopes.Accounting, OAuthClient.scopes.OpenId, OAuthClient.scopes.Profile, OAuthClient.scopes.Email],
     state: 'intuit-test',
   });
   res.send(authUri);

diff --git a/src/OAuthClient.js b/src/OAuthClient.js
@@ -182,10 +182,10 @@ OAuthClient.prototype.createToken = function createToken(uri) {
     resolve(this.getTokenRequest(request));
   })
     .then((res) => {
-      const authResponse = res.json ? res : null;
+      const authResponse = res.hasOwnProperty('json')? res : null;
       const json = (authResponse && authResponse.json) || res;
       this.token.setToken(json);
-       this.log('info', 'Create Token response is : ', JSON.stringify(authResponse && authResponse.json, null, 2));
+      this.log('info', 'Create Token response is : ', JSON.stringify(authResponse && authResponse.json, null, 2));
       return authResponse;
     })
     .catch((e) => {
@@ -223,7 +223,7 @@ OAuthClient.prototype.refresh = function refresh() {
     resolve(this.getTokenRequest(request));
   })
     .then((res) => {
-      const authResponse = res.json ? res : null;
+      const authResponse = res.hasOwnProperty('json')? res : null;
       const json = (authResponse && authResponse.json) || res;
       this.token.setToken(json);
       this.log('info', 'Refresh Token () response is : ', JSON.stringify(authResponse && authResponse.json, null, 2));
@@ -265,7 +265,7 @@ OAuthClient.prototype.refreshUsingToken = function refreshUsingToken(refresh_tok
     resolve(this.getTokenRequest(request));
   })
     .then((res) => {
-      const authResponse = res.json ? res : null;
+      const authResponse = res.hasOwnProperty('json')? res : null;
       const json = (authResponse && authResponse.json) || res;
       this.token.setToken(json);
       this.log(
@@ -315,7 +315,7 @@ OAuthClient.prototype.revoke = function revoke(params) {
     resolve(this.getTokenRequest(request));
   })
     .then((res) => {
-      const authResponse = res.json ? res : null;
+      const authResponse = res.hasOwnProperty('json')? res : null;
       this.token.clearToken();
       this.log('info', 'Revoke Token () response is : ', JSON.stringify(authResponse && authResponse.json, null, 2));
       return authResponse;
@@ -349,7 +349,7 @@ OAuthClient.prototype.getUserInfo = function getUserInfo() {
     resolve(this.getTokenRequest(request));
   })
     .then((res) => {
-      const authResponse = res.json ? res : null;
+      const authResponse = res.hasOwnProperty('json')? res : null;
       this.log(
         'info',
         'The Get User Info () response is : ', JSON.stringify(authResponse && authResponse.json, null, 2),
@@ -456,7 +456,7 @@ OAuthClient.prototype.validateIdToken = function validateIdToken(params = {}) {
     return resolve(this.getKeyFromJWKsURI(id_token, id_token_header.kid, request));
   })
     .then((res) => {
-      this.log('info', 'The validateIdToken () response is : ', JSON.stringify(res, null, 2));
+      this.log('info', 'The validateIdToken () response is :', JSON.stringify(res, null, 2));
       if (res) return true;
       return false;
     })