@pnp/cli-microsoft365 7.1.0-beta.aca68bd → 7.1.0-beta.bcf9db3

package/.devcontainer/Dockerfile

@@ -6,7 +6,6 @@ LABEL name="CLI for Microsoft 365 Development" \
   maintainers="Waldek Mastykarz <waldek@mastykarz.nl>, \
   Garry Trinder <garry.trinder@live.com>, \
   Albert-Jan Schot <appie@digiwijs.nl>, \
-  Rabia Williams <rabiawilliams@gmail.com>, \
   Patrick Lamber <patrick@nubo.eu>, \
   Arjun Menon <arjun.umenon@gmail.com>, \
   Adam Wojcik <adam.wojcik.it@gmail.com>, \

package/.eslintrc.cjs

@@ -136,6 +136,7 @@ module.exports = {
   "rules": {
     "cli-microsoft365/correct-command-class-name": ["error", sortedDictionary, capitalized],
     "cli-microsoft365/correct-command-name": "error",
+    "cli-microsoft365/no-by-server-relative-url-usage": "error",
     "indent": "off",
     "@typescript-eslint/indent": [
       "error",

package/Dockerfile

@@ -8,7 +8,6 @@ LABEL name="m365pnp/cli-microsoft365:${CLI_VERSION}" \
   maintainers="Waldek Mastykarz <waldek@mastykarz.nl>, \
   Garry Trinder <garry.trinder@live.com>, \
   Albert-Jan Schot <appie@digiwijs.nl>, \
-  Rabia Williams <rabiawilliams@gmail.com>, \
   Patrick Lamber <patrick@nubo.eu>, \
   Arjun Menon <arjun.umenon@gmail.com>, \
   Adam Wojcik <adam.wojcik.it@gmail.com>, \

package/dist/Auth.js

@@ -341,7 +341,7 @@ export class Auth {
         const cli = Cli.getInstance();
         cli.spinner.text = response.message;
         cli.spinner.spinner = {
-            frames: ['🌶️  ']
+            frames: ['🌶️']
         };
         // don't show spinner if running tests
         /* c8 ignore next 3 */

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/appInsights.js

@@ -9,7 +9,6 @@ import fs from 'fs';
 import path from 'path';
 import url from 'url';
 import { app } from './utils/app.js';
-import { pid } from './utils/pid.js';
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 const config = appInsights.setup('6b908c80-d09f-4cf6-8274-e54349a0149a');
 config.setInternalLogging(false, false);
@@ -18,17 +17,14 @@ config.setInternalLogging(false, false);
 // in the telemetry
 const version = `${app.packageJson().version}${fs.existsSync(path.join(__dirname, `..${path.sep}src`)) ? '-dev' : ''}`;
 const env = process.env.CLIMICROSOFT365_ENV !== undefined ? process.env.CLIMICROSOFT365_ENV : '';
-appInsights.default.defaultClient.commonProperties = {
+const appInsightsClient = appInsights.default.defaultClient;
+appInsightsClient.commonProperties = {
     version: version,
     node: process.version,
-    shell: pid.getProcessName(process.ppid) || '',
     env: env,
     ci: Boolean(process.env.CI).toString()
 };
-appInsights.default.defaultClient.context.tags['ai.session.id'] =
-    crypto.randomBytes(24).toString('base64');
-appInsights.default.defaultClient.context.tags['ai.cloud.roleInstance'] =
-    crypto.createHash('sha256').update(appInsights.default.defaultClient.context.tags['ai.cloud.roleInstance']).digest('hex');
-delete appInsights.default.defaultClient.context.tags['ai.cloud.role'];
-export default appInsights.default.defaultClient;
+appInsightsClient.context.tags['ai.cloud.roleInstance'] = crypto.createHash('sha256').update(appInsightsClient.context.tags['ai.cloud.roleInstance']).digest('hex');
+appInsightsClient.context.tags['ai.cloud.role'];
+export default appInsightsClient;
 //# sourceMappingURL=appInsights.js.map

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) {
@@ -31,11 +32,15 @@ export class Cli {
             return configuredValue;
         }
     }
-    // eslint-disable-next-line @typescript-eslint/no-empty-function
     constructor() {
         this.commands = [];
         this.commandsFolder = '';
-        this.spinner = ora('Running command...');
+        const options = {
+            text: 'Running command...',
+            /* c8 ignore next 1 */
+            stream: this.getSettingWithDefaultValue('errorOutput', 'stderr') === 'stderr' ? process.stderr : process.stdout
+        };
+        this.spinner = ora(options);
     }
     static getInstance() {
         if (!Cli.instance) {
@@ -799,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) {
@@ -823,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/app/app-deploy.js

@@ -43,7 +43,7 @@ class SpoAppDeployCommand extends SpoAppBaseCommand {
                     await logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
                 }
                 const requestOptions = {
-                    url: `${appCatalogUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
+                    url: `${appCatalogUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

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

@@ -39,7 +39,7 @@ class SpoAppGetCommand extends SpoAppBaseCommand {
                     await logger.logToStderr(`Looking up app id for app named ${args.options.name}...`);
                 }
                 const requestOptions = {
-                    url: `${appCatalogSiteUrl}/_api/web/getfolderbyserverrelativeurl('AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
+                    url: `${appCatalogSiteUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='AppCatalog')/files('${args.options.name}')?$select=UniqueId`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

package/dist/m365/spo/commands/app/app-teamspackage-download.js

@@ -88,7 +88,7 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand {
             url += `GetList('${serverRelativeAppCatalogListUrl}')/GetItemById(${args.options.appItemId})?$expand=File&$select=File/Name`;
         }
         else if (args.options.appName) {
-            url += `getfolderbyserverrelativeurl('${appCatalogListName}')/files('${formatting.encodeQueryParameter(args.options.appName)}')/ListItemAllFields?$select=Id`;
+            url += `GetFolderByServerRelativePath(DecodedUrl='${appCatalogListName}')/files('${formatting.encodeQueryParameter(args.options.appName)}')/ListItemAllFields?$select=Id`;
         }
         const requestOptions = {
             url,

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

@@ -38,7 +38,7 @@ class SpoAppPageAddCommand extends SpoCommand {
             const page = await request.post(createPageRequestOptions);
             const pageUrl = page.value;
             let requestOptions = {
-                url: `${args.options.webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/${pageUrl}')?$expand=ListItemAllFields`,
+                url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/${pageUrl}')?$expand=ListItemAllFields`,
                 headers: {
                     'content-type': 'application/json;charset=utf-8',
                     accept: 'application/json;odata=nometadata'