@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.636d726

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

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
+const validation_1 = require("../../../utils/validation");
 const AzmgmtCommand_1 = require("../../base/AzmgmtCommand");
 const commands_1 = require("../commands");
 class FlowExportCommand extends AzmgmtCommand_1.default {
@@ -180,7 +180,7 @@ _FlowExportCommand_instances = new WeakSet(), _FlowExportCommand_initTelemetry =
 }, _FlowExportCommand_initValidators = function _FlowExportCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const lowerCaseFormat = args.options.format ? args.options.format.toLowerCase() : '';
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.format && (lowerCaseFormat !== 'json' && lowerCaseFormat !== 'zip')) {

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

@@ -16,9 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowRemoveCommand_instances, _FlowRemoveCommand_initTelemetry, _FlowRemoveCommand_initOptions, _FlowRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-const cli_1 = require("../../../cli");
+const Cli_1 = require("../../../cli/Cli");
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
+const validation_1 = require("../../../utils/validation");
 const AzmgmtCommand_1 = require("../../base/AzmgmtCommand");
 const commands_1 = require("../commands");
 class FlowRemoveCommand extends AzmgmtCommand_1.default {
@@ -65,7 +65,7 @@ class FlowRemoveCommand extends AzmgmtCommand_1.default {
                 yield removeFlow();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -97,7 +97,7 @@ _FlowRemoveCommand_instances = new WeakSet(), _FlowRemoveCommand_initTelemetry =
     });
 }, _FlowRemoveCommand_initValidators = function _FlowRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.name)) {
+        if (!validation_1.validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
         return true;

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowRunCancelCommand_instances, _FlowRunCancelCommand_initOptions, _FlowRunCancelCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowRunCancelCommand extends AzmgmtCommand_1.default {
@@ -57,7 +57,7 @@ class FlowRunCancelCommand extends AzmgmtCommand_1.default {
                 yield cancelFlow();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -82,7 +82,7 @@ _FlowRunCancelCommand_instances = new WeakSet(), _FlowRunCancelCommand_initOptio
     });
 }, _FlowRunCancelCommand_initValidators = function _FlowRunCancelCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.flowName)) {
+        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-resubmit.js

@@ -16,9 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _FlowRunResubmitCommand_instances, _FlowRunResubmitCommand_initTelemetry, _FlowRunResubmitCommand_initOptions, _FlowRunResubmitCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const AzmgmtCommand_1 = require("../../../base/AzmgmtCommand");
 const commands_1 = require("../../commands");
 class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
@@ -63,7 +63,7 @@ class FlowRunResubmitCommand extends AzmgmtCommand_1.default {
                 yield resubmitFlow();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -106,7 +106,7 @@ _FlowRunResubmitCommand_instances = new WeakSet(), _FlowRunResubmitCommand_initT
     });
 }, _FlowRunResubmitCommand_initValidators = function _FlowRunResubmitCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.flowName)) {
+        if (!validation_1.validation.isValidGuid(args.options.flowName)) {
             return `${args.options.flowName} is not a valid GUID`;
         }
         return true;

package/dist/m365/graph/commands/changelog/changelog-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _GraphChangelogListCommand_instances, _GraphChangelogListCommand_initTelemetry, _GraphChangelogListCommand_initOptions, _GraphChangelogListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const md_1 = require("../../../../utils/md");
+const validation_1 = require("../../../../utils/validation");
 const AnonymousCommand_1 = require("../../../base/AnonymousCommand");
 const commands_1 = require("../../commands");
 const request_1 = require("../../../../request");
@@ -106,7 +107,7 @@ class GraphChangelogListCommand extends AnonymousCommand_1.default {
         };
         Array.from(xmlDoc.getElementsByTagName('item')).forEach((item) => {
             const description = args.options.output === 'text' ?
-                utils_1.md.md2plain(item.getElementsByTagName('description').item(0).textContent, '') :
+                md_1.md.md2plain(item.getElementsByTagName('description').item(0).textContent, '') :
                 item.getElementsByTagName('description').item(0).textContent;
             changelog.items.push({
                 guid: item.getElementsByTagName('guid').item(0).textContent,
@@ -147,10 +148,10 @@ _GraphChangelogListCommand_instances = new WeakSet(), _GraphChangelogListCommand
             args.options.services.toLocaleLowerCase().split(',').some(x => !this.allowedServices.map(y => y.toLocaleLowerCase()).includes(x))) {
             return `The services contains invalid value. Specify either ${this.allowedServices.join(', ')} as properties`;
         }
-        if (args.options.startDate && !utils_1.validation.isValidISODate(args.options.startDate)) {
+        if (args.options.startDate && !validation_1.validation.isValidISODate(args.options.startDate)) {
             return 'The startDate is not a valid ISO date string';
         }
-        if (args.options.endDate && !utils_1.validation.isValidISODate(args.options.endDate)) {
+        if (args.options.endDate && !validation_1.validation.isValidISODate(args.options.endDate)) {
             return 'The endDate is not a valid ISO date string';
         }
         if (args.options.endDate && args.options.startDate && new Date(args.options.endDate) < new Date(args.options.startDate)) {

package/dist/m365/graph/commands/schemaextension/schemaextension-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GraphSchemaExtensionAddCommand_instances, _GraphSchemaExtensionAddCommand_initOptions, _GraphSchemaExtensionAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class GraphSchemaExtensionAddCommand extends GraphCommand_1.default {
@@ -112,7 +112,7 @@ _GraphSchemaExtensionAddCommand_instances = new WeakSet(), _GraphSchemaExtension
     });
 }, _GraphSchemaExtensionAddCommand_initValidators = function _GraphSchemaExtensionAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.owner && !utils_1.validation.isValidGuid(args.options.owner)) {
+        if (args.options.owner && !validation_1.validation.isValidGuid(args.options.owner)) {
             return `The specified owner '${args.options.owner}' is not a valid App Id`;
         }
         return this.validateProperties(args.options.properties);

package/dist/m365/graph/commands/schemaextension/schemaextension-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GraphSchemaExtensionListCommand_instances, _GraphSchemaExtensionListCommand_initTelemetry, _GraphSchemaExtensionListCommand_initOptions, _GraphSchemaExtensionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class GraphSchemaExtensionListCommand extends GraphCommand_1.default {
@@ -114,7 +114,7 @@ _GraphSchemaExtensionListCommand_instances = new WeakSet(), _GraphSchemaExtensio
     });
 }, _GraphSchemaExtensionListCommand_initValidators = function _GraphSchemaExtensionListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.owner && !utils_1.validation.isValidGuid(args.options.owner)) {
+        if (args.options.owner && !validation_1.validation.isValidGuid(args.options.owner)) {
             return `${args.options.owner} is not a valid GUID`;
         }
         if (args.options.pageNumber && parseInt(args.options.pageNumber) < 1) {

package/dist/m365/graph/commands/schemaextension/schemaextension-remove.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _GraphSchemaExtensionRemoveCommand_instances, _GraphSchemaExtensionRemoveCommand_initTelemetry, _GraphSchemaExtensionRemoveCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -57,7 +57,7 @@ class GraphSchemaExtensionRemoveCommand extends GraphCommand_1.default {
                 yield removeSchemaExtension();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,

package/dist/m365/graph/commands/schemaextension/schemaextension-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GraphSchemaExtensionSetCommand_instances, _GraphSchemaExtensionSetCommand_initTelemetry, _GraphSchemaExtensionSetCommand_initOptions, _GraphSchemaExtensionSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class GraphSchemaExtensionSetCommand extends GraphCommand_1.default {
@@ -151,7 +151,7 @@ _GraphSchemaExtensionSetCommand_instances = new WeakSet(), _GraphSchemaExtension
     });
 }, _GraphSchemaExtensionSetCommand_initValidators = function _GraphSchemaExtensionSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.owner)) {
+        if (!validation_1.validation.isValidGuid(args.options.owner)) {
             return `The specified owner '${args.options.owner}' is not a valid App Id`;
         }
         if (!args.options.status && !args.options.properties && !args.options.targetTypes && !args.options.description) {

package/dist/m365/graph/commands/subscription/subscription-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _GraphSubscriptionAddCommand_instances, _GraphSubscriptionAddCommand_initTelemetry, _GraphSubscriptionAddCommand_initOptions, _GraphSubscriptionAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const DEFAULT_EXPIRATION_DELAY_IN_MINUTES_PER_RESOURCE_TYPE = {
@@ -160,7 +160,7 @@ _GraphSubscriptionAddCommand_instances = new WeakSet(), _GraphSubscriptionAddCom
         if (!this.isValidChangeTypes(args.options.changeType)) {
             return `The specified changeType is invalid. Valid options are 'created', 'updated' and 'deleted'`;
         }
-        if (args.options.expirationDateTime && !utils_1.validation.isValidISODateTime(args.options.expirationDateTime)) {
+        if (args.options.expirationDateTime && !validation_1.validation.isValidISODateTime(args.options.expirationDateTime)) {
             return 'The expirationDateTime is not a valid ISO date string';
         }
         if (args.options.clientState && args.options.clientState.length > 128) {

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

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../config");
 const request_1 = require("../../../request");
-const utils_1 = require("../../../utils");
+const spo_1 = require("../../../utils/spo");
 const SpoCommand_1 = require("../../base/SpoCommand");
 const commands_1 = require("../commands");
 class OneDriveListCommand extends SpoCommand_1.default {
@@ -27,7 +27,7 @@ class OneDriveListCommand extends SpoCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving list of OneDrive sites...`);
                 }
@@ -42,7 +42,7 @@ class OneDriveListCommand extends SpoCommand_1.default {
     }
     getAllSites(spoAdminUrl, startIndex, formDigest, logger) {
         return new Promise((resolve, reject) => {
-            utils_1.spo
+            spo_1.spo
                 .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
                 .then((res) => {
                 const requestOptions = {

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _OneNoteNotebookListCommand_instances, _OneNoteNotebookListCommand_initTelemetry, _OneNoteNotebookListCommand_initOptions, _OneNoteNotebookListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -101,7 +102,7 @@ class OneNoteNotebookListCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const endpoint = yield this.getEndpointUrl(args);
-                const items = yield utils_1.odata.getAllItems(endpoint);
+                const items = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(items);
             }
             catch (err) {
@@ -120,10 +121,10 @@ _OneNoteNotebookListCommand_instances = new WeakSet(), _OneNoteNotebookListComma
     this.options.unshift({ option: '--userId [userId]' }, { option: '--userName [userName]' }, { option: '--groupId [groupId]' }, { option: '--groupName [groupName]' }, { option: '-u, --webUrl [webUrl]' });
 }, _OneNoteNotebookListCommand_initValidators = function _OneNoteNotebookListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
-        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.userId && args.options.userName) {

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

@@ -15,10 +15,13 @@ 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");
 class OutlookMailSendCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -34,7 +37,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);
@@ -48,28 +50,8 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
                         '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 +59,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 +104,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 +129,8 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
     }, {
         option: '--importance [importance]',
         autocomplete: ['low', 'normal', 'high']
+    }, {
+        option: '--attachment [attachment]'
     }, {
         option: '--saveToSentItems [saveToSentItems]'
     });
@@ -129,16 +139,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,7 +17,7 @@ var _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemet
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const Outlook_1 = require("../../Outlook");
@@ -43,7 +43,7 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
             try {
                 const folderId = yield this.getFolderId(args);
                 const url = folderId ? `me/mailFolders/${folderId}/messages` : 'me/messages';
-                const messages = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/${url}?$top=50`);
+                const messages = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/${url}?$top=50`);
                 logger.log(messages);
             }
             catch (err) {

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OutlookRoomListCommand_instances, _OutlookRoomListCommand_initTelemetry, _OutlookRoomListCommand_initOptions;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class OutlookRoomListCommand extends GraphCommand_1.default {
@@ -41,7 +41,7 @@ class OutlookRoomListCommand extends GraphCommand_1.default {
                 endpoint = `${this.resource}/v1.0/places/${args.options.roomlistEmail}/microsoft.graph.roomlist/rooms`;
             }
             try {
-                const rooms = yield utils_1.odata.getAllItems(endpoint);
+                const rooms = yield odata_1.odata.getAllItems(endpoint);
                 logger.log(rooms);
             }
             catch (err) {

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

@@ -9,7 +9,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class OutlookRoomListListCommand extends GraphCommand_1.default {
@@ -25,7 +25,7 @@ class OutlookRoomListListCommand extends GraphCommand_1.default {
     commandAction(logger) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const roomLists = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/places/microsoft.graph.roomlist`);
+                const roomLists = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/places/microsoft.graph.roomlist`);
                 logger.log(roomLists);
             }
             catch (err) {

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