@pnp/cli-microsoft365 7.3.0-beta.16c6462 → 7.3.0-beta.1c23854

package/dist/m365/teams/commands/user/user-app-add.js

@@ -3,8 +3,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _TeamsUserAppAddCommand_instances, _TeamsUserAppAddCommand_initOptions, _TeamsUserAppAddCommand_initValidators;
+var _TeamsUserAppAddCommand_instances, _TeamsUserAppAddCommand_initTelemetry, _TeamsUserAppAddCommand_initOptions, _TeamsUserAppAddCommand_initValidators, _TeamsUserAppAddCommand_initOptionSets;
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -18,13 +19,16 @@ class TeamsUserAppAddCommand extends GraphCommand {
     constructor() {
         super();
         _TeamsUserAppAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        const userId = (args.options.userId ?? args.options.userName);
         const endpoint = `${this.resource}/v1.0`;
         const requestOptions = {
-            url: `${endpoint}/users/${args.options.userId}/teamwork/installedApps`,
+            url: `${endpoint}/users/${formatting.encodeQueryParameter(userId)}/teamwork/installedApps`,
             headers: {
                 'content-type': 'application/json;odata=nometadata',
                 'accept': 'application/json;odata.metadata=none'
@@ -42,22 +46,36 @@ class TeamsUserAppAddCommand extends GraphCommand {
         }
     }
 }
-_TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initOptions = function _TeamsUserAppAddCommand_initOptions() {
+_TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initTelemetry = function _TeamsUserAppAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _TeamsUserAppAddCommand_initOptions = function _TeamsUserAppAddCommand_initOptions() {
     this.options.unshift({
         option: '--id <id>'
     }, {
-        option: '--userId <userId>'
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
     });
 }, _TeamsUserAppAddCommand_initValidators = function _TeamsUserAppAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        if (!validation.isValidGuid(args.options.userId)) {
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
             return `${args.options.userId} is not a valid GUID`;
         }
+        if (args.options.userName && !validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName`;
+        }
         return true;
     });
+}, _TeamsUserAppAddCommand_initOptionSets = function _TeamsUserAppAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName'] });
 };
 export default new TeamsUserAppAddCommand();
 //# sourceMappingURL=user-app-add.js.map

package/dist/m365/teams/commands/user/user-app-list.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TeamsUserAppListCommand_instances, _TeamsUserAppListCommand_initTelemetry, _TeamsUserAppListCommand_initOptions, _TeamsUserAppListCommand_initValidators, _TeamsUserAppListCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
@@ -36,7 +36,7 @@ class TeamsUserAppListCommand extends GraphCommand {
                 const appId = userAppId.substr(userAppId.indexOf("##") + 2, userAppId.length - userId.length - 2);
                 i.appId = appId;
             });
-            if (!Cli.shouldTrimOutput(args.options.output)) {
+            if (!cli.shouldTrimOutput(args.options.output)) {
                 await logger.log(items);
             }
             else {

package/dist/m365/teams/commands/user/user-app-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TeamsUserAppRemoveCommand_instances, _TeamsUserAppRemoveCommand_initTelemetry, _TeamsUserAppRemoveCommand_initOptions, _TeamsUserAppRemoveCommand_initValidators, _TeamsUserAppRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -52,7 +52,7 @@ class TeamsUserAppRemoveCommand extends GraphCommand {
             await removeApp();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the app with id ${args.options.id} for user ${args.options.userId ?? args.options.userName}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the app with id ${args.options.id} for user ${args.options.userId ?? args.options.userName}?` });
             if (result) {
                 await removeApp();
             }
@@ -77,7 +77,7 @@ class TeamsUserAppRemoveCommand extends GraphCommand {
             throw `The specified Teams app does not exist`;
         }
         const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
-        const result = (await Cli.handleMultipleResultsFound(`Multiple Teams apps with name '${args.options.name}' found.`, resultAsKeyValuePair));
+        const result = (await cli.handleMultipleResultsFound(`Multiple Teams apps with name '${args.options.name}' found.`, resultAsKeyValuePair));
         return result.id;
     }
 }

package/dist/m365/teams/commands.js

@@ -27,9 +27,10 @@ export default {
     FUNSETTINGS_SET: `${prefix} funsettings set`,
     GUESTSETTINGS_LIST: `${prefix} guestsettings list`,
     GUESTSETTINGS_SET: `${prefix} guestsettings set`,
-    MEETING_ATTENDANCEREPORT_LIST: `${prefix} meeting attendancereport list`,
+    MEETING_ADD: `${prefix} meeting add`,
     MEETING_GET: `${prefix} meeting get`,
     MEETING_LIST: `${prefix} meeting list`,
+    MEETING_ATTENDANCEREPORT_LIST: `${prefix} meeting attendancereport list`,
     MEETING_TRANSCRIPT_LIST: `${prefix} meeting transcript list`,
     MEMBERSETTINGS_LIST: `${prefix} membersettings list`,
     MEMBERSETTINGS_SET: `${prefix} membersettings set`,

package/dist/m365/tenant/commands/people/people-profilecardproperty-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TenantPeopleProfileCardPropertyRemoveCommand_instances, _TenantPeopleProfileCardPropertyRemoveCommand_initTelemetry, _TenantPeopleProfileCardPropertyRemoveCommand_initOptions, _TenantPeopleProfileCardPropertyRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -47,7 +47,7 @@ class TenantPeopleProfileCardPropertyRemoveCommand extends GraphCommand {
             await removeProfileCardProperty();
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the profile card property '${directoryPropertyName}'?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the profile card property '${directoryPropertyName}'?` });
             if (result) {
                 await removeProfileCardProperty();
             }

package/dist/m365/todo/commands/list/list-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TodoListRemoveCommand_instances, _TodoListRemoveCommand_initTelemetry, _TodoListRemoveCommand_initOptions, _TodoListRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -27,7 +27,7 @@ class TodoListRemoveCommand extends GraphCommand {
             await this.removeList(args);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the task list ${args.options.id || args.options.name}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the task list ${args.options.id || args.options.name}?` });
             if (result) {
                 await this.removeList(args);
             }

package/dist/m365/todo/commands/task/task-get.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TodoTaskGetCommand_instances, _TodoTaskGetCommand_initTelemetry, _TodoTaskGetCommand_initOptions, _TodoTaskGetCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -54,7 +54,7 @@ class TodoTaskGetCommand extends GraphCommand {
                 responseType: 'json'
             };
             const item = await request.get(requestOptions);
-            if (!Cli.shouldTrimOutput(args.options.output)) {
+            if (!cli.shouldTrimOutput(args.options.output)) {
                 await logger.log(item);
             }
             else {

package/dist/m365/todo/commands/task/task-list.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TodoTaskListCommand_instances, _TodoTaskListCommand_initTelemetry, _TodoTaskListCommand_initOptions, _TodoTaskListCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -49,7 +49,7 @@ class TodoTaskListCommand extends GraphCommand {
             const listId = await this.getTodoListId(args);
             const endpoint = `${this.resource}/v1.0/me/todo/lists/${listId}/tasks`;
             const items = await odata.getAllItems(endpoint);
-            if (!Cli.shouldTrimOutput(args.options.output)) {
+            if (!cli.shouldTrimOutput(args.options.output)) {
                 await logger.log(items);
             }
             else {

package/dist/m365/todo/commands/task/task-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TodoTaskRemoveCommand_instances, _TodoTaskRemoveCommand_initTelemetry, _TodoTaskRemoveCommand_initOptions, _TodoTaskRemoveCommand_initOptionSets;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
@@ -27,7 +27,7 @@ class TodoTaskRemoveCommand extends GraphCommand {
             await this.removeToDoTask(args.options);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the task ${args.options.id} from list ${args.options.listId || args.options.listName}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the task ${args.options.id} from list ${args.options.listId || args.options.listName}?` });
             if (result) {
                 await this.removeToDoTask(args.options);
             }

package/dist/m365/viva/commands/connections/connections-app-create.js

@@ -8,7 +8,7 @@ import AdmZip from 'adm-zip';
 import fs from 'fs';
 import path from 'path';
 import { v4 } from 'uuid';
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import AnonymousCommand from '../../../base/AnonymousCommand.js';
 import spoWebGetCommand from '../../../spo/commands/web/web-get.js';
 import commands from '../../commands.js';
@@ -143,7 +143,7 @@ class VivaConnectionsAppCreateCommand extends AnonymousCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoWebGetCommand, { options: { ...options, _: [] } });
+        return cli.executeCommandWithOutput(spoWebGetCommand, { options: { ...options, _: [] } });
     }
 }
 _VivaConnectionsAppCreateCommand_instances = new WeakSet(), _VivaConnectionsAppCreateCommand_initOptions = function _VivaConnectionsAppCreateCommand_initOptions() {

package/dist/m365/yammer/commands/group/group-user-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _YammerGroupUserRemoveCommand_instances, _YammerGroupUserRemoveCommand_initTelemetry, _YammerGroupUserRemoveCommand_initOptions, _YammerGroupUserRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import YammerCommand from "../../../base/YammerCommand.js";
 import commands from '../../commands.js';
@@ -31,7 +31,7 @@ class YammerGroupUserRemoveCommand extends YammerCommand {
             if (args.options.id) {
                 messagePrompt = `Are you sure you want to remove the user ${args.options.id} from the group ${args.options.groupId}?`;
             }
-            const result = await Cli.promptForConfirmation({ message: messagePrompt });
+            const result = await cli.promptForConfirmation({ message: messagePrompt });
             if (result) {
                 await this.executeRemoveAction(args.options);
             }

package/dist/m365/yammer/commands/message/message-like-set.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _YammerMessageLikeSetCommand_instances, _YammerMessageLikeSetCommand_initTelemetry, _YammerMessageLikeSetCommand_initOptions, _YammerMessageLikeSetCommand_initTypes, _YammerMessageLikeSetCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import YammerCommand from '../../../base/YammerCommand.js';
 import commands from '../../commands.js';
@@ -30,7 +30,7 @@ class YammerMessageLikeSetCommand extends YammerCommand {
             }
             else {
                 const message = `Are you sure you want to unlike message ${args.options.messageId}?`;
-                const result = await Cli.promptForConfirmation({ message });
+                const result = await cli.promptForConfirmation({ message });
                 if (result) {
                     await this.executeLikeAction(args.options);
                 }

package/dist/m365/yammer/commands/message/message-remove.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _YammerMessageRemoveCommand_instances, _YammerMessageRemoveCommand_initTelemetry, _YammerMessageRemoveCommand_initOptions, _YammerMessageRemoveCommand_initValidators;
-import { Cli } from '../../../../cli/Cli.js';
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import YammerCommand from '../../../base/YammerCommand.js';
 import commands from '../../commands.js';
@@ -27,7 +27,7 @@ class YammerMessageRemoveCommand extends YammerCommand {
             await this.removeMessage(args.options);
         }
         else {
-            const result = await Cli.promptForConfirmation({ message: `Are you sure you want to remove the Yammer message ${args.options.id}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove the Yammer message ${args.options.id}?` });
             if (result) {
                 await this.removeMessage(args.options);
             }

package/dist/m365/yammer/commands/yammer-search.js

@@ -4,7 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _YammerSearchCommand_instances, _a, _YammerSearchCommand_initTelemetry, _YammerSearchCommand_initOptions, _YammerSearchCommand_initValidators;
-import { Cli } from '../../../cli/Cli.js';
+import { cli } from '../../../cli/cli.js';
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
 import YammerCommand from '../../base/YammerCommand.js';
@@ -101,7 +101,7 @@ class YammerSearchCommand extends YammerCommand {
         this.users = [];
         try {
             await this.getAllItems(logger, args, 1);
-            if (!Cli.shouldTrimOutput(args.options.output)) {
+            if (!cli.shouldTrimOutput(args.options.output)) {
                 await logger.log({
                     summary: this.summary,
                     messages: this.messages,

package/dist/telemetry.js

@@ -1,7 +1,7 @@
 import child_process from 'child_process';
 import path from 'path';
 import url from 'url';
-import { Cli } from './cli/Cli.js';
+import { cli } from './cli/cli.js';
 import { settingsNames } from './settingsNames.js';
 import { pid } from './utils/pid.js';
 import { session } from './utils/session.js';
@@ -22,7 +22,7 @@ function trackTelemetry(object) {
 }
 export const telemetry = {
     trackEvent: (commandName, properties) => {
-        if (Cli.getInstance().getSettingWithDefaultValue(settingsNames.disableTelemetry, false)) {
+        if (cli.getSettingWithDefaultValue(settingsNames.disableTelemetry, false)) {
             return;
         }
         trackTelemetry({

package/dist/utils/aadAdministrativeUnit.js

@@ -1,7 +1,6 @@
-import { odata } from "./odata.js";
-import { formatting } from "./formatting.js";
-import { Cli } from "../cli/Cli.js";
-const graphResource = 'https://graph.microsoft.com';
+import { odata } from './odata.js';
+import { formatting } from './formatting.js';
+import { cli } from '../cli/cli.js';
 export const aadAdministrativeUnit = {
     /**
      * Get an administrative unit by its display name.
@@ -10,13 +9,14 @@ export const aadAdministrativeUnit = {
      * @throws Error when administrative unit was not found.
      */
     async getAdministrativeUnitByDisplayName(displayName) {
+        const graphResource = 'https://graph.microsoft.com';
         const administrativeUnits = await odata.getAllItems(`${graphResource}/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);
-            const selectedAdministrativeUnit = await Cli.handleMultipleResultsFound(`Multiple administrative units with name '${displayName}' found.`, resultAsKeyValuePair);
+            const selectedAdministrativeUnit = await cli.handleMultipleResultsFound(`Multiple administrative units with name '${displayName}' found.`, resultAsKeyValuePair);
             return selectedAdministrativeUnit;
         }
         return administrativeUnits[0];

package/dist/utils/aadDevice.js

@@ -0,0 +1,25 @@
+import { odata } from "./odata.js";
+import { formatting } from "./formatting.js";
+import { cli } from "../cli/cli.js";
+const graphResource = 'https://graph.microsoft.com';
+export const aadDevice = {
+    /**
+     * Get a device by its display name.
+     * @param displayName Device display name.
+     * @returns The device.
+     * @throws Error when device was not found.
+     */
+    async getDeviceByDisplayName(displayName) {
+        const devices = await odata.getAllItems(`${graphResource}/v1.0/devices?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'`);
+        if (devices.length === 0) {
+            throw `The specified device '${displayName}' does not exist.`;
+        }
+        if (devices.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', devices);
+            const selectedDevice = await cli.handleMultipleResultsFound(`Multiple devices with name '${displayName}' found.`, resultAsKeyValuePair);
+            return selectedDevice;
+        }
+        return devices[0];
+    }
+};
+//# sourceMappingURL=aadDevice.js.map

package/dist/utils/aadGroup.js

@@ -1,7 +1,7 @@
 import request from "../request.js";
 import { formatting } from "./formatting.js";
 import { odata } from "./odata.js";
-import { Cli } from '../cli/Cli.js';
+import { cli } from '../cli/cli.js';
 const graphResource = 'https://graph.microsoft.com';
 export const aadGroup = {
     /**
@@ -38,7 +38,7 @@ export const aadGroup = {
         }
         if (groups.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', groups);
-            return await Cli.handleMultipleResultsFound(`Multiple groups with name '${displayName}' found.`, resultAsKeyValuePair);
+            return await cli.handleMultipleResultsFound(`Multiple groups with name '${displayName}' found.`, resultAsKeyValuePair);
         }
         return groups[0];
     },
@@ -55,7 +55,7 @@ export const aadGroup = {
         }
         if (groups.length > 1) {
             const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', groups);
-            const result = await Cli.handleMultipleResultsFound(`Multiple groups with name '${displayName}' found.`, resultAsKeyValuePair);
+            const result = await cli.handleMultipleResultsFound(`Multiple groups with name '${displayName}' found.`, resultAsKeyValuePair);
             return result.id;
         }
         return groups[0].id;

package/dist/utils/prompt.js

@@ -1,33 +1,30 @@
 import { settingsNames } from '../settingsNames.js';
-import { Cli } from '../cli/Cli.js';
+import { cli } from '../cli/cli.js';
 let inquirerInput;
 let inquirerConfirm;
 let inquirerSelect;
 export const prompt = {
-    /* c8 ignore next 10 */
+    /* c8 ignore next 9 */
     async forInput(config) {
         if (!inquirerInput) {
             inquirerInput = await import('@inquirer/input');
         }
-        const cli = Cli.getInstance();
         const errorOutput = cli.getSettingWithDefaultValue(settingsNames.errorOutput, 'stderr');
         return inquirerInput.default(config, { output: errorOutput === 'stderr' ? process.stderr : process.stdout });
     },
-    /* c8 ignore next 10 */
+    /* c8 ignore next 9 */
     async forConfirmation(config) {
         if (!inquirerConfirm) {
             inquirerConfirm = await import('@inquirer/confirm');
         }
-        const cli = Cli.getInstance();
         const errorOutput = cli.getSettingWithDefaultValue(settingsNames.errorOutput, 'stderr');
         return inquirerConfirm.default(config, { output: errorOutput === 'stderr' ? process.stderr : process.stdout });
     },
-    /* c8 ignore next 15 */
+    /* c8 ignore next 14 */
     async forSelection(config) {
         if (!inquirerSelect) {
             inquirerSelect = await import('@inquirer/select');
         }
-        const cli = Cli.getInstance();
         const errorOutput = cli.getSettingWithDefaultValue(settingsNames.errorOutput, 'stderr');
         const promptPageSizeCap = cli.getSettingWithDefaultValue(settingsNames.promptListPageSize, 7);
         if (!config.pageSize) {

package/dist/utils/validation.js

@@ -7,8 +7,11 @@ export const validation = {
             return false;
         }
         const guidRegEx = new RegExp(/^[0-9a-f]{8}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{4}-[0-9a-f]{12}$/i);
-        // verify if the guid is a valid guid. @meid will be replaced in a later stage with the actual user id of the logged in user
-        return guidRegEx.test(guid) || guid.toLowerCase().trim() === '@meid';
+        // verify if the guid is a valid guid. @meid will be replaced in a later
+        // stage with the actual user id of the logged in user
+        // we also need to make it toString in case the args is resolved as number
+        // or boolean
+        return guidRegEx.test(guid) || guid.toString().toLowerCase().trim() === '@meid';
     },
     isValidTeamsChannelId(guid) {
         const guidRegEx = new RegExp(/^19:[0-9a-zA-Z-_]+@thread\.(skype|tacv2)$/i);

package/docs/docs/cmd/aad/administrativeunit/administrativeunit-member-add.mdx

@@ -0,0 +1,93 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# aad administrativeunit member add
+
+Add a member (user, group, or device) to an administrative unit
+
+## Usage
+
+```sh
+m365 aad administrativeunit member add [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --administrativeUnitId [administrativeUnitId]`
+: The id of the administrative unit. Specify either `administrativeUnitId` or `administrativeUnitName` but not both.
+
+`-n, --administrativeUnitName [administrativeUnitName]`
+: The name of the administrative unit. Specify either `administrativeUnitId` or `administrativeUnitName` but not both.
+
+`--userId [userId]`
+: The id of the user to be added. Specify `userId`, `userName`, `groupId`, `groupName`, `deviceId` or `deviceName`.
+
+`--userName [userName]`
+: The user principal name (UPN) of the user to be added. Specify `userId`, `userName`, `groupId`, `groupName`, `deviceId` or `deviceName`.
+
+`--groupId [groupId]`
+: The id of the group to be added. Specify `userId`, `userName`, `groupId`, `groupName`, `deviceId` or `deviceName`.
+
+`--groupName [groupName]`
+: The name of the group to be added. Specify `userId`, `userName`, `groupId`, `groupName`, `deviceId` or `deviceName`.
+
+`--deviceId [deviceId]`
+: The id of the device to be added. Specify `userId`, `userName`, `groupId`, `groupName`, `deviceId` or `deviceName`.
+
+`--deviceName [deviceName]`
+: The name of the device to be added. Specify `userId`, `userName`, `groupId`, `groupName`, `deviceId` or `deviceName`.
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command you must be either **Global Administrator** or **Privileged Role Administrator**.
+
+:::
+
+## Examples
+
+Add a single user specified by id to an administrative unit specified by id
+
+```sh
+m365 aad administrativeunit member add --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --userId 1caf7dcd-7e83-4c3a-94f7-932a1299c844
+```
+
+Add a single user specified by user principal name to an administrative unit specified by name
+
+```sh
+m365 aad administrativeunit member add --administrativeUnitName 'Marketing Division' --userName john.doe@contoso.com
+```
+
+Add a single group specified by id to an administrative unit specified by id
+
+```sh
+m365 aad administrativeunit member add --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --groupId b2307a39-e878-458b-bc90-03bc578531d6
+```
+
+Add a single group specified by name to an administrative unit specified by name
+
+```sh
+m365 aad administrativeunit member add --administrativeUnitName 'Marketing Division' --groupName 'Marketing Group'
+```
+
+Add a single device specified by id to an administrative unit specified by id
+
+```sh
+m365 aad administrativeunit member add --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --deviceId 810c84a8-4a9e-49e6-bf7d-12d183f40d01
+```
+
+Add a single device specified by name to an administrative unit specified by name
+
+```sh
+m365 aad administrativeunit member add --administrativeUnitName 'Marketing Division' --deviceName 'JohnDoe-PC'
+```
+
+## More information
+
+- Administrative units: https://learn.microsoft.com/entra/identity/role-based-access-control/administrative-units