@pnp/cli-microsoft365 5.0.0 → 5.1.0-beta.04832fc

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const Utils_1 = require("../../../../Utils");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadO365GroupConversationListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadO365GroupConversationListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.O365GROUP_CONVERSATION_LIST;
     }
@@ -14,10 +14,10 @@ class AadO365GroupConversationListCommand extends GraphItemsListCommand_1.GraphI
         return ['topic', 'lastDeliveredDateTime', 'id'];
     }
     commandAction(logger, args, cb) {
-        this
-            .getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`, logger, true)
-            .then(() => {
-            logger.log(this.items);
+        utils_1.odata
+            .getAllItems(`${this.resource}/v1.0/groups/${args.options.groupId}/conversations`, logger)
+            .then((conversations) => {
+            logger.log(conversations);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
@@ -31,7 +31,7 @@ class AadO365GroupConversationListCommand extends GraphItemsListCommand_1.GraphI
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.groupId)) {
+        if (!utils_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

@@ -0,0 +1,87 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+class AadO365GroupConversationPostListCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.O365GROUP_CONVERSATION_POST_LIST;
+    }
+    get description() {
+        return 'Lists conversation posts of a Microsoft 365 group';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.groupId = typeof args.options.groupId !== 'undefined';
+        telemetryProps.groupDisplayName = typeof args.options.groupDisplayName !== 'undefined';
+        return telemetryProps;
+    }
+    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`, logger);
+        })
+            .then((posts) => {
+            logger.log(posts);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    getGroupId(args) {
+        if (args.options.groupId) {
+            return Promise.resolve(encodeURIComponent(args.options.groupId));
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.groupDisplayName)}'&$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(res => {
+            if (res.value.length === 1) {
+                return Promise.resolve(res.value[0].id);
+            }
+            if (res.value.length === 0) {
+                return Promise.reject(`The specified group does not exist`);
+            }
+            return Promise.reject(`Multiple groups found with name ${args.options.groupDisplayName} found. Please choose between the following IDs: ${res.value.map(a => a.id).join(', ')}`);
+        });
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --groupId [groupId]'
+            },
+            {
+                option: '-d, --groupDisplayName [groupDisplayName]'
+            },
+            {
+                option: '-t, --threadId <threadId>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        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)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        return true;
+    }
+}
+module.exports = new AadO365GroupConversationPostListCommand();
+//# sourceMappingURL=o365group-conversation-post-list.js.map

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupGetCommand extends GraphCommand_1.default {
@@ -59,7 +59,7 @@ class AadO365GroupGetCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -1,9 +1,10 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadO365GroupListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadO365GroupListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.O365GROUP_LIST;
     }
@@ -32,20 +33,22 @@ class AadO365GroupListCommand extends GraphItemsListCommand_1.GraphItemsListComm
         if (args.options.deleted) {
             endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${groupFilter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
         }
-        this
-            .getAllItems(endpoint, logger, true)
-            .then(() => {
+        let groups = [];
+        utils_1.odata
+            .getAllItems(endpoint, logger)
+            .then((_groups) => {
+            groups = _groups;
             if (args.options.orphaned) {
                 const orphanedGroups = [];
-                this.items.forEach((group) => {
+                groups.forEach((group) => {
                     if (!group.owners || group.owners.length === 0) {
                         orphanedGroups.push(group);
                     }
                 });
-                this.items = orphanedGroups;
+                groups = orphanedGroups;
             }
             if (args.options.includeSiteUrl) {
-                return Promise.all(this.items.map(g => this.getGroupSiteUrl(g.id)));
+                return Promise.all(groups.map(g => this.getGroupSiteUrl(g.id)));
             }
             else {
                 return Promise.resolve();
@@ -54,16 +57,16 @@ class AadO365GroupListCommand extends GraphItemsListCommand_1.GraphItemsListComm
             .then((res) => {
             if (res) {
                 res.forEach(r => {
-                    for (let i = 0; i < this.items.length; i++) {
-                        if (this.items[i].id !== r.id) {
+                    for (let i = 0; i < groups.length; i++) {
+                        if (groups[i].id !== r.id) {
                             continue;
                         }
-                        this.items[i].siteUrl = r.url;
+                        groups[i].siteUrl = r.url;
                         break;
                     }
                 });
             }
-            logger.log(this.items);
+            logger.log(groups);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-clear.js

@@ -2,9 +2,10 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadO365GroupRecycleBinItemClearCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadO365GroupRecycleBinItemClearCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.O365GROUP_RECYCLEBINITEM_CLEAR;
     }
@@ -43,15 +44,15 @@ class AadO365GroupRecycleBinItemClearCommand extends GraphItemsListCommand_1.Gra
         const filter = `?$filter=groupTypes/any(c:c+eq+'Unified')`;
         const topCount = '&$top=100';
         const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${topCount}`;
-        return this
-            .getAllItems(endpoint, logger, true)
-            .then(() => {
-            if (this.items.length === 0) {
+        return utils_1.odata
+            .getAllItems(endpoint, logger)
+            .then((recycleBinItems) => {
+            if (recycleBinItems.length === 0) {
                 return Promise.resolve();
             }
             const deletePromises = [];
             // Logic to delete a group from recycle bin items.
-            this.items.forEach(grp => {
+            recycleBinItems.forEach(grp => {
                 deletePromises.push(request_1.default.delete({
                     url: `${this.resource}/v1.0/directory/deletedItems/${grp.id}`,
                     headers: {

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

@@ -1,8 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadO365GroupRecycleBinItemListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadO365GroupRecycleBinItemListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.O365GROUP_RECYCLEBINITEM_LIST;
     }
@@ -24,10 +25,10 @@ class AadO365GroupRecycleBinItemListCommand extends GraphItemsListCommand_1.Grap
         const mailNicknameFilter = args.options.mailNickname ? ` and startswith(MailNickname,'${encodeURIComponent(args.options.mailNickname).replace(/'/g, `''`)}')` : '';
         const topCount = '&$top=100';
         const endpoint = `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group${filter}${displayNameFilter}${mailNicknameFilter}${topCount}`;
-        this
-            .getAllItems(endpoint, logger, true)
-            .then(() => {
-            logger.log(this.items);
+        utils_1.odata
+            .getAllItems(endpoint, logger)
+            .then((recycleBinItems) => {
+            logger.log(recycleBinItems);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-restore.js

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
@@ -40,7 +40,7 @@ class AadO365GroupRecycleBinItemRestoreCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -2,7 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRemoveCommand extends GraphCommand_1.default {
@@ -80,7 +80,7 @@ class AadO365GroupRemoveCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupRenewCommand extends GraphCommand_1.default {
@@ -35,7 +35,7 @@ class AadO365GroupRenewCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -3,7 +3,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 utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupSetCommand extends GraphCommand_1.default {
@@ -205,7 +205,7 @@ class AadO365GroupSetCommand extends GraphCommand_1.default {
             !args.options.logoPath) {
             return 'Specify at least one property to update';
         }
-        if (!Utils_1.default.isValidGuid(args.options.id)) {
+        if (!utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.owners) {

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
@@ -84,7 +84,7 @@ class AadO365GroupTeamifyCommand extends GraphCommand_1.default {
         if (!args.options.groupId && !args.options.mailNickname) {
             return 'Specify groupId or mailNickname, one is required';
         }
-        if (args.options.groupId && !Utils_1.default.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../../teams/commands");
 const commands_2 = require("../../commands");
@@ -73,10 +73,10 @@ class AadO365GroupUserAddCommand extends GraphCommand_1.default {
         if (args.options.groupId && args.options.teamId) {
             return 'You cannot provide both a groupId and teamId parameter, please provide only one';
         }
-        if (args.options.teamId && !Utils_1.default.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.groupId && !Utils_1.default.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.role) {

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

@@ -1,9 +1,9 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const Utils_1 = require("../../../../Utils");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
-class AadO365GroupUserListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadO365GroupUserListCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.O365GROUP_USER_LIST;
     }
@@ -16,35 +16,41 @@ class AadO365GroupUserListCommand extends GraphItemsListCommand_1.GraphItemsList
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
+        let users = [];
         this
             .getOwners(logger, args.options.groupId)
-            .then(() => {
-            if (args.options.role === "Owner") {
-                return Promise.resolve();
+            .then((owners) => {
+            users = owners;
+            if (args.options.role === 'Owner') {
+                return Promise.resolve([]);
             }
             return this.getMembersAndGuests(logger, args.options.groupId);
         })
-            .then(() => {
+            .then((membersAndGuests) => {
+            users = users.concat(membersAndGuests);
             if (args.options.role) {
-                this.items = this.items.filter(i => i.userType === args.options.role);
+                users = users.filter(i => i.userType === args.options.role);
             }
-            logger.log(this.items);
+            logger.log(users);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
     getOwners(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
-        return this.getAllItems(endpoint, logger, true).then(() => {
+        return utils_1.odata
+            .getAllItems(endpoint, logger)
+            .then(users => {
             // Currently there is a bug in the Microsoft Graph that returns Owners as
             // userType 'member'. We therefore update all returned user as owner
-            for (const i in this.items) {
-                this.items[i].userType = "Owner";
-            }
+            users.forEach(user => {
+                user.userType = 'Owner';
+            });
+            return users;
         });
     }
     getMembersAndGuests(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return this.getAllItems(endpoint, logger, false);
+        return utils_1.odata.getAllItems(endpoint, logger);
     }
     options() {
         const options = [
@@ -60,7 +66,7 @@ class AadO365GroupUserListCommand extends GraphItemsListCommand_1.GraphItemsList
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.groupId)) {
+        if (!utils_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.role) {

package/dist/m365/aad/commands/o365group/o365group-user-remove.js

@@ -11,7 +11,7 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
 Object.defineProperty(exports, "__esModule", { value: true });
 const cli_1 = require("../../../../cli");
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../../teams/commands");
 const commands_2 = require("../../commands");
@@ -131,10 +131,10 @@ class AadO365GroupUserRemoveCommand extends GraphCommand_1.default {
         if (args.options.groupId && args.options.teamId) {
             return 'You cannot provide both a groupId and teamId parameter, please provide only one';
         }
-        if (args.options.teamId && !Utils_1.default.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.groupId && !Utils_1.default.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         return true;

package/dist/m365/aad/commands/o365group/o365group-user-set.js

@@ -1,11 +1,11 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
-const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../../teams/commands");
 const commands_2 = require("../../commands");
-class AadO365GroupUserSetCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+class AadO365GroupUserSetCommand extends GraphCommand_1.default {
     get name() {
         return commands_2.default.O365GROUP_USER_SET;
     }
@@ -24,27 +24,30 @@ class AadO365GroupUserSetCommand extends GraphItemsListCommand_1.GraphItemsListC
     }
     commandAction(logger, args, cb) {
         const groupId = (typeof args.options.groupId !== 'undefined') ? args.options.groupId : args.options.teamId;
+        let users = [];
         this
             .getOwners(logger, groupId)
-            .then(() => {
+            .then((owners) => {
+            users = owners;
             return this.getMembersAndGuests(logger, groupId);
         })
-            .then(() => {
+            .then((membersAndGuests) => {
+            users = users.concat(membersAndGuests);
             // Filter out duplicate added values for owners (as they are returned as members as well)
-            this.items = this.items.filter((groupUser, index, self) => index === self.findIndex((t) => (t.id === groupUser.id && t.displayName === groupUser.displayName)));
+            users = users.filter((groupUser, index, self) => index === self.findIndex((t) => (t.id === groupUser.id && t.displayName === groupUser.displayName)));
             if (this.debug) {
                 logger.logToStderr((typeof args.options.groupId !== 'undefined') ? 'Group owners and members:' : 'Team owners and members:');
-                logger.logToStderr(this.items);
+                logger.logToStderr(users);
                 logger.logToStderr('');
             }
-            if (this.items.filter(i => args.options.userName.toUpperCase() === i.userPrincipalName.toUpperCase()).length <= 0) {
+            if (users.filter(i => args.options.userName.toUpperCase() === i.userPrincipalName.toUpperCase()).length <= 0) {
                 const userNotInGroup = (typeof args.options.groupId !== 'undefined') ?
                     'The specified user does not belong to the given Microsoft 365 Group. Please use the \'o365group user add\' command to add new users.' :
                     'The specified user does not belong to the given Microsoft Teams team. Please use the \'graph teams user add\' command to add new users.';
                 throw new Error(userNotInGroup);
             }
             if (args.options.role === "Owner") {
-                const foundMember = this.items.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Member');
+                const foundMember = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Member');
                 if (foundMember !== undefined) {
                     const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/$ref`;
                     const requestOptions = {
@@ -65,7 +68,7 @@ class AadO365GroupUserSetCommand extends GraphItemsListCommand_1.GraphItemsListC
                 }
             }
             else {
-                const foundOwner = this.items.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Owner');
+                const foundOwner = users.find(e => args.options.userName.toUpperCase() === e.userPrincipalName.toUpperCase() && e.userType === 'Owner');
                 if (foundOwner !== undefined) {
                     const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners/${foundOwner.id}/$ref`;
                     const requestOptions = {
@@ -88,17 +91,20 @@ class AadO365GroupUserSetCommand extends GraphItemsListCommand_1.GraphItemsListC
     }
     getOwners(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
-        return this.getAllItems(endpoint, logger, true).then(() => {
+        return utils_1.odata
+            .getAllItems(endpoint, logger)
+            .then(users => {
             // Currently there is a bug in the Microsoft Graph that returns Owners as
             // userType 'member'. We therefore update all returned user as owner
-            for (const i in this.items) {
-                this.items[i].userType = 'Owner';
-            }
+            users.forEach(user => {
+                user.userType = 'Owner';
+            });
+            return users;
         });
     }
     getMembersAndGuests(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return this.getAllItems(endpoint, logger, false);
+        return utils_1.odata.getAllItems(endpoint, logger);
     }
     options() {
         const options = [
@@ -126,10 +132,10 @@ class AadO365GroupUserSetCommand extends GraphItemsListCommand_1.GraphItemsListC
         if (args.options.groupId && args.options.teamId) {
             return 'You cannot provide both a groupId and teamId parameter, please provide only one';
         }
-        if (args.options.teamId && !Utils_1.default.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.groupId && !Utils_1.default.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !utils_1.validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (['Owner', 'Member'].indexOf(args.options.role) === -1) {

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadOAuth2GrantAddCommand extends GraphCommand_1.default {
@@ -49,10 +49,10 @@ class AadOAuth2GrantAddCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.clientId)) {
+        if (!utils_1.validation.isValidGuid(args.options.clientId)) {
             return `${args.options.clientId} is not a valid GUID`;
         }
-        if (!Utils_1.default.isValidGuid(args.options.resourceId)) {
+        if (!utils_1.validation.isValidGuid(args.options.resourceId)) {
             return `${args.options.resourceId} is not a valid GUID`;
         }
         return true;

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

@@ -1,7 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const Utils_1 = require("../../../../Utils");
+const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class AadOAuth2GrantListCommand extends GraphCommand_1.default {
@@ -44,7 +44,7 @@ class AadOAuth2GrantListCommand extends GraphCommand_1.default {
         return options.concat(parentOptions);
     }
     validate(args) {
-        if (!Utils_1.default.isValidGuid(args.options.spObjectId)) {
+        if (!utils_1.validation.isValidGuid(args.options.spObjectId)) {
             return `${args.options.spObjectId} is not a valid GUID`;
         }
         return true;