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

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;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsFunSettingsSetCommand_instances, _TeamsFunSettingsSetCommand_initTelemetry, _TeamsFunSettingsSetCommand_initOptions, _TeamsFunSettingsSetCommand_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 TeamsFunSettingsSetCommand extends GraphCommand_1.default {
@@ -33,29 +33,34 @@ class TeamsFunSettingsSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates fun settings of a Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        const data = {
-            funSettings: {}
-        };
-        TeamsFunSettingsSetCommand.booleanProps.forEach(p => {
-            if (typeof args.options[p] !== 'undefined') {
-                data.funSettings[p] = args.options[p] === 'true';
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const data = {
+                    funSettings: {}
+                };
+                TeamsFunSettingsSetCommand.booleanProps.forEach(p => {
+                    if (typeof args.options[p] !== 'undefined') {
+                        data.funSettings[p] = args.options[p] === 'true';
+                    }
+                });
+                if (args.options.giphyContentRating) {
+                    data.funSettings.giphyContentRating = args.options.giphyContentRating;
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    data: data,
+                    responseType: 'json'
+                };
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
         });
-        if (args.options.giphyContentRating) {
-            data.funSettings.giphyContentRating = args.options.giphyContentRating;
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            data: data,
-            responseType: 'json'
-        };
-        request_1.default
-            .patch(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
 }
 _TeamsFunSettingsSetCommand_instances = new WeakSet(), _TeamsFunSettingsSetCommand_initTelemetry = function _TeamsFunSettingsSetCommand_initTelemetry() {
@@ -81,7 +86,7 @@ _TeamsFunSettingsSetCommand_instances = new WeakSet(), _TeamsFunSettingsSetComma
     });
 }, _TeamsFunSettingsSetCommand_initValidators = function _TeamsFunSettingsSetCommand_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`;
         }
         let isValid = true;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsGuestSettingsListCommand_instances, _TeamsGuestSettingsListCommand_initOptions, _TeamsGuestSettingsListCommand_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 TeamsGuestSettingsListCommand extends GraphCommand_1.default {
@@ -32,20 +32,23 @@ class TeamsGuestSettingsListCommand extends GraphCommand_1.default {
     get description() {
         return 'Lists guest settings for a Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}?$select=guestSettings`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res.guestSettings);
-            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=guestSettings`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res.guestSettings);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsGuestSettingsListCommand_instances = new WeakSet(), _TeamsGuestSettingsListCommand_initOptions = function _TeamsGuestSettingsListCommand_initOptions() {
@@ -54,7 +57,7 @@ _TeamsGuestSettingsListCommand_instances = new WeakSet(), _TeamsGuestSettingsLis
     });
 }, _TeamsGuestSettingsListCommand_initValidators = function _TeamsGuestSettingsListCommand_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;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsGuestSettingsSetCommand_instances, _TeamsGuestSettingsSetCommand_initTelemetry, _TeamsGuestSettingsSetCommand_initOptions, _TeamsGuestSettingsSetCommand_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 TeamsGuestSettingsSetCommand extends GraphCommand_1.default {
@@ -33,26 +33,31 @@ class TeamsGuestSettingsSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates guest settings of a Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        const data = {
-            guestSettings: {}
-        };
-        TeamsGuestSettingsSetCommand.props.forEach(p => {
-            if (typeof args.options[p] !== 'undefined') {
-                data.guestSettings[p] = args.options[p] === 'true';
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = {
+                guestSettings: {}
+            };
+            TeamsGuestSettingsSetCommand.props.forEach(p => {
+                if (typeof args.options[p] !== 'undefined') {
+                    data.guestSettings[p] = args.options[p] === 'true';
+                }
+            });
+            const requestOptions = {
+                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                data: data,
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
         });
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            data: data,
-            responseType: 'json'
-        };
-        request_1.default
-            .patch(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
 }
 _TeamsGuestSettingsSetCommand_instances = new WeakSet(), _TeamsGuestSettingsSetCommand_initTelemetry = function _TeamsGuestSettingsSetCommand_initTelemetry() {
@@ -71,7 +76,7 @@ _TeamsGuestSettingsSetCommand_instances = new WeakSet(), _TeamsGuestSettingsSetC
     });
 }, _TeamsGuestSettingsSetCommand_initValidators = function _TeamsGuestSettingsSetCommand_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`;
         }
         let isValid = true;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsMemberSettingsListCommand_instances, _TeamsMemberSettingsListCommand_initOptions, _TeamsMemberSettingsListCommand_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 TeamsMemberSettingsListCommand extends GraphCommand_1.default {
@@ -32,20 +32,23 @@ class TeamsMemberSettingsListCommand extends GraphCommand_1.default {
     get description() {
         return 'Lists member settings for a Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}?$select=memberSettings`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            logger.log(res.memberSettings);
-            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=memberSettings`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res.memberSettings);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsMemberSettingsListCommand_instances = new WeakSet(), _TeamsMemberSettingsListCommand_initOptions = function _TeamsMemberSettingsListCommand_initOptions() {
@@ -54,7 +57,7 @@ _TeamsMemberSettingsListCommand_instances = new WeakSet(), _TeamsMemberSettingsL
     });
 }, _TeamsMemberSettingsListCommand_initValidators = function _TeamsMemberSettingsListCommand_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;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsMemberSettingsSetCommand_instances, _TeamsMemberSettingsSetCommand_initTelemetry, _TeamsMemberSettingsSetCommand_initOptions, _TeamsMemberSettingsSetCommand_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 TeamsMemberSettingsSetCommand extends GraphCommand_1.default {
@@ -33,26 +33,31 @@ class TeamsMemberSettingsSetCommand extends GraphCommand_1.default {
     get description() {
         return 'Updates member settings of a Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        const data = {
-            memberSettings: {}
-        };
-        TeamsMemberSettingsSetCommand.props.forEach(p => {
-            if (typeof args.options[p] !== 'undefined') {
-                data.memberSettings[p] = args.options[p] === 'true';
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const data = {
+                memberSettings: {}
+            };
+            TeamsMemberSettingsSetCommand.props.forEach(p => {
+                if (typeof args.options[p] !== 'undefined') {
+                    data.memberSettings[p] = args.options[p] === 'true';
+                }
+            });
+            const requestOptions = {
+                url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                data: data,
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
         });
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${encodeURIComponent(args.options.teamId)}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            data: data,
-            responseType: 'json'
-        };
-        request_1.default
-            .patch(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
 }
 _TeamsMemberSettingsSetCommand_instances = new WeakSet(), _TeamsMemberSettingsSetCommand_initTelemetry = function _TeamsMemberSettingsSetCommand_initTelemetry() {
@@ -77,7 +82,7 @@ _TeamsMemberSettingsSetCommand_instances = new WeakSet(), _TeamsMemberSettingsSe
     });
 }, _TeamsMemberSettingsSetCommand_initValidators = function _TeamsMemberSettingsSetCommand_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`;
         }
         let isValid = true;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsMessageGetCommand_instances, _TeamsMessageGetCommand_initOptions, _TeamsMessageGetCommand_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 TeamsMessageGetCommand extends GraphCommand_1.default {
@@ -32,20 +32,23 @@ class TeamsMessageGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Retrieves a message from a channel in a Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${args.options.channelId}/messages/${args.options.id}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(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 requestOptions = {
+                url: `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${args.options.channelId}/messages/${args.options.id}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            try {
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsMessageGetCommand_instances = new WeakSet(), _TeamsMessageGetCommand_initOptions = function _TeamsMessageGetCommand_initOptions() {
@@ -58,10 +61,10 @@ _TeamsMessageGetCommand_instances = new WeakSet(), _TeamsMessageGetCommand_initO
     });
 }, _TeamsMessageGetCommand_initValidators = function _TeamsMessageGetCommand_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 (!utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (!validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
         return true;

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsMessageListCommand_instances, _TeamsMessageListCommand_initTelemetry, _TeamsMessageListCommand_initOptions, _TeamsMessageListCommand_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 TeamsMessageListCommand extends GraphCommand_1.default {
@@ -35,20 +36,23 @@ class TeamsMessageListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'summary', 'body'];
     }
-    commandAction(logger, args, cb) {
-        const deltaExtension = args.options.since !== undefined ? `/delta?$filter=lastModifiedDateTime gt ${args.options.since}` : '';
-        const endpoint = `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${args.options.channelId}/messages${deltaExtension}`;
-        utils_1.odata
-            .getAllItems(endpoint)
-            .then((items) => {
-            if (args.options.output !== 'json') {
-                items.forEach(i => {
-                    i.body = i.body.content;
-                });
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const deltaExtension = args.options.since !== undefined ? `/delta?$filter=lastModifiedDateTime gt ${args.options.since}` : '';
+            const endpoint = `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${args.options.channelId}/messages${deltaExtension}`;
+            try {
+                const items = yield odata_1.odata.getAllItems(endpoint);
+                if (args.options.output !== 'json') {
+                    items.forEach(i => {
+                        i.body = i.body.content;
+                    });
+                }
+                logger.log(items);
             }
-            logger.log(items);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsMessageListCommand_instances = new WeakSet(), _TeamsMessageListCommand_initTelemetry = function _TeamsMessageListCommand_initTelemetry() {
@@ -67,16 +71,16 @@ _TeamsMessageListCommand_instances = new WeakSet(), _TeamsMessageListCommand_ini
     });
 }, _TeamsMessageListCommand_initValidators = function _TeamsMessageListCommand_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 (!utils_1.validation.isValidTeamsChannelId(args.options.channelId)) {
+        if (!validation_1.validation.isValidTeamsChannelId(args.options.channelId)) {
             return `${args.options.channelId} is not a valid Teams ChannelId`;
         }
-        if (args.options.since && !utils_1.validation.isValidISODateDashOnly(args.options.since)) {
+        if (args.options.since && !validation_1.validation.isValidISODateDashOnly(args.options.since)) {
             return `${args.options.since} is not a valid ISO Date (with dash separator)`;
         }
-        if (args.options.since && !utils_1.validation.isDateInRange(args.options.since, 8)) {
+        if (args.options.since && !validation_1.validation.isDateInRange(args.options.since, 8)) {
             return `${args.options.since} is not in the last 8 months (for delta messages)`;
         }
         return true;