@pnp/cli-microsoft365 5.8.0-beta.f956c5d → 5.9.0-beta.005c47a

package/dist/m365/teams/commands/team/team-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsTeamRemoveCommand_instances, _TeamsTeamRemoveCommand_initTelemetry, _TeamsTeamRemoveCommand_initOptions, _TeamsTeamRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 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");
@@ -48,44 +48,43 @@ class TeamsTeamRemoveCommand extends GraphCommand_1.default {
             return group.id;
         });
     }
-    commandAction(logger, args, cb) {
-        if (args.options.teamId) {
-            args.options.id = args.options.teamId;
-            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
-        }
-        const removeTeam = () => {
-            this
-                .getTeamId(args)
-                .then((teamId) => {
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${encodeURIComponent(teamId)}`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none'
-                    },
-                    responseType: 'json'
-                };
-                return request_1.default.delete(requestOptions);
-            })
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeTeam();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the team ${args.options.teamId}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.teamId) {
+                args.options.id = args.options.teamId;
+                this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
+            }
+            const removeTeam = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const teamId = yield this.getTeamId(args);
+                    const requestOptions = {
+                        url: `${this.resource}/v1.0/groups/${encodeURIComponent(teamId)}`,
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeTeam();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeTeam();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the team ${args.options.teamId}?`
+                });
+                if (result.continue) {
+                    yield removeTeam();
+                }
+            }
+        });
     }
 }
 _TeamsTeamRemoveCommand_instances = new WeakSet(), _TeamsTeamRemoveCommand_initTelemetry = function _TeamsTeamRemoveCommand_initTelemetry() {
@@ -112,10 +111,10 @@ _TeamsTeamRemoveCommand_instances = new WeakSet(), _TeamsTeamRemoveCommand_initT
         if (args.options.name && (args.options.id || args.options.teamId)) {
             return 'Specify either id or name but not both';
         }
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamSetCommand_instances, _TeamsTeamSetCommand_initTelemetry, _TeamsTeamSetCommand_initOptions, _TeamsTeamSetCommand_initValidators, _TeamsTeamSetCommand_initOptionSets;
 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 TeamsTeamSetCommand extends GraphCommand_1.default {
@@ -53,27 +53,32 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
         }
         return requestBody;
     }
-    commandAction(logger, args, cb) {
-        if (args.options.teamId) {
-            args.options.id = args.options.teamId;
-            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
-        }
-        if (args.options.displayName) {
-            args.options.name = args.options.displayName;
-            this.warn(logger, `Option 'displayName' is deprecated. Please use 'name' instead.`);
-        }
-        const data = this.mapRequestBody(args.options);
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.id)}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            data: data,
-            responseType: 'json'
-        };
-        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 (args.options.teamId) {
+                args.options.id = args.options.teamId;
+                this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
+            }
+            if (args.options.displayName) {
+                args.options.name = args.options.displayName;
+                this.warn(logger, `Option 'displayName' is deprecated. Please use 'name' instead.`);
+            }
+            const data = this.mapRequestBody(args.options);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.id)}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                data: data,
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemetry = function _TeamsTeamSetCommand_initTelemetry() {
@@ -103,10 +108,10 @@ _TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemet
     });
 }, _TeamsTeamSetCommand_initValidators = function _TeamsTeamSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.visibility) {

package/dist/m365/teams/commands/team/team-unarchive.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsTeamUnarchiveCommand_instances, _TeamsTeamUnarchiveCommand_initOptions, _TeamsTeamUnarchiveCommand_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");
@@ -46,26 +46,29 @@ class TeamsTeamUnarchiveCommand extends GraphCommand_1.default {
             return group.id;
         });
     }
-    commandAction(logger, args, cb) {
-        if (args.options.teamId) {
-            args.options.id = args.options.teamId;
-            this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
-        }
-        const endpoint = `${this.resource}/v1.0`;
-        this
-            .getTeamId(args)
-            .then((teamId) => {
-            const requestOptions = {
-                url: `${endpoint}/teams/${encodeURIComponent(teamId)}/unarchive`,
-                headers: {
-                    'content-type': 'application/json;odata=nometadata',
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.teamId) {
+                args.options.id = args.options.teamId;
+                this.warn(logger, `Option 'teamId' is deprecated. Please use 'id' instead.`);
+            }
+            const endpoint = `${this.resource}/v1.0`;
+            try {
+                const teamId = yield this.getTeamId(args);
+                const requestOptions = {
+                    url: `${endpoint}/teams/${encodeURIComponent(teamId)}/unarchive`,
+                    headers: {
+                        'content-type': 'application/json;odata=nometadata',
+                        'accept': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsTeamUnarchiveCommand_instances = new WeakSet(), _TeamsTeamUnarchiveCommand_initOptions = function _TeamsTeamUnarchiveCommand_initOptions() {
@@ -84,10 +87,10 @@ _TeamsTeamUnarchiveCommand_instances = new WeakSet(), _TeamsTeamUnarchiveCommand
         if (args.options.name && (args.options.id || args.options.teamId)) {
             return 'Specify either id or name but not both';
         }
-        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (args.options.teamId && !validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
-        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         return true;

package/dist/m365/teams/commands/user/user-app-add.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsUserAppAddCommand_instances, _TeamsUserAppAddCommand_initOptions, _TeamsUserAppAddCommand_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 TeamsUserAppAddCommand extends GraphCommand_1.default {
@@ -32,22 +32,27 @@ class TeamsUserAppAddCommand extends GraphCommand_1.default {
     get description() {
         return 'Install an app in the personal scope of the specified user';
     }
-    commandAction(logger, args, cb) {
-        const endpoint = `${this.resource}/v1.0`;
-        const requestOptions = {
-            url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps`,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${args.options.appId}`
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = `${this.resource}/v1.0`;
+            const requestOptions = {
+                url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps`,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${args.options.appId}`
+                }
+            };
+            try {
+                yield request_1.default.post(requestOptions);
             }
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initOptions = function _TeamsUserAppAddCommand_initOptions() {
@@ -58,10 +63,10 @@ _TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initO
     });
 }, _TeamsUserAppAddCommand_initValidators = function _TeamsUserAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.appId)) {
+        if (!validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (!utils_1.validation.isValidGuid(args.options.userId)) {
+        if (!validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         return true;

package/dist/m365/teams/commands/user/user-app-list.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsUserAppListCommand_instances, _TeamsUserAppListCommand_initTelemetry, _TeamsUserAppListCommand_initOptions, _TeamsUserAppListCommand_initValidators, _TeamsUserAppListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-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 TeamsUserAppListCommand extends GraphCommand_1.default {
@@ -34,36 +35,35 @@ class TeamsUserAppListCommand extends GraphCommand_1.default {
     get description() {
         return 'List the apps installed in the personal scope of the specified user';
     }
-    commandAction(logger, args, cb) {
-        let userId = '';
-        this
-            .getUserId(args)
-            .then((_userId) => {
-            userId = _userId.value;
-            const endpoint = `${this.resource}/v1.0/users/${encodeURIComponent(userId)}/teamwork/installedApps?$expand=teamsAppDefinition`;
-            return utils_1.odata.getAllItems(endpoint);
-        })
-            .then((items) => {
-            items.forEach(i => {
-                const userAppId = Buffer.from(i.id, 'base64').toString('ascii');
-                const appId = userAppId.substr(userAppId.indexOf("##") + 2, userAppId.length - userId.length - 2);
-                i.appId = appId;
-            });
-            if (args.options.output === 'json') {
-                logger.log(items);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const userId = (yield this.getUserId(args)).value;
+                const endpoint = `${this.resource}/v1.0/users/${encodeURIComponent(userId)}/teamwork/installedApps?$expand=teamsAppDefinition`;
+                const items = yield odata_1.odata.getAllItems(endpoint);
+                items.forEach(i => {
+                    const userAppId = Buffer.from(i.id, 'base64').toString('ascii');
+                    const appId = userAppId.substr(userAppId.indexOf("##") + 2, userAppId.length - userId.length - 2);
+                    i.appId = appId;
+                });
+                if (args.options.output === 'json') {
+                    logger.log(items);
+                }
+                else {
+                    logger.log(items.map(i => {
+                        return {
+                            id: i.id,
+                            appId: i.appId,
+                            displayName: i.teamsAppDefinition.displayName,
+                            version: i.teamsAppDefinition.version
+                        };
+                    }));
+                }
             }
-            else {
-                logger.log(items.map(i => {
-                    return {
-                        id: i.id,
-                        appId: i.appId,
-                        displayName: i.teamsAppDefinition.displayName,
-                        version: i.teamsAppDefinition.version
-                    };
-                }));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        });
     }
     getUserId(args) {
         if (args.options.userId) {
@@ -94,10 +94,10 @@ _TeamsUserAppListCommand_instances = new WeakSet(), _TeamsUserAppListCommand_ini
     });
 }, _TeamsUserAppListCommand_initValidators = function _TeamsUserAppListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.userId && !utils_1.validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
-        if (args.options.userName && !utils_1.validation.isValidUserPrincipalName(args.options.userName)) {
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
             return `${args.options.userName} is not a valid userName`;
         }
         return true;

package/dist/m365/teams/commands/user/user-app-remove.js

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsUserAppRemoveCommand_instances, _TeamsUserAppRemoveCommand_initTelemetry, _TeamsUserAppRemoveCommand_initOptions, _TeamsUserAppRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 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 TeamsUserAppRemoveCommand extends GraphCommand_1.default {
@@ -34,38 +34,39 @@ class TeamsUserAppRemoveCommand extends GraphCommand_1.default {
     get description() {
         return 'Uninstall an app from the personal scope of the specified user.';
     }
-    commandAction(logger, args, cb) {
-        const removeApp = () => {
-            const endpoint = `${this.resource}/v1.0`;
-            const requestOptions = {
-                url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps/${args.options.appId}`,
-                headers: {
-                    'accept': 'application/json;odata.metadata=none'
-                },
-                responseType: 'json'
-            };
-            request_1.default
-                .delete(requestOptions)
-                .then(_ => cb(), (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeApp();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the app with id ${args.options.appId} for user ${args.options.userId}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeApp = () => __awaiter(this, void 0, void 0, function* () {
+                const endpoint = `${this.resource}/v1.0`;
+                const requestOptions = {
+                    url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps/${args.options.appId}`,
+                    headers: {
+                        'accept': 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                try {
+                    yield request_1.default.delete(requestOptions);
                 }
-                else {
-                    removeApp();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeApp();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the app with id ${args.options.appId} for user ${args.options.userId}?`
+                });
+                if (result.continue) {
+                    yield removeApp();
+                }
+            }
+        });
     }
 }
 _TeamsUserAppRemoveCommand_instances = new WeakSet(), _TeamsUserAppRemoveCommand_initTelemetry = function _TeamsUserAppRemoveCommand_initTelemetry() {
@@ -84,7 +85,7 @@ _TeamsUserAppRemoveCommand_instances = new WeakSet(), _TeamsUserAppRemoveCommand
     });
 }, _TeamsUserAppRemoveCommand_initValidators = function _TeamsUserAppRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.userId)) {
+        if (!validation_1.validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
         return true;

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

@@ -15,7 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TeamsUserListCommand_instances, _TeamsUserListCommand_initTelemetry, _TeamsUserListCommand_initOptions, _TeamsUserListCommand_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 TeamsUserListCommand extends GraphCommand_1.default {
@@ -33,30 +34,28 @@ class TeamsUserListCommand extends GraphCommand_1.default {
     get description() {
         return "Lists users for the specified Microsoft Teams team";
     }
-    commandAction(logger, args, cb) {
-        this
-            .getOwners(logger, args.options.teamId)
-            .then(() => {
-            if (args.options.role === "Owner") {
-                return Promise.resolve([]);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                yield this.getOwners(logger, args.options.teamId);
+                const items = args.options.role === "Owner" ? [] : yield this.getMembersAndGuests(logger, args.options.teamId);
+                this.items = this.items.concat(items);
+                // Filter out duplicate added values for owners (as they are returned as members as well)
+                // this aligns the output with what is displayed in the Teams UI
+                this.items = this.items.filter((groupUser, index, self) => index === self.findIndex((t) => (t.id === groupUser.id && t.displayName === groupUser.displayName)));
+                if (args.options.role) {
+                    this.items = this.items.filter(i => i.userType === args.options.role);
+                }
+                logger.log(this.items);
             }
-            return this.getMembersAndGuests(logger, args.options.teamId);
-        })
-            .then((items) => {
-            this.items = this.items.concat(items);
-            // Filter out duplicate added values for owners (as they are returned as members as well)
-            // this aligns the output with what is displayed in the Teams UI
-            this.items = this.items.filter((groupUser, index, self) => index === self.findIndex((t) => (t.id === groupUser.id && t.displayName === groupUser.displayName)));
-            if (args.options.role) {
-                this.items = this.items.filter(i => i.userType === args.options.role);
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(this.items);
-            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 utils_1.odata.getAllItems(endpoint).then((items) => {
+        return odata_1.odata.getAllItems(endpoint).then((items) => {
             this.items = this.items.concat(items);
             // Currently there is a bug in the Microsoft Graph that returns Owners as
             // userType 'member'. We therefore update all returned user as owner
@@ -67,7 +66,7 @@ class TeamsUserListCommand extends GraphCommand_1.default {
     }
     getMembersAndGuests(logger, groupId) {
         const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return utils_1.odata.getAllItems(endpoint);
+        return odata_1.odata.getAllItems(endpoint);
     }
 }
 _TeamsUserListCommand_instances = new WeakSet(), _TeamsUserListCommand_initTelemetry = function _TeamsUserListCommand_initTelemetry() {
@@ -85,7 +84,7 @@ _TeamsUserListCommand_instances = new WeakSet(), _TeamsUserListCommand_initTelem
     });
 }, _TeamsUserListCommand_initValidators = function _TeamsUserListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.teamId)) {
+        if (!validation_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
         if (args.options.role) {