@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.3da776c

package/dist/m365/teams/commands/channel/channel-remove.js

@@ -13,11 +13,11 @@ 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 _TeamsChannelRemoveCommand_instances, _TeamsChannelRemoveCommand_initTelemetry, _TeamsChannelRemoveCommand_initOptions, _TeamsChannelRemoveCommand_initValidators;
+var _TeamsChannelRemoveCommand_instances, _TeamsChannelRemoveCommand_initTelemetry, _TeamsChannelRemoveCommand_initOptions, _TeamsChannelRemoveCommand_initValidators, _TeamsChannelRemoveCommand_initOptionSets;
 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 GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChannelRemoveCommand extends GraphCommand_1.default {
@@ -27,6 +27,7 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChannelRemoveCommand_instances, "m", _TeamsChannelRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHANNEL_REMOVE;
@@ -34,67 +35,64 @@ class TeamsChannelRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Removes the specified channel in the Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        const removeChannel = () => {
-            if (args.options.name) {
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                };
-                request_1.default
-                    .get(requestOptions)
-                    .then((res) => {
-                    const channelItem = res.value[0];
-                    if (!channelItem) {
-                        return Promise.reject(`The specified channel does not exist in the Microsoft Teams team`);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeChannel = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (args.options.name) {
+                        const getRequestOptions = {
+                            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
+                            headers: {
+                                accept: 'application/json;odata.metadata=none'
+                            },
+                            responseType: 'json'
+                        };
+                        const res = yield request_1.default.get(getRequestOptions);
+                        const channelItem = res.value[0];
+                        if (!channelItem) {
+                            return Promise.reject(`The specified channel does not exist in the Microsoft Teams team`);
+                        }
+                        const channelId = res.value[0].id;
+                        const deleteRequestOptions = {
+                            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${encodeURIComponent(channelId)}`,
+                            headers: {
+                                accept: 'application/json;odata.metadata=none'
+                            },
+                            responseType: 'json'
+                        };
+                        yield request_1.default.delete(deleteRequestOptions);
+                    }
+                    else {
+                        const requestOptions = {
+                            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${encodeURIComponent(args.options.id)}`,
+                            headers: {
+                                accept: 'application/json;odata.metadata=none'
+                            },
+                            responseType: 'json'
+                        };
+                        yield request_1.default.delete(requestOptions);
                     }
-                    const channelId = res.value[0].id;
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${encodeURIComponent(channelId)}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    return request_1.default.delete(requestOptions);
-                })
-                    .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-            }
-            if (args.options.id) {
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${encodeURIComponent(args.options.id)}`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                };
-                request_1.default
-                    .delete(requestOptions)
-                    .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-            }
-        };
-        if (args.options.confirm) {
-            removeChannel();
-        }
-        else {
-            const channelName = args.options.name ? args.options.name : args.options.id;
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the channel ${channelName} from team ${args.options.teamId}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
                 }
-                else {
-                    removeChannel();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeChannel();
+            }
+            else {
+                const channelName = args.options.name ? args.options.name : args.options.id;
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the channel ${channelName} from team ${args.options.teamId}?`
+                });
+                if (result.continue) {
+                    yield removeChannel();
+                }
+            }
+        });
     }
 }
 _TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand_initTelemetry = function _TeamsChannelRemoveCommand_initTelemetry() {
@@ -117,20 +115,16 @@ _TeamsChannelRemoveCommand_instances = new WeakSet(), _TeamsChannelRemoveCommand
     });
 }, _TeamsChannelRemoveCommand_initValidators = function _TeamsChannelRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && args.options.name) {
-            return 'Specify id or name but not both';
-        }
-        if (!args.options.id && !args.options.name) {
-            return 'Specify id or name';
-        }
-        if (args.options.id && !utils_1.validation.isValidTeamsChannelId(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidTeamsChannelId(args.options.id)) {
             return `${args.options.id} is not a valid Teams channel id`;
         }
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         return true;
     }));
+}, _TeamsChannelRemoveCommand_initOptionSets = function _TeamsChannelRemoveCommand_initOptionSets() {
+    this.optionSets.push(['id', 'name']);
 };
 module.exports = new TeamsChannelRemoveCommand();
 //# sourceMappingURL=channel-remove.js.map

package/dist/m365/teams/commands/channel/channel-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsChannelSetCommand_instances, _TeamsChannelSetCommand_initTelemetry, _TeamsChannelSetCommand_initOptions, _TeamsChannelSetCommand_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 TeamsChannelSetCommand extends GraphCommand_1.default {
@@ -33,34 +33,37 @@ class TeamsChannelSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates properties of the specified channel in the given Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            const channelItem = res.value[0];
-            if (!channelItem) {
-                return Promise.reject(`The specified channel does not exist in the Microsoft Teams team`);
-            }
-            const channelId = res.value[0].id;
-            const data = this.mapRequestBody(args.options);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${channelId}`,
+                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.name)}'`,
                 headers: {
-                    'accept': 'application/json;odata.metadata=none'
+                    accept: 'application/json;odata.metadata=none'
                 },
-                responseType: 'json',
-                data: data
+                responseType: 'json'
             };
-            return request_1.default.patch(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                const channelItem = res.value[0];
+                if (!channelItem) {
+                    throw `The specified channel does not exist in the Microsoft Teams team`;
+                }
+                const channelId = res.value[0].id;
+                const data = this.mapRequestBody(args.options);
+                const requestOptionsPatch = {
+                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}/channels/${channelId}`,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: data
+                };
+                yield request_1.default.patch(requestOptionsPatch);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     mapRequestBody(options) {
         const requestBody = {};
@@ -92,7 +95,7 @@ _TeamsChannelSetCommand_instances = new WeakSet(), _TeamsChannelSetCommand_initT
     });
 }, _TeamsChannelSetCommand_initValidators = function _TeamsChannelSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         if (args.options.name.toLowerCase() === "general") {

package/dist/m365/teams/commands/chat/chat-get.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 _TeamsChatGetCommand_instances, _TeamsChatGetCommand_initTelemetry, _TeamsChatGetCommand_initOptions, _TeamsChatGetCommand_initValidators;
+var _TeamsChatGetCommand_instances, _TeamsChatGetCommand_initTelemetry, _TeamsChatGetCommand_initOptions, _TeamsChatGetCommand_initValidators, _TeamsChatGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const Auth_1 = require("../../../../Auth");
@@ -30,6 +30,7 @@ class TeamsChatGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChatGetCommand_instances, "m", _TeamsChatGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChatGetCommand_instances, "m", _TeamsChatGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChatGetCommand_instances, "m", _TeamsChatGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChatGetCommand_instances, "m", _TeamsChatGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHAT_GET;
@@ -37,14 +38,17 @@ class TeamsChatGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Get a Microsoft Teams chat conversation by id, participants or chat name.';
     }
-    commandAction(logger, args, cb) {
-        this
-            .getChatId(args)
-            .then(chatId => this.getChatDetailsById(chatId))
-            .then((chat) => {
-            logger.log(chat);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const chatId = yield this.getChatId(args);
+                const chat = yield this.getChatDetailsById(chatId);
+                logger.log(chat);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getChatId(args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -120,22 +124,6 @@ _TeamsChatGetCommand_instances = new WeakSet(), _TeamsChatGetCommand_initTelemet
     });
 }, _TeamsChatGetCommand_initValidators = function _TeamsChatGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.id && !args.options.participants && !args.options.name) {
-            return 'Specify id or participants or name, one is required.';
-        }
-        let nrOfMutuallyExclusiveOptionsInUse = 0;
-        if (args.options.id) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (args.options.participants) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (args.options.name) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (nrOfMutuallyExclusiveOptionsInUse > 1) {
-            return 'Specify either id or participants or name, but not multiple.';
-        }
         if (args.options.id && !validation_1.validation.isValidTeamsChatId(args.options.id)) {
             return `${args.options.id} is not a valid Teams ChatId.`;
         }
@@ -147,6 +135,8 @@ _TeamsChatGetCommand_instances = new WeakSet(), _TeamsChatGetCommand_initTelemet
         }
         return true;
     }));
+}, _TeamsChatGetCommand_initOptionSets = function _TeamsChatGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'participants', 'name']);
 };
 module.exports = new TeamsChatGetCommand();
 //# sourceMappingURL=chat-get.js.map

package/dist/m365/teams/commands/chat/chat-list.js

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChatListCommand_instances, _TeamsChatListCommand_initTelemetry, _TeamsChatListCommand_initOptions, _TeamsChatListCommand_initValidators;
 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 TeamsChatListCommand extends GraphCommand_1.default {
@@ -35,15 +35,18 @@ class TeamsChatListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'topic', 'chatType'];
     }
-    commandAction(logger, args, cb) {
-        const filter = args.options.type !== undefined ? `?$filter=chatType eq '${args.options.type}'` : '';
-        const endpoint = `${this.resource}/v1.0/chats${filter}`;
-        utils_1.odata
-            .getAllItems(endpoint)
-            .then((items) => {
-            logger.log(items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const filter = args.options.type !== undefined ? `?$filter=chatType eq '${args.options.type}'` : '';
+            const endpoint = `${this.resource}/v1.0/chats${filter}`;
+            try {
+                const items = yield odata_1.odata.getAllItems(endpoint);
+                logger.log(items);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsChatListCommand_instances = new WeakSet(), _TeamsChatListCommand_initTelemetry = function _TeamsChatListCommand_initTelemetry() {

package/dist/m365/teams/commands/chat/chat-member-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChatMemberListCommand_instances, _TeamsChatMemberListCommand_initOptions, _TeamsChatMemberListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChatMemberListCommand extends GraphCommand_1.default {
@@ -34,14 +35,17 @@ class TeamsChatMemberListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['userId', 'displayName', 'email'];
     }
-    commandAction(logger, args, cb) {
-        const endpoint = `${this.resource}/v1.0/chats/${args.options.chatId}/members`;
-        utils_1.odata
-            .getAllItems(endpoint)
-            .then((items) => {
-            logger.log(items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = `${this.resource}/v1.0/chats/${args.options.chatId}/members`;
+            try {
+                const items = yield odata_1.odata.getAllItems(endpoint);
+                logger.log(items);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsChatMemberListCommand_instances = new WeakSet(), _TeamsChatMemberListCommand_initOptions = function _TeamsChatMemberListCommand_initOptions() {
@@ -50,7 +54,7 @@ _TeamsChatMemberListCommand_instances = new WeakSet(), _TeamsChatMemberListComma
     });
 }, _TeamsChatMemberListCommand_initValidators = function _TeamsChatMemberListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidTeamsChatId(args.options.chatId)) {
+        if (!validation_1.validation.isValidTeamsChatId(args.options.chatId)) {
             return `${args.options.chatId} is not a valid Teams ChatId`;
         }
         return true;

package/dist/m365/teams/commands/chat/chat-message-list.js

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsChatMessageListCommand_instances, _TeamsChatMessageListCommand_initOptions, _TeamsChatMessageListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChatMessageListCommand extends GraphCommand_1.default {
@@ -34,32 +35,35 @@ class TeamsChatMessageListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'shortBody'];
     }
-    commandAction(logger, args, cb) {
-        const endpoint = `${this.resource}/v1.0/chats/${args.options.chatId}/messages`;
-        utils_1.odata
-            .getAllItems(endpoint)
-            .then((items) => {
-            if (args.options.output !== 'json') {
-                items.forEach(i => {
-                    // hoist the content to body for readability
-                    i.body = i.body.content;
-                    let shortBody;
-                    const bodyToProcess = i.body;
-                    if (bodyToProcess) {
-                        let maxLength = 50;
-                        let addedDots = '...';
-                        if (bodyToProcess.length < maxLength) {
-                            maxLength = bodyToProcess.length;
-                            addedDots = '';
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = `${this.resource}/v1.0/chats/${args.options.chatId}/messages`;
+            try {
+                const items = yield odata_1.odata.getAllItems(endpoint);
+                if (args.options.output !== 'json') {
+                    items.forEach(i => {
+                        // hoist the content to body for readability
+                        i.body = i.body.content;
+                        let shortBody;
+                        const bodyToProcess = i.body;
+                        if (bodyToProcess) {
+                            let maxLength = 50;
+                            let addedDots = '...';
+                            if (bodyToProcess.length < maxLength) {
+                                maxLength = bodyToProcess.length;
+                                addedDots = '';
+                            }
+                            shortBody = bodyToProcess.replace(/\n/g, ' ').substring(0, maxLength) + addedDots;
                         }
-                        shortBody = bodyToProcess.replace(/\n/g, ' ').substring(0, maxLength) + addedDots;
-                    }
-                    i.shortBody = shortBody;
-                });
+                        i.shortBody = shortBody;
+                    });
+                }
+                logger.log(items);
             }
-            logger.log(items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsChatMessageListCommand_instances = new WeakSet(), _TeamsChatMessageListCommand_initOptions = function _TeamsChatMessageListCommand_initOptions() {
@@ -68,7 +72,7 @@ _TeamsChatMessageListCommand_instances = new WeakSet(), _TeamsChatMessageListCom
     });
 }, _TeamsChatMessageListCommand_initValidators = function _TeamsChatMessageListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidTeamsChatId(args.options.chatId)) {
+        if (!validation_1.validation.isValidTeamsChatId(args.options.chatId)) {
             return `${args.options.chatId} is not a valid Teams chat ID`;
         }
         return true;

package/dist/m365/teams/commands/chat/chat-message-send.js

@@ -13,12 +13,13 @@ 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 _TeamsChatMessageSendCommand_instances, _TeamsChatMessageSendCommand_initTelemetry, _TeamsChatMessageSendCommand_initOptions, _TeamsChatMessageSendCommand_initValidators;
+var _TeamsChatMessageSendCommand_instances, _TeamsChatMessageSendCommand_initTelemetry, _TeamsChatMessageSendCommand_initOptions, _TeamsChatMessageSendCommand_initValidators, _TeamsChatMessageSendCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const os = require("os");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const accessToken_1 = require("../../../../utils/accessToken");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const chatUtil_1 = require("./chatUtil");
@@ -29,6 +30,7 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChatMessageSendCommand_instances, "m", _TeamsChatMessageSendCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.CHAT_MESSAGE_SEND;
@@ -36,13 +38,16 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
     get description() {
         return 'Sends a chat message to a Microsoft Teams chat conversation.';
     }
-    commandAction(logger, args, cb) {
-        this
-            .getChatId(logger, args)
-            .then(chatId => this.sendChatMessage(chatId, args))
-            .then(_ => {
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const chatId = yield this.getChatId(logger, args);
+                yield this.sendChatMessage(chatId, args);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getChatId(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -57,7 +62,7 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
     ensureChatIdByUserEmails(userEmailsOption) {
         return __awaiter(this, void 0, void 0, function* () {
             const userEmails = userEmailsOption.trim().toLowerCase().split(',').filter(e => e && e !== '');
-            const currentUserEmail = utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken).toLowerCase();
+            const currentUserEmail = accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken).toLowerCase();
             const existingChats = yield chatUtil_1.chatUtil.findExistingChatsByParticipants([currentUserEmail, ...userEmails]);
             if (!existingChats || existingChats.length === 0) {
                 const chat = yield this.createConversation([currentUserEmail, ...userEmails]);
@@ -165,33 +170,19 @@ _TeamsChatMessageSendCommand_instances = new WeakSet(), _TeamsChatMessageSendCom
     });
 }, _TeamsChatMessageSendCommand_initValidators = function _TeamsChatMessageSendCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.chatId && !args.options.userEmails && !args.options.chatName) {
-            return 'Specify chatId or userEmails or chatName, one is required.';
-        }
-        let nrOfMutuallyExclusiveOptionsInUse = 0;
-        if (args.options.chatId) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (args.options.userEmails) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (args.options.chatName) {
-            nrOfMutuallyExclusiveOptionsInUse++;
-        }
-        if (nrOfMutuallyExclusiveOptionsInUse > 1) {
-            return 'Specify either chatId or userEmails or chatName, but not multiple.';
-        }
-        if (args.options.chatId && !utils_1.validation.isValidTeamsChatId(args.options.chatId)) {
+        if (args.options.chatId && !validation_1.validation.isValidTeamsChatId(args.options.chatId)) {
             return `${args.options.chatId} is not a valid Teams ChatId.`;
         }
         if (args.options.userEmails) {
             const userEmails = args.options.userEmails.trim().toLowerCase().split(',').filter(e => e && e !== '');
-            if (!userEmails || userEmails.length === 0 || userEmails.some(e => !utils_1.validation.isValidUserPrincipalName(e))) {
+            if (!userEmails || userEmails.length === 0 || userEmails.some(e => !validation_1.validation.isValidUserPrincipalName(e))) {
                 return `${args.options.userEmails} contains one or more invalid email addresses.`;
             }
         }
         return true;
     }));
+}, _TeamsChatMessageSendCommand_initOptionSets = function _TeamsChatMessageSendCommand_initOptionSets() {
+    this.optionSets.push(['chatId', 'userEmails', 'chatName']);
 };
 module.exports = new TeamsChatMessageSendCommand();
 //# sourceMappingURL=chat-message-send.js.map

package/dist/m365/teams/commands/funsettings/funsettings-list.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsFunSettingsListCommand_instances, _TeamsFunSettingsListCommand_initOptions, _TeamsFunSettingsListCommand_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 TeamsFunSettingsListCommand extends GraphCommand_1.default {
@@ -32,20 +32,23 @@ class TeamsFunSettingsListCommand extends GraphCommand_1.default {
     get description() {
         return 'Lists fun settings for the specified Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}?$select=funSettings`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res.funSettings);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}?$select=funSettings`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res.funSettings);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsFunSettingsListCommand_instances = new WeakSet(), _TeamsFunSettingsListCommand_initOptions = function _TeamsFunSettingsListCommand_initOptions() {
@@ -54,7 +57,7 @@ _TeamsFunSettingsListCommand_instances = new WeakSet(), _TeamsFunSettingsListCom
     });
 }, _TeamsFunSettingsListCommand_initValidators = function _TeamsFunSettingsListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         return true;