@salesforce/core 2.33.2 → 2.35.1

package/CHANGELOG.md

@@ -2,6 +2,22 @@
 
 All notable changes to this project will be documented in this file. See [standard-version](https://github.com/conventional-changelog/standard-version) for commit guidelines.
 
+### [2.35.1](https://github.com/forcedotcom/sfdx-core/compare/v2.35.0...v2.35.1) (2022-02-10)
+
+### Bug Fixes
+
+- add error message on failed settings deploy ([e218b1e](https://github.com/forcedotcom/sfdx-core/commit/e218b1e40414ea9e4fec256b74224626d96eff4a))
+- prefer instanceUrl for loginUrl on user:create ([#518](https://github.com/forcedotcom/sfdx-core/issues/518)) ([c070a87](https://github.com/forcedotcom/sfdx-core/commit/c070a871861409dea722e85845eeb91f262ab66f))
+
+## [2.35.0](https://github.com/forcedotcom/sfdx-core/compare/v2.34.2...v2.35.0) (2022-01-25)
+
+### Bug Fixes
+
+- jsforce dep and pjson version realign ([#516](https://github.com/forcedotcom/sfdx-core/issues/516)) ([9f35f2f](https://github.com/forcedotcom/sfdx-core/commit/9f35f2f0ce30e996a0b4c88461c2babb536c33f7))
+- refresh auth on a connection, too ([ff32a70](https://github.com/forcedotcom/sfdx-core/commit/ff32a705d87d6e410d06597eefa407b54eeb215d))
+
+### [2.34.2](https://github.com/forcedotcom/sfdx-core/compare/v2.33.2...v2.34.2) (2022-01-25)
+
 ### [2.33.2](https://github.com/forcedotcom/sfdx-core/compare/v2.33.1...v2.33.2) (2022-01-25)
 
 ### Bug Fixes

package/lib/connection.d.ts

@@ -173,6 +173,11 @@ export declare class Connection extends JSForceConnection {
      * @param options The query options.
      */
     singleRecordQuery<T>(soql: string, options?: SingleRecordQueryOptions): Promise<T>;
+    /**
+     * Executes a get request on the baseUrl to force an auth refresh
+     * Useful for the raw methods (request, requestRaw) that use the accessToken directly and don't handle refreshes
+     */
+    refreshAuth(): Promise<void>;
     private loadInstanceApiVersion;
 }
 export declare const SingleRecordQueryErrors: {

package/lib/connection.js

@@ -127,6 +127,8 @@ class Connection extends jsforce_1.Connection {
         delete options.rest;
         if (rest) {
             this.logger.debug('deploy with REST');
+            // do a quick auth refresh because the raw transport used doesn't handle expired AccessTokens
+            await this.refreshAuth();
             const headers = {
                 Authorization: this && `OAuth ${this.accessToken}`,
                 clientId: this.oauth2 && this.oauth2.clientId,
@@ -182,6 +184,7 @@ class Connection extends jsforce_1.Connection {
      * @param request HTTP request object or URL to GET request.
      */
     async requestRaw(request) {
+        await this.refreshAuth();
         const headers = this.accessToken ? { Authorization: `Bearer ${this.accessToken}` } : {};
         kit_1.merge(headers, exports.SFDX_HTTP_HEADERS, request.headers);
         return this._transport.httpRequest({
@@ -389,6 +392,18 @@ class Connection extends jsforce_1.Connection {
         }
         return result.records[0];
     }
+    /**
+     * Executes a get request on the baseUrl to force an auth refresh
+     * Useful for the raw methods (request, requestRaw) that use the accessToken directly and don't handle refreshes
+     */
+    async refreshAuth() {
+        this.logger.debug('Refreshing auth for org.');
+        const requestInfo = {
+            url: this.baseUrl(),
+            method: 'GET',
+        };
+        await this.request(requestInfo);
+    }
     async loadInstanceApiVersion() {
         const authFileFields = this.options.authInfo.getFields();
         const lastCheckedDateString = authFileFields.instanceApiVersionLastRetrieved;

package/lib/org.js

@@ -306,13 +306,8 @@ class Org extends kit_1.AsyncCreatable {
      * Refreshes the auth for this org's instance by calling HTTP GET on the baseUrl of the connection object.
      */
     async refreshAuth() {
-        this.logger.debug('Refreshing auth for org.');
-        const requestInfo = {
-            url: this.getConnection().baseUrl(),
-            method: 'GET',
-        };
         const conn = this.getConnection();
-        await conn.request(requestInfo);
+        await conn.refreshAuth();
     }
     /**
      * Reads and returns the content of all user auth files for this org as an array.

package/lib/scratchOrgSettingsGenerator.js

@@ -7,9 +7,7 @@
  */
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.RequestStatus = void 0;
-// Node
 const path = require("path");
-// @salesforce
 const kit_1 = require("@salesforce/kit");
 const ts_types_1 = require("@salesforce/ts-types");
 const js2xmlparser = require("js2xmlparser");
@@ -77,7 +75,7 @@ class SettingsGenerator {
         const pollingOptions = {
             async poll() {
                 try {
-                    result = await connection.metadata.checkDeployStatus(id);
+                    result = await connection.metadata.checkDeployStatus(id, true);
                     logger.debug(`Deploy id: ${id} status: ${result.status}`);
                     if (breakPolling.includes(result.status)) {
                         return {
@@ -105,7 +103,11 @@ class SettingsGenerator {
         const client = await pollingClient_1.PollingClient.create(pollingOptions);
         const status = (await client.subscribe());
         if (status !== RequestStatus.Succeeded) {
-            const error = new sfdxError_1.SfdxError(`A scratch org was created with username ${username}, but the settings failed to deploy`, 'ProblemDeployingSettings');
+            const componentFailures = ts_types_1.ensureObject(result.details).componentFailures;
+            const failures = (Array.isArray(componentFailures) ? componentFailures : [componentFailures])
+                .map((failure) => failure.problem)
+                .join('\n');
+            const error = new sfdxError_1.SfdxError(`A scratch org was created with username ${username}, but the settings failed to deploy due to: \n${failures}`, 'ProblemDeployingSettings');
             error.setData(result);
             throw error;
         }

package/lib/user.js

@@ -280,6 +280,7 @@ class User extends kit_1.AsyncCreatable {
      * ```
      */
     async createUser(fields) {
+        var _a;
         // Create a user and get a refresh token
         const refreshTokenSecret = await this.createUserInternal(fields);
         // Create the initial auth info
@@ -287,7 +288,8 @@ class User extends kit_1.AsyncCreatable {
         const adminUserAuthFields = authInfo.getFields(true);
         // Setup oauth options for the new user
         const oauthOptions = {
-            loginUrl: adminUserAuthFields.loginUrl,
+            // Communities users require the instance for auth
+            loginUrl: (_a = adminUserAuthFields.instanceUrl) !== null && _a !== void 0 ? _a : adminUserAuthFields.loginUrl,
             refreshToken: refreshTokenSecret.buffer.value((buffer) => buffer.toString('utf8')),
             clientId: adminUserAuthFields.clientId,
             clientSecret: adminUserAuthFields.clientSecret,

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@salesforce/core",
-  "version": "2.33.2",
+  "version": "2.35.1",
   "description": "Core libraries to interact with SFDX projects, orgs, and APIs.",
   "main": "lib/exported",
   "types": "lib/exported.d.ts",
@@ -39,6 +39,7 @@
     "@salesforce/schemas": "^1.0.1",
     "@salesforce/ts-types": "^1.5.20",
     "@types/graceful-fs": "^4.1.5",
+    "@types/jsforce": "^1.9.38",
     "@types/mkdirp": "^1.0.1",
     "archiver": "^5.3.0",
     "debug": "^3.1.0",
@@ -60,7 +61,6 @@
     "@types/archiver": "^5.1.1",
     "@types/debug": "0.0.30",
     "@types/jsen": "0.0.19",
-    "@types/jsforce": "^1.9.38",
     "@types/jsonwebtoken": "8.3.2",
     "@types/semver": "^7.3.9",
     "@types/shelljs": "0.7.8",
@@ -82,7 +82,7 @@
     "nyc": "^15.1.0",
     "prettier": "^2.0.5",
     "pretty-quick": "^3.1.0",
-    "shelljs": "0.8.1",
+    "shelljs": "0.8.5",
     "sinon": "10.0.0",
     "ts-node": "^10.0.0",
     "typescript": "^4.1.3"