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

package/dist/m365/aad/commands/groupsetting/groupsetting-set.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadGroupSettingSetCommand_instances, _AadGroupSettingSetCommand_initOptions, _AadGroupSettingSetCommand_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 AadGroupSettingSetCommand extends GraphCommand_1.default {
@@ -35,36 +35,39 @@ class AadGroupSettingSetCommand extends GraphCommand_1.default {
     allowUnknownOptions() {
         return true;
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving group setting with id '${args.options.id}'...`);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groupSettings/${args.options.id}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((groupSetting) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/groupSettings/${args.options.id}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json'
-                },
-                data: {
-                    displayName: groupSetting.displayName,
-                    templateId: groupSetting.templateId,
-                    values: this.getGroupSettingValues(args.options, groupSetting)
-                },
-                responseType: 'json'
-            };
-            return request_1.default.patch(requestOptions);
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving group setting with id '${args.options.id}'...`);
+            }
+            try {
+                let requestOptions = {
+                    url: `${this.resource}/v1.0/groupSettings/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const groupSetting = yield request_1.default.get(requestOptions);
+                requestOptions = {
+                    url: `${this.resource}/v1.0/groupSettings/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json'
+                    },
+                    data: {
+                        displayName: groupSetting.displayName,
+                        templateId: groupSetting.templateId,
+                        values: this.getGroupSettingValues(args.options, groupSetting)
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getGroupSettingValues(options, groupSetting) {
         const values = [];
@@ -99,7 +102,7 @@ _AadGroupSettingSetCommand_instances = new WeakSet(), _AadGroupSettingSetCommand
     });
 }, _AadGroupSettingSetCommand_initValidators = function _AadGroupSettingSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -13,10 +13,10 @@ 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 _AadGroupSettingTemplateGetCommand_instances, _AadGroupSettingTemplateGetCommand_initTelemetry, _AadGroupSettingTemplateGetCommand_initOptions, _AadGroupSettingTemplateGetCommand_initValidators;
+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 odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingTemplateGetCommand extends GraphCommand_1.default {
@@ -26,6 +26,7 @@ class AadGroupSettingTemplateGetCommand extends GraphCommand_1.default {
         __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;
@@ -33,20 +34,22 @@ class AadGroupSettingTemplateGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Gets information about the specified Azure AD group settings template';
     }
-    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 odata_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));
+        });
     }
 }
 _AadGroupSettingTemplateGetCommand_instances = new WeakSet(), _AadGroupSettingTemplateGetCommand_initTelemetry = function _AadGroupSettingTemplateGetCommand_initTelemetry() {
@@ -64,18 +67,14 @@ _AadGroupSettingTemplateGetCommand_instances = new WeakSet(), _AadGroupSettingTe
     });
 }, _AadGroupSettingTemplateGetCommand_initValidators = function _AadGroupSettingTemplateGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        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';
-        }
         if (args.options.id &&
-            !utils_1.validation.isValidGuid(args.options.id)) {
+            !validation_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,6 +1,15 @@
 "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 odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadGroupSettingTemplateListCommand extends GraphCommand_1.default {
@@ -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 odata_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

@@ -18,7 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupAddCommand extends GraphCommand_1.default {
@@ -35,112 +35,101 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Creates a Microsoft 365 Group';
     }
-    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 ? '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'
                 }
-            })));
-        })
-            .then(() => {
-            logger.log(group);
-            cb();
-        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+            };
+            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}`
+                        }
+                    })));
+                }
+                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) {
@@ -157,7 +146,7 @@ class AadO365GroupAddCommand extends GraphCommand_1.default {
         let userIds = [];
         promises = userArr.map(user => {
             const requestOptions = {
-                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${utils_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
+                url: `${this.resource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(user)}'&$select=id,userPrincipalName`,
                 headers: {
                     'content-type': 'application/json'
                 },

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _AadO365GroupConversationListCommand_instances, _AadO365GroupConversationListCommand_initOptions, _AadO365GroupConversationListCommand_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 AadO365GroupConversationListCommand extends GraphCommand_1.default {
@@ -34,13 +35,16 @@ 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));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const conversations = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`);
+                logger.log(conversations);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _AadO365GroupConversationListCommand_instances = new WeakSet(), _AadO365GroupConversationListCommand_initOptions = function _AadO365GroupConversationListCommand_initOptions() {
@@ -49,7 +53,7 @@ _AadO365GroupConversationListCommand_instances = new WeakSet(), _AadO365GroupCon
     });
 }, _AadO365GroupConversationListCommand_initValidators = function _AadO365GroupConversationListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (!validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;

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

@@ -13,9 +13,10 @@ 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 _AadO365GroupConversationPostListCommand_instances, _AadO365GroupConversationPostListCommand_initTelemetry, _AadO365GroupConversationPostListCommand_initOptions, _AadO365GroupConversationPostListCommand_initValidators;
+var _AadO365GroupConversationPostListCommand_instances, _AadO365GroupConversationPostListCommand_initTelemetry, _AadO365GroupConversationPostListCommand_initOptions, _AadO365GroupConversationPostListCommand_initValidators, _AadO365GroupConversationPostListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const utils_1 = require("../../../../utils");
+const odata_1 = require("../../../../utils/odata");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -26,6 +27,7 @@ class AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _AadO365GroupConversationPostListCommand_instances, "m", _AadO365GroupConversationPostListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadO365GroupConversationPostListCommand_instances, "m", _AadO365GroupConversationPostListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadO365GroupConversationPostListCommand_instances, "m", _AadO365GroupConversationPostListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadO365GroupConversationPostListCommand_instances, "m", _AadO365GroupConversationPostListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.O365GROUP_CONVERSATION_POST_LIST;
@@ -36,16 +38,17 @@ class AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
     defaultProperties() {
         return ['receivedDateTime', 'id'];
     }
-    commandAction(logger, args, cb) {
-        this
-            .getGroupId(args)
-            .then((retrievedgroupId) => {
-            return utils_1.odata.getAllItems(`${this.resource}/v1.0/groups/${retrievedgroupId}/threads/${args.options.threadId}/posts`);
-        })
-            .then((posts) => {
-            logger.log(posts);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const retrievedgroupId = yield this.getGroupId(args);
+                const posts = yield odata_1.odata.getAllItems(`${this.resource}/v1.0/groups/${retrievedgroupId}/threads/${args.options.threadId}/posts`);
+                logger.log(posts);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     getGroupId(args) {
         if (args.options.groupId) {
@@ -73,18 +76,13 @@ _AadO365GroupConversationPostListCommand_instances = new WeakSet(), _AadO365Grou
     });
 }, _AadO365GroupConversationPostListCommand_initValidators = function _AadO365GroupConversationPostListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.groupId &&
-            !args.options.groupDisplayName) {
-            return 'Specify either groupId or groupDisplayName';
-        }
-        if (args.options.groupId && args.options.groupDisplayName) {
-            return 'Specify either groupId or groupDisplayName, but not both';
-        }
-        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !validation_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;
     }));
+}, _AadO365GroupConversationPostListCommand_initOptionSets = function _AadO365GroupConversationPostListCommand_initOptionSets() {
+    this.optionSets.push(['groupId', 'groupDisplayName']);
 };
 module.exports = new AadO365GroupConversationPostListCommand();
 //# sourceMappingURL=o365group-conversation-post-list.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _AadO365GroupGetCommand_instances, _AadO365GroupGetCommand_initOptions, _AadO365GroupGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -33,33 +33,28 @@ class AadO365GroupGetCommand extends GraphCommand_1.default {
     get description() {
         return 'Gets information about the specified Microsoft 365 Group or Microsoft Teams team';
     }
-    commandAction(logger, args, cb) {
-        let group;
-        aadGroup_1.aadGroup
-            .getGroupById(args.options.id)
-            .then((res) => {
-            group = res;
-            if (args.options.includeSiteUrl) {
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${group.id}/drive?$select=webUrl`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.get(requestOptions);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let group;
+            try {
+                group = yield aadGroup_1.aadGroup.getGroupById(args.options.id);
+                if (args.options.includeSiteUrl) {
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/groups/${group.id}/drive?$select=webUrl`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    const res = yield request_1.default.get(requestOptions);
+                    group.siteUrl = res.webUrl ? res.webUrl.substr(0, res.webUrl.lastIndexOf('/')) : '';
+                }
+                logger.log(group);
             }
-            else {
-                return Promise.resolve(undefined);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-        })
-            .then((res) => {
-            if (res) {
-                group.siteUrl = res.webUrl ? res.webUrl.substr(0, res.webUrl.lastIndexOf('/')) : '';
-            }
-            logger.log(group);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
 }
 _AadO365GroupGetCommand_instances = new WeakSet(), _AadO365GroupGetCommand_initOptions = function _AadO365GroupGetCommand_initOptions() {
@@ -70,7 +65,7 @@ _AadO365GroupGetCommand_instances = new WeakSet(), _AadO365GroupGetCommand_initO
     });
 }, _AadO365GroupGetCommand_initValidators = function _AadO365GroupGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;