@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

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

@@ -33,65 +33,68 @@ class GraphSchemaExtensionSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates a Microsoft Graph schema extension';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Updating schema extension with id '${args.options.id}'...`);
-        }
-        // The default request data always contains owner
-        const data = {
-            owner: args.options.owner
-        };
-        // Add the description to request data if any
-        if (args.options.description) {
-            if (this.debug) {
-                logger.logToStderr(`Will update description to '${args.options.description}'...`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Updating schema extension with id '${args.options.id}'...`);
             }
-            data.description = args.options.description;
-        }
-        // Add the status to request data if any
-        if (args.options.status) {
-            if (this.debug) {
-                logger.logToStderr(`Will update status to '${args.options.status}'...`);
+            // The default request data always contains owner
+            const data = {
+                owner: args.options.owner
+            };
+            // Add the description to request data if any
+            if (args.options.description) {
+                if (this.debug) {
+                    logger.logToStderr(`Will update description to '${args.options.description}'...`);
+                }
+                data.description = args.options.description;
             }
-            data.status = args.options.status;
-        }
-        // Add the target types to request data if any
-        const targetTypes = args.options.targetTypes
-            ? args.options.targetTypes.split(',').map(t => t.trim())
-            : [];
-        if (targetTypes.length > 0) {
-            if (this.debug) {
-                logger.logToStderr(`Will update targetTypes to '${args.options.targetTypes}'...`);
+            // Add the status to request data if any
+            if (args.options.status) {
+                if (this.debug) {
+                    logger.logToStderr(`Will update status to '${args.options.status}'...`);
+                }
+                data.status = args.options.status;
             }
-            data.targetTypes = targetTypes;
-        }
-        // Add the properties to request data if any
-        const properties = args.options.properties
-            ? JSON.parse(args.options.properties)
-            : null;
-        if (properties) {
-            if (this.debug) {
-                logger.logToStderr(`Will update properties to '${args.options.properties}'...`);
+            // Add the target types to request data if any
+            const targetTypes = args.options.targetTypes
+                ? args.options.targetTypes.split(',').map(t => t.trim())
+                : [];
+            if (targetTypes.length > 0) {
+                if (this.debug) {
+                    logger.logToStderr(`Will update targetTypes to '${args.options.targetTypes}'...`);
+                }
+                data.targetTypes = targetTypes;
             }
-            data.properties = properties;
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/schemaExtensions/${args.options.id}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json'
-            },
-            data,
-            responseType: 'json'
-        };
-        request_1.default
-            .patch(requestOptions)
-            .then(() => {
-            if (this.debug) {
-                logger.logToStderr("Schema extension successfully updated.");
+            // Add the properties to request data if any
+            const properties = args.options.properties
+                ? JSON.parse(args.options.properties)
+                : null;
+            if (properties) {
+                if (this.debug) {
+                    logger.logToStderr(`Will update properties to '${args.options.properties}'...`);
+                }
+                data.properties = properties;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/schemaExtensions/${args.options.id}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                data,
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.patch(requestOptions);
+                if (this.debug) {
+                    logger.logToStderr("Schema extension successfully updated.");
+                }
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     validateProperties(propertiesString) {
         let properties = null;

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

@@ -52,31 +52,34 @@ class GraphSubscriptionAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Creates a Microsoft Graph subscription';
     }
-    commandAction(logger, args, cb) {
-        const data = {
-            changeType: args.options.changeType,
-            resource: args.options.resource,
-            notificationUrl: args.options.notificationUrl,
-            expirationDateTime: this.getExpirationDateTimeOrDefault(logger, args)
-        };
-        if (args.options.clientState) {
-            data["clientState"] = args.options.clientState;
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/subscriptions`,
-            headers: {
-                accept: 'application/json;odata.metadata=none',
-                'content-type': 'application/json'
-            },
-            data,
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = {
+                changeType: args.options.changeType,
+                resource: args.options.resource,
+                notificationUrl: args.options.notificationUrl,
+                expirationDateTime: this.getExpirationDateTimeOrDefault(logger, args)
+            };
+            if (args.options.clientState) {
+                data["clientState"] = args.options.clientState;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/subscriptions`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json'
+                },
+                data,
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getExpirationDateTimeOrDefault(logger, args) {
         if (args.options.expirationDateTime) {

package/dist/m365/graph/commands.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'graph';
 exports.default = {
+    CHANGELOG_LIST: `${prefix} changelog list`,
     SCHEMAEXTENSION_ADD: `${prefix} schemaextension add`,
     SCHEMAEXTENSION_GET: `${prefix} schemaextension get`,
     SCHEMAEXTENSION_LIST: `${prefix} schemaextension list`,

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

@@ -1,4 +1,13 @@
 "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());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../config");
 const request_1 = require("../../../request");
@@ -15,20 +24,21 @@ class OneDriveListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Title', 'Url'];
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((spoAdminUrl) => {
-            if (this.verbose) {
-                logger.logToStderr(`Retrieving list of OneDrive sites...`);
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving list of OneDrive sites...`);
+                }
+                this.allSites = [];
+                yield this.getAllSites(spoAdminUrl, '0', undefined, logger);
+                logger.log(this.allSites);
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            this.allSites = [];
-            return this.getAllSites(spoAdminUrl, '0', undefined, logger);
-        })
-            .then(_ => {
-            logger.log(this.allSites);
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     getAllSites(spoAdminUrl, startIndex, formDigest, logger) {
         return new Promise((resolve, reject) => {

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

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

package/dist/m365/onenote/commands.js

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

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OutlookMailSendCommand_instances, _OutlookMailSendCommand_initTelemetry, _OutlookMailSendCommand_initOptions, _OutlookMailSendCommand_initValidators;
 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");
@@ -30,49 +31,76 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
         return commands_1.default.MAIL_SEND;
     }
     get description() {
-        return 'Sends e-mail on behalf of the current user';
+        return 'Sends an email';
     }
     alias() {
         return [commands_1.default.SENDMAIL];
     }
-    commandAction(logger, args, cb) {
-        const bodyContents = args.options.bodyContents;
-        const requestOptions = {
-            url: `${this.resource}/v1.0/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: bodyContents
+    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);
+                if (isAppOnlyAuth === true && !args.options.sender) {
+                    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`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json'
                     },
-                    toRecipients: args.options.to.split(',').map(e => {
-                        return {
-                            emailAddress: {
-                                address: e.trim()
-                            }
-                        };
-                    })
-                },
-                saveToSentItems: args.options.saveToSentItems
+                    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
+                    }
+                };
+                if (args.options.mailbox) {
+                    requestOptions.data.message.from = {
+                        emailAddress: {
+                            address: args.options.mailbox
+                        }
+                    };
+                }
+                yield request_1.default.post(requestOptions);
             }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    mapEmailAddressesToRecipients(emailAddresses) {
+        if (!emailAddresses) {
+            return emailAddresses;
+        }
+        return emailAddresses.map(email => ({
+            emailAddress: {
+                address: email.trim()
+            }
+        }));
     }
 }
 _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initTelemetry = function _OutlookMailSendCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            bodyContents: typeof args.options.bodyContents !== 'undefined',
+            cc: typeof args.options.cc !== 'undefined',
+            bcc: typeof args.options.bcc !== 'undefined',
             bodyContentType: args.options.bodyContentType,
-            saveToSentItems: args.options.saveToSentItems
+            saveToSentItems: args.options.saveToSentItems,
+            importance: args.options.importance,
+            mailbox: typeof args.options.mailbox !== 'undefined',
+            sender: typeof args.options.sender !== 'undefined'
         });
     });
 }, _OutlookMailSendCommand_initOptions = function _OutlookMailSendCommand_initOptions() {
@@ -80,11 +108,22 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
         option: '-s, --subject <subject>'
     }, {
         option: '-t, --to <to>'
+    }, {
+        option: '--cc [cc]'
+    }, {
+        option: '--bcc [bcc]'
+    }, {
+        option: '--sender [sender]'
+    }, {
+        option: '-m, --mailbox [mailbox]'
     }, {
         option: '--bodyContents <bodyContents>'
     }, {
         option: '--bodyContentType [bodyContentType]',
         autocomplete: ['Text', 'HTML']
+    }, {
+        option: '--importance [importance]',
+        autocomplete: ['low', 'normal', 'high']
     }, {
         option: '--saveToSentItems [saveToSentItems]'
     });
@@ -100,6 +139,9 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
             args.options.saveToSentItems !== 'false') {
             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`;
+        }
         return true;
     }));
 };

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

@@ -13,7 +13,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemetry, _OutlookMessageListCommand_initOptions, _OutlookMessageListCommand_initValidators;
+var _OutlookMessageListCommand_instances, _OutlookMessageListCommand_initTelemetry, _OutlookMessageListCommand_initOptions, _OutlookMessageListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const request_1 = require("../../../../request");
@@ -27,7 +27,7 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
         _OutlookMessageListCommand_instances.add(this);
         __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageListCommand_instances, "m", _OutlookMessageListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.MESSAGE_LIST;
@@ -38,17 +38,18 @@ class OutlookMessageListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['subject', 'receivedDateTime'];
     }
-    commandAction(logger, args, cb) {
-        this
-            .getFolderId(args)
-            .then((folderId) => {
-            const url = folderId ? `me/mailFolders/${folderId}/messages` : 'me/messages';
-            return utils_1.odata.getAllItems(`${this.resource}/v1.0/${url}?$top=50`);
-        })
-            .then((messages) => {
-            logger.log(messages);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            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`);
+                logger.log(messages);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getFolderId(args) {
         if (!args.options.folderId && !args.options.folderName) {
@@ -99,18 +100,8 @@ _OutlookMessageListCommand_instances = new WeakSet(), _OutlookMessageListCommand
         option: '--folderId [folderId]',
         autocomplete: Outlook_1.Outlook.wellKnownFolderNames
     });
-}, _OutlookMessageListCommand_initValidators = function _OutlookMessageListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.folderId &&
-            !args.options.folderName) {
-            return 'Specify folderId or folderName';
-        }
-        if (args.options.folderId &&
-            args.options.folderName) {
-            return 'Specify either folderId or folderName but not both';
-        }
-        return true;
-    }));
+}, _OutlookMessageListCommand_initOptionSets = function _OutlookMessageListCommand_initOptionSets() {
+    this.optionSets.push(['folderId', 'folderName']);
 };
 module.exports = new OutlookMessageListCommand();
 //# sourceMappingURL=message-list.js.map