@pnp/cli-microsoft365 6.0.0-beta.c5ce305 → 6.0.0-beta.c63e3b2

package/dist/m365/flow/commands/flow-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 validation_1 = require("../../../utils/validation");
 const AzmgmtCommand_1 = require("../../base/AzmgmtCommand");
 const commands_1 = require("../commands");
@@ -51,7 +52,7 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
                 }
                 else {
                     const requestOptions = {
-                        url: `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${encodeURIComponent(args.options.environmentName)}/listPackageResources?api-version=2016-11-01`,
+                        url: `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/listPackageResources?api-version=2016-11-01`,
                         headers: {
                             accept: 'application/json'
                         },
@@ -72,8 +73,8 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
                 }
                 let requestOptions = {
                     url: formatArgument === 'json' ?
-                        `${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`,
+                        `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(args.options.id)}?api-version=2016-11-01`
+                        : `https://api.bap.microsoft.com/providers/Microsoft.BusinessAppPlatform/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/exportPackage?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },
@@ -116,7 +117,7 @@ class FlowExportCommand extends AzmgmtCommand_1.default {
                 }
                 requestOptions = {
                     url: formatArgument === 'json' ?
-                        `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.id)}/exportToARMTemplate?api-version=2016-11-01`
+                        `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting_1.formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting_1.formatting.encodeQueryParameter(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

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

@@ -16,6 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowGetCommand_instances, _FlowGetCommand_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 FlowGetCommand extends AzmgmtCommand_1.default {
@@ -39,7 +40,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.environmentName)}/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`,
                 headers: {
                     accept: 'application/json'
                 },

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.environmentName)}/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) {

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.environmentName)}/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'

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");
@@ -40,7 +41,7 @@ class FlowRunCancelCommand extends AzmgmtCommand_1.default {
             }
             const cancelFlow = () => __awaiter(this, void 0, void 0, function* () {
                 const requestOptions = {
-                    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`,
+                    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'
                     },

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 {
@@ -39,7 +40,7 @@ class FlowRunGetCommand extends AzmgmtCommand_1.default {
                 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.environmentName)}/flows/${encodeURIComponent(args.options.flowName)}/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'
                 },

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 {
@@ -37,7 +38,7 @@ class FlowRunListCommand extends AzmgmtItemsListCommand_1.AzmgmtItemsListCommand
             if (this.verbose) {
                 logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flowName}...`);
             }
-            const url = `${this.resource}providers/Microsoft.ProcessSimple/environments/${encodeURIComponent(args.options.environmentName)}/flows/${encodeURIComponent(args.options.flowName)}/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) {

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");
@@ -47,7 +48,7 @@ class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
                         logger.logToStderr(chalk.yellow(`Retrieved trigger: ${triggerName}`));
                     }
                     const requestOptions = {
-                        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`,
+                        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'
             },

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

@@ -15,10 +15,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OutlookMailSendCommand_instances, _OutlookMailSendCommand_initTelemetry, _OutlookMailSendCommand_initOptions, _OutlookMailSendCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const path = require("path");
 const Auth_1 = require("../../../../Auth");
 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();
@@ -34,7 +38,6 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
         return 'Sends an email';
     }
     commandAction(logger, args) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
@@ -42,34 +45,14 @@ 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'
                     },
                     responseType: 'json',
-                    data: {
-                        message: {
-                            subject: args.options.subject,
-                            body: {
-                                contentType: args.options.bodyContentType || 'Text',
-                                content: args.options.bodyContents
-                            },
-                            toRecipients: this.mapEmailAddressesToRecipients(args.options.to.split(',')),
-                            ccRecipients: this.mapEmailAddressesToRecipients((_a = args.options.cc) === null || _a === void 0 ? void 0 : _a.split(',')),
-                            bccRecipients: this.mapEmailAddressesToRecipients((_b = args.options.bcc) === null || _b === void 0 ? void 0 : _b.split(',')),
-                            importance: args.options.importance
-                        },
-                        saveToSentItems: args.options.saveToSentItems
-                    }
+                    data: this.getRequestBody(args.options)
                 };
-                if (args.options.mailbox) {
-                    requestOptions.data.message.from = {
-                        emailAddress: {
-                            address: args.options.mailbox
-                        }
-                    };
-                }
                 yield request_1.default.post(requestOptions);
             }
             catch (err) {
@@ -77,15 +60,40 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
             }
         });
     }
-    mapEmailAddressesToRecipients(emailAddresses) {
-        if (!emailAddresses) {
-            return emailAddresses;
+    mapEmailAddressToRecipient(email) {
+        if (!email) {
+            return undefined;
         }
-        return emailAddresses.map(email => ({
+        return {
             emailAddress: {
                 address: email.trim()
             }
+        };
+    }
+    getRequestBody(options) {
+        var _a, _b;
+        const attachments = typeof options.attachment === 'string' ? [options.attachment] : options.attachment;
+        const attachmentContents = attachments === null || attachments === void 0 ? void 0 : attachments.map(a => ({
+            '@odata.type': '#microsoft.graph.fileAttachment',
+            name: path.basename(a),
+            contentBytes: fs.readFileSync(a, { encoding: 'base64' })
         }));
+        return ({
+            message: {
+                subject: options.subject,
+                body: {
+                    contentType: options.bodyContentType || 'Text',
+                    content: options.bodyContents
+                },
+                from: this.mapEmailAddressToRecipient(options.mailbox),
+                toRecipients: options.to.split(',').map(mail => this.mapEmailAddressToRecipient(mail)),
+                ccRecipients: (_a = options.cc) === null || _a === void 0 ? void 0 : _a.split(',').map(mail => this.mapEmailAddressToRecipient(mail)),
+                bccRecipients: (_b = options.bcc) === null || _b === void 0 ? void 0 : _b.split(',').map(mail => this.mapEmailAddressToRecipient(mail)),
+                importance: options.importance,
+                attachments: attachmentContents
+            },
+            saveToSentItems: options.saveToSentItems
+        });
     }
 }
 _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initTelemetry = function _OutlookMailSendCommand_initTelemetry() {
@@ -97,7 +105,8 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
             saveToSentItems: args.options.saveToSentItems,
             importance: args.options.importance,
             mailbox: typeof args.options.mailbox !== 'undefined',
-            sender: typeof args.options.sender !== 'undefined'
+            sender: typeof args.options.sender !== 'undefined',
+            attachment: typeof args.options.attachment !== 'undefined'
         });
     });
 }, _OutlookMailSendCommand_initOptions = function _OutlookMailSendCommand_initOptions() {
@@ -121,6 +130,8 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
     }, {
         option: '--importance [importance]',
         autocomplete: ['low', 'normal', 'high']
+    }, {
+        option: '--attachment [attachment]'
     }, {
         option: '--saveToSentItems [saveToSentItems]'
     });
@@ -129,16 +140,30 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
         if (args.options.bodyContentType &&
             args.options.bodyContentType !== 'Text' &&
             args.options.bodyContentType !== 'HTML') {
-            return `${args.options.bodyContents} is not a valid value for the bodyContents option. Allowed values are Text|HTML`;
+            return `${args.options.bodyContentType} is not a valid value for the bodyContentType option. Allowed values are Text|HTML`;
         }
-        if (args.options.saveToSentItems &&
-            args.options.saveToSentItems !== 'true' &&
-            args.options.saveToSentItems !== 'false') {
+        if (args.options.saveToSentItems && !validation_1.validation.isValidBoolean(args.options.saveToSentItems)) {
             return `${args.options.saveToSentItems} is not a valid value for the saveToSentItems option. Allowed values are true|false`;
         }
         if (args.options.importance && ['low', 'normal', 'high'].indexOf(args.options.importance) === -1) {
             return `'${args.options.importance}' is not a valid value for the importance option. Allowed values are low|normal|high`;
         }
+        if (args.options.attachment) {
+            const attachments = typeof args.options.attachment === 'string' ? [args.options.attachment] : args.options.attachment;
+            for (const attachment of attachments) {
+                if (!fs.existsSync(attachment)) {
+                    return `File with path '${attachment}' was not found.`;
+                }
+                if (!fs.lstatSync(attachment).isFile()) {
+                    return `'${attachment}' is not a file.`;
+                }
+            }
+            const requestBody = this.getRequestBody(args.options);
+            // The max body size of the request is 4 194 304 chars before getting a 413 response
+            if (JSON.stringify(requestBody).length > 4194304) {
+                return 'Exceeded the max total size of attachments which is 3MB.';
+            }
+        }
         return true;
     }));
 };

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'
                 },

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");
@@ -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'
                 },

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`,

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'
                         },

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.environmentName)}%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'
                 },

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.environmentName)}%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) {

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'
                 },