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

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
+const formatting_1 = require("../../../utils/formatting");
 const AzmgmtItemsListCommand_1 = require("../../base/AzmgmtItemsListCommand");
 const commands_1 = require("../commands");
 class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
@@ -35,7 +36,7 @@ class FlowListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            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/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows?api-version=2016-11-01`;
             try {
                 yield this.getAllItems(url, logger, true);
                 if (this.items.length > 0) {
@@ -64,7 +65,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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const Cli_1 = require("../../../cli/Cli");
 const request_1 = require("../../../request");
+const formatting_1 = require("../../../utils/formatting");
 const validation_1 = require("../../../utils/validation");
 const AzmgmtCommand_1 = require("../../base/AzmgmtCommand");
 const commands_1 = require("../commands");
@@ -42,7 +43,7 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
             }
             const removeFlow = () => __awaiter(this, void 0, void 0, function* () {
                 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/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
                     resolveWithFullResponse: true,
                     headers: {
                         accept: 'application/json'
@@ -54,7 +55,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}'`));
                     }
                 }
                 catch (err) {
@@ -89,7 +90,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

@@ -17,6 +17,7 @@ var _FlowRunCancelCommand_instances, _FlowRunCancelCommand_initOptions, _FlowRun
 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 AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
@@ -36,11 +37,11 @@ class FlowRunCancelCommand extends AzmgmtCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             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 = () => __awaiter(this, void 0, void 0, function* () {
                 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/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting_1.formatting.encodeQueryParameter(args.options.name)}/cancel?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },
@@ -74,16 +75,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 (!validation_1.validation.isValidGuid(args.options.flow)) {
-            return `${args.options.flow} is not a valid GUID`;
+        if (!validation_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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowRunGetCommand_instances, _FlowRunGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowRunGetCommand extends AzmgmtCommand_1.default {
@@ -36,10 +37,10 @@ class FlowRunGetCommand extends AzmgmtCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             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/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting_1.formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -63,9 +64,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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowRunListCommand_instances, _FlowRunListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
+const formatting_1 = require("../../../../utils/formatting");
 const AzmgmtItemsListCommand_1 = require("../../../base/AzmgmtItemsListCommand");
 const commands_1 = require("../../commands");
 class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand {
@@ -35,9 +36,9 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             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/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
             try {
                 yield this.getAllItems(url, logger, true);
                 if (this.items.length > 0) {
@@ -61,9 +62,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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
@@ -38,16 +39,16 @@ class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             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 = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    const triggerName = yield this.getTriggerName(args.options.environment, args.options.flow);
+                    const triggerName = yield this.getTriggerName(args.options.environmentName, args.options.flowName);
                     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/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.flowName)}/triggers/${formatting_1.formatting.encodeQueryParameter(triggerName)}/histories/${formatting_1.formatting.encodeQueryParameter(args.options.name)}/resubmit?api-version=2016-11-01`,
                         headers: {
                             accept: 'application/json'
                         },
@@ -77,7 +78,7 @@ class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
     }
     getTriggerName(environment, flow) {
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(environment)}/flows/${encodeURIComponent(flow)}/triggers?api-version=2016-11-01`,
+            url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting_1.formatting.encodeQueryParameter(environment)}/flows/${formatting_1.formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },
@@ -98,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 (!validation_1.validation.isValidGuid(args.options.flow)) {
-            return `${args.options.flow} is not a valid GUID`;
+        if (!validation_1.validation.isValidGuid(args.options.flowName)) {
+            return `${args.options.flowName} is not a valid GUID`;
         }
         return true;
     }));

package/dist/m365/outlook/commands/mail/mail-send.js

@@ -22,6 +22,7 @@ const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const validation_1 = require("../../../../utils/validation");
+const formatting_1 = require("../../../../utils/formatting");
 class OutlookMailSendCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -36,9 +37,6 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
     get description() {
         return 'Sends an email';
     }
-    alias() {
-        return [commands_1.default.SENDMAIL];
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -47,7 +45,7 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
                     throw `Specify a upn or user id in the 'sender' option when using app only authentication.`;
                 }
                 const requestOptions = {
-                    url: `${this.resource}/v1.0/${args.options.sender ? 'users/' + encodeURIComponent(args.options.sender) : 'me'}/sendMail`,
+                    url: `${this.resource}/v1.0/${args.options.sender ? 'users/' + formatting_1.formatting.encodeQueryParameter(args.options.sender) : 'me'}/sendMail`,
                     headers: {
                         accept: 'application/json;odata.metadata=none',
                         'content-type': 'application/json'

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

@@ -0,0 +1,97 @@
+"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 _OutlookMessageGetCommand_instances, _OutlookMessageGetCommand_initTelemetry, _OutlookMessageGetCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class OutlookMessageGetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _OutlookMessageGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OutlookMessageGetCommand_instances, "m", _OutlookMessageGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageGetCommand_instances, "m", _OutlookMessageGetCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands_1.default.MESSAGE_GET;
+    }
+    get description() {
+        return 'Retrieves specified message';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving message with id ${args.options.id} using ${isAppOnlyAuth ? 'app only permissions' : 'delegated permissions'}`);
+                }
+                let requestUrl = '';
+                if (isAppOnlyAuth) {
+                    if (!args.options.userId && !args.options.userPrincipalName) {
+                        throw `The option 'userId' or 'userPrincipalName' is required when retrieving an email using app only credentials`;
+                    }
+                    if (args.options.userId && args.options.userPrincipalName) {
+                        throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using app only credentials`;
+                    }
+                    requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                }
+                else {
+                    if (args.options.userId && args.options.userPrincipalName) {
+                        throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using delegated credentials`;
+                    }
+                    if (args.options.userId || args.options.userPrincipalName) {
+                        requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                    }
+                    else {
+                        requestUrl += 'me';
+                    }
+                }
+                requestUrl += `/messages/${args.options.id}`;
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/${requestUrl}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_OutlookMessageGetCommand_instances = new WeakSet(), _OutlookMessageGetCommand_initTelemetry = function _OutlookMessageGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userPrincipalName: typeof args.options.userPrincipalName !== 'undefined'
+        });
+    });
+}, _OutlookMessageGetCommand_initOptions = function _OutlookMessageGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userPrincipalName [userPrincipalName]'
+    });
+};
+module.exports = new OutlookMessageGetCommand();
+//# sourceMappingURL=message-get.js.map

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

@@ -17,6 +17,7 @@ var _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemet
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 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");
@@ -63,7 +64,7 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
         }
         return new Promise((resolve, reject) => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/me/mailFolders?$filter=displayName eq '${encodeURIComponent(args.options.folderName)}'&$select=id`,
+                url: `${this.resource}/v1.0/me/mailFolders?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.folderName)}'&$select=id`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -101,7 +102,7 @@ _OutlookMessageListCommand_instances = new WeakSet(), _OutlookMessageListCommand
         autocomplete: Outlook_1.Outlook.wellKnownFolderNames
     });
 }, _OutlookMessageListCommand_initOptionSets = function _OutlookMessageListCommand_initOptionSets() {
-    this.optionSets.push(['folderId', 'folderName']);
+    this.optionSets.push({ options: ['folderId', 'folderName'] });
 };
 module.exports = new OutlookMessageListCommand();
 //# sourceMappingURL=message-list.js.map

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

@@ -17,6 +17,7 @@ var _OutlookMessageMoveCommand_instances, _OutlookMessageMoveCommand_initTelemet
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const Outlook_1 = require("../../Outlook");
@@ -41,7 +42,7 @@ class OutlookMessageMoveCommand extends GraphCommand_1.default {
             try {
                 sourceFolder = yield this.getFolderId(args.options.sourceFolderId, args.options.sourceFolderName);
                 targetFolder = yield this.getFolderId(args.options.targetFolderId, args.options.targetFolderName);
-                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: {
@@ -68,7 +69,7 @@ class OutlookMessageMoveCommand extends GraphCommand_1.default {
         }
         return new Promise((resolve, reject) => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/me/mailFolders?$filter=displayName eq '${encodeURIComponent(folderName)}'&$select=id`,
+                url: `${this.resource}/v1.0/me/mailFolders?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(folderName)}'&$select=id`,
                 headers: {
                     accept: 'application/json;odata.metadata=none'
                 },
@@ -101,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
@@ -116,7 +117,7 @@ _OutlookMessageMoveCommand_instances = new WeakSet(), _OutlookMessageMoveCommand
         autocomplete: Outlook_1.Outlook.wellKnownFolderNames
     });
 }, _OutlookMessageMoveCommand_initOptionSets = function _OutlookMessageMoveCommand_initOptionSets() {
-    this.optionSets.push(['sourceFolderId', 'sourceFolderName'], ['targetFolderId', 'targetFolderName']);
+    this.optionSets.push({ options: ['sourceFolderId', 'sourceFolderName'] }, { options: ['targetFolderId', 'targetFolderName'] });
 };
 module.exports = new OutlookMessageMoveCommand();
 //# sourceMappingURL=message-move.js.map

package/dist/m365/outlook/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'outlook';
 exports.default = {
     MAIL_SEND: `${prefix} mail send`,
+    MESSAGE_GET: `${prefix} message get`,
     MESSAGE_LIST: `${prefix} message list`,
     MESSAGE_MOVE: `${prefix} message move`,
     REPORT_MAILACTIVITYCOUNTS: `${prefix} report mailactivitycounts`,
@@ -17,7 +18,6 @@ exports.default = {
     REPORT_MAILBOXUSAGEQUOTASTATUSMAILBOXCOUNTS: `${prefix} report mailboxusagequotastatusmailboxcounts`,
     REPORT_MAILBOXUSAGESTORAGE: `${prefix} report mailboxusagestorage`,
     ROOM_LIST: `${prefix} room list`,
-    ROOMLIST_LIST: `${prefix} roomlist list`,
-    SENDMAIL: `${prefix} sendmail`
+    ROOMLIST_LIST: `${prefix} roomlist list`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -17,6 +17,7 @@ var _PaAppGetCommand_instances, _PaAppGetCommand_initTelemetry, _PaAppGetCommand
 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 PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
@@ -44,7 +45,7 @@ class PaAppGetCommand extends PowerAppsCommand_1.default {
             try {
                 if (args.options.name) {
                     const requestOptions = {
-                        url: `${this.resource}/providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                        url: `${this.resource}/providers/Microsoft.PowerApps/apps/${formatting_1.formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
                         headers: {
                             accept: 'application/json'
                         },
@@ -127,7 +128,7 @@ _PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = fun
         return true;
     }));
 }, _PaAppGetCommand_initOptionSets = function _PaAppGetCommand_initOptionSets() {
-    this.optionSets.push(['name', 'displayName']);
+    this.optionSets.push({ options: ['name', 'displayName'] });
 };
 module.exports = new PaAppGetCommand();
 //# sourceMappingURL=app-get.js.map

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PaAppListCommand_instances, _PaAppListCommand_initTelemetry, _PaAppListCommand_initOptions, _PaAppListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const formatting_1 = require("../../../../utils/formatting");
 const odata_1 = require("../../../../utils/odata");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
@@ -37,7 +38,7 @@ class PaAppListCommand extends PowerAppsCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environment ? '/environments/' + encodeURIComponent(args.options.environment) : ''}/apps?api-version=2017-08-01`;
+            const url = `${this.resource}/providers/Microsoft.PowerApps${args.options.asAdmin ? '/scopes/admin' : ''}${args.options.environment ? '/environments/' + formatting_1.formatting.encodeQueryParameter(args.options.environment) : ''}/apps?api-version=2017-08-01`;
             try {
                 const apps = yield odata_1.odata.getAllItems(url);
                 if (apps.length > 0) {

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
@@ -42,7 +43,7 @@ class PaAppRemoveCommand extends PowerAppsCommand_1.default {
             }
             const removePaApp = () => __awaiter(this, void 0, void 0, function* () {
                 const requestOptions = {
-                    url: `${this.resource}/providers/Microsoft.PowerApps/apps/${encodeURIComponent(args.options.name)}?api-version=2017-08-01`,
+                    url: `${this.resource}/providers/Microsoft.PowerApps/apps/${formatting_1.formatting.encodeQueryParameter(args.options.name)}?api-version=2017-08-01`,
                     resolveWithFullResponse: true,
                     headers: {
                         accept: 'application/json'

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../../flow/commands");
 const commands_2 = require("../../commands");
@@ -42,7 +43,7 @@ class PaConnectorExportCommand extends PowerAppsCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             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/${formatting_1.formatting.encodeQueryParameter(args.options.connector)}?api-version=2016-11-01&$filter=environment%20eq%20%27${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}%27%20and%20IsCustomApi%20eq%20%27True%27`,
                 headers: {
                     accept: 'application/json'
                 },
@@ -65,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"
@@ -167,7 +168,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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PaConnectorListCommand_instances, _PaConnectorListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
+const formatting_1 = require("../../../../utils/formatting");
 const odata_1 = require("../../../../utils/odata");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../../flow/commands");
@@ -39,7 +40,7 @@ class PaConnectorListCommand extends PowerAppsCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            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${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}%27%20and%20IsCustomApi%20eq%20%27True%27`;
             try {
                 const connectors = yield odata_1.odata.getAllItems(url);
                 if (connectors.length > 0) {
@@ -62,7 +63,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/environment/environment-get.js

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _PaEnvironmentGetCommand_instances, _PaEnvironmentGetCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
 const PowerAppsCommand_1 = require("../../../base/PowerAppsCommand");
 const commands_1 = require("../../commands");
 class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
@@ -39,7 +40,7 @@ class PaEnvironmentGetCommand extends PowerAppsCommand_1.default {
                 logger.logToStderr(`Retrieving information about Microsoft Power Apps environment ${args.options.name}...`);
             }
             const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.PowerApps/environments/${encodeURIComponent(args.options.name)}?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.PowerApps/environments/${formatting_1.formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },

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

@@ -42,7 +42,7 @@ class PaSolutionReferenceAddCommand extends AnonymousCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             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');
@@ -69,7 +69,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* () {
@@ -80,15 +80,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;