@pnp/cli-microsoft365 7.1.0-beta.99de250 → 7.1.0-beta.bcf9db3

package/dist/Command.js

@@ -12,6 +12,7 @@ import { settingsNames } from './settingsNames.js';
 import { telemetry } from './telemetry.js';
 import { accessToken } from './utils/accessToken.js';
 import { md } from './utils/md.js';
+import { prompt } from './utils/prompt.js';
 export class CommandError {
     constructor(message, code) {
         this.message = message;
@@ -75,7 +76,6 @@ class Command {
     }
     async validateRequiredOptions(args, command) {
         const shouldPrompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames.prompt, true);
-        let inquirer;
         let prompted = false;
         for (let i = 0; i < command.options.length; i++) {
             if (!command.options[i].required ||
@@ -87,19 +87,17 @@ class Command {
             }
             if (!prompted) {
                 prompted = true;
-                Cli.log('Provide values for the following parameters:');
+                Cli.error('🌶️  Provide values for the following parameters:');
             }
-            if (!inquirer) {
-                inquirer = await import('inquirer');
-            }
-            const missingRequireOptionValue = await inquirer.default
-                .prompt({
+            const missingRequireOptionValue = await prompt.forInput({
                 name: 'missingRequireOptionValue',
                 message: `${command.options[i].name}: `
-            })
-                .then(result => result.missingRequireOptionValue);
+            }).then(result => result.missingRequireOptionValue);
             args.options[command.options[i].name] = missingRequireOptionValue;
         }
+        if (prompted) {
+            Cli.error('');
+        }
         this.processOptions(args.options);
         return true;
     }
@@ -108,7 +106,6 @@ class Command {
         if (!optionsSets || optionsSets.length === 0) {
             return true;
         }
-        let inquirer;
         const shouldPrompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames.prompt, true);
         const argsOptions = Object.keys(args.options);
         for (const optionSet of optionsSets.sort(opt => opt.runsWhen ? 0 : 1)) {
@@ -120,50 +117,43 @@ class Command {
                 if (!shouldPrompt) {
                     return `Specify one of the following options: ${optionSet.options.join(', ')}.`;
                 }
-                await this.promptForOptionSetNameAndValue(args, optionSet, inquirer);
+                await this.promptForOptionSetNameAndValue(args, optionSet);
             }
             if (commonOptions.length > 1) {
                 if (!shouldPrompt) {
                     return `Specify one of the following options: ${optionSet.options.join(', ')}, but not multiple.`;
                 }
-                await this.promptForSpecificOption(args, commonOptions, inquirer);
+                await this.promptForSpecificOption(args, commonOptions);
             }
         }
         return true;
     }
-    async promptForOptionSetNameAndValue(args, optionSet, inquirer) {
-        if (!inquirer) {
-            inquirer = await import('inquirer');
-        }
-        Cli.log(`Please specify one of the following options:`);
-        const resultOptionName = await inquirer.default.prompt({
+    async promptForOptionSetNameAndValue(args, optionSet) {
+        Cli.error(`🌶️  Please specify one of the following options:`);
+        const resultOptionName = await prompt.forInput({
             type: 'list',
             name: 'missingRequiredOptionName',
             message: `Option to use:`,
             choices: optionSet.options
         });
         const missingRequiredOptionName = resultOptionName.missingRequiredOptionName;
-        const resultOptionValue = await inquirer.default
-            .prompt({
+        const resultOptionValue = await prompt.forInput({
             name: 'missingRequiredOptionValue',
             message: `${missingRequiredOptionName}:`
         });
         args.options[missingRequiredOptionName] = resultOptionValue.missingRequiredOptionValue;
-        Cli.log();
+        Cli.error('');
     }
-    async promptForSpecificOption(args, commonOptions, inquirer) {
-        if (!inquirer) {
-            inquirer = await import('inquirer');
-        }
-        Cli.log(`Multiple options for an option set specified. Please specify the correct option that you wish to use.`);
-        const requiredOptionNameResult = await inquirer.default.prompt({
+    async promptForSpecificOption(args, commonOptions) {
+        Cli.error(`🌶️  Multiple options for an option set specified. Please specify the correct option that you wish to use.`);
+        const requiredOptionNameResult = await prompt.forInput({
             type: 'list',
             name: 'missingRequiredOptionName',
             message: `Option to use:`,
             choices: commonOptions
         });
         commonOptions.filter(y => y !== requiredOptionNameResult.missingRequiredOptionName).map(optionName => args.options[optionName] = undefined);
-        Cli.log();
+        Cli.error('');
     }
     async validateOutput(args) {
         if (args.options.output &&

package/dist/cli/Cli.js

@@ -15,6 +15,7 @@ import { formatting } from '../utils/formatting.js';
 import { fsUtil } from '../utils/fsUtil.js';
 import { md } from '../utils/md.js';
 import { validation } from '../utils/validation.js';
+import { prompt } from '../utils/prompt.js';
 export class Cli {
     get config() {
         if (!this._config) {
@@ -803,14 +804,13 @@ export class Cli {
         }
     }
     static async prompt(options, answers) {
-        const inquirer = await import('inquirer');
         const cli = Cli.getInstance();
         const spinnerSpinning = cli.spinner.isSpinning;
         /* c8 ignore next 3 */
         if (spinnerSpinning) {
             cli.spinner.stop();
         }
-        const response = await inquirer.default.prompt(options, answers);
+        const response = await prompt.forInput(options, answers);
         // Restart the spinner if it was running before the prompt
         /* c8 ignore next 3 */
         if (spinnerSpinning) {
@@ -827,6 +827,7 @@ export class Cli {
             type: 'list',
             name: 'select',
             default: 0,
+            prefix: '🌶️  ',
             message: `${message} Please choose one:`,
             choices: Object.keys(values)
         });

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

@@ -0,0 +1,146 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _AadGroupUserListCommand_instances, _AadGroupUserListCommand_initTelemetry, _AadGroupUserListCommand_initOptions, _AadGroupUserListCommand_initOptionSets, _AadGroupUserListCommand_initValidators;
+import { aadGroup } from '../../../../utils/aadGroup.js';
+import { odata } from '../../../../utils/odata.js';
+import { validation } from '../../../../utils/validation.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class AadGroupUserListCommand extends GraphCommand {
+    get name() {
+        return commands.GROUP_USER_LIST;
+    }
+    get description() {
+        return 'Lists users of a specific Azure AD group';
+    }
+    defaultProperties() {
+        return ['id', 'displayName', 'userPrincipalName', 'roles'];
+    }
+    constructor() {
+        super();
+        _AadGroupUserListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadGroupUserListCommand_instances, "m", _AadGroupUserListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadGroupUserListCommand_instances, "m", _AadGroupUserListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadGroupUserListCommand_instances, "m", _AadGroupUserListCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _AadGroupUserListCommand_instances, "m", _AadGroupUserListCommand_initValidators).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            const groupId = await this.getGroupId(args.options, logger);
+            const users = [];
+            if (!args.options.role || args.options.role === 'Owner') {
+                const owners = await this.getUsers(args.options, 'Owners', groupId, logger);
+                owners.forEach(owner => users.push({ ...owner, roles: ['Owner'] }));
+            }
+            if (!args.options.role || args.options.role === 'Member') {
+                const members = await this.getUsers(args.options, 'Members', groupId, logger);
+                members.forEach((member) => {
+                    const user = users.find((u) => u.id === member.id);
+                    if (user !== undefined) {
+                        user.roles.push('Member');
+                    }
+                    else {
+                        users.push({ ...member, roles: ['Member'] });
+                    }
+                });
+            }
+            await logger.log(users);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getGroupId(options, logger) {
+        if (options.groupId) {
+            return options.groupId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr('Retrieving Group Id...');
+        }
+        return await aadGroup.getGroupIdByDisplayName(options.groupDisplayName);
+    }
+    async getUsers(options, role, groupId, logger) {
+        const { properties, filter } = options;
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving ${role} of the group with id ${groupId}`);
+        }
+        const selectProperties = properties ?
+            `${properties.split(',').filter(f => f.toLowerCase() !== 'id').concat('id').map(p => p.trim()).join(',')}` :
+            'id,displayName,userPrincipalName,givenName,surname';
+        const allSelectProperties = selectProperties.split(',');
+        const propertiesWithSlash = allSelectProperties.filter(item => item.includes('/'));
+        let fieldExpand = '';
+        propertiesWithSlash.forEach(p => {
+            if (fieldExpand.length > 0) {
+                fieldExpand += ',';
+            }
+            fieldExpand += `${p.split('/')[0]}($select=${p.split('/')[1]})`;
+        });
+        const expandParam = fieldExpand.length > 0 ? `&$expand=${fieldExpand}` : '';
+        const selectParam = allSelectProperties.filter(item => !item.includes('/'));
+        const endpoint = `${this.resource}/v1.0/groups/${groupId}/${role}/microsoft.graph.user?$select=${selectParam}${expandParam}`;
+        let users = [];
+        if (filter) {
+            // While using the filter, we need to specify the ConsistencyLevel header.
+            // Can be refactored when the header is no longer necessary.
+            const requestOptions = {
+                url: `${endpoint}&$filter=${encodeURIComponent(filter)}&$count=true`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    ConsistencyLevel: 'eventual'
+                },
+                responseType: 'json'
+            };
+            users = await odata.getAllItems(requestOptions);
+        }
+        else {
+            users = await odata.getAllItems(endpoint);
+        }
+        return users;
+    }
+}
+_AadGroupUserListCommand_instances = new WeakSet(), _AadGroupUserListCommand_initTelemetry = function _AadGroupUserListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            role: typeof args.options.role !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined',
+            filter: typeof args.options.filter !== 'undefined'
+        });
+    });
+}, _AadGroupUserListCommand_initOptions = function _AadGroupUserListCommand_initOptions() {
+    this.options.unshift({
+        option: "-i, --groupId [groupId]"
+    }, {
+        option: "-n, --groupDisplayName [groupDisplayName]"
+    }, {
+        option: "-r, --role [role]",
+        autocomplete: ["Owner", "Member"]
+    }, {
+        option: "-p, --properties [properties]"
+    }, {
+        option: "-f, --filter [filter]"
+    });
+}, _AadGroupUserListCommand_initOptionSets = function _AadGroupUserListCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['groupId', 'groupDisplayName']
+    });
+}, _AadGroupUserListCommand_initValidators = function _AadGroupUserListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        if (args.options.role) {
+            if (['Owner', 'Member'].indexOf(args.options.role) === -1) {
+                return `${args.options.role} is not a valid role value. Allowed values Owner|Member`;
+            }
+        }
+        return true;
+    });
+};
+export default new AadGroupUserListCommand();
+//# sourceMappingURL=group-user-list.js.map

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

@@ -10,16 +10,21 @@ import { aadGroup } from '../../../../utils/aadGroup.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
+import config from '../../../../config.js';
+import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
+import { setTimeout } from 'timers/promises';
 class AadM365GroupRemoveCommand extends GraphCommand {
     get name() {
         return commands.M365GROUP_REMOVE;
     }
     get description() {
-        return 'Removes an Microsoft 365 Group';
+        return 'Removes a Microsoft 365 Group';
     }
     constructor() {
         super();
         _AadM365GroupRemoveCommand_instances.add(this);
+        this.intervalInMs = 5000;
         __classPrivateFieldGet(this, _AadM365GroupRemoveCommand_instances, "m", _AadM365GroupRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadM365GroupRemoveCommand_instances, "m", _AadM365GroupRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _AadM365GroupRemoveCommand_instances, "m", _AadM365GroupRemoveCommand_initValidators).call(this);
@@ -34,21 +39,13 @@ class AadM365GroupRemoveCommand extends GraphCommand {
                 if (!isUnifiedGroup) {
                     throw Error(`Specified group with id '${args.options.id}' is not a Microsoft 365 group.`);
                 }
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/groups/${args.options.id}`,
-                    headers: {
-                        'accept': 'application/json;odata.metadata=none'
-                    }
-                };
-                await request.delete(requestOptions);
+                const siteUrl = await this.getM365GroupSiteUrl(logger, args.options.id);
+                const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+                // Delete the Microsoft 365 group site. This operation will also delete the group.
+                await this.deleteM365GroupSite(logger, siteUrl, spoAdminUrl);
                 if (args.options.skipRecycleBin) {
-                    const requestOptions2 = {
-                        url: `${this.resource}/v1.0/directory/deletedItems/${args.options.id}`,
-                        headers: {
-                            'accept': 'application/json;odata.metadata=none'
-                        }
-                    };
-                    await request.delete(requestOptions2);
+                    await this.deleteM365GroupFromRecycleBin(logger, args.options.id);
+                    await this.deleteSiteFromRecycleBin(logger, siteUrl, spoAdminUrl);
                 }
             }
             catch (err) {
@@ -70,6 +67,102 @@ class AadM365GroupRemoveCommand extends GraphCommand {
             }
         }
     }
+    async getM365GroupSiteUrl(logger, id) {
+        if (this.verbose) {
+            await logger.logToStderr(`Getting the site URL of Microsoft 365 Group: ${id}...`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/groups/${id}/drive?$select=webUrl`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const res = await request.get(requestOptions);
+        // Extract the base URL by removing everything after the last '/' character in the URL.
+        const baseUrl = res.webUrl.substring(0, res.webUrl.lastIndexOf('/'));
+        return baseUrl;
+    }
+    async deleteM365GroupSite(logger, url, spoAdminUrl) {
+        if (this.verbose) {
+            await logger.logToStderr(`Deleting the group site: '${url}'...`);
+        }
+        const requestOptions = {
+            url: `${spoAdminUrl}/_api/GroupSiteManager/Delete?siteUrl='${url}'`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        await request.post(requestOptions);
+    }
+    async deleteM365GroupFromRecycleBin(logger, id) {
+        for (let retries = 0; retries < AadM365GroupRemoveCommand.maxRetries; retries++) {
+            if (await this.isM365GroupInDeletedItemsList(id)) {
+                await this.removeM365GroupPermanently(logger, id);
+                return;
+            }
+            else {
+                if (this.verbose) {
+                    await logger.logToStderr(`Group has not been deleted yet. Waiting for ${this.intervalInMs / 1000} seconds before the next attempt. ${AadM365GroupRemoveCommand.maxRetries - retries} attempts remaining...`);
+                }
+                await setTimeout(this.intervalInMs);
+            }
+        }
+        await logger.logToStderr(`Group has been successfully deleted, but it couldn't be permanently removed from the recycle bin after all retries. It will still appear in the deleted groups list.`);
+    }
+    async removeM365GroupPermanently(logger, id) {
+        if (this.verbose) {
+            await logger.logToStderr(`Group has been deleted and is now available in the deleted groups list. Removing permanently...`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/directory/deletedItems/${id}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            }
+        };
+        await request.delete(requestOptions);
+    }
+    async isM365GroupInDeletedItemsList(id) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/directory/deletedItems/${id}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        try {
+            const response = await request.get(requestOptions);
+            return Boolean(response && response.id);
+        }
+        catch (error) {
+            if (error.response && error.response.status === 404) {
+                return false;
+            }
+            else {
+                throw error;
+            }
+        }
+    }
+    async deleteSiteFromRecycleBin(logger, url, spoAdminUrl) {
+        if (this.verbose) {
+            await logger.logToStderr(`Deleting the M365 group site '${url}' from the recycle bin...`);
+        }
+        const res = await spo.ensureFormDigest(spoAdminUrl, logger, undefined, this.debug);
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': res.FormDigestValue
+            },
+            data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="185" ObjectPathId="184" /><Query Id="186" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="184" ParentId="175" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+        };
+        const processQuery = await request.post(requestOptions);
+        const json = JSON.parse(processQuery);
+        const response = json[0];
+        if (response.ErrorInfo) {
+            throw response.ErrorInfo.ErrorMessage;
+        }
+    }
 }
 _AadM365GroupRemoveCommand_instances = new WeakSet(), _AadM365GroupRemoveCommand_initTelemetry = function _AadM365GroupRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -94,5 +187,6 @@ _AadM365GroupRemoveCommand_instances = new WeakSet(), _AadM365GroupRemoveCommand
         return true;
     });
 };
+AadM365GroupRemoveCommand.maxRetries = 10;
 export default new AadM365GroupRemoveCommand();
 //# sourceMappingURL=m365group-remove.js.map

package/dist/m365/aad/commands.js

@@ -14,6 +14,7 @@ export default {
     GROUP_GET: `${prefix} group get`,
     GROUP_LIST: `${prefix} group list`,
     GROUP_REMOVE: `${prefix} group remove`,
+    GROUP_USER_LIST: `${prefix} group user list`,
     GROUPSETTING_ADD: `${prefix} groupsetting add`,
     GROUPSETTING_GET: `${prefix} groupsetting get`,
     GROUPSETTING_LIST: `${prefix} groupsetting list`,

package/dist/m365/cli/commands/cli-doctor.js

@@ -14,11 +14,14 @@ class CliDoctorCommand extends Command {
     }
     async commandAction(logger) {
         const roles = [];
-        const scopes = [];
+        const scopes = new Map();
         Object.keys(auth.service.accessTokens).forEach(resource => {
             const accessToken = auth.service.accessTokens[resource].accessToken;
             this.getRolesFromAccessToken(accessToken).forEach(role => roles.push(role));
-            this.getScopesFromAccessToken(accessToken).forEach(scope => scopes.push(scope));
+            const [res, scp] = this.getScopesFromAccessToken(accessToken);
+            if (res !== "") {
+                scopes.set(res, scp);
+            }
         });
         const diagnosticInfo = {
             os: {
@@ -34,7 +37,7 @@ class CliDoctorCommand extends Command {
             cliEnvironment: process.env.CLIMICROSOFT365_ENV ? process.env.CLIMICROSOFT365_ENV : '',
             cliConfig: Cli.getInstance().config.all,
             roles: roles,
-            scopes: scopes
+            scopes: Object.fromEntries(scopes)
         };
         await logger.log(diagnosticInfo);
     }
@@ -55,20 +58,22 @@ class CliDoctorCommand extends Command {
         return roles;
     }
     getScopesFromAccessToken(accessToken) {
+        let resource = "";
         let scopes = [];
         if (!accessToken || accessToken.length === 0) {
-            return scopes;
+            return [resource, scopes];
         }
         const chunks = accessToken.split('.');
         if (chunks.length !== 3) {
-            return scopes;
+            return [resource, scopes];
         }
         const tokenString = Buffer.from(chunks[1], 'base64').toString();
         const token = JSON.parse(tokenString);
         if (token.scp?.length > 0) {
+            resource = token.aud.replace(/(-my|-admin).sharepoint.com/, '.sharepoint.com');
             scopes = token.scp.split(' ');
         }
-        return scopes;
+        return [resource, scopes];
     }
 }
 export default new CliDoctorCommand();

package/dist/m365/commands/setup.js

@@ -12,6 +12,7 @@ import { pid } from '../../utils/pid.js';
 import AnonymousCommand from '../base/AnonymousCommand.js';
 import commands from './commands.js';
 import { interactivePreset, powerShellPreset, scriptingPreset } from './setupPresets.js';
+import { prompt } from '../../utils/prompt.js';
 class SetupCommand extends AnonymousCommand {
     get name() {
         return commands.SETUP;
@@ -48,7 +49,7 @@ class SetupCommand extends AnonymousCommand {
         await logger.logToStderr(`This command will guide you through the process of configuring the CLI for your needs.`);
         await logger.logToStderr(`Please, answer the following questions and we'll define a set of settings to best match how you intend to use the CLI.`);
         await logger.logToStderr('');
-        const preferences = await Cli.prompt([
+        const preferences = await prompt.forInput([
             {
                 type: 'list',
                 name: 'usageMode',

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

@@ -4,7 +4,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoSiteDesignGetCommand_instances, _SpoSiteDesignGetCommand_initTelemetry, _SpoSiteDesignGetCommand_initOptions, _SpoSiteDesignGetCommand_initValidators, _SpoSiteDesignGetCommand_initOptionSets;
+import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -24,9 +26,9 @@ class SpoSiteDesignGetCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoSiteDesignGetCommand_instances, "m", _SpoSiteDesignGetCommand_initOptionSets).call(this);
     }
-    getSiteDesignId(args, spoUrl) {
+    async getSiteDesignId(args, spoUrl) {
         if (args.options.id) {
-            return Promise.resolve(args.options.id);
+            return args.options.id;
         }
         const requestOptions = {
             url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.GetSiteDesigns`,
@@ -35,18 +37,17 @@ class SpoSiteDesignGetCommand extends SpoCommand {
             },
             responseType: 'json'
         };
-        return request
-            .post(requestOptions)
-            .then(response => {
-            const matchingSiteDesigns = response.value.filter(x => x.Title === args.options.title);
-            if (matchingSiteDesigns.length === 0) {
-                return Promise.reject(`The specified site design does not exist`);
-            }
-            if (matchingSiteDesigns.length > 1) {
-                return Promise.reject(`Multiple site designs with title ${args.options.title} found: ${matchingSiteDesigns.map(x => x.Id).join(', ')}`);
-            }
-            return Promise.resolve(matchingSiteDesigns[0].Id);
-        });
+        const response = await request.post(requestOptions);
+        const matchingSiteDesigns = response.value.filter(x => x.Title === args.options.title);
+        if (matchingSiteDesigns.length === 0) {
+            throw `The specified site design does not exist`;
+        }
+        if (matchingSiteDesigns.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', matchingSiteDesigns);
+            const result = await Cli.handleMultipleResultsFound(`Multiple site designs with title '${args.options.title}' found.`, resultAsKeyValuePair);
+            return result.Id;
+        }
+        return matchingSiteDesigns[0].Id;
     }
     async commandAction(logger, args) {
         try {

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

@@ -25,28 +25,8 @@ class SpoSiteDesignRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSiteDesignRemoveCommand_instances, "m", _SpoSiteDesignRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const removeSiteDesign = async () => {
-            try {
-                const spoUrl = await spo.getSpoUrl(logger, this.debug);
-                const requestDigest = await spo.getRequestDigest(spoUrl);
-                const requestOptions = {
-                    url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.DeleteSiteDesign`,
-                    headers: {
-                        'X-RequestDigest': requestDigest.FormDigestValue,
-                        'content-type': 'application/json;charset=utf-8',
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    data: { id: args.options.id },
-                    responseType: 'json'
-                };
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeSiteDesign();
+            await this.removeSiteDesign(logger, args.options.id);
         }
         else {
             const result = await Cli.prompt({
@@ -56,10 +36,30 @@ class SpoSiteDesignRemoveCommand extends SpoCommand {
                 message: `Are you sure you want to remove the site design ${args.options.id}?`
             });
             if (result.continue) {
-                await removeSiteDesign();
+                await this.removeSiteDesign(logger, args.options.id);
             }
         }
     }
+    async removeSiteDesign(logger, id) {
+        try {
+            const spoUrl = await spo.getSpoUrl(logger, this.debug);
+            const requestDigest = await spo.getRequestDigest(spoUrl);
+            const requestOptions = {
+                url: `${spoUrl}/_api/Microsoft.Sharepoint.Utilities.WebTemplateExtensions.SiteScriptUtility.DeleteSiteDesign`,
+                headers: {
+                    'X-RequestDigest': requestDigest.FormDigestValue,
+                    'content-type': 'application/json;charset=utf-8',
+                    accept: 'application/json;odata=nometadata'
+                },
+                data: { id: id },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _SpoSiteDesignRemoveCommand_instances = new WeakSet(), _SpoSiteDesignRemoveCommand_initTelemetry = function _SpoSiteDesignRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/todo/commands/task/task-list.js

@@ -26,9 +26,9 @@ class TodoTaskListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TodoTaskListCommand_instances, "m", _TodoTaskListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TodoTaskListCommand_instances, "m", _TodoTaskListCommand_initOptionSets).call(this);
     }
-    getTodoListId(args) {
+    async getTodoListId(args) {
         if (args.options.listId) {
-            return Promise.resolve(args.options.listId);
+            return args.options.listId;
         }
         const requestOptions = {
             url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.listName)}'`,
@@ -37,14 +37,12 @@ class TodoTaskListCommand extends GraphCommand {
             },
             responseType: 'json'
         };
-        return request.get(requestOptions)
-            .then(response => {
-            const taskList = response.value[0];
-            if (!taskList) {
-                return Promise.reject(`The specified task list does not exist`);
-            }
-            return Promise.resolve(taskList.id);
-        });
+        const response = await request.get(requestOptions);
+        const taskList = response.value[0];
+        if (!taskList) {
+            throw `The specified task list does not exist`;
+        }
+        return taskList.id;
     }
     async commandAction(logger, args) {
         try {

package/dist/m365/todo/commands/task/task-remove.js

@@ -23,42 +23,8 @@ class TodoTaskRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TodoTaskRemoveCommand_instances, "m", _TodoTaskRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const getToDoListId = async () => {
-            if (args.options.listName) {
-                // Search list by its name
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.listName)}'`,
-                    headers: {
-                        accept: "application/json;odata.metadata=none"
-                    },
-                    responseType: 'json'
-                };
-                const response = await request.get(requestOptions);
-                return response.value && response.value.length === 1 ? response.value[0].id : undefined;
-            }
-            return Promise.resolve(args.options.listId);
-        };
-        const removeToDoTask = async () => {
-            try {
-                const toDoListId = await getToDoListId();
-                if (!toDoListId) {
-                    throw `The list ${args.options.listName} cannot be found`;
-                }
-                const requestOptions = {
-                    url: `${this.resource}/v1.0/me/todo/lists/${toDoListId}/tasks/${args.options.id}`,
-                    headers: {
-                        accept: "application/json;odata.metadata=none"
-                    },
-                    responseType: 'json'
-                };
-                await request.delete(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeToDoTask();
+            await this.removeToDoTask(args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -68,10 +34,44 @@ class TodoTaskRemoveCommand extends GraphCommand {
                 message: `Are you sure you want to remove the task ${args.options.id} from list ${args.options.listId || args.options.listName}?`
             });
             if (result.continue) {
-                await removeToDoTask();
+                await this.removeToDoTask(args.options);
             }
         }
     }
+    async getToDoListId(options) {
+        if (options.listName) {
+            // Search list by its name
+            const requestOptions = {
+                url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(options.listName)}'`,
+                headers: {
+                    accept: "application/json;odata.metadata=none"
+                },
+                responseType: 'json'
+            };
+            const response = await request.get(requestOptions);
+            return response.value && response.value.length === 1 ? response.value[0].id : undefined;
+        }
+        return options.listId;
+    }
+    async removeToDoTask(options) {
+        try {
+            const toDoListId = await this.getToDoListId(options);
+            if (!toDoListId) {
+                throw `The list ${options.listName} cannot be found`;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/me/todo/lists/${toDoListId}/tasks/${options.id}`,
+                headers: {
+                    accept: "application/json;odata.metadata=none"
+                },
+                responseType: 'json'
+            };
+            await request.delete(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _TodoTaskRemoveCommand_instances = new WeakSet(), _TodoTaskRemoveCommand_initTelemetry = function _TodoTaskRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/todo/commands/task/task-set.js

@@ -28,7 +28,7 @@ class TodoTaskSetCommand extends GraphCommand {
         const endpoint = `${this.resource}/v1.0`;
         const data = this.mapRequestBody(args.options);
         try {
-            const listId = await this.getTodoListId(args);
+            const listId = await this.getTodoListId(args.options);
             const requestOptions = {
                 url: `${endpoint}/me/todo/lists/${listId}/tasks/${formatting.encodeQueryParameter(args.options.id)}`,
                 headers: {
@@ -45,25 +45,23 @@ class TodoTaskSetCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    getTodoListId(args) {
-        if (args.options.listId) {
-            return Promise.resolve(args.options.listId);
+    async getTodoListId(options) {
+        if (options.listId) {
+            return options.listId;
         }
         const requestOptions = {
-            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(args.options.listName)}'`,
+            url: `${this.resource}/v1.0/me/todo/lists?$filter=displayName eq '${escape(options.listName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
-        return request.get(requestOptions)
-            .then(response => {
-            const taskList = response.value[0];
-            if (!taskList) {
-                return Promise.reject(`The specified task list does not exist`);
-            }
-            return Promise.resolve(taskList.id);
-        });
+        const response = await request.get(requestOptions);
+        const taskList = response.value[0];
+        if (!taskList) {
+            throw `The specified task list does not exist`;
+        }
+        return taskList.id;
     }
     getDateTimeTimeZone(dateTime) {
         return {

package/dist/m365/yammer/commands/group/group-user-remove.js

@@ -23,29 +23,8 @@ class YammerGroupUserRemoveCommand extends YammerCommand {
         __classPrivateFieldGet(this, _YammerGroupUserRemoveCommand_instances, "m", _YammerGroupUserRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const executeRemoveAction = async () => {
-            const endpoint = `${this.resource}/v1/group_memberships.json`;
-            const requestOptions = {
-                url: endpoint,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: {
-                    group_id: args.options.groupId,
-                    user_id: args.options.id
-                }
-            };
-            try {
-                await request.delete(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await executeRemoveAction();
+            await this.executeRemoveAction(args.options);
         }
         else {
             let messagePrompt = `Are you sure you want to leave group ${args.options.groupId}?`;
@@ -59,8 +38,28 @@ class YammerGroupUserRemoveCommand extends YammerCommand {
                 message: messagePrompt
             });
             if (result.continue) {
-                await executeRemoveAction();
+                await this.executeRemoveAction(args.options);
+            }
+        }
+    }
+    async executeRemoveAction(options) {
+        const requestOptions = {
+            url: `${this.resource}/v1/group_memberships.json`,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            data: {
+                group_id: options.groupId,
+                user_id: options.id
             }
+        };
+        try {
+            await request.delete(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

package/dist/utils/odata.js

@@ -1,23 +1,24 @@
 import request from "../request.js";
-export const odata = {
-    async getAllItems(url, metadata) {
-        let items = [];
-        const requestOptions = {
-            url: url,
-            headers: {
-                accept: `application/json;odata.metadata=${metadata ?? 'none'}`,
-                'odata-version': '4.0'
-            },
-            responseType: 'json'
-        };
-        const res = await request.get(requestOptions);
-        items = res.value;
-        const nextLink = res['@odata.nextLink'] ?? res.nextLink;
-        if (nextLink) {
-            const nextPageItems = await odata.getAllItems(nextLink, metadata);
-            items = items.concat(nextPageItems);
-        }
-        return items;
+async function getAllItems(param1, metadata) {
+    let items = [];
+    const requestOptions = typeof param1 !== 'string' ? param1 : {
+        url: param1,
+        headers: {
+            accept: `application/json;odata.metadata=${metadata ?? 'none'}`,
+            'odata-version': '4.0'
+        },
+        responseType: 'json'
+    };
+    const res = await request.get(requestOptions);
+    items = res.value;
+    const nextLink = res['@odata.nextLink'] ?? res.nextLink;
+    if (nextLink) {
+        const nextPageItems = await odata.getAllItems({ ...requestOptions, url: nextLink });
+        items = items.concat(nextPageItems);
     }
+    return items;
+}
+export const odata = {
+    getAllItems
 };
 //# sourceMappingURL=odata.js.map

package/dist/utils/prompt.js

@@ -0,0 +1,16 @@
+import { Cli } from '../cli/Cli.js';
+import { settingsNames } from '../settingsNames.js';
+let inquirer;
+export const prompt = {
+    /* c8 ignore next 10 */
+    async forInput(config, answers) {
+        if (!inquirer) {
+            inquirer = await import('inquirer');
+        }
+        const cli = Cli.getInstance();
+        const errorOutput = cli.getSettingWithDefaultValue(settingsNames.errorOutput, 'stderr');
+        const prompt = inquirer.createPromptModule({ output: errorOutput === 'stderr' ? process.stderr : process.stdout });
+        return await prompt(config, answers);
+    }
+};
+//# sourceMappingURL=prompt.js.map

package/docs/docs/cmd/aad/group/group-user-list.mdx

@@ -0,0 +1,135 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# aad group user list
+
+Lists users of a specific Azure AD group
+
+## Usage
+
+```sh
+m365 aad group user list [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --groupId [groupId]`
+: The ID of the Azure AD group. Specify `groupId` or `groupDisplayName` but not both.
+
+`-n, --groupDisplayName [groupDisplayName]`
+: The display name of the Azure AD group. Specify `groupId` or `groupDisplayName` but not both.
+
+`-r, --role [role]`
+: Filter the results to only users with the given role: `Owner`, `Member`.
+
+`-p, --properties [properties]`
+: Comma-separated list of properties to retrieve.
+
+`-f, --filter [filter]`
+: OData filter to use to query the list of users with.
+```
+
+<Global />
+
+## Remarks
+
+When the `properties` option includes values with a `/`, for example: `manager/displayName`, an additional `$expand` query parameter will be included on `manager`.
+
+## Examples
+
+List all group users from a group specified by ID.
+
+```sh
+m365 aad group user list --groupId 03cba9da-3974-46c1-afaf-79caa2e45bbe
+```
+
+List all owners from a group specified by display name.
+
+```sh
+m365 aad group user list --groupDisplayName Developers --role Owner
+```
+
+List all group users from a group specified by name. For each one return the display name, e-mail address, and manager display name.
+
+```sh
+m365 aad group user list --groupDisplayName Developers --properties "displayName,mail,manager/displayName"
+```
+
+List all group users from a group specified by name. For each one return the display name, e-mail address, and manager information.
+
+```sh
+m365 aad group user list --groupDisplayName Developers --properties "displayName,mail,manager/*"
+```
+
+List all group members that are guest users.
+
+```sh
+m365 aad group user list --groupDisplayName Developers --filter "userType eq 'Guest'"
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  [
+    {
+      "id": "da52218e-4822-4ac6-b41d-255e2059655e",
+      "displayName": "Adele Vance",
+      "userPrincipalName": "AdeleV@contoso.OnMicrosoft.com",
+      "givenName": "Adele",
+      "surname": "Vance",
+      "roles": [
+        "Owner",
+        "Member"
+      ]
+    }
+  ]
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  id                                    displayName           userPrincipalName                     roles
+  ------------------------------------  --------------------  ------------------------------------  --------
+  da52218e-4822-4ac6-b41d-255e2059655e  Adele Vance           AdeleV@contoso.OnMicrosoft.com        Owner,Member
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  id,displayName,userPrincipalName,givenName,surname
+  da52218e-4822-4ac6-b41d-255e2059655e,Adele Vance,AdeleV@contoso.OnMicrosoft.com,Adele,Vance
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  # aad group user list --groupId "1deaa428-8dde-4043-b028-5492226d6114"
+
+  Date: 2023-10-02
+
+  ## Adele Vance (da52218e-4822-4ac6-b41d-255e2059655e)
+
+  Property | Value
+  ---------|-------
+  id | da52218e-4822-4ac6-b41d-255e2059655e
+  displayName | Adele Vance
+  userPrincipalName | AdeleV@contoso.OnMicrosoft.com
+  givenName | Adele
+  surname | Vance
+  ```
+
+  </TabItem>
+</Tabs>
+
+
+## More information
+
+- View the documentation to see what userproperties can be included: [https://pnp.github.io/cli-microsoft365/cmd/aad/user/user-get#more-information](https://pnp.github.io/cli-microsoft365/cmd/aad/user/user-get#more-information)

package/docs/docs/cmd/aad/m365group/m365group-remove.mdx

@@ -27,7 +27,17 @@ m365 aad m365group remove [options]
 
 ## Remarks
 
-If the specified _id_ doesn't refer to an existing group, you will get a `Resource does not exist` error.
+If the specified _id_ doesn't refer to an existing group, you will get a `Resource does not exist` error. Additionally, if you do not have access to the group or the associated group-connected site, you will get an `Access denied` error.
+
+When you use `--skipRecycleBin` flag to remove a Microsoft 365 group permanently, the process involves deleting the associated group-connected site and the group, and then checking if the group has been moved to the deleted groups list. In some cases, it may take a few seconds for the group to appear in the deleted groups list.
+
+To ensure a smooth deletion process, the command employs a retry mechanism with the following parameters:
+
+- `maxRetries`: This parameter is set to 10 by default. It specifies the maximum number of times the command will check if the group has been moved to the deleted groups list.
+
+- `intervalInMs`: This parameter is set to 5000 milliseconds (5 seconds) by default. It defines the time interval between each retry attempt.
+
+If the group is successfully moved to the deleted groups list within the specified number of retries, the command will then proceed to permanently remove it from the tenant. If the group cannot be removed after all retries, it will remain in the deleted groups list.
 
 ## Examples
 

package/docs/docs/cmd/spo/field/field-get.mdx

@@ -31,7 +31,7 @@ m365 spo field get [options]
 : The ID of the field to retrieve. Specify `id` or `title` but not both.
 
 `-t, --title [title]`
-: The display name (case-sensitive) of the field to remove. Specify `id` or `title` but not both.
+: The display name (case-sensitive) of the field to retrieve. Specify `id` or `title` but not both.
 ```
 
 <Global />

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "7.1.0-beta.99de250",
+  "version": "7.1.0-beta.bcf9db3",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",
@@ -31,21 +31,41 @@
     "lint": "eslint --ext .ts src"
   },
   "keywords": [
-    "office 365",
+    "adaptive card",
+    "ai builder",
+    "azure active directory",
+    "azure ad",
+    "azure",
+    "bookings",
+    "dataverse",
+    "entra id",
+    "graph",
+    "m365",
     "microsoft 365",
-    "sharepoint framework",
+    "microsoft",
     "o365",
-    "m365",
-    "spfx",
+    "office 365",
+    "onedrive",
+    "onenote",
+    "outlook",
+    "planner",
+    "power apps",
+    "power automate",
+    "power platform",
+    "purview",
+    "search",
+    "sharepoint framework",
     "sharepoint online",
     "sharepoint",
-    "microsoft teams",
-    "microsoft graph",
-    "microsoft flow",
-    "azure active directory",
-    "azure ad",
-    "azure",
-    "microsoft"
+    "skype",
+    "spfx",
+    "teams",
+    "tenant",
+    "todo",
+    "viva connections",
+    "viva engage",
+    "viva",
+    "yammer"
   ],
   "author": "https://github.com/pnp/cli-microsoft365/graphs/contributors",
   "maintainers": [
@@ -209,7 +229,7 @@
     "Thangavel, Sekar <sekar.thangavel@gmail.com>",
     "Thorild, Fredrik <fredrik.thorild@sogeti.com>",
     "Trinder, Garry <garry.trinder@live.com>",
-    "Tripathi, Saurabh <saurabh.k.a.tripathi@avanade.com>",
+    "Tripathi, Saurabh <saurabh7019@gmail.com>",
     "Vaghasia, Siddharth <siddh.vaghasia@gmail.com>",
     "Van de Voorde, Tim <tim.vdv1995@hotmail.com>",
     "van Dijk, Mark <mark@ichicraft.com>",