@pnp/cli-microsoft365 10.6.0-beta.7205e34 → 10.6.0-beta.8ecef43

package/dist/m365/pp/commands/card/card-remove.js

@@ -43,13 +43,19 @@ class PpCardRemoveCommand extends PowerPlatformCommand {
         if (args.options.id) {
             return args.options.id;
         }
-        const card = await powerPlatform.getCardByName(dynamicsApiUrl, args.options.name, logger, this.verbose);
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving the card with name '${args.options.name}'`);
+        }
+        const card = await powerPlatform.getCardByName(dynamicsApiUrl, args.options.name);
         return card.cardid;
     }
     async deleteCard(args, logger) {
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
             const cardId = await this.getCardId(args, dynamicsApiUrl, logger);
+            if (this.verbose) {
+                await logger.logToStderr(`Deleting card with Id '${cardId}'`);
+            }
             const requestOptions = {
                 url: `${dynamicsApiUrl}/api/data/v9.1/cards(${cardId})`,
                 headers: {

package/dist/m365/pp/commands/solution/solution-get.js

@@ -49,23 +49,17 @@ class PpSolutionGetCommand extends PowerPlatformCommand {
         }
     }
     async getSolution(dynamicsApiUrl, options) {
+        if (options.name) {
+            return powerPlatform.getSolutionByName(dynamicsApiUrl, options.name);
+        }
         const requestOptions = {
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
-        if (options.id) {
-            requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/solutions(${options.id})?$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
-            const result = await request.get(requestOptions);
-            return result;
-        }
-        requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/solutions?$filter=isvisible eq true and uniquename eq \'${options.name}\'&$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
-        const result = await request.get(requestOptions);
-        if (result.value.length === 0) {
-            throw `The specified solution '${options.name}' does not exist.`;
-        }
-        return result.value[0];
+        requestOptions.url = `${dynamicsApiUrl}/api/data/v9.0/solutions(${options.id})?$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`;
+        return request.get(requestOptions);
     }
 }
 _PpSolutionGetCommand_instances = new WeakSet(), _PpSolutionGetCommand_initTelemetry = function _PpSolutionGetCommand_initTelemetry() {

package/dist/m365/pp/commands/solution/solution-publish.js

@@ -4,14 +4,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _PpSolutionPublishCommand_instances, _PpSolutionPublishCommand_initTelemetry, _PpSolutionPublishCommand_initOptions, _PpSolutionPublishCommand_initOptionSets, _PpSolutionPublishCommand_initValidators;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-import ppSolutionGetCommand from './solution-get.js';
 class PpSolutionPublishCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_PUBLISH;
@@ -29,8 +27,8 @@ class PpSolutionPublishCommand extends PowerPlatformCommand {
     }
     async commandAction(logger, args) {
         try {
-            const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const solutionId = await this.getSolutionId(args, logger);
+            const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environment, args.options.asAdmin);
+            const solutionId = await this.getSolutionId(args, dynamicsApiUrl, logger);
             const solutionComponents = await this.getSolutionComponents(dynamicsApiUrl, solutionId, logger);
             const parameterXml = await this.buildXmlRequestObject(solutionComponents, logger);
             const requestOptions = {
@@ -71,23 +69,15 @@ class PpSolutionPublishCommand extends PowerPlatformCommand {
         const response = await request.get(requestOptions);
         return response.value;
     }
-    async getSolutionId(args, logger) {
+    async getSolutionId(args, dynamicsApiUrl, logger) {
         if (args.options.id) {
             return args.options.id;
         }
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving solutionId`);
+            await logger.logToStderr(`Retrieving solutionId...`);
         }
-        const options = {
-            environmentName: args.options.environmentName,
-            name: args.options.name,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(ppSolutionGetCommand, { options: { ...options, _: [] } });
-        const getSolutionOutput = JSON.parse(output.stdout);
-        return getSolutionOutput.solutionid;
+        const solution = await powerPlatform.getSolutionByName(dynamicsApiUrl, args.options.name);
+        return solution.solutionid;
     }
     async buildXmlRequestObject(solutionComponents, logger) {
         if (this.verbose) {

package/dist/m365/pp/commands/solution/solution-remove.js

@@ -10,7 +10,6 @@ import { powerPlatform } from '../../../../utils/powerPlatform.js';
 import { validation } from '../../../../utils/validation.js';
 import PowerPlatformCommand from '../../../base/PowerPlatformCommand.js';
 import commands from '../../commands.js';
-import ppSolutionGetCommand from './solution-get.js';
 class PpSolutionRemoveCommand extends PowerPlatformCommand {
     get name() {
         return commands.SOLUTION_REMOVE;
@@ -40,25 +39,17 @@ class PpSolutionRemoveCommand extends PowerPlatformCommand {
             }
         }
     }
-    async getSolutionId(args) {
+    async getSolutionId(args, dynamicsApiUrl) {
         if (args.options.id) {
             return args.options.id;
         }
-        const options = {
-            environmentName: args.options.environmentName,
-            name: args.options.name,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(ppSolutionGetCommand, { options: { ...options, _: [] } });
-        const getSolutionOutput = JSON.parse(output.stdout);
-        return getSolutionOutput.solutionid;
+        const solution = await powerPlatform.getSolutionByName(dynamicsApiUrl, args.options.name);
+        return solution.solutionid;
     }
     async deleteSolution(args) {
         try {
             const dynamicsApiUrl = await powerPlatform.getDynamicsInstanceApiUrl(args.options.environmentName, args.options.asAdmin);
-            const solutionId = await this.getSolutionId(args);
+            const solutionId = await this.getSolutionId(args, dynamicsApiUrl);
             const requestOptions = {
                 url: `${dynamicsApiUrl}/api/data/v9.1/solutions(${solutionId})`,
                 headers: {

package/dist/m365/spfx/commands/project/DeployWorkflow.js

@@ -10,6 +10,9 @@ export const workflow = {
     jobs: {
         "build-and-deploy": {
             "runs-on": "ubuntu-latest",
+            env: {
+                NodeVersion: "22.x"
+            },
             steps: [
                 {
                     name: "Checkout",
@@ -19,7 +22,7 @@ export const workflow = {
                     name: "Use Node.js",
                     uses: "actions/setup-node@v4",
                     with: {
-                        "node-version": "18.x"
+                        "node-version": "${{ env.NodeVersion }}"
                     }
                 },
                 {
@@ -105,6 +108,10 @@ export const pipeline = {
         {
             name: "SiteAppCatalogUrl",
             value: ""
+        },
+        {
+            name: "NodeVersion",
+            value: "22.x"
         }
     ],
     stages: [
@@ -118,7 +125,7 @@ export const pipeline = {
                             task: "NodeTool@0",
                             displayName: "Use Node.js",
                             inputs: {
-                                versionSpec: "18.x"
+                                versionSpec: "$(NodeVersion)"
                             }
                         },
                         {

package/dist/m365/spfx/commands/project/project-azuredevops-pipeline-add.js

@@ -13,7 +13,6 @@ import { BaseProjectCommand } from './base-project-command.js';
 import { validation } from '../../../../utils/validation.js';
 import { pipeline } from './DeployWorkflow.js';
 import { fsUtil } from '../../../../utils/fsUtil.js';
-import { parse } from 'semver';
 class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
     get name() {
         return commands.PROJECT_AZUREDEVOPS_PIPELINE_ADD;
@@ -65,20 +64,6 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
         if (options.branchName) {
             pipeline.trigger.branches.include[0] = options.branchName;
         }
-        const version = this.getProjectVersion();
-        if (!version) {
-            throw `Unable to determine the version of the current SharePoint Framework project`;
-        }
-        const minorVersion = parse(version)?.minor;
-        if (minorVersion === undefined) {
-            throw `Unable to determine the minor version of the current SharePoint Framework project`;
-        }
-        if (minorVersion < 18) {
-            const node = this.getNodeAction(pipeline);
-            if (node.inputs) {
-                node.inputs.versionSpec = '16.x';
-            }
-        }
         const script = this.getScriptAction(pipeline);
         if (script.script) {
             if (options.loginMethod === 'user') {
@@ -122,10 +107,6 @@ class SpfxProjectAzureDevOpsPipelineAddCommand extends BaseProjectCommand {
         const steps = this.getPipelineSteps(pipeline);
         return steps.find(step => step.script);
     }
-    getNodeAction(pipeline) {
-        const steps = this.getPipelineSteps(pipeline);
-        return steps.find(step => step.task && step.task.indexOf('NodeTool') >= 0);
-    }
     getPipelineSteps(pipeline) {
         return pipeline.stages[0].jobs[0].steps;
     }

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

@@ -0,0 +1,25 @@
+import { FN002021_DEVDEP_rushstack_eslint_config } from '../project-upgrade/rules/FN002021_DEVDEP_rushstack_eslint_config.js';
+import { FN001008_DEP_react } from './rules/FN001008_DEP_react.js';
+import { FN001009_DEP_react_dom } from './rules/FN001009_DEP_react_dom.js';
+import { FN001035_DEP_fluentui_react } from './rules/FN001035_DEP_fluentui_react.js';
+import { FN002004_DEVDEP_gulp } from './rules/FN002004_DEVDEP_gulp.js';
+import { FN002007_DEVDEP_ajv } from './rules/FN002007_DEVDEP_ajv.js';
+import { FN002013_DEVDEP_types_webpack_env } from './rules/FN002013_DEVDEP_types_webpack_env.js';
+import { FN002015_DEVDEP_types_react } from './rules/FN002015_DEVDEP_types_react.js';
+import { FN002016_DEVDEP_types_react_dom } from './rules/FN002016_DEVDEP_types_react_dom.js';
+import { FN002019_DEVDEP_microsoft_rush_stack_compiler } from './rules/FN002019_DEVDEP_microsoft_rush_stack_compiler.js';
+import { FN021001_PKG_spfx_deps_versions_match_project_version } from './rules/FN021001_PKG_spfx_deps_versions_match_project_version.js';
+export default [
+    new FN001008_DEP_react('17'),
+    new FN001009_DEP_react_dom('17'),
+    new FN001035_DEP_fluentui_react('^8.106.4'),
+    new FN002004_DEVDEP_gulp('4.0.2'),
+    new FN002007_DEVDEP_ajv('^6.12.5'),
+    new FN002013_DEVDEP_types_webpack_env('~1.15.2'),
+    new FN002015_DEVDEP_types_react('17'),
+    new FN002016_DEVDEP_types_react_dom('17'),
+    new FN002019_DEVDEP_microsoft_rush_stack_compiler(['5.3']),
+    new FN002021_DEVDEP_rushstack_eslint_config('4.0.1'),
+    new FN021001_PKG_spfx_deps_versions_match_project_version(true)
+];
+//# sourceMappingURL=doctor-1.21.0.js.map

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

@@ -71,7 +71,8 @@ class SpfxProjectDoctorCommand extends BaseProjectCommand {
             '1.18.1',
             '1.18.2',
             '1.19.0',
-            '1.20.0'
+            '1.20.0',
+            '1.21.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectDoctorCommand_instances, "m", _SpfxProjectDoctorCommand_initOptions).call(this);

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -13,7 +13,6 @@ import { validation } from '../../../../utils/validation.js';
 import commands from '../../commands.js';
 import { workflow } from './DeployWorkflow.js';
 import { BaseProjectCommand } from './base-project-command.js';
-import { parse } from 'semver';
 class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
     get name() {
         return commands.PROJECT_GITHUB_WORKFLOW_ADD;
@@ -64,17 +63,6 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
             // eslint-disable-next-line camelcase
             workflow.on.workflow_dispatch = null;
         }
-        const version = this.getProjectVersion();
-        if (!version) {
-            throw `Unable to determine the version of the current SharePoint Framework project`;
-        }
-        const minorVersion = parse(version)?.minor;
-        if (minorVersion === undefined) {
-            throw `Unable to determine the minor version of the current SharePoint Framework project`;
-        }
-        if (minorVersion < 18) {
-            this.getNodeAction(workflow).with['node-version'] = '16.x';
-        }
         if (options.skipFeatureDeployment) {
             this.getDeployAction(workflow).with.SKIP_FEATURE_DEPLOYMENT = true;
         }
@@ -103,10 +91,6 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         const steps = this.getWorkFlowSteps(workflow);
         return steps.find(step => step.uses && step.uses.indexOf('action-cli-deploy') >= 0);
     }
-    getNodeAction(workflow) {
-        const steps = this.getWorkFlowSteps(workflow);
-        return steps.find(step => step.uses && step.uses.indexOf('actions/setup-node@') >= 0);
-    }
     getWorkFlowSteps(workflow) {
         return workflow.jobs['build-and-deploy'].steps;
     }

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN002029_DEVDEP_microsoft_rush_stack_compiler_5_3.js

@@ -0,0 +1,13 @@
+import { DependencyRule } from "./DependencyRule.js";
+export class FN002029_DEVDEP_microsoft_rush_stack_compiler_5_3 extends DependencyRule {
+    constructor(packageVersion) {
+        super('@microsoft/rush-stack-compiler-5.3', packageVersion, true);
+    }
+    get id() {
+        return 'FN002029';
+    }
+    get supersedes() {
+        return ['FN002010', 'FN002011', 'FN002012', 'FN002017', 'FN002018', 'FN002020', 'FN002028'];
+    }
+}
+//# sourceMappingURL=FN002029_DEVDEP_microsoft_rush_stack_compiler_5_3.js.map

package/dist/m365/spfx/commands/project/project-upgrade/upgrade-1.21.0.js

@@ -0,0 +1,63 @@
+import { FN001001_DEP_microsoft_sp_core_library } from './rules/FN001001_DEP_microsoft_sp_core_library.js';
+import { FN001002_DEP_microsoft_sp_lodash_subset } from './rules/FN001002_DEP_microsoft_sp_lodash_subset.js';
+import { FN001003_DEP_microsoft_sp_office_ui_fabric_core } from './rules/FN001003_DEP_microsoft_sp_office_ui_fabric_core.js';
+import { FN001004_DEP_microsoft_sp_webpart_base } from './rules/FN001004_DEP_microsoft_sp_webpart_base.js';
+import { FN001011_DEP_microsoft_sp_dialog } from './rules/FN001011_DEP_microsoft_sp_dialog.js';
+import { FN001012_DEP_microsoft_sp_application_base } from './rules/FN001012_DEP_microsoft_sp_application_base.js';
+import { FN001013_DEP_microsoft_decorators } from './rules/FN001013_DEP_microsoft_decorators.js';
+import { FN001014_DEP_microsoft_sp_listview_extensibility } from './rules/FN001014_DEP_microsoft_sp_listview_extensibility.js';
+import { FN001021_DEP_microsoft_sp_property_pane } from './rules/FN001021_DEP_microsoft_sp_property_pane.js';
+import { FN001023_DEP_microsoft_sp_component_base } from './rules/FN001023_DEP_microsoft_sp_component_base.js';
+import { FN001024_DEP_microsoft_sp_diagnostics } from './rules/FN001024_DEP_microsoft_sp_diagnostics.js';
+import { FN001025_DEP_microsoft_sp_dynamic_data } from './rules/FN001025_DEP_microsoft_sp_dynamic_data.js';
+import { FN001026_DEP_microsoft_sp_extension_base } from './rules/FN001026_DEP_microsoft_sp_extension_base.js';
+import { FN001027_DEP_microsoft_sp_http } from './rules/FN001027_DEP_microsoft_sp_http.js';
+import { FN001028_DEP_microsoft_sp_list_subscription } from './rules/FN001028_DEP_microsoft_sp_list_subscription.js';
+import { FN001029_DEP_microsoft_sp_loader } from './rules/FN001029_DEP_microsoft_sp_loader.js';
+import { FN001030_DEP_microsoft_sp_module_interfaces } from './rules/FN001030_DEP_microsoft_sp_module_interfaces.js';
+import { FN001031_DEP_microsoft_sp_odata_types } from './rules/FN001031_DEP_microsoft_sp_odata_types.js';
+import { FN001032_DEP_microsoft_sp_page_context } from './rules/FN001032_DEP_microsoft_sp_page_context.js';
+import { FN001034_DEP_microsoft_sp_adaptive_card_extension_base } from './rules/FN001034_DEP_microsoft_sp_adaptive_card_extension_base.js';
+import { FN002001_DEVDEP_microsoft_sp_build_web } from './rules/FN002001_DEVDEP_microsoft_sp_build_web.js';
+import { FN002002_DEVDEP_microsoft_sp_module_interfaces } from './rules/FN002002_DEVDEP_microsoft_sp_module_interfaces.js';
+import { FN002022_DEVDEP_microsoft_eslint_plugin_spfx } from './rules/FN002022_DEVDEP_microsoft_eslint_plugin_spfx.js';
+import { FN002023_DEVDEP_microsoft_eslint_config_spfx } from './rules/FN002023_DEVDEP_microsoft_eslint_config_spfx.js';
+import { FN002024_DEVDEP_eslint } from './rules/FN002024_DEVDEP_eslint.js';
+import { FN002026_DEVDEP_typescript } from './rules/FN002026_DEVDEP_typescript.js';
+import { FN002029_DEVDEP_microsoft_rush_stack_compiler_5_3 } from './rules/FN002029_DEVDEP_microsoft_rush_stack_compiler_5_3.js';
+import { FN010001_YORC_version } from './rules/FN010001_YORC_version.js';
+import { FN012017_TSC_extends } from './rules/FN012017_TSC_extends.js';
+import { FN021003_PKG_engines_node } from './rules/FN021003_PKG_engines_node.js';
+export default [
+    new FN001001_DEP_microsoft_sp_core_library('1.21.0'),
+    new FN001002_DEP_microsoft_sp_lodash_subset('1.21.0'),
+    new FN001003_DEP_microsoft_sp_office_ui_fabric_core('1.21.0'),
+    new FN001004_DEP_microsoft_sp_webpart_base('1.21.0'),
+    new FN001011_DEP_microsoft_sp_dialog('1.21.0'),
+    new FN001012_DEP_microsoft_sp_application_base('1.21.0'),
+    new FN001014_DEP_microsoft_sp_listview_extensibility('1.21.0'),
+    new FN001021_DEP_microsoft_sp_property_pane('1.21.0'),
+    new FN001023_DEP_microsoft_sp_component_base('1.21.0'),
+    new FN001024_DEP_microsoft_sp_diagnostics('1.21.0'),
+    new FN001025_DEP_microsoft_sp_dynamic_data('1.21.0'),
+    new FN001026_DEP_microsoft_sp_extension_base('1.21.0'),
+    new FN001027_DEP_microsoft_sp_http('1.21.0'),
+    new FN001028_DEP_microsoft_sp_list_subscription('1.21.0'),
+    new FN001029_DEP_microsoft_sp_loader('1.21.0'),
+    new FN001030_DEP_microsoft_sp_module_interfaces('1.21.0'),
+    new FN001031_DEP_microsoft_sp_odata_types('1.21.0'),
+    new FN001032_DEP_microsoft_sp_page_context('1.21.0'),
+    new FN001013_DEP_microsoft_decorators('1.21.0'),
+    new FN001034_DEP_microsoft_sp_adaptive_card_extension_base('1.21.0'),
+    new FN002001_DEVDEP_microsoft_sp_build_web('1.21.0'),
+    new FN002002_DEVDEP_microsoft_sp_module_interfaces('1.21.0'),
+    new FN002024_DEVDEP_eslint('8.57.1'),
+    new FN002022_DEVDEP_microsoft_eslint_plugin_spfx('1.21.0'),
+    new FN002023_DEVDEP_microsoft_eslint_config_spfx('1.21.0'),
+    new FN002026_DEVDEP_typescript('5.3.3'),
+    new FN002029_DEVDEP_microsoft_rush_stack_compiler_5_3('0.1.0'),
+    new FN010001_YORC_version('1.21.0'),
+    new FN012017_TSC_extends('./node_modules/@microsoft/rush-stack-compiler-5.3/includes/tsconfig-web.json'),
+    new FN021003_PKG_engines_node('>=22.14.0 < 23.0.0')
+];
+//# sourceMappingURL=upgrade-1.21.0.js.map

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -73,7 +73,8 @@ class SpfxProjectUpgradeCommand extends BaseProjectCommand {
             '1.18.1',
             '1.18.2',
             '1.19.0',
-            '1.20.0'
+            '1.20.0',
+            '1.21.0'
         ];
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpfxProjectUpgradeCommand_instances, "m", _SpfxProjectUpgradeCommand_initOptions).call(this);

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

@@ -590,6 +590,21 @@ class SpfxDoctorCommand extends BaseProjectCommand {
                     range: '^4 || ^5',
                     fix: 'npm i -g yo@5'
                 }
+            },
+            '1.21.0': {
+                gulpCli: {
+                    range: '^1 || ^2 || ^3',
+                    fix: 'npm i -g gulp-cli@3'
+                },
+                node: {
+                    range: '>=22.14.0 < 23.0.0',
+                    fix: 'Install Node.js >=22.14.0 < 23.0.0'
+                },
+                sp: SharePointVersion.SPO,
+                yo: {
+                    range: '^4 || ^5',
+                    fix: 'npm i -g yo@5'
+                }
             }
         };
         this.output = '';

package/dist/m365/util/commands/accesstoken/accesstoken-get.js

@@ -7,6 +7,7 @@ var _UtilAccessTokenGetCommand_instances, _UtilAccessTokenGetCommand_initTelemet
 import auth, { Auth } from '../../../../Auth.js';
 import Command from '../../../../Command.js';
 import commands from '../../commands.js';
+import { accessToken } from '../../../../utils/accessToken.js';
 class UtilAccessTokenGetCommand extends Command {
     get name() {
         return commands.ACCESSTOKEN_GET;
@@ -34,8 +35,14 @@ class UtilAccessTokenGetCommand extends Command {
             resource = Auth.getEndpointForResource('https://graph.microsoft.com', auth.connection.cloudType);
         }
         try {
-            const accessToken = await auth.ensureAccessToken(resource, logger, this.debug, args.options.new);
-            await logger.log(accessToken);
+            const token = await auth.ensureAccessToken(resource, logger, this.debug, args.options.new);
+            if (args.options.decoded) {
+                const { header, payload } = accessToken.getDecodedAccessToken(token);
+                await logger.logRaw(`${JSON.stringify(header, null, 2)}.${JSON.stringify(payload, null, 2)}.[signature]`);
+            }
+            else {
+                await logger.log(token);
+            }
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -45,7 +52,8 @@ class UtilAccessTokenGetCommand extends Command {
 _UtilAccessTokenGetCommand_instances = new WeakSet(), _UtilAccessTokenGetCommand_initTelemetry = function _UtilAccessTokenGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            new: args.options.new
+            new: args.options.new,
+            decoded: args.options.decoded
         });
     });
 }, _UtilAccessTokenGetCommand_initOptions = function _UtilAccessTokenGetCommand_initOptions() {
@@ -53,6 +61,8 @@ _UtilAccessTokenGetCommand_instances = new WeakSet(), _UtilAccessTokenGetCommand
         option: '-r, --resource <resource>'
     }, {
         option: '--new'
+    }, {
+        option: '--decoded'
     });
 };
 export default new UtilAccessTokenGetCommand();

package/dist/utils/accessToken.js

@@ -75,6 +75,14 @@ export const accessToken = {
         }
         return userId;
     },
+    getDecodedAccessToken(accessToken) {
+        const chunks = accessToken.split('.');
+        const headerString = Buffer.from(chunks[0], 'base64').toString();
+        const payloadString = Buffer.from(chunks[1], 'base64').toString();
+        const header = JSON.parse(headerString);
+        const payload = JSON.parse(payloadString);
+        return { header, payload };
+    },
     /**
      * Asserts the presence of a delegated access token.
      * @throws {CommandError} Will throw an error if the access token is not available.

package/dist/utils/powerPlatform.js

@@ -71,10 +71,7 @@ export const powerPlatform = {
      * @param logger The logger object
      * @param verbose Set for verbose logging
      */
-    async getCardByName(dynamicsApiUrl, name, logger, verbose) {
-        if (verbose && logger) {
-            await logger.logToStderr(`Retrieving the card with name ${name}`);
-        }
+    async getCardByName(dynamicsApiUrl, name) {
         const requestOptions = {
             url: `${dynamicsApiUrl}/api/data/v9.1/cards?$filter=name eq '${name}'`,
             headers: {
@@ -91,6 +88,30 @@ export const powerPlatform = {
             return cli.handleMultipleResultsFound(`Multiple cards with name '${name}' found.`, resultAsKeyValuePair);
         }
         return result.value[0];
+    },
+    /**
+   * Get a solution by name
+   * Returns the solution object
+   * @param dynamicsApiUrl The dynamics api url of the environment
+   * @param name The name of the solution
+   */
+    async getSolutionByName(dynamicsApiUrl, name) {
+        const requestOptions = {
+            url: `${dynamicsApiUrl}/api/data/v9.0/solutions?$filter=isvisible eq true and uniquename eq \'${name}\'&$expand=publisherid($select=friendlyname)&$select=solutionid,uniquename,version,publisherid,installedon,solutionpackageversion,friendlyname,versionnumber&api-version=9.1`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const result = await request.get(requestOptions);
+        if (result.value.length === 0) {
+            throw Error(`The specified solution '${name}' does not exist.`);
+        }
+        if (result.value.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('solutionid', result.value);
+            return cli.handleMultipleResultsFound(`Multiple solutions with name '${name}' found.`, resultAsKeyValuePair);
+        }
+        return result.value[0];
     }
 };
 //# sourceMappingURL=powerPlatform.js.map

package/dist/utils/prompt.js

@@ -6,13 +6,20 @@ let inquirerSelect;
 ;
 ;
 export const prompt = {
-    /* c8 ignore next 9 */
+    /* c8 ignore next 16 */
     async forInput(config) {
         if (!inquirerInput) {
             inquirerInput = await import('@inquirer/input');
         }
         const errorOutput = cli.getSettingWithDefaultValue(settingsNames.errorOutput, 'stderr');
-        return inquirerInput.default(config, { output: errorOutput === 'stderr' ? process.stderr : process.stdout });
+        return inquirerInput
+            .default(config, { output: errorOutput === 'stderr' ? process.stderr : process.stdout })
+            .catch(error => {
+            if (error instanceof Error && error.name === 'ExitPromptError') {
+                return ''; // noop; handle Ctrl + C
+            }
+            throw error;
+        });
     },
     /* c8 ignore next 9 */
     async forConfirmation(config) {

package/dist/utils/types.js

@@ -1,2 +1,3 @@
 export {};
+// #endregion
 //# sourceMappingURL=types.js.map

package/docs/docs/cmd/entra/group/group-member-add.mdx

@@ -2,7 +2,7 @@ import Global from '/docs/cmd/_global.mdx';
 
 # entra group member add
 
-Adds a member to a Microsoft Entra ID group
+Adds members to a Microsoft Entra group
 
 ## Usage
 

package/docs/docs/cmd/entra/group/group-member-remove.mdx

@@ -0,0 +1,96 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# entra group member remove
+
+Removes members from a Microsoft Entra group
+
+## Usage
+
+```sh
+m365 entra group member remove [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --groupId [groupId]`
+: The ID of the Entra ID group. Specify `groupId` or `groupName` but not both.
+
+`-n, --groupName [groupName]`
+: The display name of the Entra ID group. Specify `groupId` or `groupName` but not both.
+
+`--userIds [userIds]`
+: Microsoft Entra user IDs. You can also pass a comma-separated list of IDs. Specify either `userIds`, `userNames`, `subgroupIds` or `subgroupNames` but not multiple.
+
+`--userNames [userNames]`
+: The user principal names of users. You can also pass a comma-separated list of UPNs. Specify either `userIds`, `userNames`, `subgroupIds` or `subgroupNames` but not multiple.
+
+`--subgroupIds [subgroupIds]`
+: Microsoft Entra group IDs. You can also pass a comma-separated list of IDs. Specify either `userIds`, `userNames`, `subgroupIds` or `subgroupNames` but not multiple.
+
+`--subgroupNames [subgroupNames]`
+: The display names of Microsoft Entra groups. You can also pass a comma-separated list of group display names. Specify either `userIds`, `userNames`, `subgroupIds` or `subgroupNames` but not multiple.
+
+`-r, --role [role]`
+: The role to be removed from the users. Valid values: `Owner`, `Member`. Defaults to both.
+
+`--suppressNotFound`
+: Suppress errors when a user was not found in a group.
+
+`-f, --force`
+: Don't prompt for confirmation.
+```
+
+<Global />
+
+## Remarks
+
+:::tip
+
+When you use the `suppressNotFound` option, the command will not return an error if a user is not found as either an owner or a member of the group.
+This feature proves useful when you need to remove a user from a group, but you are uncertain whether the user holds the role of a member or an owner within that group.
+Without using this option, you would need to manually verify the user's role in the group before proceeding with removal.
+
+:::
+
+## Examples
+
+Remove a single user specified by ID as member from a group specified by display name
+
+```sh
+m365 entra group member remove --groupName Developers --userIds 098b9f52-f48c-4401-819f-29c33794c3f5 --role Member
+```
+
+Remove multiple users specified by ID from a group specified by ID
+
+```sh
+m365 entra group member remove --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --userIds "098b9f52-f48c-4401-819f-29c33794c3f5,f1e06e31-3abf-4746-83c2-1513d71f38b8"
+```
+
+Remove a single user specified by UPN as an owner from a group specified by display name
+
+```sh
+m365 entra group member remove --groupName Developers --userNames john.doe@contoso.com --role Owner
+```
+
+Remove multiple users specified by UPN from a group specified by ID
+
+```sh
+m365 entra group member remove --groupId a03c0c35-ef9a-419b-8cab-f89e0a8d2d2a --userNames "john.doe@contoso.com,adele.vance@contoso.com"
+```
+
+Remove a single user specified by ID as owner and member of the group and suppress errors when the user was not found as owner or member
+
+```sh
+m365 entra group member remove --groupName Developers --userIds 098b9f52-f48c-4401-819f-29c33794c3f5 --suppressNotFound
+```
+
+Remove 2 nested groups referenced by id from a security group
+
+```sh
+m365 entra group member remove --groupName Developers --subgroupIds "b51b6157-839f-4d92-8dab-ac61b53c6c40,1e793f86-8dc6-4df6-8037-649ef9a22330" --role Member
+```
+
+## Response
+
+The command doesn't return a response on success.