@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.80d195f

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

@@ -34,12 +34,12 @@ class AadSpGetCommand extends GraphCommand_1.default {
         return 'Gets information about the specific service principal';
     }
     getSpId(args) {
-        if (args.options.objectId) {
-            return Promise.resolve(args.options.objectId);
+        if (args.options.appObjectId) {
+            return Promise.resolve(args.options.appObjectId);
         }
         let spMatchQuery = '';
-        if (args.options.displayName) {
-            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.displayName)}'`;
+        if (args.options.appDisplayName) {
+            spMatchQuery = `displayName eq '${encodeURIComponent(args.options.appDisplayName)}'`;
         }
         else if (args.options.appId) {
             spMatchQuery = `appId eq '${encodeURIComponent(args.options.appId)}'`;
@@ -59,7 +59,7 @@ class AadSpGetCommand extends GraphCommand_1.default {
                 return Promise.reject(`The specified Azure AD app does not exist`);
             }
             if (response.value.length > 1) {
-                return Promise.reject(`Multiple Azure AD apps with name ${args.options.displayName} found: ${response.value.map(x => x.id)}`);
+                return Promise.reject(`Multiple Azure AD apps with name ${args.options.appDisplayName} found: ${response.value.map(x => x.id)}`);
             }
             return Promise.resolve(spItem.id);
         });
@@ -91,32 +91,32 @@ _AadSpGetCommand_instances = new WeakSet(), _AadSpGetCommand_initTelemetry = fun
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: (!(!args.options.appId)).toString(),
-            displayName: (!(!args.options.displayName)).toString(),
-            objectId: (!(!args.options.objectId)).toString()
+            appDisplayName: (!(!args.options.appDisplayName)).toString(),
+            appObjectId: (!(!args.options.appObjectId)).toString()
         });
     });
 }, _AadSpGetCommand_initOptions = function _AadSpGetCommand_initOptions() {
     this.options.unshift({
         option: '-i, --appId [appId]'
     }, {
-        option: '-n, --displayName [displayName]'
+        option: '-n, --appDisplayName [appDisplayName]'
     }, {
-        option: '--objectId [objectId]'
+        option: '--appObjectId [appObjectId]'
     });
 }, _AadSpGetCommand_initValidators = function _AadSpGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         let optionsSpecified = 0;
         optionsSpecified += args.options.appId ? 1 : 0;
-        optionsSpecified += args.options.displayName ? 1 : 0;
-        optionsSpecified += args.options.objectId ? 1 : 0;
+        optionsSpecified += args.options.appDisplayName ? 1 : 0;
+        optionsSpecified += args.options.appObjectId ? 1 : 0;
         if (optionsSpecified !== 1) {
-            return 'Specify either appId, objectId or displayName';
+            return 'Specify either appId, appObjectId or appDisplayName';
         }
         if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid appId GUID`;
         }
-        if (args.options.objectId && !utils_1.validation.isValidGuid(args.options.objectId)) {
-            return `${args.options.objectId} is not a valid objectId GUID`;
+        if (args.options.appObjectId && !utils_1.validation.isValidGuid(args.options.appObjectId)) {
+            return `${args.options.appObjectId} is not a valid objectId GUID`;
         }
         return true;
     }));

package/dist/m365/booking/commands/business/business-get.js

@@ -0,0 +1,86 @@
+"use strict";
+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 _BookingBusinessGetCommand_instances, _BookingBusinessGetCommand_initTelemetry, _BookingBusinessGetCommand_initOptions, _BookingBusinessGetCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class BookingBusinessGetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _BookingBusinessGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _BookingBusinessGetCommand_instances, "m", _BookingBusinessGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _BookingBusinessGetCommand_instances, "m", _BookingBusinessGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _BookingBusinessGetCommand_instances, "m", _BookingBusinessGetCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.BUSINESS_GET;
+    }
+    get description() {
+        return 'Retrieve the specified Microsoft Bookings business.';
+    }
+    defaultProperties() {
+        return ['id', 'displayName', 'businessType', 'phone', 'email', 'defaultCurrencyIso'];
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getBusinessId(args.options)
+            .then(businessId => {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/solutions/bookingBusinesses/${encodeURIComponent(businessId)}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        })
+            .then(business => {
+            logger.log(business);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    getBusinessId(options) {
+        if (options.id) {
+            return Promise.resolve(options.id);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/solutions/bookingBusinesses`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then((response) => {
+            const name = options.name;
+            const bookingBusinesses = response.value.filter(val => { var _a; return ((_a = val.displayName) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === name.toLocaleLowerCase(); });
+            if (!bookingBusinesses.length) {
+                return Promise.reject(`The specified business with name ${options.name} does not exist.`);
+            }
+            if (bookingBusinesses.length > 1) {
+                return Promise.reject(`Multiple businesses with name ${options.name} found. Please disambiguate: ${bookingBusinesses.map(x => x.id).join(', ')}`);
+            }
+            return bookingBusinesses[0].id;
+        });
+    }
+}
+_BookingBusinessGetCommand_instances = new WeakSet(), _BookingBusinessGetCommand_initTelemetry = function _BookingBusinessGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined'
+        });
+    });
+}, _BookingBusinessGetCommand_initOptions = function _BookingBusinessGetCommand_initOptions() {
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-n, --name [name]' });
+}, _BookingBusinessGetCommand_initOptionSets = function _BookingBusinessGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
+};
+module.exports = new BookingBusinessGetCommand();
+//# sourceMappingURL=business-get.js.map

package/dist/m365/booking/commands/business/business-list.js

@@ -0,0 +1,30 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class BookingBusinessListCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.BUSINESS_LIST;
+    }
+    get description() {
+        return 'Lists all Microsoft Bookings businesses that are created for the tenant.';
+    }
+    defaultProperties() {
+        return ['id', 'displayName'];
+    }
+    commandAction(logger, args, cb) {
+        const endpoint = `${this.resource}/v1.0/solutions/bookingBusinesses`;
+        utils_1.odata
+            .getAllItems(endpoint)
+            .then((items) => {
+            return Promise.resolve(items);
+        })
+            .then((items) => {
+            logger.log(items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+}
+module.exports = new BookingBusinessListCommand();
+//# sourceMappingURL=business-list.js.map

package/dist/m365/booking/commands.js

@@ -0,0 +1,8 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const prefix = 'booking';
+exports.default = {
+    BUSINESS_GET: `${prefix} business get`,
+    BUSINESS_LIST: `${prefix} business list`
+};
+//# sourceMappingURL=commands.js.map

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

@@ -26,7 +26,7 @@ class FlowDisableCommand extends AzmgmtCommand_1.default {
             logger.logToStderr(`Disables 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)}/stop?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)}/stop?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },
@@ -41,7 +41,7 @@ _FlowDisableCommand_instances = new WeakSet(), _FlowDisableCommand_initOptions =
     this.options.unshift({
         option: '-n, --name <name>'
     }, {
-        option: '-e, --environment <environment>'
+        option: '-e, --environmentName <environmentName>'
     }, {
         option: '--asAdmin'
     });

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/outlook/commands/message/message-move.js

@@ -45,7 +45,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 +102,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

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();

package/dist/m365/pa/commands/solution/solution-reference-add.js

@@ -41,7 +41,7 @@ class PaSolutionReferenceAddCommand extends AnonymousCommand_1.default {
     }
     commandAction(logger, args, cb) {
         try {
-            const referencedProjectFilePath = this.getSupportedProjectFiles(args.options.path)[0];
+            const referencedProjectFilePath = this.getSupportedProjectFiles(args.options.projectPath)[0];
             const relativeReferencedProjectFilePath = path.relative(process.cwd(), referencedProjectFilePath);
             const cdsProjectFilePath = this.getCdsProjectFile(process.cwd())[0];
             const cdsProjectFileContent = fs.readFileSync(cdsProjectFilePath, 'utf8');
@@ -68,7 +68,7 @@ class PaSolutionReferenceAddCommand extends AnonymousCommand_1.default {
 }
 _PaSolutionReferenceAddCommand_instances = new WeakSet(), _PaSolutionReferenceAddCommand_initOptions = function _PaSolutionReferenceAddCommand_initOptions() {
     this.options.unshift({
-        option: '-p, --path <path>'
+        option: '-p, --projectPath <projectPath>'
     });
 }, _PaSolutionReferenceAddCommand_initValidators = function _PaSolutionReferenceAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -79,15 +79,15 @@ _PaSolutionReferenceAddCommand_instances = new WeakSet(), _PaSolutionReferenceAd
         if (existingCdsProjects.length > 1) {
             return 'Multiple CDS solution project files with extension cdsproj were found in the current directory.';
         }
-        if (!fs.existsSync(args.options.path)) {
-            return `Path ${args.options.path} is not a valid path.`;
+        if (!fs.existsSync(args.options.projectPath)) {
+            return `Path ${args.options.projectPath} is not a valid path.`;
         }
-        const existingSupportedProjects = this.getSupportedProjectFiles(args.options.path);
+        const existingSupportedProjects = this.getSupportedProjectFiles(args.options.projectPath);
         if (existingSupportedProjects.length === 0) {
-            return `No supported project type found in path ${args.options.path}.`;
+            return `No supported project type found in path ${args.options.projectPath}.`;
         }
         if (existingSupportedProjects.length !== 1) {
-            return `More than one supported project type found in path ${args.options.path}.`;
+            return `More than one supported project type found in path ${args.options.projectPath}.`;
         }
         const cdsProjectName = path.parse(path.basename(existingCdsProjects[0])).name;
         const pcfProjectName = path.parse(path.basename(existingSupportedProjects[0])).name;