@pnp/cli-microsoft365 6.0.0-beta.01ba480 → 6.0.0-beta.063a75a

package/.eslintrc.js

@@ -100,7 +100,8 @@ module.exports = {
   },
   "plugins": [
     "@typescript-eslint",
-    "cli-microsoft365"
+    "cli-microsoft365",
+    "mocha"
   ],
   "ignorePatterns": [
     "**/pcf-init/assets/**",
@@ -186,7 +187,8 @@ module.exports = {
         ]
       }
     ],
-    "@typescript-eslint/explicit-function-return-type": ["error", { "allowExpressions": true }]
+    "@typescript-eslint/explicit-function-return-type": ["error", { "allowExpressions": true }],
+    "mocha/no-identical-title": "error"
   },
   "overrides": [
     {

package/LICENSE

@@ -1,5 +1,3 @@
-Copyright (c) Microsoft Corporation. All rights reserved. 
-
 MIT License
 
 Permission is hereby granted, free of charge, to any person obtaining
@@ -19,4 +17,4 @@ MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND
 NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE
 LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION
 OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION
-WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
+WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.

package/dist/Command.js

@@ -127,12 +127,14 @@ class Command {
             }
             const argsOptions = Object.keys(args.options);
             for (const optionSet of optionsSets) {
-                const commonOptions = argsOptions.filter(opt => optionSet.includes(opt));
-                if (commonOptions.length === 0) {
-                    return `Specify one of the following options: ${optionSet.map(opt => opt).join(', ')}.`;
-                }
-                if (commonOptions.length > 1) {
-                    return `Specify one of the following options: ${optionSet.map(opt => opt).join(', ')}, but not multiple.`;
+                if (optionSet.runsWhen === undefined || optionSet.runsWhen(args)) {
+                    const commonOptions = argsOptions.filter(opt => optionSet.options.includes(opt));
+                    if (commonOptions.length === 0) {
+                        return `Specify one of the following options: ${optionSet.options.map(opt => opt).join(', ')}.`;
+                    }
+                    if (commonOptions.length > 1) {
+                        return `Specify one of the following options: ${optionSet.options.map(opt => opt).join(', ')}, but not multiple.`;
+                    }
                 }
             }
             return true;

package/dist/cli/Cli.js

@@ -98,7 +98,7 @@ class Cli {
                 showHelp ||
                 parsedArgs.h ||
                 parsedArgs.help) {
-                this.printHelp();
+                this.printHelp(this.getHelpMode(parsedArgs));
                 return Promise.resolve();
             }
             const optionsWithoutShorts = Cli.removeShortOptions(this.optionsFromArgs);
@@ -202,27 +202,24 @@ class Cli {
             const currentLogger = request_1.default.logger;
             try {
                 yield command.action(logger, args);
-                // restoring the command and logger is done here instead of in a 'finally' because there were issues with the code coverage tool
-                // restore the original command name
-                cli.currentCommandName = parentCommandName;
-                // restore the original logger
-                request_1.default.logger = currentLogger;
                 return ({
                     stdout: log.join(os.EOL),
                     stderr: logErr.join(os.EOL)
                 });
             }
             catch (err) {
-                // restoring the command and logger is done here instead of in a 'finally' because there were issues with the code coverage tool
-                // restore the original command name
-                cli.currentCommandName = parentCommandName;
-                // restore the original logger
-                request_1.default.logger = currentLogger;
                 throw {
                     error: err,
                     stderr: logErr.join(os.EOL)
                 };
             }
+            /* c8 ignore next */
+            finally {
+                // restore the original command name
+                cli.currentCommandName = parentCommandName;
+                // restore the original logger
+                request_1.default.logger = currentLogger;
+            }
         });
     }
     loadAllCommands() {
@@ -497,11 +494,11 @@ class Cli {
         }
         return undefined;
     }
-    printHelp(exitCode = 0) {
+    printHelp(helpMode, exitCode = 0) {
         const properties = {};
         if (this.commandToExecute) {
             properties.command = this.commandToExecute.name;
-            this.printCommandHelp();
+            this.printCommandHelp(helpMode);
         }
         else {
             Cli.log();
@@ -518,7 +515,7 @@ class Cli {
         appInsights_1.default.flush();
         process.exit(exitCode);
     }
-    printCommandHelp() {
+    printCommandHelp(helpMode) {
         let helpFilePath = '';
         let commandNameWords = [];
         if (this.commandToExecute) {
@@ -538,9 +535,65 @@ class Cli {
         }
         helpFilePath = path.join(...pathChunks);
         if (fs.existsSync(helpFilePath)) {
+            let helpContents = fs.readFileSync(helpFilePath, 'utf8');
+            helpContents = this.getHelpSection(helpMode, helpContents);
+            helpContents = md_1.md.md2plain(helpContents, path.join(this.commandsFolder, '..', '..', 'docs'));
             Cli.log();
-            Cli.log(md_1.md.md2plain(fs.readFileSync(helpFilePath, 'utf8'), path.join(this.commandsFolder, '..', '..', 'docs')));
+            Cli.log(helpContents);
+        }
+    }
+    getHelpMode(options) {
+        const h = options.h;
+        const help = options.help;
+        // user passed -h or --help, let's see if they passed a specific mode
+        // or requested the default
+        if (h || help) {
+            const helpMode = h !== null && h !== void 0 ? h : help;
+            if (typeof helpMode === 'boolean' || typeof helpMode !== 'string') {
+                // requested default mode or passed a number, let's use default
+                return this.getSettingWithDefaultValue(settingsNames_1.settingsNames.helpMode, Cli.defaultHelpMode);
+            }
+            else {
+                const lowerCaseHelpMode = helpMode.toLowerCase();
+                if (Cli.helpModes.indexOf(lowerCaseHelpMode) < 0) {
+                    Cli.getInstance().closeWithError(`Unknown help mode ${helpMode}. Allowed values are ${Cli.helpModes.join(', ')}`, { options }, false);
+                    return ''; // noop
+                }
+                else {
+                    return lowerCaseHelpMode;
+                }
+            }
+        }
+        else {
+            return this.getSettingWithDefaultValue(settingsNames_1.settingsNames.helpMode, Cli.defaultHelpMode);
+        }
+    }
+    getHelpSection(helpMode, helpContents) {
+        if (helpMode === 'full') {
+            return helpContents;
+        }
+        // options is the first section, so get help up to options
+        const titleAndUsage = helpContents.substring(0, helpContents.indexOf('## Options'));
+        // find the requested section
+        const sectionLines = [];
+        const sectionName = helpMode[0].toUpperCase() + helpMode.substring(1);
+        const lines = helpContents.split('\n');
+        for (let i = 0; i < lines.length; i++) {
+            const line = lines[i];
+            if (line.indexOf(`## ${sectionName}`) === 0) {
+                sectionLines.push(line);
+            }
+            else if (sectionLines.length > 0) {
+                if (line.indexOf('## ') === 0) {
+                    // we've reached the next section, stop
+                    break;
+                }
+                else {
+                    sectionLines.push(line);
+                }
+            }
         }
+        return titleAndUsage + sectionLines.join('\n');
     }
     printAvailableCommands() {
         // commands that match the current group
@@ -645,7 +698,7 @@ class Cli {
         Cli.error(errorMessage);
         if (showHelpIfEnabled &&
             this.getSettingWithDefaultValue(settingsNames_1.settingsNames.showHelpOnFailure, showHelpIfEnabled)) {
-            this.printHelp(exitCode);
+            this.printHelp(this.getHelpMode(args.options), exitCode);
         }
         else {
             process.exit(exitCode);
@@ -704,4 +757,6 @@ class Cli {
     }
 }
 exports.Cli = Cli;
+Cli.defaultHelpMode = 'full';
+Cli.helpModes = ['options', 'examples', 'remarks', 'response', 'full'];
 //# sourceMappingURL=Cli.js.map

package/dist/m365/aad/commands/app/app-add.js

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _AadAppAddCommand_instances, _AadAppAddCommand_initTelemetry, _AadAppAddCommand_initOptions, _AadAppAddCommand_initValidators;
+var _AadAppAddCommand_instances, _AadAppAddCommand_initTelemetry, _AadAppAddCommand_initOptions, _AadAppAddCommand_initValidators, _AadAppAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const uuid_1 = require("uuid");
@@ -32,6 +32,7 @@ class AadAppAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAppAddCommand_instances, "m", _AadAppAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_ADD;
@@ -731,9 +732,6 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
     });
 }, _AadAppAddCommand_initValidators = function _AadAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.manifest && !args.options.name) {
-            return 'Specify either the name of the app to create or the manifest';
-        }
         if (args.options.platform &&
             AadAppAddCommand.aadApplicationPlatform.indexOf(args.options.platform) < 0) {
             return `${args.options.platform} is not a valid value for platform. Allowed values are ${AadAppAddCommand.aadApplicationPlatform.join(', ')}`;
@@ -778,6 +776,8 @@ _AadAppAddCommand_instances = new WeakSet(), _AadAppAddCommand_initTelemetry = f
         }
         return true;
     }));
+}, _AadAppAddCommand_initOptionSets = function _AadAppAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['name', 'manifest'] });
 };
 AadAppAddCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
 AadAppAddCommand.aadAppScopeConsentBy = ['admins', 'adminsAndUsers'];

package/dist/m365/aad/commands/app/app-get.js

@@ -17,6 +17,7 @@ var _AadAppGetCommand_instances, _AadAppGetCommand_initTelemetry, _AadAppGetComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -54,8 +55,8 @@ class AadAppGetCommand extends GraphCommand_1.default {
         }
         const { appId, name } = args.options;
         const filter = appId ?
-            `appId eq '${encodeURIComponent(appId)}'` :
-            `displayName eq '${encodeURIComponent(name)}'`;
+            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+            `displayName eq '${formatting_1.formatting.encodeQueryParameter(name)}'`;
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
             headers: {
@@ -149,7 +150,7 @@ _AadAppGetCommand_instances = new WeakSet(), _AadAppGetCommand_initTelemetry = f
         return true;
     }));
 }, _AadAppGetCommand_initOptionSets = function _AadAppGetCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'objectId', 'name']);
+    this.optionSets.push({ options: ['appId', 'objectId', 'name'] });
 };
 module.exports = new AadAppGetCommand();
 //# sourceMappingURL=app-get.js.map

package/dist/m365/aad/commands/app/app-list.js

@@ -0,0 +1,38 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const odata_1 = require("../../../../utils/odata");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadAppListCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.APP_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of Azure AD app registrations';
+    }
+    defaultProperties() {
+        return ['appId', 'id', 'displayName', "signInAudience"];
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const results = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/applications`);
+                logger.log(results);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+module.exports = new AadAppListCommand();
+//# sourceMappingURL=app-list.js.map

package/dist/m365/aad/commands/app/app-remove.js

@@ -17,6 +17,7 @@ var _AadAppRemoveCommand_instances, _AadAppRemoveCommand_initTelemetry, _AadAppR
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -81,8 +82,8 @@ class AadAppRemoveCommand extends GraphCommand_1.default {
             logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : name}...`);
         }
         const filter = appId ?
-            `appId eq '${encodeURIComponent(appId)}'` :
-            `displayName eq '${encodeURIComponent(name)}'`;
+            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+            `displayName eq '${formatting_1.formatting.encodeQueryParameter(name)}'`;
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
             headers: {
@@ -126,7 +127,7 @@ _AadAppRemoveCommand_instances = new WeakSet(), _AadAppRemoveCommand_initTelemet
         return true;
     }));
 }, _AadAppRemoveCommand_initOptionSets = function _AadAppRemoveCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'objectId', 'name']);
+    this.optionSets.push({ options: ['appId', 'objectId', 'name'] });
 };
 module.exports = new AadAppRemoveCommand();
 //# sourceMappingURL=app-remove.js.map

package/dist/m365/aad/commands/app/app-role-add.js

@@ -17,6 +17,7 @@ var _AadAppRoleAddCommand_instances, _AadAppRoleAddCommand_initTelemetry, _AadAp
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppRoleAddCommand extends GraphCommand_1.default {
@@ -99,8 +100,8 @@ class AadAppRoleAddCommand extends GraphCommand_1.default {
             logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
         }
         const filter = appId ?
-            `appId eq '${encodeURIComponent(appId)}'` :
-            `displayName eq '${encodeURIComponent(appName)}'`;
+            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+            `displayName eq '${formatting_1.formatting.encodeQueryParameter(appName)}'`;
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
             headers: {
@@ -152,7 +153,7 @@ _AadAppRoleAddCommand_instances = new WeakSet(), _AadAppRoleAddCommand_initTelem
         return true;
     }));
 }, _AadAppRoleAddCommand_initOptionSets = function _AadAppRoleAddCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'appObjectId', 'appName']);
+    this.optionSets.push({ options: ['appId', 'appObjectId', 'appName'] });
 };
 AadAppRoleAddCommand.allowedMembers = ['usersGroups', 'applications', 'both'];
 module.exports = new AadAppRoleAddCommand();

package/dist/m365/aad/commands/app/app-role-list.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadAppRoleListCommand_instances, _AadAppRoleListCommand_initTelemetry, _AadAppRoleListCommand_initOptions, _AadAppRoleListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -57,8 +58,8 @@ class AadAppRoleListCommand extends GraphCommand_1.default {
             logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
         }
         const filter = appId ?
-            `appId eq '${encodeURIComponent(appId)}'` :
-            `displayName eq '${encodeURIComponent(appName)}'`;
+            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+            `displayName eq '${formatting_1.formatting.encodeQueryParameter(appName)}'`;
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
             headers: {
@@ -91,7 +92,7 @@ _AadAppRoleListCommand_instances = new WeakSet(), _AadAppRoleListCommand_initTel
 }, _AadAppRoleListCommand_initOptions = function _AadAppRoleListCommand_initOptions() {
     this.options.unshift({ option: '--appId [appId]' }, { option: '--appObjectId [appObjectId]' }, { option: '--appName [appName]' });
 }, _AadAppRoleListCommand_initOptionSets = function _AadAppRoleListCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'appObjectId', 'appName']);
+    this.optionSets.push({ options: ['appId', 'appObjectId', 'appName'] });
 };
 module.exports = new AadAppRoleListCommand();
 //# sourceMappingURL=app-role-list.js.map

package/dist/m365/aad/commands/app/app-role-remove.js

@@ -17,6 +17,7 @@ var _AadAppRoleRemoveCommand_instances, _AadAppRoleRemoveCommand_initTelemetry,
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -150,8 +151,8 @@ class AadAppRoleRemoveCommand extends GraphCommand_1.default {
             logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : appName}...`);
         }
         const filter = appId ?
-            `appId eq '${encodeURIComponent(appId)}'` :
-            `displayName eq '${encodeURIComponent(appName)}'`;
+            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+            `displayName eq '${formatting_1.formatting.encodeQueryParameter(appName)}'`;
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
             headers: {
@@ -196,7 +197,7 @@ _AadAppRoleRemoveCommand_instances = new WeakSet(), _AadAppRoleRemoveCommand_ini
         return true;
     }));
 }, _AadAppRoleRemoveCommand_initOptionSets = function _AadAppRoleRemoveCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'appObjectId', 'appName'], ['name', 'claim', 'id']);
+    this.optionSets.push({ options: ['appId', 'appObjectId', 'appName'] }, { options: ['name', 'claim', 'id'] });
 };
 module.exports = new AadAppRoleRemoveCommand();
 //# sourceMappingURL=app-role-remove.js.map

package/dist/m365/aad/commands/app/app-set.js

@@ -17,6 +17,7 @@ var _AadAppSetCommand_instances, _AadAppSetCommand_initTelemetry, _AadAppSetComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadAppSetCommand extends GraphCommand_1.default {
@@ -56,8 +57,8 @@ class AadAppSetCommand extends GraphCommand_1.default {
             logger.logToStderr(`Retrieving information about Azure AD app ${appId ? appId : name}...`);
         }
         const filter = appId ?
-            `appId eq '${encodeURIComponent(appId)}'` :
-            `displayName eq '${encodeURIComponent(name)}'`;
+            `appId eq '${formatting_1.formatting.encodeQueryParameter(appId)}'` :
+            `displayName eq '${formatting_1.formatting.encodeQueryParameter(name)}'`;
         const requestOptions = {
             url: `${this.resource}/v1.0/myorganization/applications?$filter=${filter}&$select=id`,
             headers: {
@@ -294,7 +295,7 @@ _AadAppSetCommand_instances = new WeakSet(), _AadAppSetCommand_initTelemetry = f
         return true;
     }));
 }, _AadAppSetCommand_initOptionSets = function _AadAppSetCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'objectId', 'name']);
+    this.optionSets.push({ options: ['appId', 'objectId', 'name'] });
 };
 AadAppSetCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
 module.exports = new AadAppSetCommand();

package/dist/m365/aad/commands/approleassignment/approleassignment-add.js

@@ -17,6 +17,7 @@ var _AadAppRoleAssignmentAddCommand_instances, _AadAppRoleAssignmentAddCommand_i
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -40,13 +41,13 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
             let objectId = '';
             let queryFilter = '';
             if (args.options.appId) {
-                queryFilter = `$filter=appId eq '${encodeURIComponent(args.options.appId)}'`;
+                queryFilter = `$filter=appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
             }
             else if (args.options.appObjectId) {
-                queryFilter = `$filter=id eq '${encodeURIComponent(args.options.appObjectId)}'`;
+                queryFilter = `$filter=id eq '${formatting_1.formatting.encodeQueryParameter(args.options.appObjectId)}'`;
             }
             else {
-                queryFilter = `$filter=displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
+                queryFilter = `$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
             }
             const getServicePrinciplesRequestOptions = {
                 url: `${this.resource}/v1.0/servicePrincipals?${queryFilter}`,
@@ -61,7 +62,7 @@ class AadAppRoleAssignmentAddCommand extends GraphCommand_1.default {
                     throw 'More than one service principal found. Please use the appId or appObjectId option to make sure the right service principal is specified.';
                 }
                 objectId = servicePrincipalResult.value[0].id;
-                let resource = encodeURIComponent(args.options.resource);
+                let resource = formatting_1.formatting.encodeQueryParameter(args.options.resource);
                 // try resolve aliases that the user might enter since these are seen in the Azure portal
                 switch (args.options.resource.toLocaleLowerCase()) {
                     case 'sharepoint':
@@ -185,7 +186,7 @@ _AadAppRoleAssignmentAddCommand_instances = new WeakSet(), _AadAppRoleAssignment
         return true;
     }));
 }, _AadAppRoleAssignmentAddCommand_initOptionSets = function _AadAppRoleAssignmentAddCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'appObjectId', 'appDisplayName']);
+    this.optionSets.push({ options: ['appId', 'appObjectId', 'appDisplayName'] });
 };
 module.exports = new AadAppRoleAssignmentAddCommand();
 //# sourceMappingURL=approleassignment-add.js.map

package/dist/m365/aad/commands/approleassignment/approleassignment-list.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadAppRoleAssignmentListCommand_instances, _AadAppRoleAssignmentListCommand_initTelemetry, _AadAppRoleAssignmentListCommand_initOptions, _AadAppRoleAssignmentListCommand_initValidators, _AadAppRoleAssignmentListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -95,10 +96,10 @@ class AadAppRoleAssignmentListCommand extends GraphCommand_1.default {
                 // Use existing way to get service principal object
                 let spMatchQuery = '';
                 if (argOptions.appId) {
-                    spMatchQuery = `appId eq '${encodeURIComponent(argOptions.appId)}'`;
+                    spMatchQuery = `appId eq '${formatting_1.formatting.encodeQueryParameter(argOptions.appId)}'`;
                 }
                 else {
-                    spMatchQuery = `displayName eq '${encodeURIComponent(argOptions.appDisplayName)}'`;
+                    spMatchQuery = `displayName eq '${formatting_1.formatting.encodeQueryParameter(argOptions.appDisplayName)}'`;
                 }
                 this.getServicePrincipalForApp(spMatchQuery)
                     .then((resp) => {
@@ -171,7 +172,7 @@ _AadAppRoleAssignmentListCommand_instances = new WeakSet(), _AadAppRoleAssignmen
         return true;
     }));
 }, _AadAppRoleAssignmentListCommand_initOptionSets = function _AadAppRoleAssignmentListCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'appObjectId', 'appDisplayName']);
+    this.optionSets.push({ options: ['appId', 'appObjectId', 'appDisplayName'] });
 };
 module.exports = new AadAppRoleAssignmentListCommand();
 //# sourceMappingURL=approleassignment-list.js.map

package/dist/m365/aad/commands/approleassignment/approleassignment-remove.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -43,13 +44,13 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
                 // get the service principal associated with the appId
                 let spMatchQuery = '';
                 if (args.options.appId) {
-                    spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
+                    spMatchQuery = `appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
                 }
                 else if (args.options.appObjectId) {
-                    spMatchQuery = `id eq '${encodeURIComponent(args.options.appObjectId)}'`;
+                    spMatchQuery = `id eq '${formatting_1.formatting.encodeQueryParameter(args.options.appObjectId)}'`;
                 }
                 else {
-                    spMatchQuery = `displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
+                    spMatchQuery = `displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
                 }
                 try {
                     let resp = yield this.getServicePrincipalForApp(spMatchQuery);
@@ -57,7 +58,7 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand_1.default {
                         throw 'app registration not found';
                     }
                     sp = resp.value[0];
-                    let resource = encodeURIComponent(args.options.resource);
+                    let resource = formatting_1.formatting.encodeQueryParameter(args.options.resource);
                     // try resolve aliases that the user might enter since these are seen in the Azure portal
                     switch (args.options.resource.toLocaleLowerCase()) {
                         case 'sharepoint':
@@ -190,7 +191,7 @@ _AadAppRoleAssignmentRemoveCommand_instances = new WeakSet(), _AadAppRoleAssignm
         return true;
     }));
 }, _AadAppRoleAssignmentRemoveCommand_initOptionSets = function _AadAppRoleAssignmentRemoveCommand_initOptionSets() {
-    this.optionSets.push(['appId', 'appObjectId', 'appDisplayName']);
+    this.optionSets.push({ options: ['appId', 'appObjectId', 'appDisplayName'] });
 };
 module.exports = new AadAppRoleAssignmentRemoveCommand();
 //# sourceMappingURL=approleassignment-remove.js.map

package/dist/m365/aad/commands/groupsettingtemplate/groupsettingtemplate-get.js

@@ -74,7 +74,7 @@ _AadGroupSettingTemplateGetCommand_instances = new WeakSet(), _AadGroupSettingTe
         return true;
     }));
 }, _AadGroupSettingTemplateGetCommand_initOptionSets = function _AadGroupSettingTemplateGetCommand_initOptionSets() {
-    this.optionSets.push(['id', 'displayName']);
+    this.optionSets.push({ options: ['id', 'displayName'] });
 };
 module.exports = new AadGroupSettingTemplateGetCommand();
 //# sourceMappingURL=groupsettingtemplate-get.js.map

package/dist/m365/aad/commands/o365group/o365group-conversation-post-list.js

@@ -20,6 +20,7 @@ const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const formatting_1 = require("../../../../utils/formatting");
 class AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -52,7 +53,7 @@ class AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
     }
     getGroupId(args) {
         if (args.options.groupId) {
-            return Promise.resolve(encodeURIComponent(args.options.groupId));
+            return Promise.resolve(formatting_1.formatting.encodeQueryParameter(args.options.groupId));
         }
         return aadGroup_1.aadGroup
             .getGroupByDisplayName(args.options.groupDisplayName)
@@ -82,7 +83,7 @@ _AadO365GroupConversationPostListCommand_instances = new WeakSet(), _AadO365Grou
         return true;
     }));
 }, _AadO365GroupConversationPostListCommand_initOptionSets = function _AadO365GroupConversationPostListCommand_initOptionSets() {
-    this.optionSets.push(['groupId', 'groupDisplayName']);
+    this.optionSets.push({ options: ['groupId', 'groupDisplayName'] });
 };
 module.exports = new AadO365GroupConversationPostListCommand();
 //# sourceMappingURL=o365group-conversation-post-list.js.map

package/dist/m365/aad/commands/o365group/o365group-list.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupListCommand_instances, _AadO365GroupListCommand_initTelemetry, _AadO365GroupListCommand_initOptions, _AadO365GroupListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -39,8 +40,8 @@ class AadO365GroupListCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const groupFilter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
-            const displayNameFilter = args.options.displayName ? ` and startswith(DisplayName,'${encodeURIComponent(args.options.displayName).replace(/'/g, `''`)}')` : '';
-            const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${encodeURIComponent(args.options.mailNickname).replace(/'/g, `''`)}')` : '';
+            const displayNameFilter = args.options.displayName ? ` and startswith(DisplayName,'${formatting_1.formatting.encodeQueryParameter(args.options.displayName)}')` : '';
+            const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${formatting_1.formatting.encodeQueryParameter(args.options.mailNickname)}')` : '';
             const expandOwners = args.options.orphaned ? '&$expand=owners' : '';
             const topCount = '&$top=100';
             let endpoint = `${this.resource}/v1.0/groups${groupFilter}${displayNameFilter}${mailNicknameFilter}${expandOwners}${topCount}`;