@pnp/cli-microsoft365 5.4.0-beta.d01ee78 → 5.4.0-beta.d09de0f

package/dist/m365/spo/commands/listitem/listitem-roleinheritance-reset.js

@@ -20,10 +20,10 @@ class SpoListItemRoleInheritanceResetCommand extends SpoCommand_1.default {
     commandAction(logger, args, cb) {
         let requestUrl = `${args.options.webUrl}/_api/web/lists`;
         if (args.options.listId) {
-            requestUrl += `(guid'${encodeURIComponent(args.options.listId)}')`;
+            requestUrl += `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
         }
         else {
-            requestUrl += `/getbytitle('${encodeURIComponent(args.options.listTitle)}')`;
+            requestUrl += `/getbytitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
         }
         const requestOptions = {
             url: `${requestUrl}/items(${args.options.listItemId})/resetroleinheritance`,

package/dist/m365/spo/commands/listitem/listitem-set.js

@@ -27,8 +27,8 @@ class SpoListItemSetCommand extends SpoCommand_1.default {
         const listIdArgument = args.options.listId || '';
         const listTitleArgument = args.options.listTitle || '';
         const listRestUrl = (args.options.listId ?
-            `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(listIdArgument)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${encodeURIComponent(listTitleArgument)}')`);
+            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
+            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
         let contentTypeName = '';
         let formDigestValue = '';
         let environmentListId = '';

package/dist/m365/spo/commands/roledefinition/roledefinition-remove.js

@@ -0,0 +1,82 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.ROLEDEFINITION_REMOVE;
+    }
+    get description() {
+        return 'Removes the role definition from the specified site';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.confirm = (!(!args.options.confirm)).toString();
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        const removeRoleDefinition = () => {
+            if (this.verbose) {
+                logger.logToStderr(`Removing role definition from site ${args.options.webUrl}...`);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
+                method: 'delete',
+                headers: {
+                    'X-HTTP-Method': 'DELETE',
+                    'If-Match': '*',
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            request_1.default
+                .delete(requestOptions)
+                .then(() => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+        };
+        if (args.options.confirm) {
+            removeRoleDefinition();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove the role definition with id ${args.options.id} from site ${args.options.webUrl}?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeRoleDefinition();
+                }
+            });
+        }
+    }
+    options() {
+        const options = [
+            {
+                option: '-u, --webUrl <webUrl>'
+            },
+            {
+                option: '-i, --id <id>'
+            },
+            {
+                option: '--confirm'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        const id = parseInt(args.options.id);
+        if (isNaN(id)) {
+            return `${args.options.id} is not a valid role definition ID`;
+        }
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }
+}
+module.exports = new SpoRoleDefinitionRemoveCommand();
+//# sourceMappingURL=roledefinition-remove.js.map

package/dist/m365/spo/commands/site/site-remove.js

@@ -5,6 +5,7 @@ const cli_1 = require("../../../../cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteRemoveCommand extends SpoCommand_1.default {
@@ -44,41 +45,36 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                         if (this.debug) {
                             logger.logToStderr(`Site attached to group ${groupId}. Initiating group delete operation via Graph API`);
                         }
-                        return this
-                            .getSiteGroup(groupId)
+                        return aadGroup_1.aadGroup
+                            .getGroupById(groupId)
                             .then((group) => {
                             if (args.options.skipRecycleBin || args.options.wait) {
                                 logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'skipRecycleBin' and 'wait' will not be applicable.`));
                             }
                             return this.deleteGroup(group.id, logger);
                         })
-                            .catch((err) => {
-                            if (err.response.status === 404) {
-                                if (this.verbose) {
-                                    logger.logToStderr(`Site group doesn't exist. Searching in the Microsoft 365 deleted groups.`);
-                                }
-                                return this
-                                    .isSiteGroupDeleted(groupId)
-                                    .then((deletedGroups) => {
-                                    if (deletedGroups.value.length === 0) {
-                                        if (this.verbose) {
-                                            logger.logToStderr("Site group doesn't exist anymore. Deleting the site.");
-                                        }
-                                        if (args.options.wait) {
-                                            logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameter 'wait' will not be applicable.`));
-                                        }
-                                        return Promise.resolve();
+                            .catch(() => {
+                            if (this.verbose) {
+                                logger.logToStderr(`Site group doesn't exist. Searching in the Microsoft 365 deleted groups.`);
+                            }
+                            return this
+                                .isSiteGroupDeleted(groupId)
+                                .then((deletedGroups) => {
+                                if (deletedGroups.value.length === 0) {
+                                    if (this.verbose) {
+                                        logger.logToStderr("Site group doesn't exist anymore. Deleting the site.");
                                     }
-                                    else {
-                                        return Promise.reject(`Site group still exists in the deleted groups. The site won't be removed.`);
+                                    if (args.options.wait) {
+                                        logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameter 'wait' will not be applicable.`));
                                     }
-                                })
-                                    .then(_ => this.deleteOrphanedSite(logger, args.options.url))
-                                    .catch((err) => Promise.reject(err));
-                            }
-                            else {
-                                return Promise.reject(err);
-                            }
+                                    return Promise.resolve();
+                                }
+                                else {
+                                    return Promise.reject(`Site group still exists in the deleted groups. The site won't be removed.`);
+                                }
+                            })
+                                .then(_ => this.deleteOrphanedSite(logger, args.options.url))
+                                .catch((err) => Promise.reject(err));
                         })
                             .then(_ => this.deleteSite(args.options.url, args.options.wait, logger));
                     }
@@ -105,16 +101,6 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
             });
         }
     }
-    getSiteGroup(groupId) {
-        const requestOptions = {
-            url: `https://graph.microsoft.com/v1.0/groups/${groupId}`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions);
-    }
     isSiteGroupDeleted(groupId) {
         const requestOptions = {
             url: `https://graph.microsoft.com/v1.0/directory/deletedItems/Microsoft.Graph.Group?$select=id&$filter=groupTypes/any(c:c+eq+'Unified') and startswith(id, '${groupId}')`,

package/dist/m365/spo/commands.js

@@ -167,6 +167,7 @@ exports.default = {
     REPORT_SITEUSAGESITECOUNTS: `${prefix} report siteusagesitecounts`,
     REPORT_SITEUSAGESTORAGE: `${prefix} report siteusagestorage`,
     ROLEDEFINITION_LIST: `${prefix} roledefinition list`,
+    ROLEDEFINITION_REMOVE: `${prefix} roledefinition remove`,
     SEARCH: `${prefix} search`,
     SERVICEPRINCIPAL_GRANT_ADD: `${prefix} serviceprincipal grant add`,
     SERVICEPRINCIPAL_GRANT_LIST: `${prefix} serviceprincipal grant list`,

package/dist/m365/teams/commands/app/app-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 aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsAppListCommand extends GraphCommand_1.default {
@@ -25,27 +25,13 @@ class TeamsAppListCommand extends GraphCommand_1.default {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const groupItem = response.value[0];
-            if (!groupItem) {
-                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
-            }
-            if (groupItem.resourceProvisioningOptions.indexOf('Team') === -1) {
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.teamName)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
                 return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
             }
-            if (response.value.length > 1) {
-                return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${response.value.map(x => x.id)}`);
-            }
-            return Promise.resolve(groupItem.id);
+            return group.id;
         });
     }
     getEndpointUrl(args) {

package/dist/m365/teams/commands/channel/channel-get.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChannelGetCommand extends GraphCommand_1.default {
@@ -28,27 +29,13 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const groupItem = response.value[0];
-            if (!groupItem) {
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.teamName)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
                 return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
             }
-            if (groupItem.resourceProvisioningOptions.indexOf('Team') === -1) {
-                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
-            }
-            if (response.value.length > 1) {
-                return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${response.value.map(x => x.id)}`);
-            }
-            return Promise.resolve(groupItem.id);
+            return group.id;
         });
     }
     getChannelId(args) {

package/dist/m365/teams/commands/channel/channel-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 aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsChannelListCommand extends GraphCommand_1.default {
@@ -24,25 +24,13 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const filteredResponseByTeam = response.value.filter(t => t.resourceProvisioningOptions.includes('Team'));
-            const groupItem = filteredResponseByTeam[0];
-            if (!groupItem) {
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.teamName)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
                 return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
             }
-            if (filteredResponseByTeam.length > 1) {
-                return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${filteredResponseByTeam.map(x => x.id)}`);
-            }
-            return Promise.resolve(groupItem.id);
+            return group.id;
         });
     }
     commandAction(logger, args, cb) {

package/dist/m365/teams/commands/channel/channel-member-add.js

@@ -5,6 +5,7 @@ const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.CHANNEL_MEMBER_ADD;
@@ -114,25 +115,13 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const filteredResponseByTeam = response.value.filter(t => t.resourceProvisioningOptions.includes('Team'));
-            const groupItem = filteredResponseByTeam[0];
-            if (!groupItem) {
-                return Promise.reject(`The specified team '${args.options.teamName}' does not exist in Microsoft Teams`);
-            }
-            if (filteredResponseByTeam.length > 1) {
-                return Promise.reject(`Multiple Microsoft Teams with name '${args.options.teamName}' found. Please disambiguate:${os.EOL}${response.value.map(x => `- ${x.id}`).join(os.EOL)}`);
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.teamName)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
+                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
             }
-            return Promise.resolve(groupItem.id);
+            return group.id;
         });
     }
     getChannelId(teamId, args) {

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

@@ -4,6 +4,7 @@ const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const request_1 = require("../../../../request");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class TeamsChannelMemberListCommand extends GraphCommand_1.default {
     constructor() {
         super(...arguments);
@@ -60,27 +61,13 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const groupItem = response.value[0];
-            if (!groupItem) {
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.teamName)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
                 return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
             }
-            if (groupItem.resourceProvisioningOptions.indexOf('Team') === -1) {
-                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
-            }
-            if (response.value.length > 1) {
-                return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${response.value.map(x => x.id)}`);
-            }
-            return Promise.resolve(groupItem.id);
+            return group.id;
         });
     }
     getChannelId(args) {

package/dist/m365/teams/commands/channel/channel-member-remove.js

@@ -5,6 +5,7 @@ const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
     constructor() {
         super(...arguments);
@@ -94,27 +95,13 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const groupItem = response.value[0];
-            if (!groupItem) {
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.teamName)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
                 return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
             }
-            if (groupItem.resourceProvisioningOptions.indexOf('Team') === -1) {
-                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
-            }
-            if (response.value.length > 1) {
-                return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${response.value.map(x => x.id)}`);
-            }
-            return Promise.resolve(groupItem.id);
+            return group.id;
         });
     }
     getChannelId(args) {

package/dist/m365/teams/commands/channel/channel-member-set.js

@@ -4,6 +4,7 @@ const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const request_1 = require("../../../../request");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 class TeamsChannelMemberSetCommand extends GraphCommand_1.default {
     constructor() {
         super(...arguments);
@@ -62,27 +63,13 @@ class TeamsChannelMemberSetCommand extends GraphCommand_1.default {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const groupItem = response.value[0];
-            if (!groupItem) {
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.teamName)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
                 return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
             }
-            if (groupItem.resourceProvisioningOptions.indexOf('Team') === -1) {
-                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
-            }
-            if (response.value.length > 1) {
-                return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${response.value.map(x => x.id)}`);
-            }
-            return Promise.resolve(groupItem.id);
+            return group.id;
         });
     }
     getChannelId(args) {

package/dist/m365/teams/commands/tab/tab-get.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTabGetCommand extends GraphCommand_1.default {
@@ -30,27 +31,13 @@ class TeamsTabGetCommand extends GraphCommand_1.default {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const groupItem = response.value[0];
-            if (!groupItem) {
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.teamName)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
                 return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
             }
-            if (groupItem.resourceProvisioningOptions.indexOf('Team') === -1) {
-                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
-            }
-            if (response.value.length > 1) {
-                return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${response.value.map(x => x.id)}`);
-            }
-            return Promise.resolve(groupItem.id);
+            return group.id;
         });
     }
     getChannelId(args) {

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

@@ -1,6 +1,7 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 var TeamsAsyncOperationStatus;
@@ -94,13 +95,7 @@ class TeamsTeamAddCommand extends GraphCommand_1.default {
             if (teamsAsyncOperation.status !== TeamsAsyncOperationStatus.Succeeded) {
                 return Promise.resolve(teamsAsyncOperation);
             }
-            return request_1.default.get({
-                url: `${this.resource}/v1.0/groups/${teamsAsyncOperation.targetResourceId}`,
-                headers: {
-                    accept: 'application/json;odata.metadata=minimal'
-                },
-                responseType: 'json'
-            });
+            return aadGroup_1.aadGroup.getGroupById(teamsAsyncOperation.targetResourceId);
         })
             .then((output) => {
             logger.log(output);

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

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
+const aadGroup_1 = require("../../../../utils/aadGroup");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class TeamsTeamGetCommand extends GraphCommand_1.default {
@@ -21,27 +22,13 @@ class TeamsTeamGetCommand extends GraphCommand_1.default {
         if (args.options.id) {
             return Promise.resolve(args.options.id);
         }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.name)}'&$select=id,resourceProvisioningOptions`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
-            const groupItem = response.value[0];
-            if (!groupItem) {
-                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
-            }
-            if (groupItem.resourceProvisioningOptions.indexOf('Team') === -1) {
+        return aadGroup_1.aadGroup
+            .getGroupByDisplayName(args.options.teamName)
+            .then(group => {
+            if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
                 return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
             }
-            if (response.value.length >= 2) {
-                return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.name} found: ${response.value.map(x => x.id)}`);
-            }
-            return Promise.resolve(groupItem.id);
+            return group.id;
         });
     }
     commandAction(logger, args, cb) {