@pnp/cli-microsoft365 7.1.0 → 7.2.0-beta.11c70fc

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

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

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/aad/commands.js

@@ -1,5 +1,9 @@
 const prefix = 'aad';
 export default {
+    ADMINISTRATIVEUNIT_ADD: `${prefix} administrativeunit add`,
+    ADMINISTRATIVEUNIT_GET: `${prefix} administrativeunit get`,
+    ADMINISTRATIVEUNIT_LIST: `${prefix} administrativeunit list`,
+    ADMINISTRATIVEUNIT_REMOVE: `${prefix} administrativeunit remove`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,

package/dist/m365/base/AppCommand.js

@@ -8,6 +8,7 @@ import fs from 'fs';
 import { Cli } from '../../cli/Cli.js';
 import Command, { CommandError } from '../../Command.js';
 import { validation } from '../../utils/validation.js';
+import { formatting } from '../../utils/formatting.js';
 class AppCommand extends Command {
     get resource() {
         return 'https://graph.microsoft.com';
@@ -52,18 +53,8 @@ class AppCommand extends Command {
             return super.action(logger, args);
         }
         if (this.m365rcJson.apps.length > 1) {
-            const result = await Cli.prompt({
-                message: `Multiple Azure AD apps found in ${m365rcJsonPath}. Which app would you like to use?`,
-                type: 'list',
-                choices: this.m365rcJson.apps.map((app, i) => {
-                    return {
-                        name: `${app.name} (${app.appId})`,
-                        value: i
-                    };
-                }),
-                default: 0,
-                name: 'appIdIndex'
-            });
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('appIdIndex', this.m365rcJson.apps);
+            const result = await Cli.handleMultipleResultsFound(`Multiple Azure AD apps found in ${m365rcJsonPath}.`, resultAsKeyValuePair);
             this.appId = this.m365rcJson.apps[result.appIdIndex].appId;
             await super.action(logger, args);
         }