@pnp/cli-microsoft365 7.2.0-beta.54705a9 → 7.2.0-beta.6775e3a

package/.devcontainer/Dockerfile

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

package/.eslintrc.cjs

@@ -5,6 +5,7 @@ const dictionary = [
   'activation',
   'activations',
   'adaptive',
+  'administrative',
   'ai',
   'app',
   'application',
@@ -15,6 +16,7 @@ const dictionary = [
   'audit',
   'bin',
   'builder',
+  'card',
   'catalog',
   'checklist',
   'client',
@@ -67,6 +69,7 @@ const dictionary = [
   'permission',
   'place',
   'policy',
+  'profile',
   'property',
   'records',
   'recycle',
@@ -90,6 +93,7 @@ const dictionary = [
   'threat',
   'token',
   'type',
+  'unit',
   'user',
   'web',
   'webhook'

package/Dockerfile

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

package/dist/Command.js

@@ -89,11 +89,8 @@ class Command {
                 prompted = true;
                 Cli.error('🌶️  Provide values for the following parameters:');
             }
-            const missingRequireOptionValue = await prompt.forInput({
-                name: 'missingRequireOptionValue',
-                message: `${command.options[i].name}: `
-            }).then(result => result.missingRequireOptionValue);
-            args.options[command.options[i].name] = missingRequireOptionValue;
+            const answer = await prompt.forInput({ message: `${command.options[i].name}: ` });
+            args.options[command.options[i].name] = answer;
         }
         if (prompted) {
             Cli.error('');
@@ -130,29 +127,15 @@ class Command {
     }
     async promptForOptionSetNameAndValue(args, optionSet) {
         Cli.error(`🌶️  Please specify one of the following options:`);
-        const resultOptionName = await prompt.forInput({
-            type: 'list',
-            name: 'missingRequiredOptionName',
-            message: `Option to use:`,
-            choices: optionSet.options
-        });
-        const missingRequiredOptionName = resultOptionName.missingRequiredOptionName;
-        const resultOptionValue = await prompt.forInput({
-            name: 'missingRequiredOptionValue',
-            message: `${missingRequiredOptionName}:`
-        });
-        args.options[missingRequiredOptionName] = resultOptionValue.missingRequiredOptionValue;
+        const selectedOptionName = await prompt.forSelection({ message: `Option to use:`, choices: optionSet.options.map((choice) => { return { name: choice, value: choice }; }) });
+        const optionValue = await prompt.forInput({ message: `${selectedOptionName}:` });
+        args.options[selectedOptionName] = optionValue;
         Cli.error('');
     }
     async promptForSpecificOption(args, commonOptions) {
         Cli.error(`🌶️  Multiple options for an option set specified. Please specify the correct option that you wish to use.`);
-        const requiredOptionNameResult = await prompt.forInput({
-            type: 'list',
-            name: 'missingRequiredOptionName',
-            message: `Option to use:`,
-            choices: commonOptions
-        });
-        commonOptions.filter(y => y !== requiredOptionNameResult.missingRequiredOptionName).map(optionName => args.options[optionName] = undefined);
+        const selectedOptionName = await prompt.forSelection({ message: `Option to use:`, choices: commonOptions.map((choice) => { return { name: choice, value: choice }; }) });
+        commonOptions.filter(y => y !== selectedOptionName).map(optionName => args.options[optionName] = undefined);
         Cli.error('');
     }
     async validateOutput(args) {

package/dist/chili/chili.js

@@ -1,5 +1,4 @@
 import fs from 'fs';
-import inquirer from 'inquirer';
 import ora from 'ora';
 import path from 'path';
 import url from 'url';
@@ -7,6 +6,7 @@ import { Cli } from '../cli/Cli.js';
 import request from '../request.js';
 import { settingsNames } from '../settingsNames.js';
 import { md } from '../utils/md.js';
+import { prompt } from '../utils/prompt.js';
 const __dirname = url.fileURLToPath(new URL('.', import.meta.url));
 const mendableApiKey = 'd3313d54-6f8e-40e0-90d3-4095019d4be7';
 let showHelp = false;
@@ -79,12 +79,7 @@ async function startConversation(args) {
     await runConversationTurn(conversationId, initialPrompt);
 }
 async function promptForPrompt() {
-    const answer = await inquirer.prompt([{
-            type: 'input',
-            name: 'prompt',
-            message: '🌶️  How can I help you?'
-        }]);
-    return answer.prompt;
+    return await prompt.forInput({ message: '🌶️  How can I help you?' });
 }
 async function runConversationTurn(conversationId, question) {
     console.log('');
@@ -120,60 +115,54 @@ async function runConversationTurn(conversationId, question) {
         }
         console.log('');
     }
-    const result = await inquirer.prompt([{
-            type: 'list',
-            name: 'chat',
-            message: 'What would you like to do next?',
-            choices: [
-                {
-                    name: '📝 I want to know more',
-                    value: 'ask'
-                },
-                {
-                    name: '👋 I know enough. Thanks!',
-                    value: 'end'
-                },
-                {
-                    name: '🔄 I want to ask about something else',
-                    value: 'new'
-                }
-            ]
-        }]);
-    switch (result.chat) {
+    const choices = [
+        {
+            name: '📝 I want to know more',
+            value: 'ask'
+        },
+        {
+            name: '👋 I know enough. Thanks!',
+            value: 'end'
+        },
+        {
+            name: '🔄 I want to ask about something else',
+            value: 'new'
+        }
+    ];
+    const result = await prompt.forSelection({ message: 'What would you like to do next?', choices });
+    switch (result) {
         case 'ask':
             const prompt = await promptForPrompt();
-            return await runConversationTurn(conversationId, prompt);
+            await runConversationTurn(conversationId, prompt);
+            break;
         case 'end':
             await endConversation(conversationId);
             console.log('');
             console.log('🌶️   Bye!');
-            return;
+            break;
         case 'new':
             initialPrompt = '';
-            return startConversation([]);
+            await startConversation([]);
+            break;
     }
 }
 async function rateResponse(messageId) {
-    const result = await inquirer.prompt([{
-            type: 'list',
-            name: 'rating',
-            message: 'Was this helpful?',
-            choices: [
-                {
-                    name: '👍 Yes',
-                    value: 1
-                },
-                {
-                    name: '👎 No',
-                    value: -1
-                },
-                {
-                    name: '🤔 Not sure/skip',
-                    value: 0
-                }
-            ]
-        }]);
-    if (result.rating === 0) {
+    const choices = [
+        {
+            name: '👍 Yes',
+            value: 1
+        },
+        {
+            name: '👎 No',
+            value: -1
+        },
+        {
+            name: '🤔 Not sure/skip',
+            value: 0
+        }
+    ];
+    const rating = await prompt.forSelection({ message: 'Was this helpful?', choices });
+    if (rating === 0) {
         return;
     }
     console.log('Thanks for letting us know! 😊');
@@ -192,7 +181,7 @@ async function rateResponse(messageId) {
             // eslint-disable-next-line camelcase
             message_id: messageId,
             // eslint-disable-next-line camelcase
-            rating_value: result.rating
+            rating_value: rating
         }
     };
     const spinner = ora('Sending rating...');

package/dist/cli/Cli.js

@@ -707,9 +707,10 @@ export class Cli {
             const maxLength = Math.max(...namesOfCommandsToPrint.map(s => s.length)) + 10;
             Cli.log(`Commands:`);
             Cli.log();
-            for (const commandName in commandsToPrint) {
+            const sortedCommandNamesToPrint = Object.getOwnPropertyNames(commandsToPrint).sort();
+            sortedCommandNamesToPrint.forEach(commandName => {
                 Cli.log(`  ${`${commandName} [options]`.padEnd(maxLength, ' ')}  ${commandsToPrint[commandName].command.description}`);
-            }
+            });
         }
         const namesOfCommandGroupsToPrint = Object.keys(commandGroupsToPrint);
         if (namesOfCommandGroupsToPrint.length > 0) {
@@ -803,35 +804,47 @@ export class Cli {
             cli.spinner.start();
         }
     }
-    static async prompt(options, answers) {
+    static async promptForSelection(config) {
         const cli = Cli.getInstance();
         const spinnerSpinning = cli.spinner.isSpinning;
         /* c8 ignore next 3 */
         if (spinnerSpinning) {
             cli.spinner.stop();
         }
-        const response = await prompt.forInput(options, answers);
+        const answer = await prompt.forSelection(config);
+        Cli.error('');
         // Restart the spinner if it was running before the prompt
         /* c8 ignore next 3 */
         if (spinnerSpinning) {
             cli.spinner.start();
         }
-        return response;
+        return answer;
+    }
+    static async promptForConfirmation(config) {
+        const cli = Cli.getInstance();
+        const spinnerSpinning = cli.spinner.isSpinning;
+        /* c8 ignore next 3 */
+        if (spinnerSpinning) {
+            cli.spinner.stop();
+        }
+        const answer = await prompt.forConfirmation(config);
+        Cli.error('');
+        // Restart the spinner if it was running before the prompt
+        /* c8 ignore next 3 */
+        if (spinnerSpinning) {
+            cli.spinner.start();
+        }
+        return answer;
     }
     static async handleMultipleResultsFound(message, values) {
         const prompt = Cli.getInstance().getSettingWithDefaultValue(settingsNames.prompt, true);
         if (!prompt) {
             throw new Error(`${message} Found: ${Object.keys(values).join(', ')}.`);
         }
-        const response = await Cli.prompt({
-            type: 'list',
-            name: 'select',
-            default: 0,
-            prefix: '🌶️  ',
-            message: `${message} Please choose one:`,
-            choices: Object.keys(values)
-        });
-        return values[response.select];
+        Cli.error(`🌶️  ${message}`);
+        const choices = Object.keys(values).map((choice) => { return { name: choice, value: choice }; });
+        const response = await Cli.promptForSelection({ message: `Please choose one:`, choices });
+        return values[response];
     }
     static removeShortOptions(args) {
         const filteredArgs = JSON.parse(JSON.stringify(args));

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

@@ -0,0 +1,61 @@
+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 _AadAdministrativeUnitAddCommand_instances, _AadAdministrativeUnitAddCommand_initTelemetry, _AadAdministrativeUnitAddCommand_initOptions;
+import request from "../../../../request.js";
+import GraphCommand from "../../../base/GraphCommand.js";
+import commands from "../../commands.js";
+class AadAdministrativeUnitAddCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_ADD;
+    }
+    get description() {
+        return 'Creates an administrative unit';
+    }
+    constructor() {
+        super();
+        _AadAdministrativeUnitAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitAddCommand_instances, "m", _AadAdministrativeUnitAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitAddCommand_instances, "m", _AadAdministrativeUnitAddCommand_initOptions).call(this);
+    }
+    async commandAction(logger, args) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/directory/administrativeUnits`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                description: args.options.description,
+                displayName: args.options.displayName,
+                visibility: args.options.hiddenMembership ? 'HiddenMembership' : null
+            }
+        };
+        try {
+            const administrativeUnit = await request.post(requestOptions);
+            await logger.log(administrativeUnit);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_AadAdministrativeUnitAddCommand_instances = new WeakSet(), _AadAdministrativeUnitAddCommand_initTelemetry = function _AadAdministrativeUnitAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            hiddenMembership: !!args.options.hiddenMembership
+        });
+    });
+}, _AadAdministrativeUnitAddCommand_initOptions = function _AadAdministrativeUnitAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --displayName <displayName>'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '--hiddenMembership'
+    });
+};
+export default new AadAdministrativeUnitAddCommand();
+//# sourceMappingURL=administrativeunit-add.js.map

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

@@ -0,0 +1,80 @@
+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 _AadAdministrativeUnitGetCommand_instances, _AadAdministrativeUnitGetCommand_initTelemetry, _AadAdministrativeUnitGetCommand_initOptions, _AadAdministrativeUnitGetCommand_initValidators, _AadAdministrativeUnitGetCommand_initOptionSets, _AadAdministrativeUnitGetCommand_initTypes;
+import { validation } from "../../../../utils/validation.js";
+import request from "../../../../request.js";
+import GraphCommand from "../../../base/GraphCommand.js";
+import commands from "../../commands.js";
+import { aadAdministrativeUnit } from "../../../../utils/aadAdministrativeUnit.js";
+class AadAdministrativeUnitGetCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_GET;
+    }
+    get description() {
+        return 'Gets information about a specific administrative unit';
+    }
+    constructor() {
+        super();
+        _AadAdministrativeUnitGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitGetCommand_instances, "m", _AadAdministrativeUnitGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitGetCommand_instances, "m", _AadAdministrativeUnitGetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitGetCommand_instances, "m", _AadAdministrativeUnitGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitGetCommand_instances, "m", _AadAdministrativeUnitGetCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitGetCommand_instances, "m", _AadAdministrativeUnitGetCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        let administrativeUnit;
+        try {
+            if (args.options.id) {
+                administrativeUnit = await this.getAdministrativeUnitById(args.options.id);
+            }
+            else {
+                administrativeUnit = await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName);
+            }
+            await logger.log(administrativeUnit);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async getAdministrativeUnitById(id) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/directory/administrativeUnits/${id}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return await request.get(requestOptions);
+    }
+}
+_AadAdministrativeUnitGetCommand_instances = new WeakSet(), _AadAdministrativeUnitGetCommand_initTelemetry = function _AadAdministrativeUnitGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            displayName: typeof args.options.displayName !== 'undefined'
+        });
+    });
+}, _AadAdministrativeUnitGetCommand_initOptions = function _AadAdministrativeUnitGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
+    });
+}, _AadAdministrativeUnitGetCommand_initValidators = function _AadAdministrativeUnitGetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _AadAdministrativeUnitGetCommand_initOptionSets = function _AadAdministrativeUnitGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'displayName'] });
+}, _AadAdministrativeUnitGetCommand_initTypes = function _AadAdministrativeUnitGetCommand_initTypes() {
+    this.types.string.push('displayName');
+};
+export default new AadAdministrativeUnitGetCommand();
+//# sourceMappingURL=administrativeunit-get.js.map

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

@@ -0,0 +1,25 @@
+import { odata } from '../../../../utils/odata.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class AadAdministrativeUnitListCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_LIST;
+    }
+    get description() {
+        return 'Retrieves a list of administrative units';
+    }
+    defaultProperties() {
+        return ['id', 'displayName', 'visibility'];
+    }
+    async commandAction(logger) {
+        try {
+            const results = await odata.getAllItems(`${this.resource}/v1.0/directory/administrativeUnits`);
+            await logger.log(results);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+export default new AadAdministrativeUnitListCommand();
+//# sourceMappingURL=administrativeunit-list.js.map

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

@@ -0,0 +1,91 @@
+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 _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 { Cli } from "../../../../cli/Cli.js";
+class AadAdministrativeUnitRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_REMOVE;
+    }
+    get description() {
+        return 'Removes an administrative unit';
+    }
+    constructor() {
+        super();
+        _AadAdministrativeUnitRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadAdministrativeUnitRemoveCommand_instances, "m", _AadAdministrativeUnitRemoveCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        const removeAdministrativeUnit = async () => {
+            try {
+                let administrativeUnitId = args.options.id;
+                if (args.options.displayName) {
+                    const administrativeUnit = await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.displayName);
+                    administrativeUnitId = administrativeUnit.id;
+                }
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/directory/administrativeUnits/${administrativeUnitId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    }
+                };
+                await request.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeAdministrativeUnit();
+        }
+        else {
+            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();
+            }
+        }
+    }
+}
+_AadAdministrativeUnitRemoveCommand_instances = new WeakSet(), _AadAdministrativeUnitRemoveCommand_initTelemetry = function _AadAdministrativeUnitRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            id: args.options.id !== 'undefined',
+            displayName: args.options.displayName !== 'undefined',
+            force: !!args.options.force
+        });
+    });
+}, _AadAdministrativeUnitRemoveCommand_initOptions = function _AadAdministrativeUnitRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id [id]'
+    }, {
+        option: '-n, --displayName [displayName]'
+    }, {
+        option: '-f, --force'
+    });
+}, _AadAdministrativeUnitRemoveCommand_initOptionSets = function _AadAdministrativeUnitRemoveCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['id', 'displayName']
+    });
+}, _AadAdministrativeUnitRemoveCommand_initValidators = function _AadAdministrativeUnitRemoveCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID for option id.`;
+        }
+        return true;
+    });
+}, _AadAdministrativeUnitRemoveCommand_initTypes = function _AadAdministrativeUnitRemoveCommand_initTypes() {
+    this.types.string.push('id', 'displayName');
+};
+export default new AadAdministrativeUnitRemoveCommand();
+//# sourceMappingURL=administrativeunit-remove.js.map

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();
             }
         }