@pnp/cli-microsoft365 7.4.0-beta.4388d3c → 7.4.0-beta.5820537

package/dist/Auth.js

@@ -262,7 +262,8 @@ export class Auth {
                     },
                     piiLoggingEnabled: false,
                     logLevel: debug ? LogLevel.Verbose : LogLevel.Error
-                }
+                },
+                proxyUrl: process.env.HTTP_PROXY || process.env.HTTPS_PROXY
             }
         };
     }

package/dist/appInsights.js

@@ -24,6 +24,8 @@ appInsightsClient.commonProperties = {
     env: env,
     ci: Boolean(process.env.CI).toString()
 };
+appInsightsClient.config.proxyHttpUrl = process.env.HTTP_PROXY ?? '';
+appInsightsClient.config.proxyHttpsUrl = process.env.HTTPS_PROXY ?? '';
 appInsightsClient.context.tags['ai.cloud.roleInstance'] = crypto.createHash('sha256').update(appInsightsClient.context.tags['ai.cloud.roleInstance']).digest('hex');
 delete appInsightsClient.context.tags['ai.cloud.role'];
 delete appInsightsClient.context.tags['ai.cloud.roleName'];

package/dist/cli/cli.js

@@ -134,6 +134,7 @@ async function execute(rawArgs) {
     if (validationResult !== true) {
         return cli.closeWithError(validationResult, cli.optionsFromArgs, true);
     }
+    cli.optionsFromArgs = removeShortOptions(cli.optionsFromArgs);
     const end = process.hrtime.bigint();
     timings.core.push(Number(end - start));
     try {

package/dist/m365/entra/aadCommands.js

@@ -7,6 +7,7 @@ export default {
     ADMINISTRATIVEUNIT_MEMBER_ADD: `${prefix} administrativeunit member add`,
     ADMINISTRATIVEUNIT_MEMBER_GET: `${prefix} administrativeunit member get`,
     ADMINISTRATIVEUNIT_MEMBER_LIST: `${prefix} administrativeunit member list`,
+    ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD: `${prefix} administrativeunit roleassignment add`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,

package/dist/m365/entra/commands/administrativeunit/administrativeunit-roleassignment-add.js

@@ -0,0 +1,102 @@
+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 _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions, _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets;
+import { aadAdministrativeUnit } from '../../../../utils/aadAdministrativeUnit.js';
+import { aadUser } from '../../../../utils/aadUser.js';
+import { roleAssignment } from '../../../../utils/roleAssignment.js';
+import { roleDefinition } from '../../../../utils/roleDefinition.js';
+import { validation } from '../../../../utils/validation.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class EntraAdministrativeUnitRoleAssignmentAddCommand extends GraphCommand {
+    get name() {
+        return commands.ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD;
+    }
+    get description() {
+        return 'Assigns a Microsoft Entra role with administrative unit scope to a user';
+    }
+    constructor() {
+        super();
+        _EntraAdministrativeUnitRoleAssignmentAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraAdministrativeUnitRoleAssignmentAddCommand_instances, "m", _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets).call(this);
+    }
+    async commandAction(logger, args) {
+        try {
+            let { administrativeUnitId, roleDefinitionId, userId } = args.options;
+            if (args.options.administrativeUnitName) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving administrative unit by its name '${args.options.administrativeUnitName}'`);
+                }
+                administrativeUnitId = (await aadAdministrativeUnit.getAdministrativeUnitByDisplayName(args.options.administrativeUnitName)).id;
+            }
+            if (args.options.roleDefinitionName) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving role definition by its name '${args.options.roleDefinitionName}'`);
+                }
+                roleDefinitionId = (await roleDefinition.getRoleDefinitionByDisplayName(args.options.roleDefinitionName)).id;
+            }
+            if (args.options.userName) {
+                if (this.verbose) {
+                    await logger.logToStderr(`Retrieving user by UPN '${args.options.userName}'`);
+                }
+                userId = await aadUser.getUserIdByUpn(args.options.userName);
+            }
+            const unifiedRoleAssignment = await roleAssignment.createRoleAssignmentWithAdministrativeUnitScope(roleDefinitionId, userId, administrativeUnitId);
+            await logger.log(unifiedRoleAssignment);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_EntraAdministrativeUnitRoleAssignmentAddCommand_instances = new WeakSet(), _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            administrativeUnitId: typeof args.options.administrativeUnitId !== 'undefined',
+            administrativeUnitName: typeof args.options.administrativeUnitName !== 'undefined',
+            roleDefinitionId: typeof args.options.roleDefinitionId !== 'undefined',
+            roleDefinitionName: typeof args.options.roleDefinitionName !== 'undefined',
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined'
+        });
+    });
+}, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --administrativeUnitId [administrativeUnitId]'
+    }, {
+        option: '-n, --administrativeUnitName [administrativeUnitName]'
+    }, {
+        option: '--roleDefinitionId [roleDefinitionId]'
+    }, {
+        option: '--roleDefinitionName [roleDefinitionName]'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    });
+}, _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (args.options.administrativeUnitId && !validation.isValidGuid(args.options.administrativeUnitId)) {
+            return `${args.options.administrativeUnitId} is not a valid GUID`;
+        }
+        if (args.options.roleDefinitionId && !validation.isValidGuid(args.options.roleDefinitionId)) {
+            return `${args.options.roleDefinitionId} is not a valid GUID`;
+        }
+        if (args.options.userId && !validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid GUID`;
+        }
+        return true;
+    });
+}, _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets = function _EntraAdministrativeUnitRoleAssignmentAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['administrativeUnitId', 'administrativeUnitName'] });
+    this.optionSets.push({ options: ['roleDefinitionId', 'roleDefinitionName'] });
+    this.optionSets.push({ options: ['userId', 'userName'] });
+};
+export default new EntraAdministrativeUnitRoleAssignmentAddCommand();
+//# sourceMappingURL=administrativeunit-roleassignment-add.js.map

package/dist/m365/entra/commands.js

@@ -7,6 +7,7 @@ export default {
     ADMINISTRATIVEUNIT_MEMBER_ADD: `${prefix} administrativeunit member add`,
     ADMINISTRATIVEUNIT_MEMBER_GET: `${prefix} administrativeunit member get`,
     ADMINISTRATIVEUNIT_MEMBER_LIST: `${prefix} administrativeunit member list`,
+    ADMINISTRATIVEUNIT_ROLEASSIGNMENT_ADD: `${prefix} administrativeunit roleassignment add`,
     APP_ADD: `${prefix} app add`,
     APP_GET: `${prefix} app get`,
     APP_LIST: `${prefix} app list`,

package/dist/m365/external/commands/connection/connection-urltoitemresolver-add.js

@@ -0,0 +1,69 @@
+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 _ExternalConnectionUrlToItemResolverAddCommand_instances, _ExternalConnectionUrlToItemResolverAddCommand_initOptions;
+import request from '../../../../request.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class ExternalConnectionUrlToItemResolverAddCommand extends GraphCommand {
+    get name() {
+        return commands.CONNECTION_URLTOITEMRESOLVER_ADD;
+    }
+    get description() {
+        return 'Adds a URL to item resolver to an external connection';
+    }
+    constructor() {
+        super();
+        _ExternalConnectionUrlToItemResolverAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _ExternalConnectionUrlToItemResolverAddCommand_instances, "m", _ExternalConnectionUrlToItemResolverAddCommand_initOptions).call(this);
+    }
+    async commandAction(logger, args) {
+        const baseUrls = args.options.baseUrls.split(',').map(b => b.trim());
+        const itemIdResolver = {
+            itemId: args.options.itemId,
+            priority: args.options.priority,
+            urlMatchInfo: {
+                baseUrls: baseUrls,
+                urlPattern: args.options.urlPattern
+            }
+        };
+        // not a part of the type definition, but required by the API
+        itemIdResolver['@odata.type'] = '#microsoft.graph.externalConnectors.itemIdResolver';
+        const requestOptions = {
+            url: `${this.resource}/v1.0/external/connections/${args.options.externalConnectionId}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json'
+            },
+            responseType: 'json',
+            data: {
+                activitySettings: {
+                    urlToItemResolvers: [itemIdResolver]
+                }
+            }
+        };
+        try {
+            await request.patch(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_ExternalConnectionUrlToItemResolverAddCommand_instances = new WeakSet(), _ExternalConnectionUrlToItemResolverAddCommand_initOptions = function _ExternalConnectionUrlToItemResolverAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-c, --externalConnectionId <externalConnectionId>'
+    }, {
+        option: '--baseUrls <baseUrls>'
+    }, {
+        option: '--urlPattern <urlPattern>'
+    }, {
+        option: '-i, --itemId <itemId>'
+    }, {
+        option: '-p, --priority <priority>'
+    });
+};
+export default new ExternalConnectionUrlToItemResolverAddCommand();
+//# sourceMappingURL=connection-urltoitemresolver-add.js.map

package/dist/m365/external/commands.js

@@ -7,6 +7,7 @@ export default {
     CONNECTION_LIST: `${prefix} connection list`,
     CONNECTION_REMOVE: `${prefix} connection remove`,
     CONNECTION_SCHEMA_ADD: `${prefix} connection schema add`,
+    CONNECTION_URLTOITEMRESOLVER_ADD: `${prefix} connection urltoitemresolver add`,
     EXTERNALCONNECTION_ADD: `${searchPrefix} externalconnection add`,
     EXTERNALCONNECTION_GET: `${searchPrefix} externalconnection get`,
     EXTERNALCONNECTION_LIST: `${searchPrefix} externalconnection list`,

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

@@ -4,6 +4,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _TeamsUserAppAddCommand_instances, _TeamsUserAppAddCommand_initTelemetry, _TeamsUserAppAddCommand_initOptions, _TeamsUserAppAddCommand_initValidators, _TeamsUserAppAddCommand_initOptionSets;
+import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
@@ -25,8 +26,12 @@ class TeamsUserAppAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _TeamsUserAppAddCommand_instances, "m", _TeamsUserAppAddCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
+        const appId = await this.getAppId(args);
         const userId = (args.options.userId ?? args.options.userName);
         const endpoint = `${this.resource}/v1.0`;
+        if (this.verbose) {
+            await logger.logToStderr(`Removing app with ID ${appId} for user ${args.options.userId}`);
+        }
         const requestOptions = {
             url: `${endpoint}/users/${formatting.encodeQueryParameter(userId)}/teamwork/installedApps`,
             headers: {
@@ -35,7 +40,7 @@ class TeamsUserAppAddCommand extends GraphCommand {
             },
             responseType: 'json',
             data: {
-                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${args.options.id}`
+                'teamsApp@odata.bind': `${endpoint}/appCatalogs/teamsApps/${appId}`
             }
         };
         try {
@@ -45,17 +50,43 @@ class TeamsUserAppAddCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async getAppId(args) {
+        if (args.options.id) {
+            return args.options.id;
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting.encodeQueryParameter(args.options.name)}'`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const response = await request.get(requestOptions);
+        if (response.value.length === 1) {
+            return response.value[0].id;
+        }
+        if (response.value.length === 0) {
+            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));
+        return result.id;
+    }
 }
 _TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initTelemetry = function _TeamsUserAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
             userId: typeof args.options.userId !== 'undefined',
             userName: typeof args.options.userName !== 'undefined'
         });
     });
 }, _TeamsUserAppAddCommand_initOptions = function _TeamsUserAppAddCommand_initOptions() {
     this.options.unshift({
-        option: '--id <id>'
+        option: '--id [id]'
+    }, {
+        option: '--name [name]'
     }, {
         option: '--userId [userId]'
     }, {
@@ -63,7 +94,7 @@ _TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initT
     });
 }, _TeamsUserAppAddCommand_initValidators = function _TeamsUserAppAddCommand_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.userId && !validation.isValidGuid(args.options.userId)) {
@@ -75,6 +106,7 @@ _TeamsUserAppAddCommand_instances = new WeakSet(), _TeamsUserAppAddCommand_initT
         return true;
     });
 }, _TeamsUserAppAddCommand_initOptionSets = function _TeamsUserAppAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'name'] });
     this.optionSets.push({ options: ['userId', 'userName'] });
 };
 export default new TeamsUserAppAddCommand();

package/dist/request.js

@@ -154,6 +154,10 @@ class Request {
                         options.headers.authorization = `Bearer ${accessToken}`;
                     }
                 }
+                const proxyUrl = process.env.HTTP_PROXY || process.env.HTTPS_PROXY;
+                if (proxyUrl) {
+                    options.proxy = this.createProxyConfigFromUrl(proxyUrl);
+                }
                 return this.req(options);
             })
                 .then((res) => {
@@ -199,6 +203,18 @@ class Request {
         const cloudUrl = Auth.getEndpointForResource(hostname, cloudType);
         options.url = options.url.replace(hostname, cloudUrl);
     }
+    createProxyConfigFromUrl(url) {
+        const parsedUrl = new URL(url);
+        const port = parsedUrl.port || (url.toLowerCase().startsWith('https') ? 443 : 80);
+        let authObject = null;
+        if (parsedUrl.username && parsedUrl.password) {
+            authObject = {
+                username: parsedUrl.username,
+                password: parsedUrl.password
+            };
+        }
+        return { host: parsedUrl.hostname, port: Number(port), protocol: 'http', ...(authObject && { auth: authObject }) };
+    }
 }
 export default new Request();
 //# sourceMappingURL=request.js.map

package/dist/utils/md.js

@@ -13,8 +13,8 @@ function convertHeadings(md) {
     });
 }
 function convertAdmonitions(md) {
-    const regex = new RegExp(/^:::(\w+)([\s\S]*?):::$/, 'gm');
-    return md.replace(regex, (_, label, content) => label.toLocaleUpperCase() + EOL + EOL + content.trim());
+    const regex = new RegExp(/^:::(\w+)(?:\[([^\]]+)\])?([\s\S]*?):::$/, 'gm');
+    return md.replace(regex, (_, label, title, content) => label.toLocaleUpperCase() + (title ? EOL + EOL + title : '') + EOL + EOL + content.trim());
 }
 function includeContent(md, rootFolder) {
     const mdxImports = [

package/dist/utils/roleAssignment.js

@@ -0,0 +1,42 @@
+import request from '../request.js';
+const getRequestOptions = (roleDefinitionId, principalId, directoryScopeId) => ({
+    url: `https://graph.microsoft.com/v1.0/roleManagement/directory/roleAssignments`,
+    headers: {
+        accept: 'application/json;odata.metadata=none'
+    },
+    responseType: 'json',
+    data: {
+        roleDefinitionId: roleDefinitionId,
+        principalId: principalId,
+        directoryScopeId: directoryScopeId
+    }
+});
+/**
+ * Utils for RBAC.
+ * Supported RBAC providers:
+ *  - Directory (Entra ID)
+ */
+export const roleAssignment = {
+    /**
+     * Assigns a specific role to a principal with scope to an administrative unit
+     * @param roleDefinitionId Role which lists the actions that can be performed
+     * @param principalId Object that represents a user, group, service principal, or managed identity that is requesting access to resources
+     * @param administrativeUnitId Administrative unit which represents a current scope for a role assignment
+     * @returns Returns unified role assignment object that represents a role definition assigned to a principal with scope to an administrative unit
+     */
+    async createRoleAssignmentWithAdministrativeUnitScope(roleDefinitionId, principalId, administrativeUnitId) {
+        const requestOptions = getRequestOptions(roleDefinitionId, principalId, `/administrativeUnits/${administrativeUnitId}`);
+        return await request.post(requestOptions);
+    },
+    /**
+     * Assigns a specific role to a principal with scope to the whole tenant
+     * @param roleDefinitionId Role which lists the actions that can be performed
+     * @param principalId Object that represents a user, group, service principal, or managed identity that is requesting access to resources
+     * @returns Returns unified role assignment object that represents a role definition assigned to a principal with scope to the whole tenant
+     */
+    async createRoleAssignmentWithTenantScope(roleDefinitionId, principalId) {
+        const requestOptions = getRequestOptions(roleDefinitionId, principalId, '/');
+        return await request.post(requestOptions);
+    }
+};
+//# sourceMappingURL=roleAssignment.js.map

package/dist/utils/roleDefinition.js

@@ -0,0 +1,24 @@
+import { cli } from '../cli/cli.js';
+import { formatting } from './formatting.js';
+import { odata } from './odata.js';
+export const roleDefinition = {
+    /**
+     * Get a directory (Microsoft Entra) role
+     * @param displayName Role definition display name.
+     * @returns The role definition.
+     * @throws Error when role definition was not found.
+     */
+    async getRoleDefinitionByDisplayName(displayName) {
+        const roleDefinitions = await odata.getAllItems(`https://graph.microsoft.com/v1.0/roleManagement/directory/roleDefinitions?$filter=displayName eq '${formatting.encodeQueryParameter(displayName)}'`);
+        if (roleDefinitions.length === 0) {
+            throw `The specified role definition '${displayName}' does not exist.`;
+        }
+        if (roleDefinitions.length > 1) {
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', roleDefinitions);
+            const selectedRoleDefinition = await cli.handleMultipleResultsFound(`Multiple role definitions with name '${displayName}' found.`, resultAsKeyValuePair);
+            return selectedRoleDefinition;
+        }
+        return roleDefinitions[0];
+    }
+};
+//# sourceMappingURL=roleDefinition.js.map

package/docs/docs/cmd/entra/administrativeunit/administrativeunit-roleassignment-add.mdx

@@ -0,0 +1,116 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# entra administrativeunit roleassignment add
+
+Assigns a Microsoft Entra role with administrative unit scope to a user
+
+## Usage
+
+```sh
+m365 entra administrativeunit roleassignment add [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --administrativeUnitId [administrativeUnitId]`
+: The id of the administrative unit. Specify either `administrativeUnitId` or `administrativeUnitName`.
+
+`-n, --administrativeUnitName [administrativeUnitName]`
+: The name of the administrative unit. Specify either `administrativeUnitId` or `administrativeUnitName`.
+
+`--roleDefinitionId [roleDefinitionId]`
+: The id of the role definition that the member is in. Specify either `roleDefinitionId` or `roleDefinitionName`.
+
+`--roleDefinitionName [roleDefinitionName]`
+: The name of the role definition that the member is in. Specify either `roleDefinitionId` or `roleDefinitionName`.
+
+`--userId [userId]`
+: The id of the user that is a member of the scoped role. Specify either `userId` or `userName`.
+
+`--userName [userName]`
+: The name of the user that is a member of the scoped role. Specify either `userId` or `userName`.
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command you must be either **Global Administrator** or **Privileged Role Administrator**.
+
+:::
+
+## Examples
+
+Assign a role definition specified by id to a user specified by id for an administrative unit specified by id
+
+```sh
+m365 entra administrativeunit roleassignment add --administrativeUnitId 81bb36e4-f4c6-4984-8e56-d4f8feae9e09 --roleDefinitionId 4d6ac14f-3453-41d0-bef9-a3e0c569773a --userId 5f91f951-7305-4a27-9b63-7b00906de09f
+```
+
+Assign a role definition specified by name to a user specified by name for an administrative unit specified by name
+
+```sh
+m365 entra administrativeunit roleassignment add --administrativeUnitName 'Marketing Division' --roleDefinitionName 'License Administrator' --userName 'john.doe@contoso.com'
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  {
+    "id": "5wuT_mJe20eRr5jDpJo4sVH5kV8FcydKm2N7AJBt4J_kNruBxvSESY5W1Pj-rp4J-2",
+    "principalId": "5f91f951-7305-4a27-9b63-7b00906de09f",
+    "directoryScopeId": "/administrativeUnits/81bb36e4-f4c6-4984-8e56-d4f8feae9e09",
+    "roleDefinitionId": "4d6ac14f-3453-41d0-bef9-a3e0c569773a"
+  }
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  directoryScopeId: /administrativeUnits/81bb36e4-f4c6-4984-8e56-d4f8feae9e09
+  id              : 4yeYchSc90m7G5YI8Va7uFH5kV8FcydKm2N7AJBt4J_kNruBxvSESY5W1Pj-rp4J-2
+  principalId     : 5f91f951-7305-4a27-9b63-7b00906de09f
+  roleDefinitionId: 4d6ac14f-3453-41d0-bef9-a3e0c569773a
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  id,principalId,directoryScopeId,roleDefinitionId
+  UB-K8uf2cUWBi2oS8q9rbFH5kV8FcydKm2N7AJBt4J_kNruBxvSESY5W1Pj-rp4J-2,5f91f951-7305-4a27-9b63-7b00906de09f,/administrativeUnits/81bb36e4-f4c6-4984-8e56-d4f8feae9e09,4d6ac14f-3453-41d0-bef9-a3e0c569773a
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  # entra administrativeunit roleassignment add --administrativeUnitId "81bb36e4-f4c6-4984-8e56-d4f8feae9e09" --roleDefinitionId "4d6ac14f-3453-41d0-bef9-a3e0c569773a" --userId "5f91f951-7305-4a27-9b63-7b00906de09f"
+
+  Date: 11/16/2023
+
+  ## T8FqTVM00EG--aPgxWl3OlH5kV8FcydKm2N7AJBt4J_kNruBxvSESY5W1Pj-rp4J-2
+
+  Property | Value
+  ---------|-------
+  id | T8FqTVM00EG--aPgxWl3OlH5kV8FcydKm2N7AJBt4J\_kNruBxvSESY5W1Pj-rp4J-2
+  principalId | 5f91f951-7305-4a27-9b63-7b00906de09f
+  directoryScopeId | /administrativeUnits/81bb36e4-f4c6-4984-8e56-d4f8feae9e09
+  roleDefinitionId | 4d6ac14f-3453-41d0-bef9-a3e0c569773a
+  ```
+
+  </TabItem>
+</Tabs>
+
+## More information
+
+- [Roles with administrative unit scope](https://learn.microsoft.com/entra/identity/role-based-access-control/admin-units-assign-roles#roles-that-can-be-assigned-with-administrative-unit-scope)

package/docs/docs/cmd/external/connection/connection-urltoitemresolver-add.mdx

@@ -0,0 +1,47 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# external connection urltoitemresolver add
+
+Adds a URL to item resolver to an external connection
+
+## Usage
+
+```sh
+m365 external connection urltoitemresolver add [options]
+```
+
+## Options
+
+```md definition-list
+`-c, --externalConnectionId <externalConnectionId>`
+: The ID of the external connection to which to add the resolver
+
+`--baseUrls <baseUrls>`
+: Comma-separated list of base URLs
+
+`--urlPattern <urlPattern>`
+: Regex pattern to match URLs
+
+`-i, --itemId <itemId>`
+: Pattern that matches captured matches from the URL with the external item ID
+
+`-p, --priority <priority>`
+: Integer that defines the resolution order
+```
+<Global />
+
+## Examples
+
+Adds a URL to item resolver to an existing connection
+
+```sh
+m365 external connection urltoitemresolver add --externalConnectionId "samplesolutiongallery" --baseUrls "https://adoption.microsoft.com" --urlPattern "/sample-solution-gallery/sample/(?<sampleId>[^/]+)" --itemId "{sampleId}" --priority 1
+```
+
+## Response
+
+The command won't return a response on success.
+
+## More information
+
+- Microsoft Graph external connection activitySettings: [https://learn.microsoft.com/graph/api/resources/externalconnectors-activitysettings?view=graph-rest-1.0](https://learn.microsoft.com/graph/api/resources/externalconnectors-activitysettings?view=graph-rest-1.0)

package/docs/docs/cmd/teams/user/user-app-add.mdx

@@ -13,8 +13,11 @@ m365 teams user app add [options]
 ## Options
 
 ```md definition-list
-`--id <id>`
-: The ID of the app to install.
+`--id [id]`
+: The ID of the app to install. Specify either `id` or `name` but not both.
+
+`--name [name]`
+: Name of the app to install. Specify either `id` or `name` but not both.
 
 `--userId [userId]`
 : The ID of the user to install the app for. Specify either `userId` or `userName` but not both.
@@ -31,16 +34,16 @@ The `id` has to be the ID of the app from the Microsoft Teams App Catalog. Do no
 
 ## Examples
 
-Install an app from the catalog for the specified user by id.
+Install an app by id from the catalog for the specified user by id.
 
 ```sh
 m365 teams user app add --id 4440558e-8c73-4597-abc7-3644a64c4bce --userId 2609af39-7775-4f94-a3dc-0dd67657e900
 ```
 
-Install an app from the catalog for the specified user by name.
+Install an app by name from the catalog for the specified user by name.
 
 ```sh
-m365 teams user app add --id 4440558e-8c73-4597-abc7-3644a64c4bce --userName admin@contoso.com
+m365 teams user app add --name HelloWorld --userName admin@contoso.com
 ```
 
 ## Response