@pnp/cli-microsoft365 6.0.0-beta.27e1012 → 6.0.0-beta.3261c97

package/dist/m365/aad/commands/groupsettingtemplate/groupsettingtemplate-get.js

@@ -1,62 +1,79 @@
 "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 _AadGroupSettingTemplateGetCommand_instances, _AadGroupSettingTemplateGetCommand_initTelemetry, _AadGroupSettingTemplateGetCommand_initOptions, _AadGroupSettingTemplateGetCommand_initValidators, _AadGroupSettingTemplateGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingTemplateGetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadGroupSettingTemplateGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadGroupSettingTemplateGetCommand_instances, "m", _AadGroupSettingTemplateGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadGroupSettingTemplateGetCommand_instances, "m", _AadGroupSettingTemplateGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadGroupSettingTemplateGetCommand_instances, "m", _AadGroupSettingTemplateGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadGroupSettingTemplateGetCommand_instances, "m", _AadGroupSettingTemplateGetCommand_initOptionSets).call(this);
+    }
     get name() {
         return commands_1.default.GROUPSETTINGTEMPLATE_GET;
     }
     get description() {
         return 'Gets information about the specified Azure AD group settings template';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.id = typeof args.options.id !== 'undefined';
-        telemetryProps.displayName = typeof args.options.displayName !== 'undefined';
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/groupSettingTemplates`)
-            .then((templates) => {
-            const groupSettingTemplate = templates.filter(t => args.options.id ? t.id === args.options.id : t.displayName === args.options.displayName);
-            if (groupSettingTemplate && groupSettingTemplate.length > 0) {
-                logger.log(groupSettingTemplate.pop());
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const templates = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/groupSettingTemplates`);
+                const groupSettingTemplate = templates.filter(t => args.options.id ? t.id === args.options.id : t.displayName === args.options.displayName);
+                if (groupSettingTemplate && groupSettingTemplate.length > 0) {
+                    logger.log(groupSettingTemplate.pop());
+                }
+                else {
+                    throw `Resource '${(args.options.id || args.options.displayName)}' does not exist.`;
+                }
             }
-            else {
-                cb(new Command_1.CommandError(`Resource '${(args.options.id || args.options.displayName)}' does not exist.`));
-                return;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
-    options() {
-        const options = [
-            {
-                option: '-i, --id [id]'
-            },
-            {
-                option: '-n, --displayName [displayName]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
-        if (!args.options.id && !args.options.displayName) {
-            return 'Specify either id or displayName';
-        }
-        if (args.options.id && args.options.displayName) {
-            return 'Specify either id or displayName but not both';
-        }
+}
+_AadGroupSettingTemplateGetCommand_instances = new WeakSet(), _AadGroupSettingTemplateGetCommand_initTelemetry = function _AadGroupSettingTemplateGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            displayName: typeof args.options.displayName !== 'undefined'
+        });
+    });
+}, _AadGroupSettingTemplateGetCommand_initOptions = function _AadGroupSettingTemplateGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
+    });
+}, _AadGroupSettingTemplateGetCommand_initValidators = function _AadGroupSettingTemplateGetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id &&
             !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+}, _AadGroupSettingTemplateGetCommand_initOptionSets = function _AadGroupSettingTemplateGetCommand_initOptionSets() {
+    this.optionSets.push(['id', 'displayName']);
+};
 module.exports = new AadGroupSettingTemplateGetCommand();
 //# sourceMappingURL=groupsettingtemplate-get.js.map

package/dist/m365/aad/commands/groupsettingtemplate/groupsettingtemplate-list.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
@@ -13,13 +22,16 @@ class AadGroupSettingTemplateListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['id', 'displayName'];
     }
-    commandAction(logger, args, cb) {
-        utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/groupSettingTemplates`)
-            .then((templates) => {
-            logger.log(templates);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const templates = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/groupSettingTemplates`);
+                logger.log(templates);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new AadGroupSettingTemplateListCommand();

package/dist/m365/aad/commands/o365group/o365group-add.js

@@ -1,4 +1,19 @@
 "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 _AadO365GroupAddCommand_instances, _AadO365GroupAddCommand_initTelemetry, _AadO365GroupAddCommand_initOptions, _AadO365GroupAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
@@ -7,130 +22,114 @@ const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadO365GroupAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadO365GroupAddCommand_instances, "m", _AadO365GroupAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupAddCommand_instances, "m", _AadO365GroupAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupAddCommand_instances, "m", _AadO365GroupAddCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.O365GROUP_ADD;
     }
     get description() {
         return 'Creates a Microsoft 365 Group';
     }
-    getTelemetryProperties(args) {
-        const telemetryProps = super.getTelemetryProperties(args);
-        telemetryProps.owners = typeof args.options.owners !== 'undefined';
-        telemetryProps.members = typeof args.options.members !== 'undefined';
-        telemetryProps.logoPath = typeof args.options.logoPath !== 'undefined';
-        telemetryProps.isPrivate = typeof args.options.isPrivate !== 'undefined';
-        telemetryProps.allowMembersToPost = (!(!args.options.allowMembersToPost)).toString();
-        telemetryProps.hideGroupInOutlook = (!(!args.options.hideGroupInOutlook)).toString();
-        telemetryProps.subscribeNewGroupMembers = (!(!args.options.subscribeNewGroupMembers)).toString();
-        telemetryProps.welcomeEmailDisabled = (!(!args.options.welcomeEmailDisabled)).toString();
-        return telemetryProps;
-    }
-    commandAction(logger, args, cb) {
-        let group;
-        let ownerIds = [];
-        let memberIds = [];
-        const resourceBehaviorOptionsCollection = [];
-        if (this.verbose) {
-            logger.logToStderr(`Creating Microsoft 365 Group...`);
-        }
-        if (args.options.allowMembersToPost) {
-            resourceBehaviorOptionsCollection.push("allowMembersToPost");
-        }
-        if (args.options.hideGroupInOutlook) {
-            resourceBehaviorOptionsCollection.push("hideGroupInOutlook");
-        }
-        if (args.options.subscribeNewGroupMembers) {
-            resourceBehaviorOptionsCollection.push("subscribeNewGroupMembers");
-        }
-        if (args.options.welcomeEmailDisabled) {
-            resourceBehaviorOptionsCollection.push("welcomeEmailDisabled");
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups`,
-            headers: {
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                description: args.options.description,
-                displayName: args.options.displayName,
-                groupTypes: [
-                    "Unified"
-                ],
-                mailEnabled: true,
-                mailNickname: args.options.mailNickname,
-                resourceBehaviorOptions: resourceBehaviorOptionsCollection,
-                securityEnabled: false,
-                visibility: args.options.isPrivate === 'true' ? 'Private' : 'Public'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let group;
+            let ownerIds = [];
+            let memberIds = [];
+            const resourceBehaviorOptionsCollection = [];
+            if (this.verbose) {
+                logger.logToStderr(`Creating Microsoft 365 Group...`);
             }
-        };
-        this
-            .getUserIds(logger, args.options.owners)
-            .then((ownerIdsRes) => {
-            ownerIds = ownerIdsRes;
-            return this.getUserIds(logger, args.options.members);
-        })
-            .then((memberIdsRes) => {
-            memberIds = memberIdsRes;
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            group = res;
-            if (!args.options.logoPath) {
-                if (this.debug) {
-                    logger.logToStderr('logoPath not set. Skipping');
-                }
-                return Promise.resolve();
+            if (args.options.allowMembersToPost) {
+                resourceBehaviorOptionsCollection.push("allowMembersToPost");
             }
-            const fullPath = path.resolve(args.options.logoPath);
-            if (this.verbose) {
-                logger.logToStderr(`Setting group logo ${fullPath}...`);
+            if (args.options.hideGroupInOutlook) {
+                resourceBehaviorOptionsCollection.push("hideGroupInOutlook");
             }
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groups/${group.id}/photo/$value`,
-                headers: {
-                    'content-type': this.getImageContentType(fullPath)
-                },
-                data: fs.readFileSync(fullPath)
-            };
-            return new Promise((resolve, reject) => {
-                this.setGroupLogo(requestOptions, AadO365GroupAddCommand.numRepeat, resolve, reject, logger);
-            });
-        })
-            .then(() => {
-            if (ownerIds.length === 0) {
-                return Promise.resolve([]);
+            if (args.options.subscribeNewGroupMembers) {
+                resourceBehaviorOptionsCollection.push("subscribeNewGroupMembers");
             }
-            return Promise.all(ownerIds.map(ownerId => request_1.default.post({
-                url: `${this.resource}/v1.0/groups/${group.id}/owners/$ref`,
-                headers: {
-                    'content-type': 'application/json'
-                },
-                responseType: 'json',
-                data: {
-                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${ownerId}`
-                }
-            })));
-        })
-            .then(() => {
-            if (memberIds.length === 0) {
-                return Promise.resolve([]);
+            if (args.options.welcomeEmailDisabled) {
+                resourceBehaviorOptionsCollection.push("welcomeEmailDisabled");
             }
-            return Promise.all(memberIds.map(memberId => request_1.default.post({
-                url: `${this.resource}/v1.0/groups/${group.id}/members/$ref`,
+            const requestOptions = {
+                url: `${this.resource}/v1.0/groups`,
                 headers: {
-                    'content-type': 'application/json'
+                    'accept': 'application/json;odata.metadata=none'
                 },
                 responseType: 'json',
                 data: {
-                    "@odata.id": `https://graph.microsoft.com/v1.0/users/${memberId}`
+                    description: args.options.description,
+                    displayName: args.options.displayName,
+                    groupTypes: [
+                        "Unified"
+                    ],
+                    mailEnabled: true,
+                    mailNickname: args.options.mailNickname,
+                    resourceBehaviorOptions: resourceBehaviorOptionsCollection,
+                    securityEnabled: false,
+                    visibility: args.options.isPrivate ? 'Private' : 'Public'
+                }
+            };
+            try {
+                ownerIds = yield this.getUserIds(logger, args.options.owners);
+                memberIds = yield this.getUserIds(logger, args.options.members);
+                group = yield request_1.default.post(requestOptions);
+                if (!args.options.logoPath) {
+                    if (this.debug) {
+                        logger.logToStderr('logoPath not set. Skipping');
+                    }
+                }
+                else {
+                    const fullPath = path.resolve(args.options.logoPath);
+                    if (this.verbose) {
+                        logger.logToStderr(`Setting group logo ${fullPath}...`);
+                    }
+                    const requestOptionsPhoto = {
+                        url: `${this.resource}/v1.0/groups/${group.id}/photo/$value`,
+                        headers: {
+                            'content-type': this.getImageContentType(fullPath)
+                        },
+                        data: fs.readFileSync(fullPath)
+                    };
+                    yield new Promise((resolve, reject) => {
+                        this.setGroupLogo(requestOptionsPhoto, AadO365GroupAddCommand.numRepeat, resolve, reject, logger);
+                    });
+                }
+                if (ownerIds.length !== 0) {
+                    yield Promise.all(ownerIds.map(ownerId => request_1.default.post({
+                        url: `${this.resource}/v1.0/groups/${group.id}/owners/$ref`,
+                        headers: {
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json',
+                        data: {
+                            "@odata.id": `https://graph.microsoft.com/v1.0/users/${ownerId}`
+                        }
+                    })));
                 }
-            })));
-        })
-            .then(() => {
-            logger.log(group);
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+                if (memberIds.length !== 0) {
+                    yield Promise.all(memberIds.map(memberId => request_1.default.post({
+                        url: `${this.resource}/v1.0/groups/${group.id}/members/$ref`,
+                        headers: {
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json',
+                        data: {
+                            "@odata.id": `https://graph.microsoft.com/v1.0/users/${memberId}`
+                        }
+                    })));
+                }
+                logger.log(group);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getUserIds(logger, users) {
         if (!users) {
@@ -192,46 +191,46 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
                 return 'image/jpeg';
         }
     }
-    options() {
-        const options = [
-            {
-                option: '-n, --displayName <displayName>'
-            },
-            {
-                option: '-d, --description <description>'
-            },
-            {
-                option: '-m, --mailNickname <mailNickname>'
-            },
-            {
-                option: '--owners [owners]'
-            },
-            {
-                option: '--members [members]'
-            },
-            {
-                option: '--isPrivate [isPrivate]'
-            },
-            {
-                option: '--allowMembersToPost [allowMembersToPost]'
-            },
-            {
-                option: '--hideGroupInOutlook [hideGroupInOutlook]'
-            },
-            {
-                option: '--subscribeNewGroupMembers [subscribeNewGroupMembers]'
-            },
-            {
-                option: '--welcomeEmailDisabled [welcomeEmailDisabled]'
-            },
-            {
-                option: '-l, --logoPath [logoPath]'
-            }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
-    }
-    validate(args) {
+}
+_AadO365GroupAddCommand_instances = new WeakSet(), _AadO365GroupAddCommand_initTelemetry = function _AadO365GroupAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            owners: typeof args.options.owners !== 'undefined',
+            members: typeof args.options.members !== 'undefined',
+            logoPath: typeof args.options.logoPath !== 'undefined',
+            isPrivate: typeof args.options.isPrivate !== 'undefined',
+            allowMembersToPost: (!(!args.options.allowMembersToPost)).toString(),
+            hideGroupInOutlook: (!(!args.options.hideGroupInOutlook)).toString(),
+            subscribeNewGroupMembers: (!(!args.options.subscribeNewGroupMembers)).toString(),
+            welcomeEmailDisabled: (!(!args.options.welcomeEmailDisabled)).toString()
+        });
+    });
+}, _AadO365GroupAddCommand_initOptions = function _AadO365GroupAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --displayName <displayName>'
+    }, {
+        option: '-d, --description <description>'
+    }, {
+        option: '-m, --mailNickname <mailNickname>'
+    }, {
+        option: '--owners [owners]'
+    }, {
+        option: '--members [members]'
+    }, {
+        option: '--isPrivate'
+    }, {
+        option: '--allowMembersToPost [allowMembersToPost]'
+    }, {
+        option: '--hideGroupInOutlook [hideGroupInOutlook]'
+    }, {
+        option: '--subscribeNewGroupMembers [subscribeNewGroupMembers]'
+    }, {
+        option: '--welcomeEmailDisabled [welcomeEmailDisabled]'
+    }, {
+        option: '-l, --logoPath [logoPath]'
+    });
+}, _AadO365GroupAddCommand_initValidators = function _AadO365GroupAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.owners) {
             const owners = args.options.owners.split(',').map(o => o.trim());
             for (let i = 0; i < owners.length; i++) {
@@ -248,11 +247,6 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
                 }
             }
         }
-        if (typeof args.options.isPrivate !== 'undefined' &&
-            args.options.isPrivate !== 'true' &&
-            args.options.isPrivate !== 'false') {
-            return `${args.options.isPrivate} is not a valid boolean value`;
-        }
         if (args.options.logoPath) {
             const fullPath = path.resolve(args.options.logoPath);
             if (!fs.existsSync(fullPath)) {
@@ -263,8 +257,8 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
             }
         }
         return true;
-    }
-}
+    }));
+};
 AadO365GroupAddCommand.numRepeat = 15;
 module.exports = new AadO365GroupAddCommand();
 //# sourceMappingURL=o365group-add.js.map

package/dist/m365/aad/commands/o365group/o365group-conversation-list.js

@@ -1,9 +1,30 @@
 "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 _AadO365GroupConversationListCommand_instances, _AadO365GroupConversationListCommand_initOptions, _AadO365GroupConversationListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupConversationListCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadO365GroupConversationListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadO365GroupConversationListCommand_instances, "m", _AadO365GroupConversationListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupConversationListCommand_instances, "m", _AadO365GroupConversationListCommand_initValidators).call(this);
+    }
     get name() {
         return commands_1.default.O365GROUP_CONVERSATION_LIST;
     }
@@ -13,29 +34,29 @@ class AadO365GroupConversationListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['topic', 'lastDeliveredDateTime', 'id'];
     }
-    commandAction(logger, args, cb) {
-        utils_1.odata
-            .getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`)
-            .then((conversations) => {
-            logger.log(conversations);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    options() {
-        const options = [
-            {
-                option: '-i, --groupId <groupId>'
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const conversations = yield utils_1.odata.getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`);
+                logger.log(conversations);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        ];
-        const parentOptions = super.options();
-        return options.concat(parentOptions);
+        });
     }
-    validate(args) {
+}
+_AadO365GroupConversationListCommand_instances = new WeakSet(), _AadO365GroupConversationListCommand_initOptions = function _AadO365GroupConversationListCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --groupId <groupId>'
+    });
+}, _AadO365GroupConversationListCommand_initValidators = function _AadO365GroupConversationListCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (!utils_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;
-    }
-}
+    }));
+};
 module.exports = new AadO365GroupConversationListCommand();
 //# sourceMappingURL=o365group-conversation-list.js.map