@pnp/cli-microsoft365 7.3.0-beta.4df0638 → 7.3.0-beta.66401a3

package/dist/m365/flow/commands/flow-list.js

@@ -5,9 +5,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowListCommand_instances, _FlowListCommand_initTelemetry, _FlowListCommand_initOptions, _FlowListCommand_initValidators;
 import { formatting } from '../../../utils/formatting.js';
-import { AzmgmtItemsListCommand } from '../../base/AzmgmtItemsListCommand.js';
+import { odata } from '../../../utils/odata.js';
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
 import commands from '../commands.js';
-class FlowListCommand extends AzmgmtItemsListCommand {
+class FlowListCommand extends PowerAutomateCommand {
     get name() {
         return commands.LIST;
     }
@@ -28,31 +29,32 @@ class FlowListCommand extends AzmgmtItemsListCommand {
     async commandAction(logger, args) {
         try {
             const { environmentName, asAdmin, sharingStatus, includeSolutions } = args.options;
+            let items = [];
             if (sharingStatus === 'personal') {
                 const url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'personal');
-                await this.getAllItems(url, logger, true);
+                items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'sharedWithMe') {
                 const url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'team');
-                await this.getAllItems(url, logger, true);
+                items = await odata.getAllItems(url);
             }
             else if (sharingStatus === 'all') {
                 let url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'personal');
-                await this.getAllItems(url, logger, true);
+                items = await odata.getAllItems(url);
                 url = this.getApiUrl(environmentName, asAdmin, includeSolutions, 'team');
-                await this.getAllItems(url, logger, false);
+                items = await odata.getAllItems(url);
             }
             else {
                 const url = this.getApiUrl(environmentName, asAdmin, includeSolutions);
-                await this.getAllItems(url, logger, true);
+                items = await odata.getAllItems(url);
             }
             // Remove duplicates
-            this.items = this.items.filter((flow, index, self) => index === self.findIndex(f => f.id === flow.id));
-            if (this.items.length > 0) {
-                this.items.forEach(i => {
+            items = items.filter((flow, index, self) => index === self.findIndex(f => f.id === flow.id));
+            if (items.length > 0) {
+                items.forEach(i => {
                     i.displayName = i.properties.displayName;
                 });
-                await logger.log(this.items);
+                await logger.log(items);
             }
             else {
                 if (this.verbose) {
@@ -65,7 +67,7 @@ class FlowListCommand extends AzmgmtItemsListCommand {
         }
     }
     getApiUrl(environmentName, asAdmin, includeSolutionFlows, filter) {
-        let url = `${this.resource}providers/Microsoft.ProcessSimple${asAdmin ? '/scopes/admin' : ''}/environments/${formatting.encodeQueryParameter(environmentName)}/flows?api-version=2016-11-01`;
+        let url = `${this.resource}/providers/Microsoft.ProcessSimple${asAdmin ? '/scopes/admin' : ''}/environments/${formatting.encodeQueryParameter(environmentName)}/flows?api-version=2016-11-01`;
         if (filter === 'personal') {
             url += `&$filter=search('personal')`;
         }

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

@@ -8,9 +8,9 @@ import { cli } from '../../../cli/cli.js';
 import request from '../../../request.js';
 import { formatting } from '../../../utils/formatting.js';
 import { validation } from '../../../utils/validation.js';
-import AzmgmtCommand from '../../base/AzmgmtCommand.js';
 import commands from '../commands.js';
-class FlowRemoveCommand extends AzmgmtCommand {
+import PowerAutomateCommand from '../../base/PowerAutomateCommand.js';
+class FlowRemoveCommand extends PowerAutomateCommand {
     get name() {
         return commands.REMOVE;
     }
@@ -30,7 +30,7 @@ class FlowRemoveCommand extends AzmgmtCommand {
         }
         const removeFlow = async () => {
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
                 fullResponse: true,
                 headers: {
                     accept: 'application/json'

package/dist/m365/flow/commands/owner/owner-ensure.js

@@ -9,9 +9,9 @@ import { aadGroup } from '../../../../utils/aadGroup.js';
 import { aadUser } from '../../../../utils/aadUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowOwnerEnsureCommand extends AzmgmtCommand {
+class FlowOwnerEnsureCommand extends PowerAutomateCommand {
     get name() {
         return commands.OWNER_ENSURE;
     }
@@ -52,7 +52,7 @@ class FlowOwnerEnsureCommand extends AzmgmtCommand {
                 type = 'Group';
             }
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },

package/dist/m365/flow/commands/owner/owner-list.js

@@ -8,9 +8,9 @@ import { cli } from '../../../../cli/cli.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowOwnerListCommand extends AzmgmtCommand {
+class FlowOwnerListCommand extends PowerAutomateCommand {
     get name() {
         return commands.OWNER_LIST;
     }
@@ -32,7 +32,7 @@ class FlowOwnerListCommand extends AzmgmtCommand {
             if (this.verbose) {
                 await logger.logToStderr(`Listing owners for flow ${args.options.flowName} in environment ${args.options.environmentName}`);
             }
-            const response = await odata.getAllItems(`${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/permissions?api-version=2016-11-01`);
+            const response = await odata.getAllItems(`${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/permissions?api-version=2016-11-01`);
             if (!cli.shouldTrimOutput(args.options.output)) {
                 await logger.log(response);
             }

package/dist/m365/flow/commands/owner/owner-remove.js

@@ -10,9 +10,9 @@ import { aadGroup } from '../../../../utils/aadGroup.js';
 import { aadUser } from '../../../../utils/aadUser.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowOwnerRemoveCommand extends AzmgmtCommand {
+class FlowOwnerRemoveCommand extends PowerAutomateCommand {
     get name() {
         return commands.OWNER_REMOVE;
     }
@@ -47,7 +47,7 @@ class FlowOwnerRemoveCommand extends AzmgmtCommand {
                     idToRemove = await aadGroup.getGroupIdByDisplayName(args.options.groupName);
                 }
                 const requestOptions = {
-                    url: `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
+                    url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/modifyPermissions?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },

package/dist/m365/flow/commands/run/run-cancel.js

@@ -8,9 +8,9 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowRunCancelCommand extends AzmgmtCommand {
+class FlowRunCancelCommand extends PowerAutomateCommand {
     get name() {
         return commands.RUN_CANCEL;
     }
@@ -30,7 +30,7 @@ class FlowRunCancelCommand extends AzmgmtCommand {
         }
         const cancelFlow = async () => {
             const requestOptions = {
-                url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}/cancel?api-version=2016-11-01`,
+                url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}/cancel?api-version=2016-11-01`,
                 headers: {
                     accept: 'application/json'
                 },

package/dist/m365/flow/commands/run/run-get.js

@@ -7,9 +7,9 @@ var _FlowRunGetCommand_instances, _FlowRunGetCommand_initOptions, _FlowRunGetCom
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowRunGetCommand extends AzmgmtCommand {
+class FlowRunGetCommand extends PowerAutomateCommand {
     get name() {
         return commands.RUN_GET;
     }
@@ -31,7 +31,7 @@ class FlowRunGetCommand extends AzmgmtCommand {
             await logger.logToStderr(`Retrieving information about run ${args.options.name} of Microsoft Flow ${args.options.flowName}...`);
         }
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

package/dist/m365/flow/commands/run/run-list.js

@@ -5,10 +5,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _FlowRunListCommand_instances, _FlowRunListCommand_initTelemetry, _FlowRunListCommand_initOptions, _FlowRunListCommand_initValidators;
 import { formatting } from '../../../../utils/formatting.js';
+import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
-import { AzmgmtItemsListCommand } from '../../../base/AzmgmtItemsListCommand.js';
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
 import commands from '../../commands.js';
-class FlowRunListCommand extends AzmgmtItemsListCommand {
+class FlowRunListCommand extends PowerAutomateCommand {
     get name() {
         return commands.RUN_LIST;
     }
@@ -30,20 +31,20 @@ class FlowRunListCommand extends AzmgmtItemsListCommand {
         if (this.verbose) {
             await logger.logToStderr(`Retrieving list of runs for Microsoft Flow ${args.options.flowName}...`);
         }
-        let url = `${this.resource}providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
+        let url = `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/runs?api-version=2016-11-01`;
         const filters = this.getFilters(args.options);
         if (filters.length > 0) {
             url += `&$filter=${filters.join(' and ')}`;
         }
         try {
-            await this.getAllItems(url, logger, true);
-            if (args.options.output !== 'json' && this.items.length > 0) {
-                this.items.forEach(i => {
+            const items = await odata.getAllItems(url);
+            if (args.options.output !== 'json' && items.length > 0) {
+                items.forEach(i => {
                     i.startTime = i.properties.startTime;
                     i.status = i.properties.status;
                 });
             }
-            await logger.log(this.items);
+            await logger.log(items);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/flow/commands/run/run-resubmit.js

@@ -9,9 +9,9 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import AzmgmtCommand from '../../../base/AzmgmtCommand.js';
 import commands from '../../commands.js';
-class FlowRunResubmitCommand extends AzmgmtCommand {
+import PowerAutomateCommand from '../../../base/PowerAutomateCommand.js';
+class FlowRunResubmitCommand extends PowerAutomateCommand {
     get name() {
         return commands.RUN_RESUBMIT;
     }
@@ -36,7 +36,7 @@ class FlowRunResubmitCommand extends AzmgmtCommand {
                     await logger.logToStderr(chalk.yellow(`Retrieved trigger: ${triggerName}`));
                 }
                 const requestOptions = {
-                    url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/triggers/${formatting.encodeQueryParameter(triggerName)}/histories/${formatting.encodeQueryParameter(args.options.name)}/resubmit?api-version=2016-11-01`,
+                    url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.flowName)}/triggers/${formatting.encodeQueryParameter(triggerName)}/histories/${formatting.encodeQueryParameter(args.options.name)}/resubmit?api-version=2016-11-01`,
                     headers: {
                         accept: 'application/json'
                     },
@@ -60,7 +60,7 @@ class FlowRunResubmitCommand extends AzmgmtCommand {
     }
     async getTriggerName(environment, flow) {
         const requestOptions = {
-            url: `${this.resource}providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(environment)}/flows/${formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/environments/${formatting.encodeQueryParameter(environment)}/flows/${formatting.encodeQueryParameter(flow)}/triggers?api-version=2016-11-01`,
             headers: {
                 accept: 'application/json'
             },

package/dist/m365/teams/commands/app/app-install.js

@@ -29,6 +29,7 @@ class TeamsAppInstallCommand extends GraphCommand {
     async commandAction(logger, args) {
         try {
             await this.validateUser(args, logger);
+            const appId = await this.getAppId(args.options);
             let url = `${this.resource}/v1.0`;
             if (args.options.teamId) {
                 url += `/teams/${formatting.encodeQueryParameter(args.options.teamId)}/installedApps`;
@@ -44,7 +45,7 @@ class TeamsAppInstallCommand extends GraphCommand {
                 },
                 responseType: 'json',
                 data: {
-                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${args.options.id}`
+                    'teamsApp@odata.bind': `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`
                 }
             };
             await request.post(requestOptions);
@@ -82,20 +83,45 @@ class TeamsAppInstallCommand extends GraphCommand {
             throw `User with ID ${args.options.userId} not found. Original error: ${err.error.message}`;
         }
     }
+    async getAppId(options) {
+        if (options.id) {
+            return options.id;
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting.encodeQueryParameter(options.name)}'`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        const app = response.value[0];
+        if (!app) {
+            throw `The specified Teams app does not exist`;
+        }
+        if (response.value.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', response.value);
+            const result = await cli.handleMultipleResultsFound(`Multiple Teams apps with name ${options.name} found.`, resultAsKeyValuePair);
+            return result.id;
+        }
+        return app.id;
+    }
 }
 _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initTelemetry = function _TeamsAppInstallCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
             teamId: typeof args.options.teamId !== 'undefined',
             userId: typeof args.options.userId !== 'undefined',
             userName: typeof args.options.userName !== 'undefined'
         });
     });
 }, _TeamsAppInstallCommand_initOptions = function _TeamsAppInstallCommand_initOptions() {
-    this.options.unshift({ option: '--id <id>' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
+    this.options.unshift({ option: '-i, --id [id]' }, { option: '-n, --name [name]' }, { option: '--teamId [teamId]' }, { option: '--userId [userId]' }, { option: '--userName [userName]' });
 }, _TeamsAppInstallCommand_initValidators = function _TeamsAppInstallCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         if (args.options.teamId &&
@@ -110,6 +136,7 @@ _TeamsAppInstallCommand_instances = new WeakSet(), _TeamsAppInstallCommand_initT
     });
 }, _TeamsAppInstallCommand_initOptionSets = function _TeamsAppInstallCommand_initOptionSets() {
     this.optionSets.push({ options: ['teamId', 'userId', 'userName'] });
+    this.optionSets.push({ options: ['id', 'name'] });
 };
 export default new TeamsAppInstallCommand();
 //# sourceMappingURL=app-install.js.map

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/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,6 +9,7 @@ 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.`;

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/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