Small bug fixes #618

Author: VinceFINET

build/src/api/core/orgcheck-api-salesforcemanager-impl.js

@@ -343,21 +343,37 @@ export class SalesforceManager extends SalesforceManagerIntf {
         const allRecords = [];
         const indexOfFromStatment = query.indexOf(' FROM ');
         const indexOfGroupByStatment = query.indexOf(' GROUP BY ');
-        const isWhereStatmentAlreadyUsed = query.indexOf(' WHERE ') !== -1;
+        const isWhereStatmentAlreadyUsed = query.indexOf(' WHERE ') !== -1;        
+        const isOrderByStatmentAlreadyUsed = query.indexOf(' ORDER BY ') !== -1;        
         const isAggregateQuery = indexOfGroupByStatment !== -1;
-        // Make sure the field used for the queryMore is not used in the group by statement:
-        if (isAggregateQuery && field && query.toLowerCase().indexOf(field.toLowerCase(), indexOfGroupByStatment) !== -1) {
-            throw new SalesforceError(
-                `The field <${field}> used for the custom queryMore cannot be used in the GROUP BY clause of the query <${query}>`,
-                'CustomQueryMoreFieldInGroupBy',
-                { 
-                    'SoqlQuery': query ?? '(empty)',
-                    'Tooling': useTooling,
-                    'Field': field ?? '(empty)',
-                    'Cause': `Field used in GROUP BY`,
-                    'Where': 'SalesforceManagerImpl.soqlQuery/_customSOQLQuery'
-                }
-            );
+        if (isAggregateQuery && field) {
+            // Make sure the field used for the queryMore is not used in the group by statement:
+            if (query.toLowerCase().indexOf(field.toLowerCase(), indexOfGroupByStatment) !== -1) {
+                throw new SalesforceError(
+                    `The field <${field}> used for the custom queryMore cannot be used in the GROUP BY clause of the query <${query}>`,
+                    'CustomQueryMoreFieldInGroupBy',
+                    { 
+                        'SoqlQuery': query ?? '(empty)',
+                        'Tooling': useTooling,
+                        'Field': field ?? '(empty)',
+                        'Cause': `Field used in GROUP BY`,
+                        'Where': 'SalesforceManagerImpl.soqlQuery/_customSOQLQuery'
+                    }
+                );
+            }
+            // Make sure the initial query does not have ORDER BY statement as it is not needed at all when using custom queryMore:
+            if (isOrderByStatmentAlreadyUsed) {
+                throw new SalesforceError(
+                    `The query <${query}> is using an ORDER BY statement, which is not supported when using a custom queryMore`,
+                    'CustomQueryMoreWithOrderBy',
+                    { 
+                        'SoqlQuery': query ?? '(empty)',
+                        'Tooling': useTooling,
+                        'Cause': `ORDER BY statement found`,
+                        'Where': 'SalesforceManagerImpl.soqlQuery/_customSOQLQuery'
+                    }
+                );
+            }
         }
         // Alternative method to queryMore based on ID ordering (inspired by Maroun IMAD!)
         const doNextQuery = async (/** @type {string} */ startingValue) => {

build/src/api/core/orgcheck-api-secretsauce.js

@@ -695,7 +695,7 @@ const ALL_SCORE_RULES = [
         description: 'User is logging directly without MFA',
         formula: (/** @type {SFDC_User} */ d) => d.nbDirectLoginsWithoutMFA > 0 && d.hasMfaByPass !== true,
         errorMessage: `This user is logging in directly to Salesforce without using MFA (Multi-Factor Authentication). And this user has not the MFA bypass enabled. Please work with your user to make them use MFA for better security.`,
-        badField: 'nbDirectLoginWithoutMFA',
+        badField: 'nbDirectLoginsWithoutMFA',
         applicable: [ SFDC_User ],
         category: SCORE_RULE_CATEGORIES.SECURITY
     }, {

build/src/api/dataset/orgcheck-api-dataset-apexclasses.js

@@ -70,7 +70,7 @@ export class DatasetApexClasses extends Dataset {
                         `WHERE ApexClassOrTriggerId IN (${subsetIds}) `+
                         `AND ApexTestClass.ManageableState IN ('installedEditable', 'unmanaged') `+
                         'GROUP BY ApexClassOrTriggerId, ApexTestClassId ',
-                queryMoreField: 'CreatedDate',
+                queryMoreField: 'CreatedDate', 
                 tooling: true
             });
             apexCodeCoverageAggQueries.push({

build/src/api/dataset/orgcheck-api-dataset-internalactiveusers.js

@@ -41,15 +41,14 @@ export class DatasetInternalActiveUsers extends Dataset {
             string: 'SELECT UserId, Status, LoginType, COUNT(Id) CntLogins ' +
                     'FROM LoginHistory ' +
                     `WHERE (LoginType = 'Application' OR LoginType LIKE '%SSO%') ` + // the option 'queryMoreField' will add a final AND so that's why we have parenthesis here around the OR statement
-                    'GROUP BY UserId, Status, LoginType ' +
-                    'ORDER BY UserId, Status, LoginType ',
+                    'GROUP BY UserId, Status, LoginType ',
             queryMoreField: 'LoginTime' // aggregate does not support calling QueryMore, use the custom instead
         }, {
             string: 'SELECT UserId, Policy, COUNT(Id) CntVerifications ' +
                     'FROM VerificationHistory ' +
                     `WHERE Activity = 'Login' ` +
                     `AND Status IN ('AutomatedSuccess', 'Succeeded') ` +
-                    `AND (LoginHistory.LoginType = 'Application')` +
+                    `AND (LoginHistory.LoginType = 'Application') ` +
                     'GROUP BY UserId, Policy ',
             queryMoreField: 'VerificationTime' // aggregate does not support calling QueryMore, use the custom instead
         }], logger);