@jsforce/jsforce-node 3.8.1 → 3.9.0

package/lib/VERSION.d.ts

@@ -1,2 +1,2 @@
-declare const _default: "3.8.1";
+declare const _default: "3.9.0";
 export default _default;

package/lib/VERSION.js

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

package/lib/connection.d.ts

@@ -267,6 +267,10 @@ export declare class Connection<S extends Schema = Schema> extends EventEmitter
     upsert<N extends SObjectNames<S>, InputRecord extends SObjectInputRecord<S, N> = SObjectInputRecord<S, N>, FieldNames extends SObjectFieldNames<S, N> = SObjectFieldNames<S, N>>(type: N, records: InputRecord[], extIdField: FieldNames, options?: DmlOptions): Promise<UpsertResult[]>;
     upsert<N extends SObjectNames<S>, InputRecord extends SObjectInputRecord<S, N> = SObjectInputRecord<S, N>, FieldNames extends SObjectFieldNames<S, N> = SObjectFieldNames<S, N>>(type: N, record: InputRecord, extIdField: FieldNames, options?: DmlOptions): Promise<UpsertResult>;
     upsert<N extends SObjectNames<S>, InputRecord extends SObjectInputRecord<S, N> = SObjectInputRecord<S, N>, FieldNames extends SObjectFieldNames<S, N> = SObjectFieldNames<S, N>>(type: N, records: InputRecord | InputRecord[], extIdField: FieldNames, options?: DmlOptions): Promise<UpsertResult | UpsertResult[]>;
+    /** @private */
+    _upsertMany(type: string, records: Record | Record[], extIdField: string, options?: DmlOptions): Promise<SaveResult | SaveResult[]>;
+    /** @private */
+    _upsertParallel(type: string, records: Record | Record[], extIdField: string, options?: DmlOptions): Promise<SaveResult | SaveResult[]>;
     /**
      * Delete records
      */

package/lib/connection.js

@@ -917,6 +917,51 @@ class Connection extends events_1.EventEmitter {
      * @param options
      */
     async upsert(type, records, extIdField, options = {}) {
+        return Array.isArray(records)
+            ? // check the version whether SObject collection API is supported (46.0)
+                this._ensureVersion(46)
+                    ? this._upsertMany(type, records, extIdField, options)
+                    : this._upsertParallel(type, records, extIdField, options)
+            : this._upsertParallel(type, records, extIdField, options);
+    }
+    /** @private */
+    async _upsertMany(type, records, extIdField, options = {}) {
+        if (records.length === 0) {
+            return [];
+        }
+        if (records.length > MAX_DML_COUNT && options.allowRecursive) {
+            return [
+                ...(await this._upsertMany(type, records.slice(0, MAX_DML_COUNT), extIdField, options)),
+                ...(await this._upsertMany(type, records.slice(MAX_DML_COUNT), extIdField, options)),
+            ];
+        }
+        const _records = records.map((recordItem) => {
+            const { [extIdField]: extId, type: recordType, attributes, ...rec } = recordItem;
+            const sobjectType = recordType || attributes?.type || type;
+            if (!extId) {
+                throw new Error('External ID is not found in record.');
+            }
+            if (!sobjectType) {
+                throw new Error('No SObject Type defined in record');
+            }
+            return { [extIdField]: extId, attributes: { type: sobjectType }, ...rec };
+        });
+        const url = [this._baseUrl(), 'composite', 'sobjects', type, extIdField].join('/');
+        return this.request({
+            method: 'PATCH',
+            url,
+            body: JSON.stringify({
+                allOrNone: options.allOrNone || false,
+                records: _records,
+            }),
+            headers: {
+                ...(options.headers || {}),
+                'content-type': 'application/json',
+            }
+        });
+    }
+    /** @private */
+    async _upsertParallel(type, records, extIdField, options = {}) {
         const isArray = Array.isArray(records);
         const _records = Array.isArray(records) ? records : [records];
         if (_records.length > this._maxRequest) {

package/lib/soap.js

@@ -11,6 +11,7 @@ exports.SOAP = exports.castTypeUsingSchema = void 0;
 const http_api_1 = __importDefault(require("./http-api"));
 const function_1 = require("./util/function");
 const get_body_size_1 = require("./util/get-body-size");
+const jwt_1 = require("./util/jwt");
 /**
  *
  */
@@ -180,6 +181,11 @@ class SOAP extends http_api_1.default {
     _xmlns;
     constructor(conn, options) {
         super(conn, options);
+        if (this._conn.accessToken && (0, jwt_1.isJWTToken)(this._conn.accessToken)) {
+            // We need to block SOAP requests with JWT tokens because the response is:
+            // statusCode=500 | body="INVALID_SESSION_ID" (xml), which triggers session refresh and enters in an infinite loop
+            throw new Error('SOAP API does not support JWT-based access tokens. You must disable the "Issue JSON Web Token (JWT)-based access tokens" setting in your Connected App or External Client App');
+        }
         this._endpointUrl = options.endpointUrl;
         this._xmlns = options.xmlns || 'urn:partner.soap.sforce.com';
     }

package/lib/util/jwt.d.ts

@@ -0,0 +1,7 @@
+/**
+ * Checks if a given access token is a JWT.
+ *
+ * @param {string} accessToken - The access token to check
+ * @returns {boolean} True if the token is a valid JWT token, false otherwise.
+ */
+export declare function isJWTToken(accessToken: string): boolean;

package/lib/util/jwt.js

@@ -0,0 +1,23 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.isJWTToken = void 0;
+/**
+ * Checks if a given access token is a JWT.
+ *
+ * @param {string} accessToken - The access token to check
+ * @returns {boolean} True if the token is a valid JWT token, false otherwise.
+ */
+function isJWTToken(accessToken) {
+    const parts = accessToken.split('.');
+    if (parts.length !== 3)
+        return false;
+    const header = parts[0];
+    try {
+        JSON.parse(atob(header));
+        return true;
+    }
+    catch (err) {
+        return false;
+    }
+}
+exports.isJWTToken = isJWTToken;

package/package.json

@@ -10,7 +10,7 @@
     "database.com"
   ],
   "homepage": "http://github.com/jsforce/jsforce",
-  "version": "3.8.1",
+  "version": "3.9.0",
   "repository": {
     "type": "git",
     "url": "git://github.com/jsforce/jsforce.git"