sfdx-hardis 6.2.1 → 6.3.1

package/CHANGELOG.md

@@ -4,6 +4,19 @@
 
 Note: Can be used with `sfdx plugins:install sfdx-hardis@beta` and docker image `hardisgroupcom/sfdx-hardis@beta`
 
+## [6.3.1] 2025-09-07
+
+- Update Grafana Home Dashboard to add Unsecure Connected Apps
+- Fix Auth configuration command for Dev Hub
+- Allow to use org shapes for scratch org creation with env variable **SCRATCH_ORG_SHAPE**
+- Replace `my.salesforce-setup.com` by `my.salesforce.com` when prompting instance URL 
+
+## [6.3.0] 2025-09-06
+
+- New command [hardis:org:diagnose:unsecure-connected-apps](https://sfdx-hardis.cloudity.com/hardis/org/diagnose/unsecure-connected-apps/) to detect Unsecured Connected Apps
+- Add documentation about Packages installation
+- Update Azure Pipelines integration documentation
+
 ## [6.2.1] 2025-09-04
 
 - [hardis:work:save](https://sfdx-hardis.cloudity.com/hardis/work/save/): Always display a button to create Merge Request

package/lib/commands/hardis/org/diagnose/unsecure-connected-apps.d.ts

@@ -0,0 +1,16 @@
+import { SfCommand } from '@salesforce/sf-plugins-core';
+import { AnyJson } from '@salesforce/ts-types';
+export default class UnsecuredConnectedApps extends SfCommand<any> {
+    static title: string;
+    static description: string;
+    static examples: string[];
+    static flags: any;
+    static requiresProject: boolean;
+    protected debugMode: boolean;
+    protected connectedAppResults: any[];
+    protected outputFile: any;
+    protected outputFilesRes: any;
+    protected outputFileConnectedApps: any;
+    protected outputFilesResConnectedApps: any;
+    run(): Promise<AnyJson>;
+}

package/lib/commands/hardis/org/diagnose/unsecure-connected-apps.js

@@ -0,0 +1,190 @@
+/* jscpd:ignore-start */
+import { SfCommand, Flags, requiredOrgFlagWithDeprecations } from '@salesforce/sf-plugins-core';
+import { Messages } from '@salesforce/core';
+import c from 'chalk';
+import { uxLog, uxLogTable } from '../../../../common/utils/index.js';
+import { soqlQuery } from '../../../../common/utils/apiUtils.js';
+import { generateCsvFile, generateReportPath } from '../../../../common/utils/filesUtils.js';
+import { getNotificationButtons, getOrgMarkdown } from '../../../../common/utils/notifUtils.js';
+import { NotifProvider } from '../../../../common/notifProvider/index.js';
+import { setConnectionVariables } from '../../../../common/utils/orgUtils.js';
+import { CONSTANTS } from '../../../../config/index.js';
+import { WebSocketClient } from '../../../../common/websocketClient.js';
+Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
+const messages = Messages.loadMessages('sfdx-hardis', 'org');
+export default class UnsecuredConnectedApps extends SfCommand {
+    static title = 'Detect Unsecured Connected Apps';
+    static description = `
+## Command Behavior
+
+**Detects unsecured Connected Apps in a Salesforce org and generates detailed reports for security analysis.**
+
+This command is a critical security diagnostic tool that helps administrators identify Connected Apps that may pose security risks due to improper configuration. It provides comprehensive analysis of OAuth tokens and Connected App security settings to ensure proper access control.
+
+Key functionalities:
+
+- **OAuth Token Analysis:** Queries all OAuth tokens in the org using SOQL to retrieve comprehensive token information including app names, users, authorization status, and usage statistics.
+- **Security Status Assessment:** Evaluates each Connected App's security configuration by checking the \`IsUsingAdminAuthorization\` flag to determine if admin pre-approval is required.
+- **Unsecured App Detection:** Identifies Connected Apps that allow users to authorize themselves without admin approval, which can pose security risks.
+- **Detailed Reporting:** Generates two comprehensive CSV reports:
+  - **OAuth Tokens Report:** Lists all OAuth tokens with security status, user information, and usage data
+  - **Connected Apps Summary:** Aggregates unsecured Connected Apps with counts of associated OAuth tokens
+- **Visual Indicators:** Uses status icons (❌ for unsecured, ✅ for secured) to provide immediate visual feedback on security status.
+- **Security Recommendations:** Provides actionable guidance on how to secure Connected Apps through proper configuration.
+- **Notifications:** Sends alerts to configured channels (Grafana, Slack, MS Teams) with security findings and attached reports.
+
+This command is part of [sfdx-hardis Monitoring](${CONSTANTS.DOC_URL_ROOT}/salesforce-monitoring-org-security/) and can output Grafana, Slack and MsTeams Notifications.
+
+<details markdown="1">
+<summary>Technical explanations</summary>
+
+The command's technical implementation involves:
+
+- **SOQL Query Execution:** Executes a comprehensive SOQL query on the \`OauthToken\` object, joining with \`AppMenuItem\` and \`User\` objects to gather complete security context.
+- **Security Analysis Logic:** Analyzes the \`AppMenuItem.IsUsingAdminAuthorization\` field to determine if a Connected App requires admin pre-approval for user authorization.
+- **Data Transformation:** Processes raw SOQL results to add security status indicators and reorganize data for optimal reporting and analysis.
+- **Aggregation Processing:** Groups OAuth tokens by Connected App name to provide summary statistics and identify the most problematic applications.
+- **Report Generation:** Uses \`generateCsvFile\` to create structured CSV reports with proper formatting and metadata for easy analysis and sharing.
+- **Notification Integration:** Integrates with the \`NotifProvider\` to send security alerts with detailed metrics, including the number of unsecured Connected Apps and associated OAuth tokens.
+- **File Management:** Generates multiple output formats (CSV, XLSX) and manages file paths using \`generateReportPath\` for consistent report organization.
+- **Connection Management:** Uses \`setConnectionVariables\` to ensure proper authentication context for notification providers that require org connection details.
+</details>
+`;
+    static examples = [
+        '$ sf hardis:org:diagnose:unsecure-connected-apps',
+    ];
+    static flags = {
+        outputfile: Flags.string({
+            char: 'f',
+            description: 'Force the path and name of output report file. Must end with .csv',
+        }),
+        debug: Flags.boolean({
+            char: 'd',
+            default: false,
+            description: messages.getMessage('debugMode'),
+        }),
+        websocket: Flags.string({
+            description: messages.getMessage('websocket'),
+        }),
+        skipauth: Flags.boolean({
+            description: 'Skip authentication check when a default username is required',
+        }),
+        'target-org': requiredOrgFlagWithDeprecations,
+    };
+    static requiresProject = false;
+    debugMode = false;
+    connectedAppResults = [];
+    outputFile;
+    outputFilesRes = {};
+    outputFileConnectedApps;
+    outputFilesResConnectedApps = {};
+    /* jscpd:ignore-end */
+    async run() {
+        const { flags } = await this.parse(UnsecuredConnectedApps);
+        this.debugMode = flags.debug || false;
+        this.outputFile = flags.outputfile || null;
+        const conn = flags['target-org'].getConnection();
+        // Collect all Connected Apps
+        uxLog("action", this, c.cyan(`Listing all OAuth Tokens from ${conn.instanceUrl} ...`));
+        const allOAuthTokenQuery = `SELECT AppName , AppMenuItem.IsUsingAdminAuthorization, LastUsedDate, CreatedDate, User.Name ,UseCount FROM OauthToken ORDER BY AppName ASC`;
+        const allOAuthTokenQueryRes = await soqlQuery(allOAuthTokenQuery, conn);
+        const allOAuthTokens = allOAuthTokenQueryRes.records;
+        const allOAuthTokensWithStatus = allOAuthTokens.map(app => {
+            const toAdd = {
+                AppName: app.AppName,
+                User: app.User ? app.User.Name : 'N/A',
+                IsUsingAdminAuthorization: app.AppMenuItem ? app.AppMenuItem.IsUsingAdminAuthorization : "N/A"
+            };
+            if (app.AppMenuItem && app.AppMenuItem.IsUsingAdminAuthorization === false) {
+                toAdd.statusIcon = '❌';
+                toAdd.status = 'Unsecured';
+            }
+            else {
+                toAdd.statusIcon = '✅';
+                toAdd.status = 'Secured';
+            }
+            delete app.attributes;
+            delete app.AppMenuItem;
+            delete app.User;
+            return Object.assign(toAdd, app);
+        });
+        // Generate output CSV file
+        this.outputFile = await generateReportPath('unsecured-oauth-tokens', this.outputFile);
+        this.outputFilesRes = await generateCsvFile(allOAuthTokensWithStatus, this.outputFile, { fileTitle: "Unsecured OAuth Tokens" });
+        const unsecuredOAuthTokens = allOAuthTokensWithStatus.filter(app => app.status === 'Unsecured');
+        // Display results
+        uxLog("action", this, `${unsecuredOAuthTokens.length} unsecured OAuth Tokens found.`);
+        uxLogTable(this, unsecuredOAuthTokens);
+        const uniqueUnsecuredAppNamesAndTokenNumber = {};
+        for (const app of unsecuredOAuthTokens) {
+            if (uniqueUnsecuredAppNamesAndTokenNumber[app.AppName]) {
+                uniqueUnsecuredAppNamesAndTokenNumber[app.AppName]++;
+            }
+            else {
+                uniqueUnsecuredAppNamesAndTokenNumber[app.AppName] = 1;
+            }
+        }
+        const uniqueUnsecuredAppNames = Object.keys(uniqueUnsecuredAppNamesAndTokenNumber);
+        const uniqueUnsecureConnectedAppsWithTokens = uniqueUnsecuredAppNames.map(appName => {
+            return {
+                AppName: appName,
+                NumberOfUnsecuredOAuthTokens: uniqueUnsecuredAppNamesAndTokenNumber[appName]
+            };
+        });
+        this.outputFileConnectedApps = await generateReportPath('unsecured-connected-apps', this.outputFileConnectedApps);
+        this.outputFilesResConnectedApps = await generateCsvFile(uniqueUnsecureConnectedAppsWithTokens, this.outputFileConnectedApps, { fileTitle: "Unsecured Connected Apps" });
+        if (uniqueUnsecuredAppNames.length > 0) {
+            uxLog("action", this, c.cyan(`${uniqueUnsecuredAppNames.length} unsecured Connected Apps found.`));
+            uxLogTable(this, uniqueUnsecureConnectedAppsWithTokens);
+            uxLog("warning", this, `You need to either block or secure these Connected Apps.
+To block a connected app, click on "Block"
+To secure a connected app:
+  - Install it if not installed
+  - Click on "Manage Policies"
+  - Set "Admin Users are pre-approved" then save
+  - Select profiles/permission sets allowed to access the connected app
+  - Users will then need to authenticate again`);
+        }
+        // Build notification
+        const numberWarnings = uniqueUnsecuredAppNames.length;
+        const orgMarkdown = await getOrgMarkdown(flags['target-org']?.getConnection()?.instanceUrl);
+        const notifButtons = await getNotificationButtons();
+        const notifSeverity = numberWarnings > 0 ? 'warning' : 'log';
+        const notifText = `${numberWarnings} Unsecured connected Apps have been found in ${orgMarkdown}`;
+        let notifDetailText = '';
+        for (const connectedApp of uniqueUnsecureConnectedAppsWithTokens) {
+            notifDetailText += `• *${connectedApp.AppName}* (${connectedApp.NumberOfUnsecuredOAuthTokens} OAuth Tokens)\n`;
+        }
+        const notifAttachments = [{ text: notifDetailText }];
+        // Post notif
+        await setConnectionVariables(flags['target-org']?.getConnection()); // Required for some notifications providers like Email
+        await NotifProvider.postNotifications({
+            type: 'UNSECURED_CONNECTED_APPS',
+            text: notifText,
+            attachments: notifAttachments,
+            buttons: notifButtons,
+            severity: notifSeverity,
+            attachedFiles: this.outputFileConnectedApps.xlsxFile ? [this.outputFileConnectedApps.xlsxFile] : [],
+            logElements: uniqueUnsecureConnectedAppsWithTokens,
+            data: { metric: numberWarnings },
+            metrics: {
+                UnsecuredConnectedApps: numberWarnings,
+            },
+        });
+        // Display link to Setup UI if there are issues
+        if (numberWarnings > 0) {
+            const OAuthUsageSetupUrl = `${conn.instanceUrl}/lightning/setup/ConnectedAppsUsage/home`;
+            WebSocketClient.sendReportFileMessage(OAuthUsageSetupUrl, 'Review OAuth Connected Apps', "actionUrl");
+        }
+        if ((this.argv || []).includes('unsecure-connected-apps')) {
+            process.exitCode = numberWarnings > 0 ? 1 : 0;
+        }
+        return {
+            status: numberWarnings === 0 ? 'success' : 'warning',
+            allOAuthTokensWithStatus: allOAuthTokensWithStatus,
+            unsecuredOAuthTokens: unsecuredOAuthTokens,
+            unsecuredConnectedApps: uniqueUnsecuredAppNames,
+        };
+    }
+}
+//# sourceMappingURL=unsecure-connected-apps.js.map

package/lib/commands/hardis/org/diagnose/unsecure-connected-apps.js.map

@@ -0,0 +1 @@
+{"version":3,"file":"unsecure-connected-apps.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/org/diagnose/unsecure-connected-apps.ts"],"names":[],"mappings":"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"}

package/lib/commands/hardis/org/monitor/all.js

@@ -87,6 +87,12 @@ export default class MonitorAll extends SfCommand {
             command: 'sf hardis:org:diagnose:unused-connected-apps',
             frequency: 'weekly',
         },
+        {
+            key: 'UNSECURED_CONNECTED_APPS',
+            title: 'Detect unsecured Connected Apps in an org',
+            command: 'sf hardis:org:diagnose:unsecure-connected-apps',
+            frequency: 'weekly',
+        },
         {
             key: 'METADATA_STATUS',
             title: 'Detect inactive metadata',

package/lib/commands/hardis/org/monitor/all.js.map

@@ -1 +1 @@
-{"version":3,"file":"all.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/org/monitor/all.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"all.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/org/monitor/all.ts"],"names":[],"mappings":"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"}

package/lib/commands/hardis/project/configure/auth.js

@@ -76,14 +76,14 @@ prompts
     async run() {
         const { flags } = await this.parse(ConfigureAuth);
         const devHub = flags.devhub || false;
-        uxLog("action", this, c.cyan("This command will configure the authentication between a git branch and a Salesforce org."));
+        uxLog("action", this, c.cyan(`This command will configure the authentication between a git branch and ${devHub ? "Dev Hub" : "a Salesforce org"}.`));
         // Ask user to login to org
         const prevUserName = devHub ? flags['target-dev-hub']?.getUsername() : flags['target-org']?.getUsername();
         await promptOrg(this, {
             setDefault: true,
             devHub: devHub,
-            promptMessage: 'Please select or login into the org you want to configure the SF CLI Authentication',
-            defaultOrgUsername: flags['target-org']?.getUsername(),
+            promptMessage: `Please select or login into ${devHub ? "your Dev Hub org" : "the org you want to configure the SF CLI Authentication"}`,
+            defaultOrgUsername: devHub ? flags['target-dev-hub']?.getUsername() : flags['target-org']?.getUsername(),
         });
         await checkConfig(this);
         // Check if the user has changed. If yes, ask to run the command again
@@ -125,12 +125,12 @@ prompts
             /* if (["main", "master"].includes(branchName)) {
               throw new SfError("You can not use main or master as deployment branch name. Maybe you want to use production ?");
             } */
-            instanceUrl = await promptInstanceUrl(['login', 'test'], `${branchName} related org`, {
-                instanceUrl: devHub
-                    ? flags['target-dev-hub']?.getConnection()?.instanceUrl || ""
-                    : flags['target-org']?.getConnection()?.instanceUrl || "",
-            });
         }
+        instanceUrl = await promptInstanceUrl(devHub ? ["login"] : ['login', "test"], devHub ? "Dev Hub  org" : `${branchName} related org`, {
+            instanceUrl: devHub
+                ? flags['target-dev-hub']?.getConnection()?.instanceUrl || ""
+                : flags['target-org']?.getConnection()?.instanceUrl || "",
+        });
         // Request merge targets
         if (!devHub) {
             let initialMergeTargets = [];
@@ -171,7 +171,22 @@ prompts
             placeholder: 'Ex: admin.sfdx@myclient.com',
         });
         if (devHub) {
+            if (!config.devHubAlias || config.devHubAlias === '') {
+                const devHubAliasResponse = await prompts({
+                    type: 'text',
+                    name: 'value',
+                    message: c.cyanBright('What is the alias you want to set for your Dev Hub ?'),
+                    description: 'Enter the alias for your Dev Hub',
+                    initial: config.projectName ? 'DevHub_' + config.projectName : 'DevHub',
+                    placeholder: 'Ex: MyCompany_DevHub',
+                });
+                config.devHubAlias = devHubAliasResponse.value;
+                await setConfig('project', {
+                    devHubAlias: config.devHubAlias,
+                });
+            }
             const configFile = await setConfig('project', {
+                devHubInstanceUrl: instanceUrl,
                 devHubUsername: usernameResponse.value,
             });
             WebSocketClient.sendReportFileMessage(configFile, 'Updated project config file', 'report');

package/lib/commands/hardis/project/configure/auth.js.map

@@ -1 +1 @@
-{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/project/configure/auth.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"auth.js","sourceRoot":"","sources":["../../../../../src/commands/hardis/project/configure/auth.ts"],"names":[],"mappings":"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"}

package/lib/commands/hardis/scratch/create.js

@@ -18,18 +18,54 @@ Messages.importMessagesDirectoryFromMetaUrl(import.meta.url);
 const messages = Messages.loadMessages('sfdx-hardis', 'org');
 export default class ScratchCreate extends SfCommand {
     static title = 'Create and initialize scratch org';
-    static description = `Create and initialize a scratch org or a source-tracked sandbox (config can be defined using \`config/.sfdx-hardis.yml\`):
+    static description = `
+## Command Behavior
 
-- **Install packages**
-  - Use property \`installedPackages\`
-- **Push sources**
-- **Assign permission sets**
-  - Use property \`initPermissionSets\`
-- **Run apex initialization scripts**
-  - Use property \`scratchOrgInitApexScripts\`
-- **Load data**
-  - Use property \`dataPackages\`
-  `;
+**Creates and fully initializes a Salesforce scratch org with complete development environment setup.**
+
+This command is a comprehensive scratch org provisioning tool that automates the entire process of creating, configuring, and initializing a Salesforce scratch org for development work. It handles everything from basic org creation to advanced configuration including package installation, metadata deployment, and data initialization.
+
+Key functionalities:
+
+- **Intelligent Org Management:** Automatically generates unique scratch org aliases based on username, git branch, and timestamp, with options to reuse existing orgs or force creation of new ones.
+- **Scratch Org Pool Integration:** Supports fetching pre-configured scratch orgs from pools for faster development cycles and CI/CD optimization.
+- **Custom Scratch Definition:** Dynamically builds project-scratch-def.json files with user-specific configurations including email, username patterns, and org shape settings (set variable **SCRATCH_ORG_SHAPE** to use org shapes).
+- **Package Installation:** Automatically installs all configured packages defined in \`installedPackages\` configuration property.
+- **Metadata Deployment:** Pushes source code and deploys metadata using optimized deployment strategies for scratch org environments.
+- **Permission Set Assignment:** Assigns specified permission sets defined in \`initPermissionSets\` configuration to the scratch org user.
+- **Apex Script Execution:** Runs custom Apex initialization scripts defined in \`scratchOrgInitApexScripts\` for org-specific setup.
+- **Data Loading:** Loads initial data using SFDMU data packages from \`dataPackages\` configuration for realistic development environments.
+- **User Configuration:** Automatically configures the scratch org admin user with proper names, email, country settings, and marketing user permissions.
+- **Password Generation:** Creates and stores secure passwords for easy scratch org access during development.
+- **CI/CD Integration:** Provides specialized handling for continuous integration environments including automated cleanup and pool management.
+- **Error Handling:** Comprehensive error recovery including scratch org cleanup on failure and detailed troubleshooting messages.
+
+The command configuration can be customized using:
+
+- \`config/.sfdx-hardis.yml\` file with properties like \`installedPackages\`, \`initPermissionSets\`, \`scratchOrgInitApexScripts\`, and \`dataPackages\`.
+- Environment variable **SCRATCH_ORG_SHAPE** with shape org id, if you want to use org shapes
+
+<details markdown="1">
+<summary>Technical explanations</summary>
+
+The command's technical implementation involves:
+
+- **Configuration Management:** Loads hierarchical configuration from \`.sfdx-hardis.yml\`, branch-specific, and user-specific configuration files using \`getConfig('user')\`.
+- **Alias Generation Logic:** Creates intelligent scratch org aliases using username, git branch, timestamp patterns with CI and pool prefixes for different environments.
+- **Scratch Org Definition Building:** Dynamically constructs \`project-scratch-def.json\` with user email, custom usernames, org shapes, and feature flags like StateAndCountryPicklist and MarketingUser.
+- **Pool Integration:** Implements scratch org pool fetching using \`fetchScratchOrg\` for rapid org provisioning in development and CI environments.
+- **Salesforce CLI Integration:** Executes \`sf org create scratch\` commands with proper parameter handling including wait times, duration, and dev hub targeting.
+- **Package Installation Pipeline:** Uses \`installPackages\` utility to install managed and unmanaged packages with dependency resolution and error handling.
+- **Metadata Deployment:** Leverages \`initOrgMetadatas\` for optimized source pushing and metadata deployment specific to scratch org environments.
+- **Permission Set Assignment:** Implements \`initPermissionSetAssignments\` for automated permission set assignment to scratch org users.
+- **Apex Script Execution:** Runs custom Apex initialization scripts using \`initApexScripts\` for org-specific configuration and setup.
+- **Data Loading Integration:** Uses SFDMU integration through \`initOrgData\` for comprehensive data loading from configured data packages.
+- **User Management:** Performs SOQL queries and DML operations to configure scratch org users with proper names, emails, country codes, and permission flags.
+- **Authentication Management:** Handles SFDX auth URL generation and storage for CI/CD environments and scratch org pool management.
+- **Error Recovery:** Implements comprehensive error handling with scratch org cleanup, pool management, and detailed error messaging for troubleshooting.
+- **WebSocket Integration:** Provides real-time status updates and file reporting through WebSocket connections for VS Code extension integration.
+</details>
+`;
     static examples = ['$ sf hardis:scratch:create'];
     // public static args = [{name: 'file'}];
     static flags = {
@@ -194,9 +230,14 @@ export default class ScratchCreate extends SfCommand {
         // Keep only first 15 and last 15 chars if scratch org alias is too long
         const aliasForUsername = this.scratchOrgAlias.length > 30 ? this.scratchOrgAlias.slice(0, 15) + this.scratchOrgAlias.slice(-15) : this.scratchOrgAlias;
         this.projectScratchDef.username = `${this.userEmail.split('@')[0].slice(0, 20)}@hardis-scratch-${aliasForUsername}.com`;
+        if (process.env.SCRATCH_ORG_SHAPE || this.configInfo.scratchOrgShape) {
+            this.projectScratchDef.sourceOrg = process.env.SCRATCH_ORG_SHAPE || this.configInfo.scratchOrgShape;
+        }
+        uxLog("log", this, c.grey("Project scratch def: \n" + JSON.stringify(this.projectScratchDef, null, 2)));
         const projectScratchDefLocal = `./config/user/project-scratch-def-${this.scratchOrgAlias}.json`;
         await fs.ensureDir(path.dirname(projectScratchDefLocal));
         await fs.writeFile(projectScratchDefLocal, JSON.stringify(this.projectScratchDef, null, 2));
+        WebSocketClient.sendReportFileMessage(projectScratchDefLocal, "Scratch Org definition", "report");
         // Check current scratch org
         const orgListResult = await execSfdxJson('sf org list', this);
         const hubOrgUsername = flags['target-dev-hub'].getUsername();
@@ -260,6 +301,10 @@ export default class ScratchCreate extends SfCommand {
             debug: this.debugMode,
         });
         await clearCache('sf org list');
+        if (!createResult || createResult.status !== 0 || !createResult.result) {
+            uxLog("error", this, this.buildScratchCreateErrorMessage(createResult));
+            throw new SfError('Scratch org creation failed');
+        }
         assert(createResult.status === 0 && createResult.result, this.buildScratchCreateErrorMessage(createResult));
         this.scratchOrgInfo = createResult.result;
         this.scratchOrgUsername = this.scratchOrgInfo.username;

package/lib/commands/hardis/scratch/create.js.map

@@ -1 +1 @@
-{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/hardis/scratch/create.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"create.js","sourceRoot":"","sources":["../../../../src/commands/hardis/scratch/create.ts"],"names":[],"mappings":"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"}

package/lib/common/notifProvider/index.d.ts

@@ -9,7 +9,7 @@ export declare abstract class NotifProvider {
 export type NotifSeverity = "critical" | "error" | "warning" | "info" | "success" | "log";
 export interface NotifMessage {
     text: string;
-    type: "ACTIVE_USERS" | "AUDIT_TRAIL" | "APEX_TESTS" | "BACKUP" | "DEPLOYMENT" | "LEGACY_API" | "LICENSES" | "LINT_ACCESS" | "UNUSED_METADATAS" | "METADATA_STATUS" | "MISSING_ATTRIBUTES" | "UNUSED_LICENSES" | "UNUSED_USERS" | "UNUSED_APEX_CLASSES" | "CONNECTED_APPS" | "ORG_INFO" | "ORG_LIMITS" | "RELEASE_UPDATES";
+    type: "ACTIVE_USERS" | "AUDIT_TRAIL" | "APEX_TESTS" | "BACKUP" | "DEPLOYMENT" | "LEGACY_API" | "LICENSES" | "LINT_ACCESS" | "UNUSED_METADATAS" | "METADATA_STATUS" | "MISSING_ATTRIBUTES" | "UNUSED_LICENSES" | "UNUSED_USERS" | "UNUSED_APEX_CLASSES" | "CONNECTED_APPS" | "UNSECURED_CONNECTED_APPS" | "ORG_INFO" | "ORG_LIMITS" | "RELEASE_UPDATES";
     buttons?: NotifButton[];
     attachments?: any[];
     severity: NotifSeverity;

package/lib/common/notifProvider/index.js.map

@@ -1 +1 @@
-{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/notifProvider/index.ts"],"names":[],"mappings":"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"}
+{"version":3,"file":"index.js","sourceRoot":"","sources":["../../../src/common/notifProvider/index.ts"],"names":[],"mappings":"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"}

package/lib/common/utils/index.js

@@ -203,7 +203,9 @@ export async function promptInstanceUrl(orgTypes = ['login', 'test'], alias = 'd
         description: 'Enter the custom Salesforce org URL for authentication',
         placeholder: 'Ex: https://myclient.my.salesforce.com',
     });
-    const urlCustom = (customUrlResponse?.value || "").replace('.lightning.force.com', '.my.salesforce.com');
+    const urlCustom = (customUrlResponse?.value || "")
+        .replace('.lightning.force.com', '.my.salesforce.com')
+        .replace('.my.salesforce-setup.com', '.my.salesforce.com');
     return urlCustom;
 }
 // Check if we are in a repo, or create it if missing