@pnp/cli-microsoft365 10.6.0-beta.36bb898 → 10.6.0-beta.a7465c9

package/dist/m365/spo/commands/web/web-roleassignment-remove.js

@@ -4,15 +4,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoWebRoleAssignmentRemoveCommand_instances, _SpoWebRoleAssignmentRemoveCommand_initTelemetry, _SpoWebRoleAssignmentRemoveCommand_initOptions, _SpoWebRoleAssignmentRemoveCommand_initValidators, _SpoWebRoleAssignmentRemoveCommand_initOptionSets;
-import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoGroupGetCommand from '../group/group-get.js';
-import spoUserGetCommand from '../user/user-get.js';
 import { entraGroup } from '../../../../utils/entraGroup.js';
 import { spo } from '../../../../utils/spo.js';
+import { cli } from '../../../../cli/cli.js';
 class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
     get name() {
         return commands.WEB_ROLEASSIGNMENT_REMOVE;
@@ -45,10 +43,12 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
         }
         try {
             if (options.upn) {
-                options.principalId = await this.getUserPrincipalId(options);
+                const principalId = await this.getUserPrincipalId(options, logger);
+                await this.removeRoleAssignmentWithOptions(options.webUrl, principalId, logger);
             }
             else if (options.groupName) {
-                options.principalId = await this.getGroupPrincipalId(options);
+                const principalId = await this.getGroupPrincipalId(options, logger);
+                await this.removeRoleAssignmentWithOptions(options.webUrl, principalId, logger);
             }
             else if (options.entraGroupId || options.entraGroupName) {
                 if (this.verbose) {
@@ -58,17 +58,19 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
                     ? await entraGroup.getGroupById(options.entraGroupId)
                     : await entraGroup.getGroupByDisplayName(options.entraGroupName);
                 const siteUser = await spo.ensureEntraGroup(options.webUrl, group);
-                options.principalId = siteUser.Id;
+                await this.removeRoleAssignmentWithOptions(options.webUrl, siteUser.Id, logger);
             }
-            await this.removeRoleAssignmentWithOptions(logger, options);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async removeRoleAssignmentWithOptions(logger, options) {
+    async removeRoleAssignmentWithOptions(webUrl, principalId, logger) {
+        if (this.verbose) {
+            await logger.logToStderr('Removing role assignment...');
+        }
         const requestOptions = {
-            url: `${options.webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
+            url: `${webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${principalId}')`,
             method: 'POST',
             headers: {
                 'accept': 'application/json;odata=nometadata',
@@ -78,30 +80,13 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
         };
         await request.post(requestOptions);
     }
-    async getGroupPrincipalId(options) {
-        const groupGetCommandOptions = {
-            webUrl: options.webUrl,
-            name: options.groupName,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
-        const getGroupOutput = JSON.parse(output.stdout);
-        return getGroupOutput.Id;
+    async getGroupPrincipalId(options, logger) {
+        const group = await spo.getGroupByName(options.webUrl, options.groupName, logger, this.verbose);
+        return group.Id;
     }
-    async getUserPrincipalId(options) {
-        const userGetCommandOptions = {
-            webUrl: options.webUrl,
-            email: options.upn,
-            id: undefined,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        const output = await cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
-        const getUserOutput = JSON.parse(output.stdout);
-        return getUserOutput.Id;
+    async getUserPrincipalId(options, logger) {
+        const user = await spo.getUserByEmail(options.webUrl, options.upn, logger, this.verbose);
+        return user.Id;
     }
 }
 _SpoWebRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoWebRoleAssignmentRemoveCommand_initTelemetry = function _SpoWebRoleAssignmentRemoveCommand_initTelemetry() {

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

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _TenantPeopleProfileCardPropertyAddCommand_instances, _TenantPeopleProfileCardPropertyAddCommand_initTelemetry, _TenantPeopleProfileCardPropertyAddCommand_initOptions, _TenantPeopleProfileCardPropertyAddCommand_initValidators;
 import request from '../../../../request.js';
+import { optionsUtils } from '../../../../utils/optionsUtils.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import { profileCardPropertyNames } from './profileCardProperties.js';
@@ -71,7 +72,7 @@ class TenantPeopleProfileCardPropertyAddCommand extends GraphCommand {
         ];
     }
     getLocalizations(options) {
-        const unknownOptions = Object.keys(this.getUnknownOptions(options));
+        const unknownOptions = Object.keys(optionsUtils.getUnknownOptions(options, this.options));
         if (unknownOptions.length === 0) {
             return [];
         }
@@ -88,7 +89,7 @@ class TenantPeopleProfileCardPropertyAddCommand extends GraphCommand {
 _TenantPeopleProfileCardPropertyAddCommand_instances = new WeakSet(), _TenantPeopleProfileCardPropertyAddCommand_initTelemetry = function _TenantPeopleProfileCardPropertyAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         // Add unknown options to telemetry
-        const unknownOptions = Object.keys(this.getUnknownOptions(args.options));
+        const unknownOptions = Object.keys(optionsUtils.getUnknownOptions(args.options, this.options));
         const unknownOptionsObj = unknownOptions.reduce((obj, key) => ({ ...obj, [key]: true }), {});
         Object.assign(this.telemetryProperties, {
             displayName: typeof args.options.displayName !== 'undefined',
@@ -114,7 +115,7 @@ _TenantPeopleProfileCardPropertyAddCommand_instances = new WeakSet(), _TenantPeo
         if (!propertyName.startsWith('customattribute') && args.options.displayName !== undefined) {
             return `The option 'displayName' can only be used when adding customAttributes as profile card properties`;
         }
-        const unknownOptions = Object.keys(this.getUnknownOptions(args.options));
+        const unknownOptions = Object.keys(optionsUtils.getUnknownOptions(args.options, this.options));
         if (!propertyName.startsWith('customattribute') && unknownOptions.length > 0) {
             return `Unknown options like ${unknownOptions.join(', ')} are only supported with customAttributes`;
         }

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

@@ -8,6 +8,7 @@ import GraphCommand from '../../../base/GraphCommand.js';
 import request from '../../../../request.js';
 import { profileCardPropertyNames as allProfileCardPropertyNames } from './profileCardProperties.js';
 import commands from '../../commands.js';
+import { optionsUtils } from '../../../../utils/optionsUtils.js';
 class TenantPeopleProfileCardPropertySetCommand extends GraphCommand {
     get name() {
         return commands.PEOPLE_PROFILECARDPROPERTY_SET;
@@ -73,7 +74,7 @@ class TenantPeopleProfileCardPropertySetCommand extends GraphCommand {
      * @example Transform "--displayName-en-US 'Cost center'" to { languageTag: 'en-US', displayName: 'Cost center' }
      */
     getLocalizations(options) {
-        const unknownOptions = this.getUnknownOptions(options);
+        const unknownOptions = optionsUtils.getUnknownOptions(options, this.options);
         const result = Object.keys(unknownOptions).map(o => ({
             languageTag: o.substring(o.indexOf('-') + 1),
             displayName: unknownOptions[o]
@@ -84,7 +85,7 @@ class TenantPeopleProfileCardPropertySetCommand extends GraphCommand {
 _TenantPeopleProfileCardPropertySetCommand_instances = new WeakSet(), _TenantPeopleProfileCardPropertySetCommand_initTelemetry = function _TenantPeopleProfileCardPropertySetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         // Add unknown options to telemetry
-        const unknownOptions = Object.keys(this.getUnknownOptions(args.options));
+        const unknownOptions = Object.keys(optionsUtils.getUnknownOptions(args.options, this.options));
         const unknownOptionsObj = unknownOptions.reduce((obj, key) => ({ ...obj, [key]: true }), {});
         Object.assign(this.telemetryProperties, {
             displayName: typeof args.options.displayName !== 'undefined',
@@ -104,7 +105,7 @@ _TenantPeopleProfileCardPropertySetCommand_instances = new WeakSet(), _TenantPeo
             return `'${args.options.name}' is not a valid value for option name. Allowed values are: ${this.profileCardPropertyNames.join(', ')}.`;
         }
         // Unknown options are allowed only if they start with 'displayName-'
-        const unknownOptionKeys = Object.keys(this.getUnknownOptions(args.options));
+        const unknownOptionKeys = Object.keys(optionsUtils.getUnknownOptions(args.options, this.options));
         const invalidOptionKey = unknownOptionKeys.find(o => !o.startsWith('displayName-'));
         if (invalidOptionKey) {
             return `Invalid option: '${invalidOptionKey}'`;

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

@@ -46,7 +46,7 @@ class TodoListRemoveCommand extends DelegatedGraphCommand {
             responseType: 'json'
         };
         const response = await request.get(requestOptions);
-        return response.value && response.value.length === 1 ? response.value[0].id : null;
+        return response.value && response.value.length === 1 ? response.value[0].id : undefined;
     }
     async removeList(args) {
         try {

package/dist/utils/entraApp.js

@@ -3,6 +3,7 @@ import request from '../request.js';
 import { odata } from './odata.js';
 import { formatting } from './formatting.js';
 import { cli } from '../cli/cli.js';
+import { optionsUtils } from './optionsUtils.js';
 async function getCertificateBase64Encoded({ options, logger, debug }) {
     if (options.certificateBase64Encoded) {
         return options.certificateBase64Encoded;
@@ -129,7 +130,7 @@ function updateAppPermissions({ spId, resourceAccessPermission, oAuth2Permission
 }
 export const entraApp = {
     appPermissions: [],
-    createAppRegistration: async ({ options, apis, logger, verbose, debug }) => {
+    createAppRegistration: async ({ options, apis, logger, verbose, debug, unknownOptions }) => {
         const applicationInfo = {
             displayName: options.name,
             signInAudience: options.multitenant ? 'AzureADMultipleOrgs' : 'AzureADMyOrg'
@@ -164,6 +165,7 @@ export const entraApp = {
         if (options.allowPublicClientFlows) {
             applicationInfo.isFallbackPublicClient = true;
         }
+        optionsUtils.addUnknownOptionsToPayload(applicationInfo, unknownOptions);
         if (verbose) {
             await logger.logToStderr(`Creating Microsoft Entra app registration...`);
         }

package/dist/utils/optionsUtils.js

@@ -0,0 +1,28 @@
+const longOptionRegex = /--([^\s]+)/;
+const shortOptionRegex = /-([a-z])\b/;
+export const optionsUtils = {
+    getUnknownOptions(options, knownOptions) {
+        const unknownOptions = JSON.parse(JSON.stringify(options));
+        // remove minimist catch-all option
+        delete unknownOptions._;
+        knownOptions.forEach(o => {
+            const longOptionName = longOptionRegex.exec(o.option)[1];
+            delete unknownOptions[longOptionName];
+            // short names are optional so we need to check if the current command has
+            // one before continuing
+            const shortOptionMatch = shortOptionRegex.exec(o.option);
+            if (shortOptionMatch) {
+                const shortOptionName = shortOptionMatch[1];
+                delete unknownOptions[shortOptionName];
+            }
+        });
+        return unknownOptions;
+    },
+    addUnknownOptionsToPayload(payload, unknownOptions) {
+        const unknownOptionsNames = Object.getOwnPropertyNames(unknownOptions);
+        unknownOptionsNames.forEach(o => {
+            payload[o] = unknownOptions[o];
+        });
+    }
+};
+//# sourceMappingURL=optionsUtils.js.map

package/dist/utils/spo.js

@@ -519,10 +519,11 @@ export const spo = {
     },
     /**
    * Retrieves the spo user by email.
+   * Returns a user object
    * @param webUrl Web url
    * @param email The email of the user
    * @param logger the Logger object
-   * @param verbose set for verbose logging
+   * @param verbose Set for verbose logging
    */
     async getUserByEmail(webUrl, email, logger, verbose) {
         if (verbose && logger) {
@@ -593,10 +594,11 @@ export const spo = {
     },
     /**
     * Retrieves the spo group by name.
+    * Returns a group object
     * @param webUrl Web url
     * @param name The name of the group
     * @param logger the Logger object
-    * @param verbose set for verbose logging
+    * @param verbose Set for verbose logging
     */
     async getGroupByName(webUrl, name, logger, verbose) {
         if (verbose && logger) {
@@ -615,10 +617,11 @@ export const spo = {
     },
     /**
     * Retrieves the role definition by name.
+    * Returns a RoleDefinition object
     * @param webUrl Web url
     * @param name the name of the role definition
     * @param logger the Logger object
-    * @param verbose set for verbose logging
+    * @param verbose Set for verbose logging
     */
     async getRoleDefinitionByName(webUrl, name, logger, verbose) {
         if (verbose && logger) {

package/docs/docs/cmd/graph/directoryextension/directoryextension-get.mdx

@@ -38,16 +38,15 @@ m365 graph directoryextension get [options]
 Get directory extension by id registered for an application specified by app id.
 
 ```sh
-m365 directoryextension get --id 1f0f15e3-925d-40f0-8fc8-9d3ad135bce0 --appId fd918e4b-c821-4efb-b50a-5eddd23afc6f
+m365 graph directoryextension get --id 1f0f15e3-925d-40f0-8fc8-9d3ad135bce0 --appId fd918e4b-c821-4efb-b50a-5eddd23afc6f
 ```
 
 Get directory extension by name registered for an application specified by name.
 
 ```sh
-m365 directoryextension get --name extension_105be60b603845fea385e58772d9d630_GitHubWorkAccount --appName ContosoApp
+m365 graph directoryextension get --name extension_105be60b603845fea385e58772d9d630_GitHubWorkAccount --appName ContosoApp
 ```
 
-
 ## Response
 
 <Tabs>

package/docs/docs/cmd/graph/openextension/openextension-add.mdx

@@ -0,0 +1,120 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# graph openextension add
+
+Adds an open extension to a resource
+
+## Usage
+
+```sh
+m365 graph openextension add [options]
+```
+
+## Options
+
+```md definition-list
+`-n, --name <name>`
+: The name of the open extension.
+
+`-i, --resourceId <resourceId>`
+: The Id of the resource for which the extension is created.
+
+`-t, --resourceType <resourceType>`
+: The resource type for which the extension is created. Allowed values are `user`, `group`, `device`, `organization`.
+```
+
+<Global />
+
+## Remarks
+
+This command allows using unknown options to add custom data to the open extension.
+
+When adding an open extension to a user, it's possible to use the UPN as the resourceId.
+
+:::warning[Escaping JSON in PowerShell]
+
+When creating open extensions it's possible to enter a JSON string. In PowerShell 5 to 7.2 [specific escaping rules](./../../../user-guide/using-cli.mdx#escaping-double-quotes-in-powershell) apply due to an issue. Remember that you can also use [file tokens](./../../../user-guide/using-cli.mdx#passing-complex-content-into-cli-options) instead.
+
+:::
+
+## Examples
+
+Create a new open extension for a user specified by id. Extension properties are specified by unknown options.
+
+```sh
+m365 graph openextension add --resourceId eb77fbcf-6fe8-458b-985d-1747284793bc --resourceType user --name 'com.contoso.roamingSettings' --theme dark --color red --language English
+```
+
+Create a new open extension for a user specified by userName. Extension properties are specified by unknown options.
+
+```sh
+m365 graph openextension add --resourceId adelev@contoso.com --resourceType user --name 'com.contoso.roamingSettings' --theme dark --color red --language English
+```
+
+Create a new open extension for a group, one of the property represents a JSON object
+
+```sh
+m365 graph openextension add --resourceId eb77fbcf-6fe8-458b-985d-1747284793bc --resourceType group --name 'com.contoso.roamingSettings' --settings '{"theme": "dark", "color": "red", "language": "English"}' --supportedSystem 'Linux'
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  {
+    "extensionName": "com.contoso.roamingSettings",
+    "settings": {
+      "theme": "dark",
+      "color": "red",
+      "language": "English"
+    },
+    "supportedSystem": "Linux",
+    "id": "com.contoso.roamingSettings"
+  }
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  extensionName  : com.contoso.roamingSettings
+  id             : com.contoso.roamingSettings
+  settings       : {"theme":"dark","color":"red","language":"English"}
+  supportedSystem: Linux
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  extensionName,supportedSystem,id
+  com.contoso.roamingSettings,Linux,com.contoso.roamingSettings
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  # graph openextension add --name "com.contoso.roamingSettings" --resourceId "01b62bc5-9701-4f93-9587-9d1ea58a086d" --resourceType "user" --settings "{"theme": "dark", "color": "red", "language": "English"}" --supportedSystem "Linux"
+
+  Date: 3/13/2025
+
+  ## com.contoso.roamingSettings
+
+  Property | Value
+  ---------|-------
+  extensionName | com.contoso.roamingSettings
+  supportedSystem | Linux
+  id | com.contoso.roamingSettings
+  ```
+
+  </TabItem>
+</Tabs>
+
+## More information
+
+- Open extensions: https://learn.microsoft.com/graph/api/opentypeextension-post-opentypeextension

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "10.6.0-beta.36bb898",
+  "version": "10.6.0-beta.a7465c9",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",