sfdx-hardis 7.4.0 → 7.5.0

package/defaults/monitoring/.github/workflows/org-monitoring.yml

@@ -194,7 +194,7 @@ jobs:
           NOTIF_API_METRICS_BASIC_AUTH_PASSWORD: ${{ secrets.NOTIF_API_METRICS_BASIC_AUTH_PASSWORD }}
         run: |
           echo "Run apex tests against \"$CONFIG_BRANCH\""
-          git pull origin ${{ matrix.branch }}
+          git pull origin ${{ matrix.branch }} || echo "Issue when pulling latest branch state, but that should be ok"
           sf hardis:auth:login
           sf hardis:org:test:apex
 
@@ -236,7 +236,7 @@ jobs:
           persist-credentials: true
 
       - name: Git pull
-        run: git pull origin ${{ matrix.branch }}
+        run: git pull origin ${{ matrix.branch }} || echo "Issue when pulling latest branch state, but that should be ok"
 
       # Mega-Linter
       - name: Mega-Linter
@@ -335,7 +335,7 @@ jobs:
 
         run: |
           echo "Run Monitoring checks against \"$CONFIG_BRANCH\""
-          git pull origin ${{ matrix.branch }}
+          git pull origin ${{ matrix.branch }} || echo "Issue when pulling latest branch state, but that should be ok"
           sf hardis:auth:login
           sf hardis:org:monitor:all
 

package/defaults/monitoring/.gitlab-ci.yml

@@ -77,7 +77,7 @@ monitoring_tools:
   before_script:
     - git config --global user.name "${GITLAB_USER_NAME}"
     - git config --global user.email "${GITLAB_USER_EMAIL}"
-    - git pull origin "${CI_COMMIT_REF_NAME}"
+    - git pull origin "${CI_COMMIT_REF_NAME}" || echo "Issue when pulling latest branch state, but that should be ok"
   script:
     # Login & run apex tests
     - sf hardis:auth:login
@@ -102,7 +102,7 @@ megalinter:
   before_script:
     - git config --global user.name "${GITLAB_USER_NAME}"
     - git config --global user.email "${GITLAB_USER_EMAIL}"
-    - git pull origin "${CI_COMMIT_REF_NAME}"
+    - git pull origin "${CI_COMMIT_REF_NAME}" || echo "Issue when pulling latest branch state, but that should be ok"
   variables:
     # All available variables are described in documentation
     # https://megalinter.io/latest/config-file/

package/defaults/monitoring/azure-pipelines.yml

@@ -143,7 +143,7 @@ jobs:
         displayName: Install @salesforce/cli & sfdx-hardis
 
       - script: |
-          git pull origin "${BRANCH_NAME}"
+          git pull origin "${BRANCH_NAME}" || echo "Issue when pulling latest branch state, but that should be ok"
         displayName: Pull git branch latest commit
         env:
           CI: "true"
@@ -206,7 +206,7 @@ jobs:
       - script: |
           git config --global user.email "contact@cloudity.com"
           git config --global user.name "sfdx-hardis monitoring"
-          git pull origin "${BRANCH_NAME}"
+          git pull origin "${BRANCH_NAME}" || echo "Issue when pulling latest branch state, but that should be ok"
         workingDirectory: $(System.DefaultWorkingDirectory)
         displayName: Git config & pull latest commit
 
@@ -262,7 +262,7 @@ jobs:
       - script: |
           git config --global user.email "contact@cloudity.com"
           git config --global user.name "sfdx-hardis monitoring"
-          git pull origin "${BRANCH_NAME}"
+          git pull origin "${BRANCH_NAME}" || echo "Issue when pulling latest branch state, but that should be ok"
         displayName: Pull git branch latest commit
         env:
           CI: "true"

package/defaults/monitoring/bitbucket-pipelines.yml

@@ -61,7 +61,7 @@ pipelines:
               - export ORG_ALIAS=$BRANCH_NAME
               - export FORCE_COLOR=1
               # Get latest commit of the branch
-              - git pull origin "${BRANCH_NAME}"
+              - git pull origin "${BRANCH_NAME}" || echo "Issue when pulling latest branch state, but that should be ok"
               # Login
               - sf hardis:auth:login
               # Apex tests
@@ -79,7 +79,7 @@ pipelines:
             script:
               # Get latest commit of the branch
               - export BRANCH_NAME=$(echo "$BITBUCKET_BRANCH" | sed 's/refs\/heads\///')
-              - git pull origin "${BRANCH_NAME}"
+              - git pull origin "${BRANCH_NAME}" || echo "Issue when pulling latest branch state, but that should be ok"
               - export DEFAULT_WORKSPACE=$BITBUCKET_CLONE_DIR && bash /entrypoint.sh
             artifacts:
               - megalinter-reports/**
@@ -100,7 +100,7 @@ pipelines:
               - export ORG_ALIAS=$BRANCH_NAME
               - export FORCE_COLOR=1
               # Get latest commit of the branch
-              - git pull origin "${BRANCH_NAME}"
+              - git pull origin "${BRANCH_NAME}" || echo "Issue when pulling latest branch state, but that should be ok"
               # Login
               - sf hardis:auth:login
               # Other monitoring tools

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

@@ -14,4 +14,5 @@ export default class UnsecuredConnectedApps extends SfCommand<any> {
     protected outputFileConnectedApps: any;
     protected outputFilesResConnectedApps: any;
     run(): Promise<AnyJson>;
+    private revokeOAuthTokens;
 }

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

@@ -20,22 +20,25 @@ export default class UnsecuredConnectedApps extends SfCommand {
     static description = `
 ## Command Behavior
 
-**Detects unsecured Connected Apps in a Salesforce org and generates detailed reports for security analysis.**
+**Detects unsecured Connected Apps and External Client 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.
+This command is a critical security diagnostic tool that helps administrators identify Connected Apps and External Client Apps that may pose security risks due to improper OAuth authorization configuration. It provides comprehensive analysis of OAuth tokens and 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.
-- **Ignore List Support:** Skips warning/escalation for Connected Apps configured in \`monitoringUnsecureConnectedAppsIgnore\` (project config) or \`MONITORING_UNSECURE_CONNECTED_APPS_IGNORE\` (environment variable). Matching OAuth tokens are marked as *Ignored*.
-- **Unsecured App Detection:** Identifies Connected Apps that allow users to authorize themselves without admin approval, which can pose security risks.
-- **Phantom App Cleanup (Optional):** Detects unsecured Connected Apps that are not present in the Installed Connected Apps list and offers an interactive option to revoke their OAuth tokens (forces re-authentication if still needed).
+- **Connected App and External Client App Coverage:** Checks both Connected Apps (via \`AppMenuItem.IsUsingAdminAuthorization\`) and External Client Apps (via \`ExtlClntAppOauthPlcyCnfg.PermittedUsersPolicyType\`) for proper admin pre-approval settings.
+- **App Type Column:** Each report row includes an \`App Type\` column indicating whether the app is a \`Connected App\` or \`Ext Client App\`.
+- **AppName-based Fallback Matching:** When an OAuth token has no \`AppMenuItem\` link (common for External Client App tokens), the command falls back to matching by \`AppName\` against \`ExternalClientApplication.MasterLabel\` or \`DeveloperName\`.
+- **Ignore List Support:** Skips warning/escalation for apps configured in \`monitoringUnsecureConnectedAppsIgnore\` (project config) or \`MONITORING_UNSECURE_CONNECTED_APPS_IGNORE\` (environment variable). Matching OAuth tokens are marked as *Ignored*.
+- **Unsecured App Detection:** Identifies apps that allow users to authorize themselves without admin approval, which can pose security risks.
+- **Phantom App Cleanup (Optional):** Detects unsecured apps not present in the installed Connected Apps or External Client Apps list and offers an interactive option to revoke their OAuth tokens (forces re-authentication if still needed).
+- **Stale Token Cleanup (Optional):** Detects secured apps that still have old unsecured OAuth tokens (authorized before proper hardening) and offers an interactive option to delete them.
 - **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
+  - **OAuth Tokens Report:** Lists all OAuth tokens with security status, app type, user information, and usage data
+  - **Connected Apps Summary:** Aggregates unsecured apps with counts of associated OAuth tokens and app type
 - **Visual Indicators:** Uses status icons (❌ for unsecured, ✅ for secured, ⚪ for ignored) to provide immediate visual feedback on security status.
-- **Security Recommendations:** Provides actionable guidance on how to secure Connected Apps through proper configuration.
+- **Security Recommendations:** Provides actionable guidance on how to secure Connected Apps and External Client 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.
@@ -48,13 +51,14 @@ This command is part of [sfdx-hardis Monitoring](${CONSTANTS.DOC_URL_ROOT}/sales
 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.
-- **Ignore Handling:** Normalizes Connected App names and marks matching OAuth tokens as *Ignored* so they do not contribute to unsecured Connected App counts and notifications.
-- **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.
-- **Token Revocation:** Optionally calls Salesforce OAuth revoke endpoint using each token's \`DeleteToken\` value to revoke OAuth tokens for selected phantom Connected Apps.
+- **Connected App Security Logic:** Analyzes the \`AppMenuItem.IsUsingAdminAuthorization\` field to determine if a Connected App requires admin pre-approval for user authorization.
+- **External Client App Security Logic:** Queries \`ExtlClntAppOauthPlcyCnfg\` for each External Client App and checks \`PermittedUsersPolicyType === 'AdminApprovedPreAuthorized'\` to determine if admin pre-approval is required. Falls back to AppName-based matching when \`AppMenuItem.ApplicationId\` is not populated.
+- **Ignore Handling:** Normalizes app names and marks matching OAuth tokens as *Ignored* so they do not contribute to unsecured app counts and notifications.
+- **Data Transformation:** Processes raw SOQL results to add security status indicators, app type, and reorganizes data for optimal reporting and analysis.
+- **Aggregation Processing:** Groups OAuth tokens by app name to provide summary statistics and identify the most problematic applications.
+- **Token Revocation:** Optionally calls Salesforce OAuth revoke endpoint using each token's \`DeleteToken\` value to revoke OAuth tokens for selected phantom apps or stale unsecured tokens on secured apps.
 - **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.
+- **Notification Integration:** Integrates with the \`NotifProvider\` to send security alerts with detailed metrics, including the number of unsecured 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>
@@ -111,6 +115,39 @@ The command's technical implementation involves:
         const connectedAppQueryRes = await bulkQuery(connectedAppQuery, conn);
         const allConnectedApps = connectedAppQueryRes.records;
         uxLog("log", this, t('connectedAppsFound', { count: allConnectedApps.length }));
+        // List available External Client Apps
+        uxLog("action", this, c.cyan(t('listingAllExternalClientAppsFrom', { conn: conn.instanceUrl })));
+        const externalClientAppQuery = `SELECT Id, MasterLabel, DeveloperName FROM ExternalClientApplication ORDER BY MasterLabel ASC`;
+        let allExternalClientApps = [];
+        try {
+            const externalClientAppQueryRes = await soqlQuery(externalClientAppQuery, conn);
+            allExternalClientApps = externalClientAppQueryRes.records;
+        }
+        catch (_e) {
+            // ExternalClientApplication may not be available in all orgs or API versions
+        }
+        uxLog("log", this, t('externalClientAppsFound', { count: allExternalClientApps.length }));
+        const allExternalClientAppsById = new Map(allExternalClientApps.map(app => [app.Id, app]));
+        // Also index by MasterLabel and DeveloperName for AppName-based matching (tokens without AppMenuItem link)
+        const allExternalClientAppsByName = new Map();
+        for (const app of allExternalClientApps) {
+            if (app.MasterLabel)
+                allExternalClientAppsByName.set(app.MasterLabel.toLowerCase(), app);
+            if (app.DeveloperName)
+                allExternalClientAppsByName.set(app.DeveloperName.toLowerCase(), app);
+        }
+        // Query External Client App OAuth Policies to check admin pre-approval setting
+        // PermittedUsersPolicyType === 'AdminApprovedPreAuthorized' means admin pre-approved
+        const ecaOauthPoliciesQuery = `SELECT Id, ExternalClientApplicationId, PermittedUsersPolicyType FROM ExtlClntAppOauthPlcyCnfg`;
+        let allEcaOauthPolicies = [];
+        try {
+            const ecaOauthPoliciesQueryRes = await soqlQuery(ecaOauthPoliciesQuery, conn);
+            allEcaOauthPolicies = ecaOauthPoliciesQueryRes.records;
+        }
+        catch (_e) {
+            // ExtlClntAppOauthConfigurablePolicies may not be available in all orgs or API versions
+        }
+        const ecaOauthPoliciesByAppId = new Map(allEcaOauthPolicies.map(policy => [policy.ExternalClientApplicationId, policy]));
         // Collect all OAuth Tokens
         uxLog("action", this, c.cyan(t('extractingAllOauthTokensFrom', { conn: conn.instanceUrl })));
         const tokensCountQuery = `SELECT count() FROM OauthToken`;
@@ -146,20 +183,47 @@ The command's technical implementation involves:
         uxLog("log", this, t('oauthTokensRetrieved', { count: allOAuthTokens.length }));
         sortArray(allOAuthTokens, { by: 'AppName' });
         const allOAuthTokensWithStatus = allOAuthTokens.map(oAuthToken => {
-            const adminPreApproved = oAuthToken["AppMenuItem.IsUsingAdminAuthorization"] ?? false;
+            let adminPreApproved = oAuthToken["AppMenuItem.IsUsingAdminAuthorization"] ?? false;
             let appName = oAuthToken.AppName ? oAuthToken.AppName : 'N/A';
-            if (oAuthToken["AppMenuItem.ApplicationId"]) {
-                const matchingConnectedApp = allConnectedApps.find(app => app.Id === oAuthToken["AppMenuItem.ApplicationId"]);
-                if (matchingConnectedApp) {
-                    appName = matchingConnectedApp.Name;
+            let appType = 'Connected App';
+            const applicationId = oAuthToken["AppMenuItem.ApplicationId"];
+            if (applicationId) {
+                if (applicationId.startsWith("0xI")) {
+                    // External Client App (matched via AppMenuItem.ApplicationId)
+                    appType = 'Ext Client App';
+                    const matchingExtClientApp = allExternalClientAppsById.get(applicationId);
+                    if (matchingExtClientApp) {
+                        appName = matchingExtClientApp.MasterLabel || matchingExtClientApp.DeveloperName;
+                    }
+                    // Use the actual ECA OAuth policy to determine admin pre-approval
+                    const ecaPolicy = ecaOauthPoliciesByAppId.get(applicationId);
+                    adminPreApproved = ecaPolicy?.PermittedUsersPolicyType === 'AdminApprovedPreAuthorized';
                 }
                 else {
-                    throw new SfError(`Connected App with Id ${oAuthToken["AppMenuItem.ApplicationId"]} not found among installed Connected Apps.`);
+                    // Connected App
+                    const matchingConnectedApp = allConnectedApps.find(app => app.Id === applicationId);
+                    if (matchingConnectedApp) {
+                        appName = matchingConnectedApp.Name;
+                    }
+                    else {
+                        throw new SfError(`Connected App with Id ${applicationId} not found among installed Connected Apps.`);
+                    }
+                }
+            }
+            else if (appName !== 'N/A') {
+                // No AppMenuItem link — try to match by AppName against External Client Apps
+                const matchingExtClientApp = allExternalClientAppsByName.get(appName.toLowerCase());
+                if (matchingExtClientApp) {
+                    appType = 'Ext Client App';
+                    appName = matchingExtClientApp.MasterLabel || matchingExtClientApp.DeveloperName;
+                    const ecaPolicy = ecaOauthPoliciesByAppId.get(matchingExtClientApp.Id);
+                    adminPreApproved = ecaPolicy?.PermittedUsersPolicyType === 'AdminApprovedPreAuthorized';
                 }
             }
             const isIgnored = unsecuredConnectedAppsToIgnoreSet.has(normalizeAppName(appName));
             const appResult = {
                 AppName: appName,
+                "App Type": appType,
                 "Status": isIgnored ? '⚪ Ignored' : (adminPreApproved ? '✅ Secured' : '❌ Unsecured'),
                 "Admin Pre-Approved": adminPreApproved ? 'Yes' : 'No',
                 "User": oAuthToken["User.Name"] ? oAuthToken["User.Name"] : 'N/A',
@@ -185,6 +249,7 @@ The command's technical implementation involves:
         const uniqueUnsecuredAppNamesAndTokenNumber = {};
         const uniqueUnsecuredAppNamesAndProfiles = {};
         const uniqueUnsecuredAppNamesAndLastUsageDate = {};
+        const uniqueUnsecuredAppNamesAndType = {};
         for (const app of unsecuredOAuthTokens) {
             if (uniqueUnsecuredAppNamesAndTokenNumber[app.AppName]) {
                 uniqueUnsecuredAppNamesAndTokenNumber[app.AppName]++;
@@ -192,6 +257,9 @@ The command's technical implementation involves:
             else {
                 uniqueUnsecuredAppNamesAndTokenNumber[app.AppName] = 1;
             }
+            if (!uniqueUnsecuredAppNamesAndType[app.AppName]) {
+                uniqueUnsecuredAppNamesAndType[app.AppName] = app["App Type"] || 'Connected App';
+            }
             if (!uniqueUnsecuredAppNamesAndProfiles[app.AppName]) {
                 uniqueUnsecuredAppNamesAndProfiles[app.AppName] = new Set();
             }
@@ -209,6 +277,7 @@ The command's technical implementation involves:
         const uniqueUnsecureConnectedAppsWithTokens = uniqueUnsecuredAppNames.map(appName => {
             return {
                 AppName: appName,
+                "App Type": uniqueUnsecuredAppNamesAndType[appName] || 'Connected App',
                 NumberOfUnsecuredOAuthTokens: uniqueUnsecuredAppNamesAndTokenNumber[appName],
                 LatestUsageDate: uniqueUnsecuredAppNamesAndLastUsageDate[appName] || "N/A",
                 ProfilesOfUsersUsingIt: Array.from(uniqueUnsecuredAppNamesAndProfiles[appName] || []).sort().join(', '),
@@ -252,11 +321,12 @@ The command's technical implementation involves:
             const OAuthUsageSetupUrl = `${conn.instanceUrl}/lightning/setup/ConnectedAppsUsage/home`;
             WebSocketClient.sendReportFileMessage(OAuthUsageSetupUrl, t('reviewOAuthConnectedApps'), "actionUrl");
         }
-        // Suggest to ignore connected apps that we are not able to find in either Connected Apps, either in OAuthUsage setup page
+        // Suggest to ignore connected apps that we are not able to find in either Connected Apps, External Client Apps, either in OAuthUsage setup page
         const uniqueUnsecureConnectedAppsWithTokensNotInConnectedApps = [];
         for (const appName of uniqueUnsecuredAppNames) {
             const matchingConnectedApp = allConnectedApps.find(app => app.Name === appName);
-            if (!matchingConnectedApp) {
+            const matchingExtClientApp = allExternalClientApps.find(app => app.MasterLabel === appName || app.DeveloperName === appName);
+            if (!matchingConnectedApp && !matchingExtClientApp) {
                 uniqueUnsecureConnectedAppsWithTokensNotInConnectedApps.push(appName);
             }
         }
@@ -293,51 +363,74 @@ The command's technical implementation involves:
         }
         // Suggest to delete tokens for some connected apps using https://MyDomainName.my.salesforce.com/services/oauth2/revoke?token=(the Delete Token)
         if (!isCI && unsecuredOAuthTokens.length > 0) {
-            const confirmDeleteRes = await prompts({
-                type: 'confirm',
-                message: t('doYouWantToDeleteAuthTokens'),
-                description: t('deletePhantomAppsTokensDescription'),
-                initial: false,
-            });
-            if (confirmDeleteRes.value === true) {
-                // Prompt user to select the apps
-                const deleteTokensPromptRes = await prompts({
-                    type: 'multiselect',
-                    message: t('selectTheAppsForWhichYouWant'),
-                    choices: uniqueUnsecureConnectedAppsWithTokensNotInConnectedApps.map(appName => ({ title: appName, value: appName })),
-                    description: t('oauthTokensForSelectedAppsWillBeDeleted'),
+            const deletableOAuthTokens = unsecuredOAuthTokens.filter(token => uniqueUnsecureConnectedAppsWithTokensNotInConnectedApps.includes(token.AppName));
+            if (deletableOAuthTokens.length > 0) {
+                uxLog("action", this, c.cyan(t('reviewingDeletableAuthTokens', { count: deletableOAuthTokens.length })));
+                uxLogTable(this, deletableOAuthTokens);
+                const outputFileDeletableAuthTokens = await generateReportPath('deletable-auth-tokens', '');
+                await generateCsvFile(deletableOAuthTokens, outputFileDeletableAuthTokens, { fileTitle: t('deletableAuthTokensFiletitle') });
+                const confirmDeleteRes = await prompts({
+                    type: 'confirm',
+                    message: t('doYouWantToDeleteAuthTokens'),
+                    description: t('deletePhantomAppsTokensDescription'),
+                    initial: false,
                 });
-                if (deleteTokensPromptRes?.value.length > 0) {
-                    const tokensToDelete = unsecuredOAuthTokens.filter(token => deleteTokensPromptRes.value.includes(token.AppName));
-                    WebSocketClient.sendProgressStartMessage(t('deletingOAuthTokens', { count: tokensToDelete.length }), tokensToDelete.length);
-                    let counter = 0;
-                    for (const tokenToDelete of tokensToDelete) {
-                        const deleteTokenRecord = allOAuthTokens.find(t => t.Id === tokenToDelete["x-Token-Id"]);
-                        if (!deleteTokenRecord) {
-                            uxLog("error", this, c.red(t('oauthTokenNotFoundSkipping', { tokenId: tokenToDelete["x-Token-Id"], appName: tokenToDelete.AppName })));
-                            counter++;
-                            continue;
-                        }
-                        const deleteTokenUrl = `${conn.instanceUrl}/services/oauth2/revoke?token=${encodeURIComponent(deleteTokenRecord.DeleteToken)}`;
-                        uxLog("log", this, t('deletingOAuthTokenForApp', { tokenId: tokenToDelete["x-Token-Id"], appName: tokenToDelete.AppName }));
-                        try {
-                            await conn.requestPost(deleteTokenUrl, {});
-                            uxLog("success", this, c.green(t('oauthTokenDeleted', { tokenId: tokenToDelete["x-Token-Id"], appName: tokenToDelete.AppName })));
-                        }
-                        catch (error) {
-                            uxLog("error", this, c.red(t('failedToDeleteOAuthToken', { tokenId: tokenToDelete["x-Token-Id"], appName: tokenToDelete.AppName, error: error })));
+                if (confirmDeleteRes.value === true) {
+                    // Prompt user to select the apps
+                    const deleteTokensPromptRes = await prompts({
+                        type: 'multiselect',
+                        message: t('selectTheAppsForWhichYouWant'),
+                        choices: uniqueUnsecureConnectedAppsWithTokensNotInConnectedApps.map(appName => {
+                            const tokenCount = uniqueUnsecuredAppNamesAndTokenNumber[appName] || 0;
+                            return {
+                                title: `${appName} (${tokenCount} token${tokenCount > 1 ? 's' : ''})`,
+                                value: appName,
+                            };
+                        }),
+                        description: t('oauthTokensForSelectedAppsWillBeDeleted'),
+                    });
+                    if (deleteTokensPromptRes?.value.length > 0) {
+                        const tokensToDelete = unsecuredOAuthTokens.filter(token => deleteTokensPromptRes.value.includes(token.AppName));
+                        const deletedOAuthTokens = await this.revokeOAuthTokens(tokensToDelete, allOAuthTokens, conn);
+                        if (deletedOAuthTokens.length > 0) {
+                            const outputFileDeletedAuthTokens = await generateReportPath('deleted-auth-tokens', '');
+                            await generateCsvFile(deletedOAuthTokens, outputFileDeletedAuthTokens, { fileTitle: t('deletedAuthTokensFiletitle') });
                         }
-                        counter++;
-                        WebSocketClient.sendProgressStepMessage(counter, tokensToDelete.length);
                     }
-                    WebSocketClient.sendProgressEndMessage(tokensToDelete.length);
-                    uxLog("action", this, c.green(t('oauthTokenDeletionCompleted')));
                 }
             }
         }
         if ((this.argv || []).includes('unsecure-connected-apps')) {
             process.exitCode = numberWarnings > 0 ? 1 : 0;
         }
+        // Handle secured apps that also have stale unsecured tokens (mixed-status apps)
+        if (!isCI && unsecuredOAuthTokens.length > 0) {
+            const securedAppsWithUnsecuredTokensMap = new Map();
+            for (const token of unsecuredOAuthTokens) {
+                const hasSecuredToken = allOAuthTokensWithStatus.some(t => t.AppName === token.AppName && t.Status === '✅ Secured');
+                if (hasSecuredToken) {
+                    const existing = securedAppsWithUnsecuredTokensMap.get(token.AppName) ?? [];
+                    existing.push(token);
+                    securedAppsWithUnsecuredTokensMap.set(token.AppName, existing);
+                }
+            }
+            for (const [appName, staleTokens] of securedAppsWithUnsecuredTokensMap) {
+                uxLog("action", this, c.yellow(t('securedAppHasUnsecuredTokens', { appName, count: staleTokens.length })));
+                uxLogTable(this, staleTokens);
+                const safeAppName = appName.replace(/[^a-zA-Z0-9_-]/g, '_');
+                const outputFileStaleTokens = await generateReportPath(`unsecured-tokens-secured-app-${safeAppName}`, '');
+                await generateCsvFile(staleTokens, outputFileStaleTokens, { fileTitle: t('unsecuredTokensForSecuredAppFiletitle', { appName }) });
+                const confirmDeleteStaleRes = await prompts({
+                    type: 'confirm',
+                    message: t('doYouWantToDeleteStaleTokensForApp', { appName, count: staleTokens.length, total: allOAuthTokensWithStatus.filter(t => t.AppName === appName).length }),
+                    description: t('deletePhantomAppsTokensDescription'),
+                    initial: false,
+                });
+                if (confirmDeleteStaleRes.value === true) {
+                    await this.revokeOAuthTokens(staleTokens, allOAuthTokens, conn);
+                }
+            }
+        }
         return {
             status: numberWarnings === 0 ? 'success' : 'warning',
             allOAuthTokensWithStatus: allOAuthTokensWithStatus,
@@ -345,5 +438,33 @@ The command's technical implementation involves:
             unsecuredConnectedApps: uniqueUnsecuredAppNames,
         };
     }
+    async revokeOAuthTokens(tokensToRevoke, allOAuthTokens, conn) {
+        WebSocketClient.sendProgressStartMessage(t('deletingOAuthTokens', { count: tokensToRevoke.length }), tokensToRevoke.length);
+        const revokedTokens = [];
+        let counter = 0;
+        for (const tokenToDelete of tokensToRevoke) {
+            const deleteTokenRecord = allOAuthTokens.find(tok => tok.Id === tokenToDelete["x-Token-Id"]);
+            if (!deleteTokenRecord) {
+                uxLog("error", this, c.red(t('oauthTokenNotFoundSkipping', { tokenId: tokenToDelete["x-Token-Id"], appName: tokenToDelete.AppName })));
+                counter++;
+                continue;
+            }
+            const deleteTokenUrl = `${conn.instanceUrl}/services/oauth2/revoke?token=${encodeURIComponent(deleteTokenRecord.DeleteToken)}`;
+            uxLog("log", this, t('deletingOAuthTokenForApp', { tokenId: tokenToDelete["x-Token-Id"], appName: tokenToDelete.AppName }));
+            try {
+                await conn.requestPost(deleteTokenUrl, {});
+                uxLog("success", this, c.green(t('oauthTokenDeleted', { tokenId: tokenToDelete["x-Token-Id"], appName: tokenToDelete.AppName })));
+                revokedTokens.push(tokenToDelete);
+            }
+            catch (error) {
+                uxLog("error", this, c.red(t('failedToDeleteOAuthToken', { tokenId: tokenToDelete["x-Token-Id"], appName: tokenToDelete.AppName, error: error })));
+            }
+            counter++;
+            WebSocketClient.sendProgressStepMessage(counter, tokensToRevoke.length);
+        }
+        WebSocketClient.sendProgressEndMessage(tokensToRevoke.length);
+        uxLog("action", this, c.green(t('oauthTokenDeletionCompleted')));
+        return revokedTokens;
+    }
 }
 //# sourceMappingURL=unsecure-connected-apps.js.map

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

@@ -1 +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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"}
+{"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/common/metadata-utils/metadataList.js

@@ -2564,6 +2564,13 @@ export function listMetadataTypes() {
             suffix: 'mcpServerDefinition',
             xmlName: 'McpServerDefinition',
         },
+        {
+            directoryName: 'meetingPlaybookDefinitions',
+            inFolder: false,
+            metaFile: false,
+            suffix: 'meetingPlaybookDefinition',
+            xmlName: 'MeetingPlaybookDefinition',
+        },
         {
             directoryName: 'messagingChannels',
             inFolder: false,
@@ -3601,6 +3608,41 @@ export function listMetadataTypes() {
             suffix: 'synonymDictionary',
             xmlName: 'SynonymDictionary',
         },
+        {
+            directoryName: 'TelemetryActionDefinitions',
+            inFolder: false,
+            metaFile: false,
+            suffix: 'TelemetryActionDefinition',
+            xmlName: 'TelemetryActionDefinition',
+        },
+        {
+            directoryName: 'TelemetryActionDefSteps',
+            inFolder: false,
+            metaFile: false,
+            suffix: 'TelemetryActionDefStep',
+            xmlName: 'TelemetryActionDefStep',
+        },
+        {
+            directoryName: 'TelemetryActnDefStepAttrs',
+            inFolder: false,
+            metaFile: false,
+            suffix: 'TelemetryActnDefStepAttr',
+            xmlName: 'TelemetryActnDefStepAttr',
+        },
+        {
+            directoryName: 'TelemetryDefinitions',
+            inFolder: false,
+            metaFile: false,
+            suffix: 'TelemetryDefinition',
+            xmlName: 'TelemetryDefinition',
+        },
+        {
+            directoryName: 'TelemetryDefinitionVersions',
+            inFolder: false,
+            metaFile: false,
+            suffix: 'TelemetryDefinitionVersion',
+            xmlName: 'TelemetryDefinitionVersion',
+        },
         {
             directoryName: 'territories',
             inFolder: false,