@pnp/cli-microsoft365 9.0.0-beta.d6b190a → 9.0.0-beta.e16d09c

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

@@ -3,16 +3,16 @@ 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 _SpoListRoleAssignmentRemoveCommand_instances, _SpoListRoleAssignmentRemoveCommand_initTelemetry, _SpoListRoleAssignmentRemoveCommand_initOptions, _SpoListRoleAssignmentRemoveCommand_initValidators, _SpoListRoleAssignmentRemoveCommand_initOptionSets;
+var _SpoListRoleAssignmentRemoveCommand_instances, _SpoListRoleAssignmentRemoveCommand_initTelemetry, _SpoListRoleAssignmentRemoveCommand_initOptions, _SpoListRoleAssignmentRemoveCommand_initValidators, _SpoListRoleAssignmentRemoveCommand_initOptionSets, _SpoListRoleAssignmentRemoveCommand_initTypes;
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
+import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.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';
 class SpoListRoleAssignmentRemoveCommand extends SpoCommand {
     get name() {
         return commands.LIST_ROLEASSIGNMENT_REMOVE;
@@ -27,11 +27,12 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoListRoleAssignmentRemoveCommand_instances, "m", _SpoListRoleAssignmentRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentRemoveCommand_instances, "m", _SpoListRoleAssignmentRemoveCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListRoleAssignmentRemoveCommand_instances, "m", _SpoListRoleAssignmentRemoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoListRoleAssignmentRemoveCommand_instances, "m", _SpoListRoleAssignmentRemoveCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         const removeRoleAssignment = async () => {
             if (this.verbose) {
-                await logger.logToStderr(`Removing role assignment from list in site at ${args.options.webUrl}...`);
+                await logger.logToStderr(`Removing role assignment from list '${args.options.listId || args.options.listTitle || args.options.listUrl}' of site ${args.options.webUrl}...`);
             }
             try {
                 let requestUrl = `${args.options.webUrl}/_api/web/`;
@@ -45,17 +46,30 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand {
                     const listServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                     requestUrl += `GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                 }
+                let principalId = args.options.principalId;
                 if (args.options.upn) {
-                    args.options.principalId = await this.getUserPrincipalId(args.options);
-                    await this.removeRoleAssignment(requestUrl, logger, args.options);
+                    const user = await spo.ensureUser(args.options.webUrl, args.options.upn);
+                    principalId = user.Id;
                 }
                 else if (args.options.groupName) {
-                    args.options.principalId = await this.getGroupPrincipalId(args.options);
-                    await this.removeRoleAssignment(requestUrl, logger, args.options);
+                    const spGroup = await spo.getGroupByName(args.options.webUrl, args.options.groupName, logger, this.verbose);
+                    principalId = spGroup.Id;
                 }
-                else {
-                    await this.removeRoleAssignment(requestUrl, logger, args.options);
+                else if (args.options.entraGroupId || args.options.entraGroupName) {
+                    if (this.verbose) {
+                        await logger.logToStderr('Retrieving group information...');
+                    }
+                    let group;
+                    if (args.options.entraGroupId) {
+                        group = await entraGroup.getGroupById(args.options.entraGroupId);
+                    }
+                    else {
+                        group = await entraGroup.getGroupByDisplayName(args.options.entraGroupName);
+                    }
+                    const siteUser = await spo.ensureEntraGroup(args.options.webUrl, group);
+                    principalId = siteUser.Id;
                 }
+                await this.removeRoleAssignment(requestUrl, principalId);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -65,49 +79,22 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand {
             await removeRoleAssignment();
         }
         else {
-            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove role assignment from list ${args.options.listId || args.options.listTitle} from site ${args.options.webUrl}?` });
+            const result = await cli.promptForConfirmation({ message: `Are you sure you want to remove role assignment from the specified user of list '${args.options.listId || args.options.listTitle || args.options.listUrl}'?` });
             if (result) {
                 await removeRoleAssignment();
             }
         }
     }
-    async removeRoleAssignment(requestUrl, logger, options) {
+    async removeRoleAssignment(requestUrl, principalId) {
         const requestOptions = {
-            url: `${requestUrl}roleassignments/removeroleassignment(principalid='${options.principalId}')`,
-            method: 'POST',
+            url: `${requestUrl}roleassignments/removeroleassignment(principalid='${principalId}')`,
             headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         return 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 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;
-    }
 }
 _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssignmentRemoveCommand_initTelemetry = function _SpoListRoleAssignmentRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -118,7 +105,9 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
             principalId: typeof args.options.principalId !== 'undefined',
             upn: typeof args.options.upn !== 'undefined',
             groupName: typeof args.options.groupName !== 'undefined',
-            force: (!(!args.options.force)).toString()
+            entraGroupId: typeof args.options.entraGroupId !== 'undefined',
+            entraGroupName: typeof args.options.entraGroupName !== 'undefined',
+            force: !!args.options.force
         });
     });
 }, _SpoListRoleAssignmentRemoveCommand_initOptions = function _SpoListRoleAssignmentRemoveCommand_initOptions() {
@@ -136,6 +125,10 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
         option: '--upn [upn]'
     }, {
         option: '--groupName [groupName]'
+    }, {
+        option: '--entraGroupId [entraGroupId]'
+    }, {
+        option: '--entraGroupName [entraGroupName]'
     }, {
         option: '-f, --force'
     });
@@ -146,15 +139,24 @@ _SpoListRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoListRoleAssig
             return isValidSharePointUrl;
         }
         if (args.options.listId && !validation.isValidGuid(args.options.listId)) {
-            return `${args.options.listId} is not a valid GUID`;
+            return `'${args.options.listId}' is not a valid GUID for option listId.`;
+        }
+        if (args.options.upn && !validation.isValidUserPrincipalName(args.options.upn)) {
+            return `'${args.options.upn}' is not a valid user principal name for option upn.`;
+        }
+        if (args.options.principalId && !validation.isValidPositiveInteger(args.options.principalId)) {
+            return `'${args.options.principalId}' is not a valid number for option principalId.`;
         }
-        if (args.options.principalId && isNaN(args.options.principalId)) {
-            return `Specified principalId ${args.options.principalId} is not a number`;
+        if (args.options.entraGroupId && !validation.isValidGuid(args.options.entraGroupId)) {
+            return `'${args.options.entraGroupId}' is not a valid GUID for option entraGroupId.`;
         }
         return true;
     });
 }, _SpoListRoleAssignmentRemoveCommand_initOptionSets = function _SpoListRoleAssignmentRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName'] });
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] }, { options: ['principalId', 'upn', 'groupName', 'entraGroupId', 'entraGroupName'] });
+}, _SpoListRoleAssignmentRemoveCommand_initTypes = function _SpoListRoleAssignmentRemoveCommand_initTypes() {
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'upn', 'groupName', 'entraGroupId', 'entraGroupName');
+    this.types.boolean.push('force');
 };
 export default new SpoListRoleAssignmentRemoveCommand();
 //# sourceMappingURL=list-roleassignment-remove.js.map

package/dist/utils/spo.js

@@ -454,15 +454,46 @@ export const spo = {
         const res = await request.get(requestOptions);
         return res.AadObjectId.NameId;
     },
+    /**
+     * Ensure a user exists on a specific SharePoint site.
+     * @param webUrl URL of the SharePoint site.
+     * @param logonName Logon name of the user to ensure on the SharePoint site.
+     * @returns SharePoint user object.
+     */
+    async ensureUser(webUrl, logonName) {
+        const requestOptions = {
+            url: `${webUrl}/_api/web/EnsureUser`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            data: {
+                logonName: logonName
+            }
+        };
+        return request.post(requestOptions);
+    },
+    /**
+     * Ensure a Microsoft Entra ID group exists on a specific SharePoint site.
+     * @param webUrl URL of the SharePoint site.
+     * @param group Microsoft Entra ID group.
+     * @returns SharePoint user object.
+     */
+    async ensureEntraGroup(webUrl, group) {
+        if (!group.securityEnabled) {
+            throw new Error('Cannot ensure a Microsoft Entra ID group that is not security enabled.');
+        }
+        return this.ensureUser(webUrl, group.mailEnabled ? `c:0o.c|federateddirectoryclaimprovider|${group.id}` : `c:0t.c|tenant|${group.id}`);
+    },
     /**
    * Retrieves the spo user by email.
    * @param webUrl Web url
    * @param email The email of the user
    * @param logger the Logger object
-   * @param debug set if debug logging should be logged
+   * @param verbose set if verbose logging should be logged
    */
-    async getUserByEmail(webUrl, email, logger, debug) {
-        if (debug) {
+    async getUserByEmail(webUrl, email, logger, verbose) {
+        if (verbose) {
             await logger.logToStderr(`Retrieving the spo user by email ${email}`);
         }
         const requestUrl = `${webUrl}/_api/web/siteusers/GetByEmail('${formatting.encodeQueryParameter(email)}')`;
@@ -533,10 +564,10 @@ export const spo = {
     * @param webUrl Web url
     * @param name The name of the group
     * @param logger the Logger object
-    * @param debug set if debug logging should be logged
+    * @param verbose set if verbose logging should be logged
     */
-    async getGroupByName(webUrl, name, logger, debug) {
-        if (debug) {
+    async getGroupByName(webUrl, name, logger, verbose) {
+        if (verbose) {
             await logger.logToStderr(`Retrieving the group by name ${name}`);
         }
         const requestUrl = `${webUrl}/_api/web/sitegroups/GetByName('${formatting.encodeQueryParameter(name)}')`;

package/docs/docs/cmd/connection/connection-use.mdx

@@ -15,7 +15,7 @@ m365 connection use [options]
 ## Options
 
 ```md definition-list
-`-n, --name <name>`
+`-n, --name [name]`
 : The name of the connection to switch to.
 ```
 
@@ -23,7 +23,13 @@ m365 connection use [options]
 
 ## Remarks
 
-The value for `--name` can be found by running [m365 connection list](connection-list.mdx). You can update the name of a connection by running [m365 connection set](connection-set.mdx). 
+:::tip
+
+If you haven't disabled the "prompt" setting, running this command without options will show a list of available connections. You can then select the connection to activate it.
+
+:::
+
+You can update the name of a connection by running [m365 connection set](connection-set.mdx).
 
 ## Examples
 

package/docs/docs/cmd/entra/multitenant/multitenant-add.mdx

@@ -0,0 +1,107 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# entra multitenant add
+
+Creates a new multitenant organization
+
+## Usage
+
+```sh
+m365 entra multitenant add [options]
+```
+
+## Options
+
+```md definition-list
+`-n, --displayname <displayName>`
+: Display name for the multitenant organization.
+
+`-d, --description [description]`
+: Description for the multitenant organiztion.
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command you must be at least **Security Administrator**.
+
+:::
+
+## Examples
+
+Create a new multitenant organization with display name only.
+
+```sh
+m365 entra multitenant add --displayName 'Contoso organization'
+```
+
+Create a new multitenant organization with display name and description.
+
+```sh
+m365 entra multitenant add --displayName 'Contoso organization' --description 'Multitenant organization between Contoso, Fabrikam, and Woodgrove Bank'
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  {
+    "id": "c231d4a5-138f-4bdf-9fee-f26a90ea3ad0",
+    "createdDateTime": "2024-05-05T05:05:05Z",
+    "state": "active",
+    "displayName": "Contoso organization",
+    "description": "Multitenant organization between Contoso, Fabrikam, and Woodgrove Bank"
+  }
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  createdDateTime: 2024-05-05T05:05:05Z
+  description    : Multitenant organization between Contoso, Fabrikam, and Woodgrove Bank
+  displayName    : Contoso organization
+  id             : c231d4a5-138f-4bdf-9fee-f26a90ea3ad0
+  state          : active
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  id,createdDateTime,state,displayName,description
+  c231d4a5-138f-4bdf-9fee-f26a90ea3ad0,2024-05-05T05:05:05Z,active,Contoso organization,"Multitenant organization between Contoso, Fabrikam, and Woodgrove Bank"
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  # entra multitenant add
+
+  Date: 5/5/2024
+
+  ## Contoso organization (c231d4a5-138f-4bdf-9fee-f26a90ea3ad0)
+
+  Property | Value
+  ---------|-------
+  id | c231d4a5-138f-4bdf-9fee-f26a90ea3ad0
+  createdDateTime | 2024-05-05T05:05:05Z
+  state | active
+  displayName | Contoso organization
+  description | Multitenant organization between Contoso, Fabrikam, and Woodgrove Bank
+  ```
+
+  </TabItem>
+</Tabs>
+
+## More information
+
+- Multitenant organization: https://learn.microsoft.com/entra/identity/multi-tenant-organizations/overview

package/docs/docs/cmd/entra/multitenant/multitenant-remove.mdx

@@ -0,0 +1,58 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# entra multitenant remove
+
+Removes a multitenant organization
+
+## Usage
+
+```sh
+m365 entra multitenant remove [options]
+```
+
+## options
+
+```md definition-list
+`-f, --force`
+: Don't prompt for confirmation.
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command you must be at least **Security Administrator**.
+
+:::
+
+:::info
+
+When removing a Multi-Tenant Organization, all associations with other tenants will be removed too.
+
+The removing process can take up to 2 hours to complete.
+
+:::
+
+## Examples
+
+Remove the multitenant organization.
+
+```sh
+m365 entra multitenant remove
+```
+
+Remove the multitenant organization without prompting for confirmation.
+
+```sh
+m365 entra multitenant remove --force
+```
+
+## Response
+
+The command won't return a response on success
+
+## More information
+
+- Multitenant organization: https://learn.microsoft.com/entra/identity/multi-tenant-organizations/overview

package/docs/docs/cmd/entra/multitenant/multitenant-set.mdx

@@ -0,0 +1,53 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# entra multitenant set
+
+Updates the properties of a multitenant organization
+
+## Usage
+
+```sh
+m365 entra multitenant set [options]
+```
+
+## Options
+
+```md definition-list
+`-n, --displayName [displayName]`
+: New display name of the multitenant organization. Both options, `displayName` and `description` are optional but at least must be specified.
+
+`-d, --description [description]`
+: New description of the multitenant organization. Both options, `displayName` and `description` are optional but at least must be specified.
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command you must be at least **Security Administrator**.
+
+:::
+
+## Examples
+
+Update display name of multitenant organization.
+
+```sh
+m365 entra multitenant set --displayName 'Fabrikam organization'
+```
+
+Update display name and description of multitenant organization.
+
+```sh
+m365 entra multitenant set --displayName 'Fabrikam organization' --description 'Multitenant organization between Fabrikam and Contoso'
+```
+
+## Response
+
+The command won't return a response on success
+
+## More information
+
+- Multitenant organization: https://learn.microsoft.com/entra/identity/multi-tenant-organizations/overview

package/docs/docs/cmd/planner/plan/plan-remove.mdx

@@ -13,7 +13,7 @@ m365 planner plan remove [options]
 ## Options
 
 ```md definition-list
-`i, --id [id]`
+`-i, --id [id]`
 : ID of the plan to remove. Specify either `id` or `title` but not both.
 
 `-t, --title [title]`

package/docs/docs/cmd/spe/containertype/containertype-list.mdx

@@ -2,14 +2,14 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# Container Types list
+# spe containertype list
 
-Retrieves a list of Container Types created for a SharePoint Embedded Application
+Lists all Container Types
 
 ## Usage
 
 ```sh
-m365 containertype list [options]
+m365 spe containertype list [options]
 ```
 
 ## Options
@@ -21,7 +21,7 @@ m365 containertype list [options]
 Retrieves a list of Container Types created for a SharePoint Embedded Application from the tenant.
 
 ```sh
-m365 containertype list
+m365 spe containertype list
 ```
 
 ## Response
@@ -30,47 +30,32 @@ m365 containertype list
   <TabItem value="JSON">
 
   ```json
-  [{
-    "_ObjectType_": "Microsoft.Online.SharePoint.TenantAdministration.SPContainerTypeProperties",
-    "ApplicationRedirectUrl": null,
-    "AzureSubscriptionId": "/Guid(00000000-0000-0000-0000-000000000000)/",
-    "ContainerTypeId": "/Guid(073269af-f1d2-042d-2ef5-5bdd6ac83115)/",
-    "CreationDate": null,
-    "DisplayName": "test1",
-    "ExpiryDate": null,
-    "IsBillingProfileRequired": true,
-    "OwningAppId": "/Guid(df4085cc-9a38-4255-badc-5c5225610475)/",
-    "OwningTenantId": "/Guid(00000000-0000-0000-0000-000000000000)/",
-    "Region": null,
-    "ResourceGroup": null,
-    "SPContainerTypeBillingClassification": 0
-  },
-   {
-    "_ObjectType_": "Microsoft.Online.SharePoint.TenantAdministration.SPContainerTypeProperties",
-    "ApplicationRedirectUrl": null,
-    "AzureSubscriptionId": "/Guid(00000000-0000-0000-0000-000000000000)/",
-    "ContainerTypeId": "/Guid(3ec7c59d-ef31-0752-1ab5-5c343a5e8557)/",
-    "CreationDate": null,
-    "DisplayName": "SharePoint Embedded Free Trial Container Type",
-    "ExpiryDate": null,
-    "IsBillingProfileRequired": true,
-    "OwningAppId": "/Guid(e6b529fe-84db-412a-8e9c-5bbb75f7b037)/",
-    "OwningTenantId": "/Guid(00000000-0000-0000-0000-000000000000)/",
-    "Region": null,
-    "ResourceGroup": null,
-    "SPContainerTypeBillingClassification": 1
-  }]
+  [
+    {
+      "_ObjectType_": "Microsoft.Online.SharePoint.TenantAdministration.SPContainerTypeProperties",
+      "ApplicationRedirectUrl": null,
+      "AzureSubscriptionId": "/Guid(00000000-0000-0000-0000-000000000000)/",
+      "ContainerTypeId": "/Guid(073269af-f1d2-042d-2ef5-5bdd6ac83115)/",
+      "CreationDate": null,
+      "DisplayName": "test1",
+      "ExpiryDate": null,
+      "IsBillingProfileRequired": true,
+      "OwningAppId": "/Guid(df4085cc-9a38-4255-badc-5c5225610475)/",
+      "OwningTenantId": "/Guid(00000000-0000-0000-0000-000000000000)/",
+      "Region": null,
+      "ResourceGroup": null,
+      "SPContainerTypeBillingClassification": 0
+    }
+  ]
   ```
 
   </TabItem>
   <TabItem value="Text">
 
   ```text
-ContainerTypeId                               DisplayName                                    OwningAppId                                 
---------------------------------------------  ---------------------------------------------  --------------------------------------------
-/Guid(073269af-f1d2-042d-2ef5-5bdd6ac83115)/  test1                                          /Guid(df4085cc-9a38-4255-badc-5c5225610475)/
-/Guid(880ab3bd-5b68-01d4-3744-01a7656cf2ba)/  test1                                          /Guid(50785fde-3082-47ac-a36d-06282ac5c7da)/
-/Guid(3ec7c59d-ef31-0752-1ab5-5c343a5e8557)/  SharePoint Embedded Free Trial Container Type  /Guid(e6b529fe-84db-412a-8e9c-5bbb75f7b037)/
+  ContainerTypeId                               DisplayName                                    OwningAppId                                 
+  --------------------------------------------  ---------------------------------------------  --------------------------------------------
+  /Guid(073269af-f1d2-042d-2ef5-5bdd6ac83115)/  test1                                          /Guid(df4085cc-9a38-4255-badc-5c5225610475)/
   ```
 
   </TabItem>
@@ -79,7 +64,6 @@ ContainerTypeId                               DisplayName
   ```csv
   _ObjectType_,ApplicationRedirectUrl,AzureSubscriptionId,ContainerTypeId,CreationDate,DisplayName,ExpiryDate,IsBillingProfileRequired,OwningAppId,OwningTenantId,Region,ResourceGroup,SPContainerTypeBillingClassification
   Microsoft.Online.SharePoint.TenantAdministration.SPContainerTypeProperties,,/Guid(00000000-0000-0000-0000-000000000000)/,/Guid(073269af-f1d2-042d-2ef5-5bdd6ac83115)/,,test1,,1,/Guid(df4085cc-9a38-4255-badc-5c5225610475)/,/Guid(00000000-0000-0000-0000-000000000000)/,,,0
-  Microsoft.Online.SharePoint.TenantAdministration.SPContainerTypeProperties,,/Guid(00000000-0000-0000-0000-000000000000)/,/Guid(3ec7c59d-ef31-0752-1ab5-5c343a5e8557)/,,SharePoint Embedded Free Trial Container Type,,1,/Guid(e6b529fe-84db-412a-8e9c-5bbb75f7b037)/,/Guid(00000000-0000-0000-0000-000000000000)/,,,1
   ```
 
   </TabItem>
@@ -102,19 +86,6 @@ ContainerTypeId                               DisplayName
   OwningAppId | /Guid(df4085cc-9a38-4255-badc-5c5225610475)/
   OwningTenantId | /Guid(00000000-0000-0000-0000-000000000000)/
   SPContainerTypeBillingClassification | 0
-
-  ## SharePoint Embedded Free Trial Container Type
-
-  Property | Value
-  ---------|-------
-  \_ObjectType\_ | Microsoft.Online.SharePoint.TenantAdministration.SPContainerTypeProperties
-  AzureSubscriptionId | /Guid(00000000-0000-0000-0000-000000000000)/
-  ContainerTypeId | /Guid(3ec7c59d-ef31-0752-1ab5-5c343a5e8557)/
-  DisplayName | SharePoint Embedded Free Trial Container Type
-  IsBillingProfileRequired | true
-  OwningAppId | /Guid(e6b529fe-84db-412a-8e9c-5bbb75f7b037)/
-  OwningTenantId | /Guid(00000000-0000-0000-0000-000000000000)/
-  SPContainerTypeBillingClassification | 1
   ```
 
   </TabItem>

package/docs/docs/cmd/spo/applicationcustomizer/applicationcustomizer-get.mdx

@@ -36,6 +36,10 @@ m365 spo applicationcustomizer get [options]
 
 <Global />
 
+## Remarks
+
+This command can be used for retrieving an application customizer from a specific site. To retrieve an application customizer that's installed tenant-wide, view our dedicated [spo tenant applicationcustomizer get](../tenant/tenant-applicationcustomizer-get.mdx) command.
+
 ## Examples
 
 Retrieves an application customizer by title.
@@ -68,10 +72,6 @@ Retrieves the client-side component properties of a application customizer.
 m365 spo applicationcustomizer get --id 14125658-a9bc-4ddf-9c75-1b5767c9a337 --webUrl https://contoso.sharepoint.com/sites/sales --clientSideComponentProperties
 ```
 
-## Remarks
-
-This command can be used for retrieving an application customizer from a specific site. To retrieve an application customizer that's installed tenant-wide, view our dedicated [spo tenant applicationcustomizer get](../tenant/tenant-applicationcustomizer-get.mdx) command.
-
 ## Response
 
 ### Standard response

package/docs/docs/cmd/spo/applicationcustomizer/applicationcustomizer-list.mdx

@@ -24,6 +24,10 @@ m365 spo applicationcustomizer list [options]
 
 <Global />
 
+## Remarks
+
+This command can be used for retrieving a list of application customizers from a specific site. To retrieve a list of application customizers that are installed tenant-wide, view our dedicated [spo tenant applicationcustomizer list](../tenant/tenant-applicationcustomizer-list.mdx) command.
+
 ## Examples
 
 Retrieves a list of application customizers.
@@ -32,10 +36,6 @@ Retrieves a list of application customizers.
 m365 spo applicationcustomizer list --webUrl https://contoso.sharepoint.com/sites/sales
 ```
 
-## Remarks
-
-This command can be used for retrieving a list of application customizers from a specific site. To retrieve a list of application customizers that are installed tenant-wide, view our dedicated [spo tenant applicationcustomizer list](../tenant/tenant-applicationcustomizer-list.mdx) command.
-
 ## Response
 
 <Tabs>