@pnp/cli-microsoft365 7.7.0-beta.72886a7 → 7.7.0-beta.7d3ef49

package/dist/Command.js

@@ -545,7 +545,7 @@ _Command_instances = new WeakSet(), _Command_initTelemetry = function _Command_i
         autocomplete: this.allowedOutputs
     }, { option: '--verbose' }, { option: '--debug' });
 }, _Command_initValidators = function _Command_initValidators() {
-    this.validators.push((args, command) => this.validateUnknownOptions(args, command), (args, command) => this.validateRequiredOptions(args, command), args => this.validateOutput(args), (args, command) => this.validateOptionSets(args, command));
+    this.validators.push(args => this.validateOutput(args), (args, command) => this.validateUnknownOptions(args, command), (args, command) => this.validateRequiredOptions(args, command), (args, command) => this.validateOptionSets(args, command));
 };
 export default Command;
 //# sourceMappingURL=Command.js.map

package/dist/cli/cli.js

@@ -17,6 +17,7 @@ import { md } from '../utils/md.js';
 import { validation } from '../utils/validation.js';
 import { prompt } from '../utils/prompt.js';
 import { timings } from './timings.js';
+import chalk from 'chalk';
 const require = createRequire(import.meta.url);
 const __dirname = fileURLToPath(new URL('.', import.meta.url));
 let _config;
@@ -96,7 +97,7 @@ async function execute(rawArgs) {
         parsedArgs.h ||
         parsedArgs.help) {
         if (parsedArgs.output !== 'none') {
-            printHelp(await getHelpMode(parsedArgs));
+            await printHelp(await getHelpMode(parsedArgs));
         }
         return;
     }
@@ -546,13 +547,16 @@ function getFirstNonUndefinedArrayItem(arr) {
     }
     return undefined;
 }
-function printHelp(helpMode, exitCode = 0) {
+async function printHelp(helpMode, exitCode = 0) {
     const properties = {};
     if (cli.commandToExecute) {
         properties.command = cli.commandToExecute.name;
         printCommandHelp(helpMode);
     }
     else {
+        if (cli.currentCommandName && !cli.commands.some(command => command.name.startsWith(cli.currentCommandName))) {
+            await cli.error(chalk.red(`Command '${cli.currentCommandName}' was not found. Below you can find the commands and command groups you can use. For detailed information on a command group, use 'm365 [command group] --help'.`));
+        }
         cli.log();
         cli.log(`CLI for Microsoft 365 v${app.packageJson().version}`);
         cli.log(`${app.packageJson().description} `);
@@ -732,7 +736,7 @@ async function closeWithError(error, args, showHelpIfEnabled = false) {
     await cli.error(errorMessage);
     if (showHelpIfEnabled &&
         await cli.getSettingWithDefaultValue(settingsNames.showHelpOnFailure, showHelpIfEnabled)) {
-        printHelp(await getHelpMode(args.options), exitCode);
+        await printHelp(await getHelpMode(args.options), exitCode);
     }
     else {
         process.exit(exitCode);
@@ -875,7 +879,8 @@ export const cli = {
 const spinnerOptions = {
     text: 'Running command...',
     /* c8 ignore next 1 */
-    stream: cli.getSettingWithDefaultValue('errorOutput', 'stderr') === 'stderr' ? process.stderr : process.stdout
+    stream: cli.getSettingWithDefaultValue('errorOutput', 'stderr') === 'stderr' ? process.stderr : process.stdout,
+    discardStdin: false
 };
 cli.spinner = ora(spinnerOptions);
 //# sourceMappingURL=cli.js.map

package/dist/m365/commands/setup.js

@@ -73,13 +73,7 @@ class SetupCommand extends AnonymousCommand {
         };
         preferences.experience = await cli.promptForSelection(experienceConfig);
         const summaryConfig = {
-            // invoked by inquirer
-            /* c8 ignore next 6 */
-            message: async () => {
-                settings = this.getSettings(preferences);
-                // eslint-disable-next-line @typescript-eslint/no-unused-vars
-                return this.getSummaryMessage(settings);
-            }
+            message: this.getSummaryMessage(this.getSettings(preferences))
         };
         preferences.summary = await cli.promptForConfirmation(summaryConfig);
         if (preferences.summary) {

package/dist/m365/entra/commands/app/app-add.js

@@ -98,6 +98,9 @@ class EntraAppAddCommand extends GraphCommand {
             };
             applicationInfo.keyCredentials = [newKeyCredential];
         }
+        if (args.options.allowPublicClientFlows) {
+            applicationInfo.isFallbackPublicClient = true;
+        }
         if (this.verbose) {
             await logger.logToStderr(`Creating Microsoft Entra app registration...`);
         }
@@ -657,7 +660,8 @@ _a = EntraAppAddCommand, _EntraAppAddCommand_instances = new WeakSet(), _EntraAp
             certificateFile: typeof args.options.certificateFile !== 'undefined',
             certificateBase64Encoded: typeof args.options.certificateBase64Encoded !== 'undefined',
             certificateDisplayName: typeof args.options.certificateDisplayName !== 'undefined',
-            grantAdminConsent: typeof args.options.grantAdminConsent !== 'undefined'
+            grantAdminConsent: typeof args.options.grantAdminConsent !== 'undefined',
+            allowPublicClientFlows: typeof args.options.allowPublicClientFlows !== 'undefined'
         });
     });
 }, _EntraAppAddCommand_initOptions = function _EntraAppAddCommand_initOptions() {
@@ -701,6 +705,8 @@ _a = EntraAppAddCommand, _EntraAppAddCommand_instances = new WeakSet(), _EntraAp
         option: '--save'
     }, {
         option: '--grantAdminConsent'
+    }, {
+        option: '--allowPublicClientFlows'
     });
 }, _EntraAppAddCommand_initValidators = function _EntraAppAddCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/entra/commands/app/app-set.js

@@ -3,7 +3,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _EntraAppSetCommand_instances, _a, _EntraAppSetCommand_initTelemetry, _EntraAppSetCommand_initOptions, _EntraAppSetCommand_initValidators, _EntraAppSetCommand_initOptionSets;
+var _EntraAppSetCommand_instances, _a, _EntraAppSetCommand_initTelemetry, _EntraAppSetCommand_initOptions, _EntraAppSetCommand_initValidators, _EntraAppSetCommand_initOptionSets, _EntraAppSetCommand_initTypes;
 import fs from 'fs';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -28,6 +28,7 @@ class EntraAppSetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraAppSetCommand_instances, "m", _EntraAppSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _EntraAppSetCommand_instances, "m", _EntraAppSetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _EntraAppSetCommand_instances, "m", _EntraAppSetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _EntraAppSetCommand_instances, "m", _EntraAppSetCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.APP_SET, commands.APP_SET);
@@ -35,6 +36,7 @@ class EntraAppSetCommand extends GraphCommand {
             let objectId = await this.getAppObjectId(args, logger);
             objectId = await this.configureUri(args, objectId, logger);
             objectId = await this.configureRedirectUris(args, objectId, logger);
+            objectId = await this.updateAllowPublicClientFlows(args, objectId, logger);
             await this.configureCertificate(args, objectId, logger);
         }
         catch (err) {
@@ -71,6 +73,27 @@ class EntraAppSetCommand extends GraphCommand {
         const result = await cli.handleMultipleResultsFound(`Multiple Microsoft Entra application registration with name '${name}' found.`, resultAsKeyValuePair);
         return result.id;
     }
+    async updateAllowPublicClientFlows(args, objectId, logger) {
+        if (args.options.allowPublicClientFlows === undefined) {
+            return objectId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Configuring Entra application AllowPublicClientFlows option...`);
+        }
+        const applicationInfo = {
+            isFallbackPublicClient: args.options.allowPublicClientFlows
+        };
+        const requestOptions = {
+            url: `${this.resource}/v1.0/myorganization/applications/${objectId}`,
+            headers: {
+                'content-type': 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: applicationInfo
+        };
+        await request.patch(requestOptions);
+        return objectId;
+    }
     async configureUri(args, objectId, logger) {
         if (!args.options.uris) {
             return objectId;
@@ -249,14 +272,18 @@ _a = EntraAppSetCommand, _EntraAppSetCommand_instances = new WeakSet(), _EntraAp
             uris: typeof args.options.uris !== 'undefined',
             certificateFile: typeof args.options.certificateFile !== 'undefined',
             certificateBase64Encoded: typeof args.options.certificateBase64Encoded !== 'undefined',
-            certificateDisplayName: typeof args.options.certificateDisplayName !== 'undefined'
+            certificateDisplayName: typeof args.options.certificateDisplayName !== 'undefined',
+            allowPublicClientFlows: typeof args.options.allowPublicClientFlows !== 'undefined'
         });
     });
 }, _EntraAppSetCommand_initOptions = function _EntraAppSetCommand_initOptions() {
     this.options.unshift({ option: '--appId [appId]' }, { option: '--objectId [objectId]' }, { option: '-n, --name [name]' }, { option: '-u, --uris [uris]' }, { option: '-r, --redirectUris [redirectUris]' }, { option: '--certificateFile [certificateFile]' }, { option: '--certificateBase64Encoded [certificateBase64Encoded]' }, { option: '--certificateDisplayName [certificateDisplayName]' }, {
         option: '--platform [platform]',
         autocomplete: _a.aadApplicationPlatform
-    }, { option: '--redirectUrisToRemove [redirectUrisToRemove]' });
+    }, { option: '--redirectUrisToRemove [redirectUrisToRemove]' }, {
+        option: '--allowPublicClientFlows [allowPublicClientFlows]',
+        autocomplete: ['true', 'false']
+    });
 }, _EntraAppSetCommand_initValidators = function _EntraAppSetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.certificateFile && args.options.certificateBase64Encoded) {
@@ -279,6 +306,8 @@ _a = EntraAppSetCommand, _EntraAppSetCommand_instances = new WeakSet(), _EntraAp
     });
 }, _EntraAppSetCommand_initOptionSets = function _EntraAppSetCommand_initOptionSets() {
     this.optionSets.push({ options: ['appId', 'objectId', 'name'] });
+}, _EntraAppSetCommand_initTypes = function _EntraAppSetCommand_initTypes() {
+    this.types.boolean.push('allowPublicClientFlows');
 };
 EntraAppSetCommand.aadApplicationPlatform = ['spa', 'web', 'publicClient'];
 export default new EntraAppSetCommand();

package/dist/m365/entra/commands/pim/pim-role-assignment-add.js

@@ -0,0 +1,233 @@
+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 _EntraPimRoleAssignmentAddCommand_instances, _EntraPimRoleAssignmentAddCommand_initTelemetry, _EntraPimRoleAssignmentAddCommand_initOptions, _EntraPimRoleAssignmentAddCommand_initValidators, _EntraPimRoleAssignmentAddCommand_initOptionSets;
+import request from '../../../../request.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { roleDefinition } from '../../../../utils/roleDefinition.js';
+import { validation } from '../../../../utils/validation.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { accessToken } from '../../../../utils/accessToken.js';
+import auth from '../../../../Auth.js';
+class EntraPimRoleAssignmentAddCommand extends GraphCommand {
+    get name() {
+        return commands.PIM_ROLE_ASSIGNMENT_ADD;
+    }
+    get description() {
+        return 'Request activation of an Entra role assignment for a user or group';
+    }
+    constructor() {
+        super();
+        _EntraPimRoleAssignmentAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraPimRoleAssignmentAddCommand_instances, "m", _EntraPimRoleAssignmentAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraPimRoleAssignmentAddCommand_instances, "m", _EntraPimRoleAssignmentAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraPimRoleAssignmentAddCommand_instances, "m", _EntraPimRoleAssignmentAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraPimRoleAssignmentAddCommand_instances, "m", _EntraPimRoleAssignmentAddCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        const { userId, userName, groupId, groupName, startDateTime, endDateTime, ticketNumber, ticketSystem } = args.options;
+        try {
+            const token = auth.connection.accessTokens[auth.defaultResource].accessToken;
+            const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(token);
+            if (isAppOnlyAccessToken) {
+                throw 'When running with application permissions either userId, userName, groupId or groupName is required';
+            }
+            const roleDefinitionId = await this.getRoleDefinitionId(args.options, logger);
+            const principalId = await this.getPrincipalId(args.options, logger);
+            const requestOptions = {
+                url: `${this.resource}/v1.0/roleManagement/directory/roleAssignmentScheduleRequests`,
+                headers: {
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    principalId: principalId,
+                    roleDefinitionId: roleDefinitionId,
+                    directoryScopeId: this.getDirectoryScope(args.options),
+                    action: !userId && !userName && !groupId && !groupName ? 'selfActivate' : 'adminAssign',
+                    justification: args.options.justification,
+                    scheduleInfo: {
+                        startDateTime: startDateTime,
+                        expiration: {
+                            duration: this.getDuration(args.options),
+                            endDateTime: endDateTime,
+                            type: this.getExpirationType(args.options)
+                        }
+                    },
+                    ticketInfo: {
+                        ticketNumber: ticketNumber,
+                        ticketSystem: ticketSystem
+                    }
+                }
+            };
+            const response = await request.post(requestOptions);
+            await logger.log(response);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getRoleDefinitionId(options, logger) {
+        if (options.roleDefinitionId) {
+            return options.roleDefinitionId;
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving role definition by its name '${options.roleDefinitionName}'`);
+        }
+        const role = await roleDefinition.getRoleDefinitionByDisplayName(options.roleDefinitionName);
+        return role.id;
+    }
+    async getPrincipalId(options, logger) {
+        if (options.userId || options.groupId) {
+            return options.userId || options.groupId;
+        }
+        if (options.userName) {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving user by its name '${options.userName}'`);
+            }
+            return await entraUser.getUserIdByUpn(options.userName);
+        }
+        else if (options.groupName) {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving group by its name '${options.groupName}'`);
+            }
+            return await entraGroup.getGroupIdByDisplayName(options.groupName);
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving id of the current user`);
+        }
+        const token = auth.connection.accessTokens[auth.defaultResource].accessToken;
+        return accessToken.getUserIdFromAccessToken(token);
+    }
+    getExpirationType(options) {
+        if (options.endDateTime) {
+            return 'afterDateTime';
+        }
+        if (options.noExpiration) {
+            return 'noExpiration';
+        }
+        return 'afterDuration';
+    }
+    getDuration(options) {
+        if (!options.duration && !options.endDateTime && !options.noExpiration) {
+            return 'PT8H';
+        }
+        return options.duration;
+    }
+    getDirectoryScope(options) {
+        if (options.administrativeUnitId) {
+            return `/administrativeUnits/${options.administrativeUnitId}`;
+        }
+        if (options.applicationId) {
+            return `/${options.applicationId}`;
+        }
+        return '/';
+    }
+}
+_EntraPimRoleAssignmentAddCommand_instances = new WeakSet(), _EntraPimRoleAssignmentAddCommand_initTelemetry = function _EntraPimRoleAssignmentAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined',
+            roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            administrativeUnitId: typeof args.options.administrativeUnitId !== 'undefined',
+            applicationId: typeof args.options.applicationId !== 'undefined',
+            justification: typeof args.options.justification !== 'undefined',
+            startDateTime: typeof args.options.startDateTime !== 'undefined',
+            endDateTime: typeof args.options.endDateTime !== 'undefined',
+            duration: typeof args.options.duration !== 'undefined',
+            ticketNumber: typeof args.options.ticketNumber !== 'undefined',
+            ticketSystem: typeof args.options.ticketSystem !== 'undefined',
+            noExpiration: !!args.options.noExpiration
+        });
+    });
+}, _EntraPimRoleAssignmentAddCommand_initOptions = function _EntraPimRoleAssignmentAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --roleDefinitionName [roleDefinitionName]'
+    }, {
+        option: '-i, --roleDefinitionId [roleDefinitionId]'
+    }, {
+        option: "--userId [userId]"
+    }, {
+        option: "--userName [userName]"
+    }, {
+        option: "--groupId [groupId]"
+    }, {
+        option: "--groupName [groupName]"
+    }, {
+        option: "--administrativeUnitId [administrativeUnitId]"
+    }, {
+        option: "--applicationId [applicationId]"
+    }, {
+        option: "-j, --justification [justification]"
+    }, {
+        option: "-s, --startDateTime [startDateTime]"
+    }, {
+        option: "-e, --endDateTime [endDateTime]"
+    }, {
+        option: "-d, --duration [duration]"
+    }, {
+        option: "--ticketNumber [ticketNumber]"
+    }, {
+        option: "--ticketSystem [ticketSystem]"
+    }, {
+        option: "--no-expiration"
+    });
+}, _EntraPimRoleAssignmentAddCommand_initValidators = function _EntraPimRoleAssignmentAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.roleDefinitionId && !validation.isValidGuid(args.options.roleDefinitionId)) {
+            return `${args.options.roleDefinitionId} is not a valid GUID`;
+        }
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        if (args.options.startDateTime && !validation.isValidISODateTime(args.options.startDateTime)) {
+            return `${args.options.startDateTime} is not a valid ISO 8601 date time string`;
+        }
+        if (args.options.endDateTime && !validation.isValidISODateTime(args.options.endDateTime)) {
+            return `${args.options.endDateTime} is not a valid ISO 8601 date time string`;
+        }
+        if (args.options.duration && !validation.isValidISODuration(args.options.duration)) {
+            return `${args.options.duration} is not a valid ISO 8601 duration`;
+        }
+        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
+            return `${args.options.administrativeUnitId} is not a valid GUID`;
+        }
+        if (args.options.applicationId && !validation.isValidGuid(args.options.applicationId)) {
+            return `${args.options.applicationId} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _EntraPimRoleAssignmentAddCommand_initOptionSets = function _EntraPimRoleAssignmentAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['roleDefinitionName', 'roleDefinitionId'] });
+    this.optionSets.push({
+        options: ['noExpiration', 'endDateTime', 'duration'],
+        runsWhen: (args) => {
+            return !!args.options.noExpiration || args.options.endDateTime !== undefined || args.options.duration !== undefined;
+        }
+    });
+    this.optionSets.push({
+        options: ['userId', 'userName', 'groupId', 'groupName'],
+        runsWhen: (args) => {
+            return args.options.userId !== undefined || args.options.userName !== undefined || args.options.groupId !== undefined || args.options.groupName !== undefined;
+        }
+    });
+    this.optionSets.push({
+        options: ['administrativeUnitId', 'applicationId'],
+        runsWhen: (args) => {
+            return args.options.administrativeUnitId !== undefined || args.options.applicationId !== undefined;
+        }
+    });
+};
+export default new EntraPimRoleAssignmentAddCommand();
+//# sourceMappingURL=pim-role-assignment-add.js.map

package/dist/m365/entra/commands/pim/pim-role-assignment-list.js

@@ -0,0 +1,122 @@
+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 _EntraPimRoleAssignmentListCommand_instances, _EntraPimRoleAssignmentListCommand_initTelemetry, _EntraPimRoleAssignmentListCommand_initOptions, _EntraPimRoleAssignmentListCommand_initValidators, _EntraPimRoleAssignmentListCommand_initOptionSets;
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { validation } from '../../../../utils/validation.js';
+import { entraUser } from '../../../../utils/entraUser.js';
+import { entraGroup } from '../../../../utils/entraGroup.js';
+import { odata } from '../../../../utils/odata.js';
+class EntraPimRoleAssignmentListCommand extends GraphCommand {
+    get name() {
+        return commands.PIM_ROLE_ASSIGNMENT_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of Entra role assignments for a user or group';
+    }
+    constructor() {
+        super();
+        _EntraPimRoleAssignmentListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraPimRoleAssignmentListCommand_instances, "m", _EntraPimRoleAssignmentListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraPimRoleAssignmentListCommand_instances, "m", _EntraPimRoleAssignmentListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraPimRoleAssignmentListCommand_instances, "m", _EntraPimRoleAssignmentListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraPimRoleAssignmentListCommand_instances, "m", _EntraPimRoleAssignmentListCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        const queryParameters = [];
+        const filters = [];
+        const expands = [];
+        try {
+            const principalId = await this.getPrincipalId(logger, args.options);
+            if (principalId) {
+                filters.push(`principalId eq '${principalId}'`);
+            }
+            if (args.options.startDateTime) {
+                filters.push(`startDateTime ge ${args.options.startDateTime}`);
+            }
+            if (filters.length > 0) {
+                queryParameters.push(`$filter=${filters.join(' and ')}`);
+            }
+            expands.push('roleDefinition($select=displayName)');
+            if (args.options.includePrincipalDetails) {
+                expands.push('principal');
+            }
+            queryParameters.push(`$expand=${expands.join(',')}`);
+            const queryString = `?${queryParameters.join('&')}`;
+            const url = `${this.resource}/v1.0/roleManagement/directory/roleAssignmentScheduleInstances${queryString}`;
+            const results = await odata.getAllItems(url);
+            await logger.log(results);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getPrincipalId(logger, options) {
+        let principalId = options.userId;
+        if (options.userName) {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving user by its name '${options.userName}'`);
+            }
+            principalId = await entraUser.getUserIdByUpn(options.userName);
+        }
+        else if (options.groupId) {
+            principalId = options.groupId;
+        }
+        else if (options.groupName) {
+            if (this.verbose) {
+                await logger.logToStderr(`Retrieving group by its name '${options.groupName}'`);
+            }
+            principalId = await entraGroup.getGroupIdByDisplayName(options.groupName);
+        }
+        return principalId;
+    }
+}
+_EntraPimRoleAssignmentListCommand_instances = new WeakSet(), _EntraPimRoleAssignmentListCommand_initTelemetry = function _EntraPimRoleAssignmentListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            startDateTime: typeof args.options.startDateTime !== 'undefined',
+            includePrincipalDetails: !!args.options.includePrincipalDetails
+        });
+    });
+}, _EntraPimRoleAssignmentListCommand_initOptions = function _EntraPimRoleAssignmentListCommand_initOptions() {
+    this.options.unshift({
+        option: "--userId [userId]"
+    }, {
+        option: "--userName [userName]"
+    }, {
+        option: "--groupId [groupId]"
+    }, {
+        option: "--groupName [groupName]"
+    }, {
+        option: "-s, --startDateTime [startDateTime]"
+    }, {
+        option: "--includePrincipalDetails [includePrincipalDetails]"
+    });
+}, _EntraPimRoleAssignmentListCommand_initValidators = function _EntraPimRoleAssignmentListCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
+            return `${args.options.groupId} is not a valid GUID`;
+        }
+        if (args.options.startDateTime && !validation.isValidISODateTime(args.options.startDateTime)) {
+            return `${args.options.startDateTime} is not a valid ISO 8601 date time string`;
+        }
+        return true;
+    });
+}, _EntraPimRoleAssignmentListCommand_initOptionSets = function _EntraPimRoleAssignmentListCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['userId', 'userName', 'groupId', 'groupName'],
+        runsWhen: (args) => args.options.userId || args.options.userName || args.options.groupId || args.options.groupName
+    });
+};
+export default new EntraPimRoleAssignmentListCommand();
+//# sourceMappingURL=pim-role-assignment-list.js.map

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

@@ -31,17 +31,22 @@ class EntraUserListCommand extends GraphCommand {
     async commandAction(logger, args) {
         await this.showDeprecationWarning(logger, aadCommands.USER_LIST, commands.USER_LIST);
         try {
+            const selectProperties = args.options.properties ? args.options.properties : 'id,displayName,mail,userPrincipalName';
+            const allSelectProperties = selectProperties.split(',');
+            const propertiesWithSlash = allSelectProperties.filter(item => item.includes('/'));
+            const fieldExpand = propertiesWithSlash
+                .map(p => `${p.split('/')[0]}($select=${p.split('/')[1]})`)
+                .join(',');
+            const expandParam = fieldExpand.length > 0 ? `&$expand=${fieldExpand}` : '';
+            const selectParam = allSelectProperties.filter(item => !item.includes('/'));
             let filter = '';
-            const properties = args.options.properties ?
-                args.options.properties.split(',').map(p => p.trim()) :
-                ['userPrincipalName', 'displayName'];
             try {
                 filter = this.getFilter(args.options);
             }
             catch (ex) {
                 throw ex;
             }
-            const url = `${this.resource}/v1.0/users?$select=${properties.join(',')}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
+            const url = `${this.resource}/v1.0/users?$select=${selectParam}${expandParam}${(filter.length > 0 ? '&' + filter : '')}&$top=100`;
             const users = await odata.getAllItems(url);
             await logger.log(users);
         }
@@ -52,6 +57,7 @@ class EntraUserListCommand extends GraphCommand {
     getFilter(options) {
         const filters = {};
         const excludeOptions = [
+            'type',
             'properties',
             'p',
             'd',
@@ -72,7 +78,10 @@ class EntraUserListCommand extends GraphCommand {
         });
         let filter = Object.keys(filters).map(key => `startsWith(${key}, '${filters[key]}')`).join(' and ');
         if (filter.length > 0) {
-            filter = '$filter=' + filter;
+            filter = `$filter=${filter}`;
+        }
+        if (options.type) {
+            filter += filter.length > 0 ? ` and userType eq '${options.type}'` : `$filter=userType eq '${options.type}'`;
         }
         return filter;
     }
@@ -80,11 +89,15 @@ class EntraUserListCommand extends GraphCommand {
 _EntraUserListCommand_instances = new WeakSet(), _EntraUserListCommand_initTelemetry = function _EntraUserListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            properties: args.options.properties
+            type: typeof args.options.type !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined'
         });
     });
 }, _EntraUserListCommand_initOptions = function _EntraUserListCommand_initOptions() {
-    this.options.unshift({ option: '-p, --properties [properties]' });
+    this.options.unshift({
+        option: "--type [type]",
+        autocomplete: ["Member", "Guest"]
+    }, { option: '-p, --properties [properties]' });
 };
 export default new EntraUserListCommand();
 //# sourceMappingURL=user-list.js.map

package/dist/m365/entra/commands.js

@@ -74,6 +74,8 @@ export default {
     OAUTH2GRANT_LIST: `${prefix} oauth2grant list`,
     OAUTH2GRANT_REMOVE: `${prefix} oauth2grant remove`,
     OAUTH2GRANT_SET: `${prefix} oauth2grant set`,
+    PIM_ROLE_ASSIGNMENT_ADD: `${prefix} pim role assignment add`,
+    PIM_ROLE_ASSIGNMENT_LIST: `${prefix} pim role assignment list`,
     POLICY_LIST: `${prefix} policy list`,
     SITECLASSIFICATION_DISABLE: `${prefix} siteclassification disable`,
     SITECLASSIFICATION_ENABLE: `${prefix} siteclassification enable`,

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.0.0.js

@@ -1,7 +1,9 @@
 import { FN002004_DEVDEP_gulp } from './rules/FN002004_DEVDEP_gulp.js';
 import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types_webpack_env.js';
+import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
 export default [
     new FN002004_DEVDEP_gulp('~3.9.1'),
-    new FN002013_DEVDEP_types_webpack_env('>=1.12.1 <1.14.0')
+    new FN002013_DEVDEP_types_webpack_env('>=1.12.1 <1.14.0'),
+    new FN021001_PKG_spfx_deps_versions_match_project_version()
 ];
 //# sourceMappingURL=doctor-1.0.0.js.map

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.0.1.js

@@ -1,7 +1,9 @@
 import { FN002004_DEVDEP_gulp } from './rules/FN002004_DEVDEP_gulp.js';
 import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types_webpack_env.js';
+import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
 export default [
     new FN002004_DEVDEP_gulp('~3.9.1'),
-    new FN002013_DEVDEP_types_webpack_env('>=1.12.1 <1.14.0')
+    new FN002013_DEVDEP_types_webpack_env('>=1.12.1 <1.14.0'),
+    new FN021001_PKG_spfx_deps_versions_match_project_version()
 ];
 //# sourceMappingURL=doctor-1.0.1.js.map

package/dist/m365/spfx/commands/project/project-doctor/doctor-1.0.2.js

@@ -1,7 +1,9 @@
 import { FN002004_DEVDEP_gulp } from './rules/FN002004_DEVDEP_gulp.js';
 import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types_webpack_env.js';
+import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
 export default [
     new FN002004_DEVDEP_gulp('~3.9.1'),
-    new FN002013_DEVDEP_types_webpack_env('>=1.12.1 <1.14.0')
+    new FN002013_DEVDEP_types_webpack_env('>=1.12.1 <1.14.0'),
+    new FN021001_PKG_spfx_deps_versions_match_project_version()
 ];
 //# sourceMappingURL=doctor-1.0.2.js.map