@pnp/cli-microsoft365 5.3.0-beta.ebb13d0 → 5.4.0-beta.0f3627d

package/dist/m365/spo/commands/list/list-webhook-list.js

@@ -31,21 +31,21 @@ class SpoListWebhookListCommand extends SpoCommand_1.default {
             logger.logToStderr(chalk.yellow(`Option 'id' is deprecated. Please use 'listId' instead`));
         }
         if (this.verbose) {
-            const list = args.options.id ? encodeURIComponent(args.options.id) : (args.options.listId ? encodeURIComponent(args.options.listId) : (args.options.title ? encodeURIComponent(args.options.title) : encodeURIComponent(args.options.listTitle)));
+            const list = args.options.id ? utils_1.formatting.encodeQueryParameter(args.options.id) : (args.options.listId ? utils_1.formatting.encodeQueryParameter(args.options.listId) : (args.options.title ? utils_1.formatting.encodeQueryParameter(args.options.title) : utils_1.formatting.encodeQueryParameter(args.options.listTitle)));
             logger.logToStderr(`Retrieving webhook information for list ${list} in site at ${args.options.webUrl}...`);
         }
         let requestUrl = '';
         if (args.options.id) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.id)}')/Subscriptions`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.id)}')/Subscriptions`;
         }
         else if (args.options.listId) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')/Subscriptions`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions`;
         }
         else if (args.options.listTitle) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')/Subscriptions`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.title)}')/Subscriptions`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.title)}')/Subscriptions`;
         }
         const requestOptions = {
             url: requestUrl,

package/dist/m365/spo/commands/list/list-webhook-remove.js

@@ -21,17 +21,17 @@ class SpoListWebhookRemoveCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const list = args.options.listId ? encodeURIComponent(args.options.listId) : encodeURIComponent(args.options.listTitle);
         const removeWebhook = () => {
             if (this.verbose) {
+                const list = (args.options.listId ? args.options.listId : args.options.listTitle);
                 logger.logToStderr(`Webhook ${args.options.id} is about to be removed from list ${list} located at site ${args.options.webUrl}...`);
             }
             let requestUrl = '';
             if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')/Subscriptions('${encodeURIComponent(args.options.id)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
             else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')/Subscriptions('${encodeURIComponent(args.options.id)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -58,7 +58,7 @@ class SpoListWebhookRemoveCommand extends SpoCommand_1.default {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to remove webhook ${args.options.id} from list ${list} located at site ${args.options.webUrl}?`
+                message: `Are you sure you want to remove webhook ${args.options.id} from list ${args.options.listTitle || args.options.listId} located at site ${args.options.webUrl}?`
             }, (result) => {
                 if (!result.continue) {
                     cb();

package/dist/m365/spo/commands/list/list-webhook-set.js

@@ -22,14 +22,14 @@ class SpoListWebhookSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args, cb) {
         if (this.verbose) {
-            logger.logToStderr(`Updating webhook ${args.options.id} belonging to list ${args.options.listId ? encodeURIComponent(args.options.listId) : encodeURIComponent(args.options.listTitle)} located at site ${args.options.webUrl}...`);
+            logger.logToStderr(`Updating webhook ${args.options.id} belonging to list ${args.options.listId ? args.options.listId : args.options.listTitle} located at site ${args.options.webUrl}...`);
         }
         let requestUrl = '';
         if (args.options.listId) {
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')/Subscriptions('${encodeURIComponent(args.options.id)}')`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')/Subscriptions('${encodeURIComponent(args.options.id)}')`;
+            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${utils_1.formatting.encodeQueryParameter(args.options.id)}')`;
         }
         const requestBody = {};
         if (args.options.notificationUrl) {

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

@@ -26,8 +26,8 @@ class SpoListItemAddCommand 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 targetFolderServerRelativeUrl = '';
         if (this.verbose) {

package/dist/m365/spo/commands/listitem/listitem-attachment-list.js

@@ -24,8 +24,8 @@ class SpoListItemAttachmentListCommand 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)}')`);
         const requestOptions = {
             url: `${listRestUrl}/items(${args.options.itemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
             method: 'GET',

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

@@ -24,8 +24,8 @@ class SpoListItemGetCommand 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)}')`);
         const propertiesSelect = args.options.properties ?
             `?$select=${encodeURIComponent(args.options.properties)}` :
             ((!args.options.output || args.options.output === 'text') ?

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

@@ -25,8 +25,8 @@ class SpoListItemIsRecordCommand 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 formDigestValue = '';
         let listId = '';
         if (this.debug) {

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

@@ -14,6 +14,8 @@ class SpoListItemListCommand extends SpoCommand_1.default {
     getTelemetryProperties(args) {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.id = typeof args.options.id !== 'undefined';
+        telemetryProps.listId = typeof args.options.listId !== 'undefined';
+        telemetryProps.listTitle = typeof args.options.listTitle !== 'undefined';
         telemetryProps.title = typeof args.options.title !== 'undefined';
         telemetryProps.fields = typeof args.options.fields !== 'undefined';
         telemetryProps.filter = typeof args.options.filter !== 'undefined';
@@ -23,14 +25,20 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        const listIdArgument = args.options.id || '';
-        const listTitleArgument = args.options.title || '';
+        if (args.options.id) {
+            this.warn(logger, `Option 'id' is deprecated. Please use 'listId' instead.`);
+        }
+        if (args.options.title) {
+            this.warn(logger, `Option 'title' is deprecated. Please use 'listTitle' instead.`);
+        }
+        const listIdArgument = args.options.listId || args.options.id || '';
+        const listTitleArgument = args.options.listTitle || args.options.title || '';
         let formDigestValue = '';
         const fieldsArray = args.options.fields ? args.options.fields.split(",")
             : (!args.options.output || args.options.output === "text") ? ["Title", "Id"] : [];
-        const listRestUrl = (args.options.id ?
-            `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(listIdArgument)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${encodeURIComponent(listTitleArgument)}')`);
+        const listRestUrl = listIdArgument ?
+            `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
+            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`;
         (() => {
             if (args.options.camlQuery) {
                 if (this.debug) {
@@ -100,10 +108,16 @@ class SpoListItemListCommand extends SpoCommand_1.default {
                 option: '-u, --webUrl <webUrl>'
             },
             {
-                option: '-i, --id [listId]'
+                option: '--id [id]'
+            },
+            {
+                option: '--title [title]'
             },
             {
-                option: '-t, --title [listTitle]'
+                option: '-i, --listId [listId]'
+            },
+            {
+                option: '-t, --listTitle [listTitle]'
             },
             {
                 option: '-s, --pageSize [pageSize]'
@@ -143,12 +157,16 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (!args.options.id && !args.options.title) {
-            return `Specify list id or title`;
+        if (!args.options.id && !args.options.title && !args.options.listId && !args.options.listTitle) {
+            return `Specify listId or listTitle`;
         }
         if (args.options.id && args.options.title) {
             return `Specify list id or title but not both`;
         }
+        // Check if only one of the 4 options is specified
+        if ([args.options.id, args.options.title, args.options.listId, args.options.listTitle].filter(o => o).length > 1) {
+            return 'Specify listId or listTitle but not both';
+        }
         if (args.options.camlQuery && args.options.fields) {
             return `Specify camlQuery or fields but not both`;
         }
@@ -167,8 +185,10 @@ class SpoListItemListCommand extends SpoCommand_1.default {
         if (args.options.pageNumber && isNaN(Number(args.options.pageNumber))) {
             return `pageNumber must be numeric`;
         }
-        if (args.options.id &&
-            !utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
+        }
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} in option id is not a valid GUID`;
         }
         return true;

package/dist/m365/spo/commands/listitem/listitem-record-declare.js

@@ -25,8 +25,8 @@ class SpoListItemRecordDeclareCommand extends SpoCommand_1.default {
         let webIdentity = '';
         let listId = '';
         const listRestUrl = args.options.listId
-            ? `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')`
-            : `${args.options.webUrl}/_api/web/lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')`;
+            ? `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`
+            : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
         utils_1.spo
             .getRequestDigest(args.options.webUrl)
             .then((contextResponse) => {

package/dist/m365/spo/commands/listitem/listitem-record-undeclare.js

@@ -22,8 +22,8 @@ class SpoListItemRecordUndeclareCommand 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 formDigestValue = '';
         let environmentListId = '';
         (() => {

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

@@ -27,10 +27,10 @@ class SpoListItemRemoveCommand extends SpoCommand_1.default {
             }
             let requestUrl = '';
             if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.listId)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
             }
             else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${encodeURIComponent(args.options.listTitle)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
             }
             requestUrl += `/items(${args.options.id})`;
             if (args.options.recycle) {

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

@@ -22,10 +22,10 @@ class SpoListItemRoleInheritanceBreakCommand extends SpoCommand_1.default {
         }
         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)}')`;
         }
         let keepExistingPermissions = true;
         if (args.options.clearExistingPermissions) {

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

@@ -35,6 +35,8 @@ exports.default = {
     CUSTOMACTION_SET: `${prefix} customaction set`,
     CUSTOMACTION_LIST: `${prefix} customaction list`,
     CUSTOMACTION_REMOVE: `${prefix} customaction remove`,
+    EVENTRECEIVER_GET: `${prefix} eventreceiver get`,
+    EVENTRECEIVER_LIST: `${prefix} eventreceiver list`,
     EXTERNALUSER_LIST: `${prefix} externaluser list`,
     FEATURE_DISABLE: `${prefix} feature disable`,
     FEATURE_ENABLE: `${prefix} feature enable`,
@@ -100,6 +102,7 @@ exports.default = {
     LIST_ROLEINHERITANCE_RESET: `${prefix} list roleinheritance reset`,
     LIST_SET: `${prefix} list set`,
     LIST_SITESCRIPT_GET: `${prefix} list sitescript get`,
+    LIST_VIEW_ADD: `${prefix} list view add`,
     LIST_VIEW_GET: `${prefix} list view get`,
     LIST_VIEW_LIST: `${prefix} list view list`,
     LIST_VIEW_REMOVE: `${prefix} list view remove`,
@@ -165,6 +168,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) {