@jsforce/jsforce-node 3.2.2 → 3.2.4

package/README.md

@@ -60,6 +60,6 @@ See [DEVELOPING.md](./DEVELOPING.md)
 
 Your contributions are welcome: both by reporting issues on [GitHub issues](https://github.com/jsforce/jsforce/issues) or pull-requesting patches.
 
-If you want to implement any additional features, to be added to JSforce to our master branch, which may or may not be merged please first check current [opening issues](https://github.com/jsforce/jsforce/issues?q=is%3Aopen) with milestones and confirm whether the feature is on road map or not.
+If you want to implement any additional features, to be added to JSforce to our main branch, which may or may not be merged please first check current [opening issues](https://github.com/jsforce/jsforce/issues?q=is%3Aopen) with milestones and confirm whether the feature is on road map or not.
 
 If your feature implementation is brand-new or fixing unsupposed bugs in the library's test cases, please include additional test codes in the `test/` directory.

package/lib/VERSION.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "3.2.2";
+declare const _default: "3.2.4";
 export default _default;

package/lib/VERSION.js

@@ -1,3 +1,3 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-exports.default = '3.2.2';
+exports.default = '3.2.4';

package/lib/http-api.js

@@ -247,7 +247,7 @@ class HttpApi extends events_1.EventEmitter {
         if (errors.Errors) {
             return errors.Errors.Error;
         }
-        return Array.isArray(errors) ? errors[0] : errors;
+        return errors;
     }
     /**
      * Get error message in response
@@ -261,6 +261,15 @@ class HttpApi extends events_1.EventEmitter {
         catch (e) {
             // eslint-disable no-empty
         }
+        if (Array.isArray(error)) {
+            if (error.length === 1) {
+                error = error[0];
+            }
+            else {
+                return new HttpApiError(`Multiple errors returned.
+  Check \`error.data\` for the error details`, 'MULTIPLE_API_ERRORS', error);
+            }
+        }
         error =
             typeof error === 'object' &&
                 error !== null &&
@@ -274,9 +283,9 @@ class HttpApi extends events_1.EventEmitter {
             this._logger.debug(`html response.body: ${response.body}`);
             return new HttpApiError(`HTTP response contains html content.
 Check that the org exists and can be reached.
-See error.content for the full html response.`, error.errorCode, error.message);
+See \`error.data\` for the full html response.`, error.errorCode, error.message);
         }
-        return new HttpApiError(error.message, error.errorCode);
+        return error instanceof HttpApiError ? error : new HttpApiError(error.message, error.errorCode, error);
     }
 }
 exports.HttpApi = HttpApi;
@@ -284,13 +293,24 @@ exports.HttpApi = HttpApi;
  *
  */
 class HttpApiError extends Error {
+    /**
+     * This contains error-specific details, usually returned from the API.
+     */
+    data;
     errorCode;
-    content;
-    constructor(message, errorCode, content) {
+    constructor(message, errorCode, data) {
         super(message);
         this.name = errorCode || this.name;
         this.errorCode = this.name;
-        this.content = content;
+        this.data = data;
+    }
+    /**
+     * This will be removed in the next major (v4)
+     *
+     * @deprecated use `error.data` instead
+     */
+    get content() {
+        return this.data;
     }
 }
 exports.default = HttpApi;

package/lib/oauth2.js

@@ -72,10 +72,11 @@ class OAuth2 {
                 revokeServiceUrl || `${this.loginUrl}/services/oauth2/revoke`;
         }
         else {
-            this.loginUrl = loginUrl || defaultOAuth2Config.loginUrl;
-            this.authzServiceUrl = `${this.loginUrl}/services/oauth2/authorize`;
-            this.tokenServiceUrl = `${this.loginUrl}/services/oauth2/token`;
-            this.revokeServiceUrl = `${this.loginUrl}/services/oauth2/revoke`;
+            const loginUrlObject = new URL(loginUrl || defaultOAuth2Config.loginUrl);
+            this.loginUrl = loginUrlObject.href;
+            this.authzServiceUrl = `${loginUrlObject.origin}/services/oauth2/authorize`;
+            this.tokenServiceUrl = `${loginUrlObject.origin}/services/oauth2/token`;
+            this.revokeServiceUrl = `${loginUrlObject.origin}/services/oauth2/revoke`;
         }
         this.clientId = clientId;
         this.clientSecret = clientSecret;

package/package.json

@@ -10,7 +10,7 @@
     "database.com"
   ],
   "homepage": "http://github.com/jsforce/jsforce",
-  "version": "3.2.2",
+  "version": "3.2.4",
   "repository": {
     "type": "git",
     "url": "git://github.com/jsforce/jsforce.git"
@@ -19,7 +19,7 @@
   "licenses": [
     {
       "type": "MIT",
-      "url": "http://github.com/jsforce/jsforce/raw/master/LICENSE"
+      "url": "http://github.com/jsforce/jsforce/raw/main/LICENSE"
     }
   ],
   "main": "./index",