@pnp/cli-microsoft365 6.0.0-beta.443926a → 6.0.0-beta.48a730d

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

@@ -1,9 +1,31 @@
 "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 _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 {
+    constructor() {
+        super();
+        _TeamsChatMemberListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsChatMemberListCommand_instances, "m", _TeamsChatMemberListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsChatMemberListCommand_instances, "m", _TeamsChatMemberListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.CHAT_MEMBER_LIST;
     }
@@ -13,30 +35,30 @@ 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));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --chatId <chatId>'
+    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);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        if (!utils_1.validation.isValidTeamsChatId(args.options.chatId)) {
+}
+_TeamsChatMemberListCommand_instances = new WeakSet(), _TeamsChatMemberListCommand_initOptions = function _TeamsChatMemberListCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --chatId <chatId>'
+    });
+}, _TeamsChatMemberListCommand_initValidators = function _TeamsChatMemberListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidTeamsChatId(args.options.chatId)) {
             return `${args.options.chatId} is not a valid Teams ChatId`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new TeamsChatMemberListCommand();
 //# sourceMappingURL=chat-member-list.js.map

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

@@ -1,9 +1,31 @@
 "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 _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 {
+    constructor() {
+        super();
+        _TeamsChatMessageListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsChatMessageListCommand_instances, "m", _TeamsChatMessageListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsChatMessageListCommand_instances, "m", _TeamsChatMessageListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.CHAT_MESSAGE_LIST;
     }
@@ -13,48 +35,48 @@ 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));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --chatId <chatId>'
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        if (!utils_1.validation.isValidTeamsChatId(args.options.chatId)) {
+}
+_TeamsChatMessageListCommand_instances = new WeakSet(), _TeamsChatMessageListCommand_initOptions = function _TeamsChatMessageListCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --chatId <chatId>'
+    });
+}, _TeamsChatMessageListCommand_initValidators = function _TeamsChatMessageListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidTeamsChatId(args.options.chatId)) {
             return `${args.options.chatId} is not a valid Teams chat ID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new TeamsChatMessageListCommand();
 //# sourceMappingURL=chat-message-list.js.map

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

@@ -8,84 +8,46 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 _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");
 class TeamsChatMessageSendCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _TeamsChatMessageSendCommand_instances.add(this);
+        __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;
     }
     get description() {
         return 'Sends a chat message to a Microsoft Teams chat conversation.';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.chatId = typeof args.options.chatId !== 'undefined';
-        telemetryProps.userEmails = typeof args.options.userEmails !== 'undefined';
-        telemetryProps.chatName = typeof args.options.chatName !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        this
-            .getChatId(logger, args)
-            .then(chatId => this.sendChatMessage(chatId, args))
-            .then(_ => {
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '--chatId [chatId]'
-            },
-            {
-                option: '-e, --userEmails [userEmails]'
-            },
-            {
-                option: '--chatName [chatName]'
-            },
-            {
-                option: '-m, --message <message>'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const chatId = yield this.getChatId(logger, args);
+                yield this.sendChatMessage(chatId, args);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        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.message) {
-            return 'Specify a message to send.';
-        }
-        if (args.options.chatId && !utils_1.validation.isValidTeamsChatId(args.options.chatId)) {
-            return `${args.options.chatId} is not a valid Teams ChatId.`;
-        }
-        if (args.options.userEmails) {
-            const userEmails = chatUtil_1.chatUtil.convertParticipantStringToArray(args.options.userEmails);
-            if (!userEmails || userEmails.length === 0 || userEmails.some(e => !utils_1.validation.isValidUserPrincipalName(e))) {
-                return `${args.options.userEmails} contains one or more invalid email addresses.`;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        }
-        return true;
+        });
     }
     getChatId(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -99,8 +61,8 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
     }
     ensureChatIdByUserEmails(userEmailsOption) {
         return __awaiter(this, void 0, void 0, function* () {
-            const userEmails = chatUtil_1.chatUtil.convertParticipantStringToArray(userEmailsOption);
-            const currentUserEmail = utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken).toLowerCase();
+            const userEmails = userEmailsOption.trim().toLowerCase().split(',').filter(e => e && e !== '');
+            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]);
@@ -188,5 +150,39 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
         });
     }
 }
+_TeamsChatMessageSendCommand_instances = new WeakSet(), _TeamsChatMessageSendCommand_initTelemetry = function _TeamsChatMessageSendCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            chatId: typeof args.options.chatId !== 'undefined',
+            userEmails: typeof args.options.userEmails !== 'undefined',
+            chatName: typeof args.options.chatName !== 'undefined'
+        });
+    });
+}, _TeamsChatMessageSendCommand_initOptions = function _TeamsChatMessageSendCommand_initOptions() {
+    this.options.unshift({
+        option: '--chatId [chatId]'
+    }, {
+        option: '-e, --userEmails [userEmails]'
+    }, {
+        option: '--chatName [chatName]'
+    }, {
+        option: '-m, --message <message>'
+    });
+}, _TeamsChatMessageSendCommand_initValidators = function _TeamsChatMessageSendCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        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 => !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/chat/chatUtil.js

@@ -45,18 +45,6 @@ exports.chatUtil = {
             const endpoint = `https://graph.microsoft.com/v1.0/chats?$filter=topic eq '${encodeURIComponent(name).replace("'", "''")}'&$expand=members&$select=id,topic,createdDateTime,chatType`;
             return odata_1.odata.getAllItems(endpoint);
         });
-    },
-    /**
-     * Converts a comma or space separated string into an array.
-     * @param value the string to convert
-     */
-    convertParticipantStringToArray(value) {
-        if (value.indexOf(',') === -1) {
-            return value.trim().toLowerCase().split(' ').filter(e => e && e !== '');
-        }
-        else {
-            return value.trim().toLowerCase().split(',').filter(e => e && e !== '');
-        }
     }
 };
 //# sourceMappingURL=chatUtil.js.map

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

@@ -1,46 +1,67 @@
 "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 _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 {
+    constructor() {
+        super();
+        _TeamsFunSettingsListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsFunSettingsListCommand_instances, "m", _TeamsFunSettingsListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsFunSettingsListCommand_instances, "m", _TeamsFunSettingsListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.FUNSETTINGS_LIST;
     }
     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));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --teamId <teamId>'
+    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);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+}
+_TeamsFunSettingsListCommand_instances = new WeakSet(), _TeamsFunSettingsListCommand_initOptions = function _TeamsFunSettingsListCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --teamId <teamId>'
+    });
+}, _TeamsFunSettingsListCommand_initValidators = function _TeamsFunSettingsListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new TeamsFunSettingsListCommand();
 //# sourceMappingURL=funsettings-list.js.map

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

@@ -1,71 +1,92 @@
 "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 _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 {
+    constructor() {
+        super();
+        _TeamsFunSettingsSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsFunSettingsSetCommand_instances, "m", _TeamsFunSettingsSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsFunSettingsSetCommand_instances, "m", _TeamsFunSettingsSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsFunSettingsSetCommand_instances, "m", _TeamsFunSettingsSetCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.FUNSETTINGS_SET;
     }
     get description() {
         return 'Updates fun settings of a Microsoft Teams team';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        TeamsFunSettingsSetCommand.booleanProps.forEach(p => {
-            telemetryProps[p] = args.options[p];
+    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);
+            }
         });
-        telemetryProps.giphyContentRating = args.options.giphyContentRating;
-        return telemetryProps;
     }
-    commandAction(logger, args, cb) {
-        const data = {
-            funSettings: {}
-        };
+}
+_TeamsFunSettingsSetCommand_instances = new WeakSet(), _TeamsFunSettingsSetCommand_initTelemetry = function _TeamsFunSettingsSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            giphyContentRating: args.options.giphyContentRating
+        });
         TeamsFunSettingsSetCommand.booleanProps.forEach(p => {
-            if (typeof args.options[p] !== 'undefined') {
-                data.funSettings[p] = args.options[p] === 'true';
-            }
+            this.telemetryProperties[p] = args.options[p];
         });
-        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));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --teamId <teamId>'
-            },
-            {
-                option: '--allowGiphy [allowGiphy]'
-            },
-            {
-                option: '--giphyContentRating [giphyContentRating]'
-            },
-            {
-                option: '--allowStickersAndMemes [allowStickersAndMemes]'
-            },
-            {
-                option: '--allowCustomMemes [allowCustomMemes]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+    });
+}, _TeamsFunSettingsSetCommand_initOptions = function _TeamsFunSettingsSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --teamId <teamId>'
+    }, {
+        option: '--allowGiphy [allowGiphy]'
+    }, {
+        option: '--giphyContentRating [giphyContentRating]'
+    }, {
+        option: '--allowStickersAndMemes [allowStickersAndMemes]'
+    }, {
+        option: '--allowCustomMemes [allowCustomMemes]'
+    });
+}, _TeamsFunSettingsSetCommand_initValidators = function _TeamsFunSettingsSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         let isValid = true;
@@ -88,8 +109,8 @@ class TeamsFunSettingsSetCommand extends GraphCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+};
 TeamsFunSettingsSetCommand.booleanProps = [
     'allowGiphy',
     'allowStickersAndMemes',