@pnp/cli-microsoft365 7.2.0-beta.ba91bbd → 7.2.0-beta.d29d172

package/dist/index.js

@@ -1,11 +1,7 @@
 #!/usr/bin/env node
-import fs from 'fs';
-import path from 'path';
-import url from 'url';
 import { Cli } from './cli/Cli.js';
 import { telemetry } from './telemetry.js';
 import { app } from './utils/app.js';
-const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 // required to make console.log() in combination with piped output synchronous
 // on Windows/in PowerShell so that the output is not trimmed by calling
 // process.exit() after executing the command, while the output is still
@@ -18,14 +14,12 @@ if (!process.env.CLIMICROSOFT365_NOUPDATE) {
         updateNotifier.default({ pkg: app.packageJson() }).notify({ defer: false });
     });
 }
-fs.realpath(__dirname, async (err, resolvedPath) => {
-    try {
-        const cli = Cli.getInstance();
-        await cli.execute(path.join(resolvedPath, 'm365'), process.argv.slice(2));
-    }
-    catch (e) {
-        telemetry.trackException(e);
-        process.exit(1);
-    }
-});
+try {
+    const cli = Cli.getInstance();
+    cli.execute(process.argv.slice(2));
+}
+catch (e) {
+    telemetry.trackException(e);
+    process.exit(1);
+}
 //# sourceMappingURL=index.js.map

package/dist/m365/aad/commands/administrativeunit/administrativeunit-add.js

@@ -24,7 +24,7 @@ class AadAdministrativeUnitAddCommand extends GraphCommand {
         const requestOptions = {
             url: `${this.resource}/v1.0/directory/administrativeUnits`,
             headers: {
-                'accept': 'application/json;odata.metadata=none'
+                accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json',
             data: {
@@ -45,7 +45,7 @@ class AadAdministrativeUnitAddCommand extends GraphCommand {
 _AadAdministrativeUnitAddCommand_instances = new WeakSet(), _AadAdministrativeUnitAddCommand_initTelemetry = function _AadAdministrativeUnitAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            hiddenMembership: args.options.hiddenMembership
+            hiddenMembership: !!args.options.hiddenMembership
         });
     });
 }, _AadAdministrativeUnitAddCommand_initOptions = function _AadAdministrativeUnitAddCommand_initOptions() {
@@ -54,7 +54,7 @@ _AadAdministrativeUnitAddCommand_instances = new WeakSet(), _AadAdministrativeUn
     }, {
         option: '-d, --description [description]'
     }, {
-        option: '--hiddenMembership [hiddenMembership]'
+        option: '--hiddenMembership'
     });
 };
 export default new AadAdministrativeUnitAddCommand();

package/dist/m365/aad/commands/administrativeunit/administrativeunit-get.js

@@ -8,9 +8,7 @@ import { validation } from "../../../../utils/validation.js";
 import request from "../../../../request.js";
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
-import { odata } from "../../../../utils/odata.js";
-import { formatting } from "../../../../utils/formatting.js";
-import { Cli } from "../../../../cli/Cli.js";
+import { aadAdministrativeUnit } from "../../../../utils/aadAdministrativeUnit.js";
 class AadAdministrativeUnitGetCommand extends GraphCommand {
     get name() {
         return commands.ADMINISTRATIVEUNIT_GET;
@@ -34,7 +32,7 @@ class AadAdministrativeUnitGetCommand extends GraphCommand {
                 administrativeUnit = await this.getAdministrativeUnitById(args.options.id);
             }
             else {
-                administrativeUnit = await this.getAdministrativeUnitByDisplayName(args.options.displayName);
+                administrativeUnit = await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName);
             }
             await logger.log(administrativeUnit);
         }
@@ -52,17 +50,6 @@ class AadAdministrativeUnitGetCommand extends GraphCommand {
         };
         return await request.get(requestOptions);
     }
-    async getAdministrativeUnitByDisplayName(displayName) {
-        const administrativeUnits = await odata.getAllItems(`${this.resource}/v1.0/directory/administrativeUnits?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'`);
-        if (administrativeUnits.length === 0) {
-            throw `The specified administrative unit '${displayName}' does not exist.`;
-        }
-        if (administrativeUnits.length > 1) {
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', administrativeUnits);
-            return await Cli.handleMultipleResultsFound(`Multiple administrative units with name '${displayName}' found.`, resultAsKeyValuePair);
-        }
-        return administrativeUnits[0];
-    }
 }
 _AadAdministrativeUnitGetCommand_instances = new WeakSet(), _AadAdministrativeUnitGetCommand_initTelemetry = function _AadAdministrativeUnitGetCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -4,12 +4,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _AadAdministrativeUnitRemoveCommand_instances, _AadAdministrativeUnitRemoveCommand_initTelemetry, _AadAdministrativeUnitRemoveCommand_initOptions, _AadAdministrativeUnitRemoveCommand_initOptionSets, _AadAdministrativeUnitRemoveCommand_initValidators, _AadAdministrativeUnitRemoveCommand_initTypes;
+import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
 import { validation } from "../../../../utils/validation.js";
 import request from "../../../../request.js";
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from "../../commands.js";
-import { odata } from "../../../../utils/odata.js";
-import { formatting } from "../../../../utils/formatting.js";
 import { Cli } from "../../../../cli/Cli.js";
 class AadAdministrativeUnitRemoveCommand extends GraphCommand {
     get name() {
@@ -32,7 +31,8 @@ class AadAdministrativeUnitRemoveCommand extends GraphCommand {
             try {
                 let administrativeUnitId = args.options.id;
                 if (args.options.displayName) {
-                    administrativeUnitId = await this.getAdministrativeUnitIdByDisplayName(args.options.displayName);
+                    const administrativeUnit = await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName);
+                    administrativeUnitId = administrativeUnit.id;
                 }
                 const requestOptions = {
                     url: `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}`,
@@ -50,29 +50,12 @@ class AadAdministrativeUnitRemoveCommand extends GraphCommand {
             await removeAdministrativeUnit();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove administrative unit '${args.options.id || args.options.displayName}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove administrative unit '${args.options.id || args.options.displayName}'?` });
+            if (result) {
                 await removeAdministrativeUnit();
             }
         }
     }
-    async getAdministrativeUnitIdByDisplayName(displayName) {
-        const administrativeUnits = await odata.getAllItems(`${this.resource}/v1.0/directory/administrativeUnits?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'&$select=id`);
-        if (administrativeUnits.length === 0) {
-            throw `The specified administrative unit '${displayName}' does not exist.`;
-        }
-        if (administrativeUnits.length > 1) {
-            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', administrativeUnits);
-            const selectedAdministrativeUnit = await Cli.handleMultipleResultsFound(`Multiple administrative units with name '${displayName}' found.`, resultAsKeyValuePair);
-            return selectedAdministrativeUnit.id;
-        }
-        return administrativeUnits[0].id;
-    }
 }
 _AadAdministrativeUnitRemoveCommand_instances = new WeakSet(), _AadAdministrativeUnitRemoveCommand_initTelemetry = function _AadAdministrativeUnitRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -49,13 +49,8 @@ class AadAppRemoveCommand extends GraphCommand {
             await deleteApp();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the app?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the app?` });
+            if (result) {
                 await deleteApp();
             }
         }

package/dist/m365/aad/commands/app/app-role-remove.js

@@ -38,13 +38,8 @@ class AadAppRoleRemoveCommand extends GraphCommand {
             await deleteAppRole();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the app role ?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the app role?` });
+            if (result) {
                 await deleteAppRole();
             }
         }

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

@@ -111,13 +111,8 @@ class AadAppRoleAssignmentRemoveCommand extends GraphCommand {
             await removeAppRoleAssignment();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the appRoleAssignment with scopes ${args.options.scopes} for resource ${args.options.resource}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the appRoleAssignment with scope ${args.options.scope} for resource ${args.options.resource}?` });
+            if (result) {
                 await removeAppRoleAssignment();
             }
         }

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

@@ -52,13 +52,8 @@ class AadGroupRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove group '${args.options.id || args.options.displayName}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove group '${args.options.id || args.options.displayName}'?` });
+            if (result) {
                 await removeGroup();
             }
         }

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

@@ -45,13 +45,8 @@ class AadGroupSettingRemoveCommand extends GraphCommand {
             await removeGroupSetting();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the group setting ${args.options.id}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group setting ${args.options.id}?` });
+            if (result) {
                 await removeGroupSetting();
             }
         }

package/dist/m365/aad/commands/m365group/m365group-recyclebinitem-clear.js

@@ -35,13 +35,8 @@ class AadM365GroupRecycleBinItemClearCommand extends GraphCommand {
             await clearM365GroupRecycleBinItems();
         }
         else {
-            const response = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to clear all M365 Groups from recycle bin ?`
-            });
-            if (response.continue) {
+            const response = await Cli.promptForConfirmation({ message: `Are you sure you want to clear all M365 Groups from recycle bin?` });
+            if (response) {
                 await clearM365GroupRecycleBinItems();
             }
         }

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

@@ -46,13 +46,8 @@ class AadM365GroupRecycleBinItemRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the group '${args.options.id || args.options.displayName || args.options.mailNickname}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group '${args.options.id || args.options.displayName || args.options.mailNickname}'?` });
+            if (result) {
                 await removeGroup();
             }
         }

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

@@ -56,13 +56,8 @@ class AadM365GroupRemoveCommand extends GraphCommand {
             await removeGroup();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the group ${args.options.id}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the group ${args.options.id}?` });
+            if (result) {
                 await removeGroup();
             }
         }

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

@@ -92,13 +92,8 @@ class AadM365GroupUserRemoveCommand extends GraphCommand {
             await removeUser();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove ${args.options.userName} from the ${(typeof args.options.groupId !== 'undefined' ? 'group' : 'team')} ${groupId}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove ${args.options.userName} from the ${(typeof args.options.groupId !== 'undefined' ? 'group' : 'team')} ${groupId}?` });
+            if (result) {
                 await removeUser();
             }
         }

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

@@ -44,13 +44,8 @@ class AadOAuth2GrantRemoveCommand extends GraphCommand {
             await removeOauth2Grant();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the OAuth2 permissions for ${args.options.grantId}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the OAuth2 permissions for ${args.options.grantId}?` });
+            if (result) {
                 await removeOauth2Grant();
             }
         }

package/dist/m365/aad/commands/siteclassification/siteclassification-disable.js

@@ -63,13 +63,8 @@ class AadSiteClassificationDisableCommand extends GraphCommand {
             await disableSiteClassification();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to disable site classification?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to disable site classification?` });
+            if (result) {
                 await disableSiteClassification();
             }
         }

package/dist/m365/aad/commands/user/user-license-remove.js

@@ -32,13 +32,8 @@ class AadUserLicenseRemoveCommand extends GraphCommand {
             await this.deleteUserLicenses(args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the licenses for the user '${args.options.userId || args.options.userName}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the licenses for the user '${args.options.userId || args.options.userName}'?` });
+            if (result) {
                 await this.deleteUserLicenses(args);
             }
         }

package/dist/m365/aad/commands/user/user-recyclebinitem-clear.js

@@ -63,13 +63,8 @@ class AadUserRecycleBinItemClearCommand extends GraphCommand {
             await clearRecycleBinUsers();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: 'Are you sure you want to permanently delete all deleted users?'
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: 'Are you sure you want to permanently delete all deleted users?' });
+            if (result) {
                 await clearRecycleBinUsers();
             }
         }

package/dist/m365/aad/commands/user/user-recyclebinitem-remove.js

@@ -43,13 +43,8 @@ class AadUserRecycleBinItemRemoveCommand extends GraphCommand {
             await clearRecycleBinItem();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to permanently delete the user with id ${args.options.id}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to permanently delete the user with id ${args.options.id}?` });
+            if (result) {
                 await clearRecycleBinItem();
             }
         }

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

@@ -32,13 +32,8 @@ class AadUserRemoveCommand extends GraphCommand {
             await this.deleteUser(args);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove user '${args.options.id || args.options.userName}'?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove user '${args.options.id || args.options.userName}'?` });
+            if (result) {
                 await this.deleteUser(args);
             }
         }

package/dist/m365/cli/commands/config/config-set.js

@@ -74,6 +74,11 @@ _a = CliConfigSetCommand, _CliConfigSetCommand_instances = new WeakSet(), _CliCo
             Cli.helpModes.indexOf(args.options.value) === -1) {
             return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${Cli.helpModes.join(', ')}`;
         }
+        const allowedAuthTypes = ['certificate', 'deviceCode', 'password', 'identity', 'browser', 'secret'];
+        if (args.options.key === settingsNames.authType &&
+            allowedAuthTypes.indexOf(args.options.value) === -1) {
+            return `${args.options.value} is not a valid value for the option ${args.options.key}. Allowed values: ${allowedAuthTypes.join(', ')}`;
+        }
         return true;
     });
 };

package/dist/m365/commands/login.js

@@ -11,6 +11,8 @@ import config from '../../config.js';
 import { accessToken } from '../../utils/accessToken.js';
 import { misc } from '../../utils/misc.js';
 import commands from './commands.js';
+import { settingsNames } from '../../settingsNames.js';
+import { Cli } from '../../cli/Cli.js';
 class LoginCommand extends Command {
     get name() {
         return commands.LOGIN;
@@ -35,9 +37,10 @@ class LoginCommand extends Command {
             if (this.verbose) {
                 await logger.logToStderr(`Signing in to Microsoft 365...`);
             }
+            const authType = args.options.authType || Cli.getInstance().getSettingWithDefaultValue(settingsNames.authType, 'deviceCode');
             auth.service.appId = args.options.appId || config.cliAadAppId;
             auth.service.tenant = args.options.tenant || config.tenant;
-            switch (args.options.authType) {
+            switch (authType) {
                 case 'password':
                     auth.service.authType = AuthType.Password;
                     auth.service.userName = args.options.userName;
@@ -126,7 +129,7 @@ class LoginCommand extends Command {
 _a = LoginCommand, _LoginCommand_instances = new WeakSet(), _LoginCommand_initTelemetry = function _LoginCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            authType: args.options.authType || 'deviceCode',
+            authType: args.options.authType || Cli.getInstance().getSettingWithDefaultValue(settingsNames.authType, 'deviceCode'),
             cloud: args.options.cloud ?? CloudType.Public
         });
     });
@@ -156,7 +159,8 @@ _a = LoginCommand, _LoginCommand_instances = new WeakSet(), _LoginCommand_initTe
     });
 }, _LoginCommand_initValidators = function _LoginCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.authType === 'password') {
+        const authType = args.options.authType || Cli.getInstance().getSettingWithDefaultValue(settingsNames.authType, 'deviceCode');
+        if (authType === 'password') {
             if (!args.options.userName) {
                 return 'Required option userName missing';
             }
@@ -164,7 +168,7 @@ _a = LoginCommand, _LoginCommand_instances = new WeakSet(), _LoginCommand_initTe
                 return 'Required option password missing';
             }
         }
-        if (args.options.authType === 'certificate') {
+        if (authType === 'certificate') {
             if (args.options.certificateFile && args.options.certificateBase64Encoded) {
                 return 'Specify either certificateFile or certificateBase64Encoded, but not both.';
             }
@@ -177,11 +181,11 @@ _a = LoginCommand, _LoginCommand_instances = new WeakSet(), _LoginCommand_initTe
                 }
             }
         }
-        if (args.options.authType &&
-            _a.allowedAuthTypes.indexOf(args.options.authType) < 0) {
-            return `'${args.options.authType}' is not a valid authentication type. Allowed authentication types are ${_a.allowedAuthTypes.join(', ')}`;
+        if (authType &&
+            _a.allowedAuthTypes.indexOf(authType) < 0) {
+            return `'${authType}' is not a valid authentication type. Allowed authentication types are ${_a.allowedAuthTypes.join(', ')}`;
         }
-        if (args.options.authType === 'secret') {
+        if (authType === 'secret') {
             if (!args.options.secret) {
                 return 'Required option secret missing';
             }

package/dist/m365/commands/setup.js

@@ -12,7 +12,6 @@ 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;
@@ -23,8 +22,6 @@ class SetupCommand extends AnonymousCommand {
     constructor() {
         super();
         _SetupCommand_instances.add(this);
-        // used for injecting answers from tests
-        this.answers = {};
         __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SetupCommand_instances, "m", _SetupCommand_initValidators).call(this);
@@ -51,43 +48,40 @@ 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 prompt.forInput([
-            {
-                type: 'list',
-                name: 'usageMode',
-                message: 'How do you plan to use the CLI?',
-                choices: [
-                    'Interactively',
-                    'Scripting'
-                ]
-            },
-            {
-                type: 'confirm',
-                name: 'usedInPowerShell',
+        const preferences = {};
+        const usageModeConfig = {
+            message: 'How do you plan to use the CLI?',
+            choices: [
+                { name: 'Interactively', value: 'Interactively' },
+                { name: 'Scripting', value: 'Scripting' }
+            ]
+        };
+        preferences.usageMode = await Cli.promptForSelection(usageModeConfig);
+        if (preferences.usageMode === 'Scripting') {
+            const usedInPowerShellConfig = {
                 message: 'Are you going to use the CLI in PowerShell?',
-                when: (answers) => answers.usageMode === 'Scripting',
                 default: pid.isPowerShell()
-            },
-            {
-                type: 'list',
-                name: 'experience',
-                message: 'How experienced are you in using the CLI?',
-                choices: [
-                    'Beginner',
-                    'Proficient'
-                ]
-            },
-            {
-                type: 'confirm',
-                name: 'summary',
-                // invoked by inquirer
-                /* c8 ignore next 4 */
-                message: (answers) => {
-                    settings = this.getSettings(answers);
-                    return this.getSummaryMessage(settings);
-                }
+            };
+            preferences.usedInPowerShell = await Cli.promptForConfirmation(usedInPowerShellConfig);
+        }
+        const experienceConfig = {
+            message: 'How experienced are you in using the CLI?',
+            choices: [
+                { name: 'Beginner', value: 'Beginner' },
+                { name: 'Proficient', value: 'Proficient' }
+            ]
+        };
+        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);
             }
-        ], this.answers);
+        };
+        preferences.summary = await Cli.promptForConfirmation(summaryConfig);
         if (preferences.summary) {
             // used only for testing. Normally, we'd get the settings from the answers
             /* c8 ignore next 3 */

package/dist/m365/context/commands/context-remove.js

@@ -27,13 +27,8 @@ class ContextRemoveCommand extends AnonymousCommand {
             await this.removeContext();
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the context?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the context?` });
+            if (result) {
                 await this.removeContext();
             }
         }

package/dist/m365/context/commands/option/option-remove.js

@@ -30,13 +30,8 @@ class ContextOptionRemoveCommand extends ContextCommand {
             await this.removeContextOption(args.options.name, logger);
         }
         else {
-            const result = await Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the context option ${args.options.name}?`
-            });
-            if (result.continue) {
+            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the context option ${args.options.name}?` });
+            if (result) {
                 await this.removeContextOption(args.options.name, logger);
             }
         }