@pnp/cli-microsoft365 5.8.0-beta.40c8ac8 → 6.0.0-beta.076a3a5

package/dist/m365/flow/commands/flow-enable.js

@@ -26,7 +26,7 @@ class FlowEnableCommand extends AzmgmtCommand_1.default {
             logger.logToStderr(`Enables Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.name)}/start?api-version=2016-11-01`,
+            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.name)}/start?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },
@@ -41,7 +41,7 @@ _FlowEnableCommand_instances = new WeakSet(), _FlowEnableCommand_initOptions = f
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/flow/commands/flow-export.js

@@ -49,7 +49,7 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
                 return Promise.resolve();
             }
             const requestOptions = {
-                url: `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environment)}/listPackageResources?api-version=2016-11-01`,
+                url: `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environmentName)}/listPackageResources?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -71,8 +71,8 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
             }
             const requestOptions = {
                 url: formatArgument === 'json' ?
-                    `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.id)}?api-version=2016-11-01`
-                    : `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environment)}/exportPackage?api-version=2016-11-01`,
+                    `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.id)}?api-version=2016-11-01`
+                    : `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environmentName)}/exportPackage?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -117,7 +117,7 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
             }
             const requestOptions = {
                 url: formatArgument === 'json' ?
-                    `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.id)}/exportToARMTemplate?api-version=2016-11-01`
+                    `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.id)}/exportToARMTemplate?api-version=2016-11-01`
                     : downloadFileUrl,
                 // Set responseType to arraybuffer, otherwise binary data will be encoded
                 // to utf8 and binary data is corrupt
@@ -163,7 +163,7 @@ _FlowExportCommand_instances = new WeakSet(), _FlowExportCommand_initTelemetry =
     this.options.unshift({
         option: '-i, --id <id>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-n, --packageDisplayName [packageDisplayName]'
     }, {

package/dist/m365/flow/commands/flow-get.js

@@ -29,7 +29,7 @@ class FlowGetCommand extends AzmgmtCommand_1.default {
             logger.logToStderr(`Retrieving information about Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+            url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },
@@ -51,7 +51,7 @@ _FlowGetCommand_instances = new WeakSet(), _FlowGetCommand_initOptions = functio
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/flow/commands/flow-list.js

@@ -25,7 +25,7 @@ class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
         return ['name', 'displayName'];
     }
     commandAction(logger, args, cb) {
-        const url = `${this.resource}providers/Microsoft.ProcessSimple${args.options.asAdmin ? '/scopes/admin' : ''}/environments/${encodeURIComponent(args.options.environment)}/flows?api-version=2016-11-01`;
+        const url = `${this.resource}providers/Microsoft.ProcessSimple${args.options.asAdmin ? '/scopes/admin' : ''}/environments/${encodeURIComponent(args.options.environmentName)}/flows?api-version=2016-11-01`;
         this
             .getAllItems(url, logger, true)
             .then(() => {
@@ -52,7 +52,7 @@ _FlowListCommand_instances = new WeakSet(), _FlowListCommand_initTelemetry = fun
     });
 }, _FlowListCommand_initOptions = function _FlowListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

package/dist/m365/flow/commands/flow-remove.js

@@ -41,7 +41,7 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
         }
         const removeFlow = () => {
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
                 resolveWithFullResponse: true,
                 headers: {
                     accept: 'application/json'
@@ -54,7 +54,7 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
                 // handle 204 and throw error message to cmd when invalid flow id is passed
                 // https://github.com/pnp/cli-microsoft365/issues/1063#issuecomment-537218957
                 if (rawRes.statusCode === 204) {
-                    logger.log(chalk.red(`Error: Resource '${args.options.name}' does not exist in environment '${args.options.environment}'`));
+                    logger.log(chalk.red(`Error: Resource '${args.options.name}' does not exist in environment '${args.options.environmentName}'`));
                     cb();
                 }
                 else {
@@ -93,7 +93,7 @@ _FlowRemoveCommand_instances = new WeakSet(), _FlowRemoveCommand_initTelemetry =
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     }, {

package/dist/m365/flow/commands/run/run-cancel.js

@@ -35,11 +35,11 @@ class FlowRunCancelCommand extends AzmgmtCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            logger.log(`Cancelling run ${args.options.name} of Microsoft Flow ${args.options.flow}...`);
+            logger.log(`Cancelling run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
         }
         const cancelFlow = () => {
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.flow)}/runs/${encodeURIComponent(args.options.name)}/cancel?api-version=2016-11-01`,
+                url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.flowName)}/runs/${encodeURIComponent(args.options.name)}/cancel?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -73,16 +73,16 @@ _FlowRunCancelCommand_instances = new WeakSet(), _FlowRunCancelCommand_initOptio
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-f, --flow <flow>'
+        option: '-f, --flowName <flowName>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--confirm'
     });
 }, _FlowRunCancelCommand_initValidators = function _FlowRunCancelCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.flow)) {
-            return `${args.options.flow} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.flowName)) {
+            return `${args.options.flowName} is not a valid GUID`;
         }
         return true;
     }));

package/dist/m365/flow/commands/run/run-get.js

@@ -26,10 +26,10 @@ class FlowRunGetCommand extends AzmgmtCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flow}...`);
+            logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.flow)}/runs/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+            url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.flowName)}/runs/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },
@@ -51,9 +51,9 @@ _FlowRunGetCommand_instances = new WeakSet(), _FlowRunGetCommand_initOptions = f
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-f, --flow <flow>'
+        option: '-f, --flowName <flowName>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     });
 };
 module.exports = new FlowRunGetCommand();

package/dist/m365/flow/commands/run/run-list.js

@@ -25,9 +25,9 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flow}...`);
+            logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flowName}...`);
         }
-        const url = `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.flow)}/runs?api-version=2016-11-01`;
+        const url = `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.flowName)}/runs?api-version=2016-11-01`;
         this
             .getAllItems(url, logger, true)
             .then(() => {
@@ -49,9 +49,9 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
 }
 _FlowRunListCommand_instances = new WeakSet(), _FlowRunListCommand_initOptions = function _FlowRunListCommand_initOptions() {
     this.options.unshift({
-        option: '-f, --flow <flow>'
+        option: '-f, --flowName <flowName>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     });
 };
 module.exports = new FlowRunListCommand();

package/dist/m365/flow/commands/run/run-resubmit.js

@@ -37,17 +37,17 @@ class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            logger.logToStderr(`Resubmitting run ${args.options.name} of Microsoft Flow ${args.options.flow}...`);
+            logger.logToStderr(`Resubmitting run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
         }
         const resubmitFlow = () => {
             this
-                .getTriggerName(args.options.environment, args.options.flow)
+                .getTriggerName(args.options.environmentName, args.options.flowName)
                 .then((triggerName) => {
                 if (this.debug) {
                     logger.logToStderr(chalk.yellow(`Retrieved trigger: ${triggerName}`));
                 }
                 const requestOptions = {
-                    url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environment)}/flows/${encodeURIComponent(args.options.flow)}/triggers/${encodeURIComponent(triggerName)}/histories/${encodeURIComponent(args.options.name)}/resubmit?api-version=2016-11-01`,
+                    url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.flowName)}/triggers/${encodeURIComponent(triggerName)}/histories/${encodeURIComponent(args.options.name)}/resubmit?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },
@@ -99,16 +99,16 @@ _FlowRunResubmitCommand_instances = new WeakSet(), _FlowRunResubmitCommand_initT
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-f, --flow <flow>'
+        option: '-f, --flowName <flowName>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--confirm'
     });
 }, _FlowRunResubmitCommand_initValidators = function _FlowRunResubmitCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.flow)) {
-            return `${args.options.flow} is not a valid GUID`;
+        if (!utils_1.validation.isValidGuid(args.options.flowName)) {
+            return `${args.options.flowName} is not a valid GUID`;
         }
         return true;
     }));

package/dist/m365/onenote/commands/notebook/notebook-list.js

@@ -0,0 +1,139 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class OneNoteNotebookListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _OneNoteNotebookListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _OneNoteNotebookListCommand_instances, "m", _OneNoteNotebookListCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.NOTEBOOK_LIST;
+    }
+    get description() {
+        return 'Retrieve a list of notebooks';
+    }
+    getEndpointUrl(args) {
+        return new Promise((resolve, reject) => {
+            let endpoint = `${this.resource}/v1.0/me/onenote/notebooks`;
+            if (args.options.userId) {
+                endpoint = `${this.resource}/v1.0/users/${args.options.userId}/onenote/notebooks`;
+                return resolve(endpoint);
+            }
+            else if (args.options.userName) {
+                endpoint = `${this.resource}/v1.0/users/${args.options.userName}/onenote/notebooks`;
+                return resolve(endpoint);
+            }
+            else if (args.options.groupId) {
+                endpoint = `${this.resource}/v1.0/groups/${args.options.groupId}/onenote/notebooks`;
+                return resolve(endpoint);
+            }
+            else if (args.options.groupName) {
+                this
+                    .getGroupId(args)
+                    .then((retrievedgroupId) => {
+                    endpoint = `${this.resource}/v1.0/groups/${retrievedgroupId}/onenote/notebooks`;
+                    return resolve(endpoint);
+                })
+                    .catch((err) => {
+                    reject(err);
+                });
+            }
+            else if (args.options.webUrl) {
+                this
+                    .getSpoSiteId(args)
+                    .then((siteId) => {
+                    endpoint = `${this.resource}/v1.0/sites/${siteId}/onenote/notebooks`;
+                    return resolve(endpoint);
+                })
+                    .catch((err) => {
+                    reject(err);
+                });
+            }
+            else {
+                return resolve(endpoint);
+            }
+        });
+    }
+    defaultProperties() {
+        return ['createdDateTime', 'displayName', 'id'];
+    }
+    getGroupId(args) {
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.groupName)
+            .then(group => group.id);
+    }
+    getSpoSiteId(args) {
+        const url = new URL(args.options.webUrl);
+        const requestOptions = {
+            url: `${this.resource}/v1.0/sites/${url.hostname}:${url.pathname}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((site) => site.id);
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getEndpointUrl(args)
+            .then(endpoint => utils_1.odata.getAllItems(endpoint))
+            .then((items) => {
+            return Promise.resolve(items);
+        })
+            .then((items) => {
+            logger.log(items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+}
+_OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListCommand_initTelemetry = function _OneNoteNotebookListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            joined: args.options.joined
+        });
+    });
+}, _OneNoteNotebookListCommand_initOptions = function _OneNoteNotebookListCommand_initOptions() {
+    this.options.unshift({ option: '--userId [userId]' }, { option: '--userName [userName]' }, { option: '--groupId [groupId]' }, { option: '--groupName [groupName]' }, { option: '-u, --webUrl [webUrl]' });
+}, _OneNoteNotebookListCommand_initValidators = function _OneNoteNotebookListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        if (args.options.userId && args.options.userName) {
+            return 'Specify either userId or userName, but not both';
+        }
+        if (args.options.groupId && args.options.groupName) {
+            return 'Specify either groupId or groupName, but not both';
+        }
+        return true;
+    }));
+};
+module.exports = new OneNoteNotebookListCommand();
+//# sourceMappingURL=notebook-list.js.map

package/dist/m365/onenote/commands.js

@@ -0,0 +1,7 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const prefix = 'onenote';
+exports.default = {
+    NOTEBOOK_LIST: `${prefix} notebook list`
+};
+//# sourceMappingURL=commands.js.map

package/dist/m365/outlook/commands/message/message-list.js

@@ -1,19 +1,10 @@
 "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());
-    });
-};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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 _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemetry, _OutlookMessageListCommand_initOptions, _OutlookMessageListCommand_initValidators;
+var _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemetry, _OutlookMessageListCommand_initOptions, _OutlookMessageListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
@@ -27,7 +18,7 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
         _OutlookMessageListCommand_instances.add(this);
         __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.MESSAGE_LIST;
@@ -99,18 +90,8 @@ _OutlookMessageListCommand_instances = new WeakSet(), _OutlookMessageListCommand
         option: '--folderId [folderId]',
         autocomplete: Outlook_1.Outlook.wellKnownFolderNames
     });
-}, _OutlookMessageListCommand_initValidators = function _OutlookMessageListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.folderId &&
-            !args.options.folderName) {
-            return 'Specify folderId or folderName';
-        }
-        if (args.options.folderId &&
-            args.options.folderName) {
-            return 'Specify either folderId or folderName but not both';
-        }
-        return true;
-    }));
+}, _OutlookMessageListCommand_initOptionSets = function _OutlookMessageListCommand_initOptionSets() {
+    this.optionSets.push(['folderId', 'folderName']);
 };
 module.exports = new OutlookMessageListCommand();
 //# sourceMappingURL=message-list.js.map

package/dist/m365/outlook/commands/message/message-move.js

@@ -1,19 +1,10 @@
 "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());
-    });
-};
 var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
     if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
     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 _OutlookMessageMoveCommand_instances, _OutlookMessageMoveCommand_initTelemetry, _OutlookMessageMoveCommand_initOptions, _OutlookMessageMoveCommand_initValidators;
+var _OutlookMessageMoveCommand_instances, _OutlookMessageMoveCommand_initTelemetry, _OutlookMessageMoveCommand_initOptions, _OutlookMessageMoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
@@ -26,7 +17,7 @@ class OutlookMessageMoveCommand extends GraphCommand_1.default {
         _OutlookMessageMoveCommand_instances.add(this);
         __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageMoveCommand_instances, "m", _OutlookMessageMoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.MESSAGE_MOVE;
@@ -45,7 +36,7 @@ class OutlookMessageMoveCommand extends GraphCommand_1.default {
         })
             .then((folderId) => {
             targetFolder = folderId;
-            const messageUrl = `mailFolders/${sourceFolder}/messages/${args.options.messageId}`;
+            const messageUrl = `mailFolders/${sourceFolder}/messages/${args.options.id}`;
             const requestOptions = {
                 url: `${this.resource}/v1.0/me/${messageUrl}/move`,
                 headers: {
@@ -102,7 +93,7 @@ _OutlookMessageMoveCommand_instances = new WeakSet(), _OutlookMessageMoveCommand
     });
 }, _OutlookMessageMoveCommand_initOptions = function _OutlookMessageMoveCommand_initOptions() {
     this.options.unshift({
-        option: '--messageId <messageId>'
+        option: '--id <id>'
     }, {
         option: '--sourceFolderName [sourceFolderName]',
         autocomplete: Outlook_1.Outlook.wellKnownFolderNames
@@ -116,26 +107,8 @@ _OutlookMessageMoveCommand_instances = new WeakSet(), _OutlookMessageMoveCommand
         option: '--targetFolderId [targetFolderId]',
         autocomplete: Outlook_1.Outlook.wellKnownFolderNames
     });
-}, _OutlookMessageMoveCommand_initValidators = function _OutlookMessageMoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.sourceFolderId &&
-            !args.options.sourceFolderName) {
-            return 'Specify sourceFolderId or sourceFolderName';
-        }
-        if (args.options.sourceFolderId &&
-            args.options.sourceFolderName) {
-            return 'Specify either sourceFolderId or sourceFolderName but not both';
-        }
-        if (!args.options.targetFolderId &&
-            !args.options.targetFolderName) {
-            return 'Specify targetFolderId or targetFolderName';
-        }
-        if (args.options.targetFolderId &&
-            args.options.targetFolderName) {
-            return 'Specify either targetFolderId or targetFolderName but not both';
-        }
-        return true;
-    }));
+}, _OutlookMessageMoveCommand_initOptionSets = function _OutlookMessageMoveCommand_initOptionSets() {
+    this.optionSets.push(['sourceFolderId', 'sourceFolderName'], ['targetFolderId', 'targetFolderName']);
 };
 module.exports = new OutlookMessageMoveCommand();
 //# sourceMappingURL=message-move.js.map

package/dist/m365/pa/commands/app/app-get.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 _PaAppGetCommand_instances, _PaAppGetCommand_initTelemetry, _PaAppGetCommand_initOptions, _PaAppGetCommand_initValidators;
+var _PaAppGetCommand_instances, _PaAppGetCommand_initTelemetry, _PaAppGetCommand_initOptions, _PaAppGetCommand_initValidators, _PaAppGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
@@ -28,6 +28,7 @@ class PaAppGetCommand extends PowerAppsCommand_1.default {
         __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppGetCommand_instances, "m", _PaAppGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.APP_GET;
@@ -121,17 +122,13 @@ _PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = fun
     });
 }, _PaAppGetCommand_initValidators = function _PaAppGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.name && !args.options.displayName) {
-            return 'Specify either name or displayName';
-        }
-        if (args.options.name && args.options.displayName) {
-            return 'Specify either name or displayName but not both';
-        }
         if (args.options.name && !utils_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;
     }));
+}, _PaAppGetCommand_initOptionSets = function _PaAppGetCommand_initOptionSets() {
+    this.optionSets.push(['name', 'displayName']);
 };
 module.exports = new PaAppGetCommand();
 //# sourceMappingURL=app-get.js.map

package/dist/m365/pa/commands/connector/connector-export.js

@@ -41,7 +41,7 @@ class PaConnectorExportCommand extends PowerAppsCommand_1.default {
     commandAction(logger, args, cb) {
         const outputFolder = path.resolve(args.options.outputFolder || '.', args.options.connector);
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.PowerApps/apis/${encodeURIComponent(args.options.connector)}?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
+            url: `${this.resource}/providers/Microsoft.PowerApps/apis/${encodeURIComponent(args.options.connector)}?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environmentName)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
             headers: {
                 accept: 'application/json'
             },
@@ -66,7 +66,7 @@ class PaConnectorExportCommand extends PowerAppsCommand_1.default {
                 apiDefinition: "apiDefinition.swagger.json",
                 apiProperties: "apiProperties.json",
                 connectorId: args.options.connector,
-                environment: args.options.environment,
+                environment: args.options.environmentName,
                 icon: "icon.png",
                 powerAppsApiVersion: "2016-11-01",
                 powerAppsUrl: "https://api.powerapps.com"
@@ -169,7 +169,7 @@ _PaConnectorExportCommand_instances = new WeakSet(), _PaConnectorExportCommand_i
     });
 }, _PaConnectorExportCommand_initOptions = function _PaConnectorExportCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '-c, --connector <connector>'
     }, {

package/dist/m365/pa/commands/connector/connector-list.js

@@ -29,7 +29,7 @@ class PaConnectorListCommand extends PowerAppsCommand_1.default {
         return ['name', 'displayName'];
     }
     commandAction(logger, args, cb) {
-        const url = `${this.resource}/providers/Microsoft.PowerApps/apis?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environment)}%27%20and%20IsCustomApi%20eq%20%27True%27`;
+        const url = `${this.resource}/providers/Microsoft.PowerApps/apis?api-version=2016-11-01&$filter=environment%20eq%20%27${encodeURIComponent(args.options.environmentName)}%27%20and%20IsCustomApi%20eq%20%27True%27`;
         utils_1.odata
             .getAllItems(url)
             .then((connectors) => {
@@ -50,7 +50,7 @@ class PaConnectorListCommand extends PowerAppsCommand_1.default {
 }
 _PaConnectorListCommand_instances = new WeakSet(), _PaConnectorListCommand_initOptions = function _PaConnectorListCommand_initOptions() {
     this.options.unshift({
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     });
 };
 module.exports = new PaConnectorListCommand();