@pnp/cli-microsoft365 7.3.0 → 7.4.0-beta.2324d53

package/dist/m365/pa/commands/app/app-get.js

@@ -32,8 +32,13 @@ class PaAppGetCommand extends PowerAppsCommand {
     async commandAction(logger, args) {
         try {
             if (args.options.name) {
+                let endpoint = `${this.resource}/providers/Microsoft.PowerApps`;
+                if (args.options.asAdmin) {
+                    endpoint += `/scopes/admin/environments/${formatting.encodeQueryParameter(args.options.environmentName)}`;
+                }
+                endpoint += `/apps/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`;
                 const requestOptions = {
-                    url: `${this.resource}/providers/Microsoft.PowerApps/apps/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+                    url: endpoint,
                     headers: {
                         accept: 'application/json'
                     },
@@ -50,8 +55,8 @@ class PaAppGetCommand extends PowerAppsCommand {
                     await logger.logToStderr(`Retrieving information about Microsoft Power App with displayName '${args.options.displayName}'...`);
                 }
                 const getAppsOutput = await this.getApps(args, logger);
-                const allApps = JSON.parse(getAppsOutput.stdout);
-                if (allApps.length > 0) {
+                if (getAppsOutput.stdout && JSON.parse(getAppsOutput.stdout).length > 0) {
+                    const allApps = JSON.parse(getAppsOutput.stdout);
                     const app = allApps.find((a) => {
                         return a.properties.displayName.toLowerCase() === `${args.options.displayName}`.toLowerCase();
                     });
@@ -59,15 +64,11 @@ class PaAppGetCommand extends PowerAppsCommand {
                         await logger.log(this.setProperties(app));
                     }
                     else {
-                        if (this.verbose) {
-                            await logger.logToStderr(`No app found with displayName '${args.options.displayName}'`);
-                        }
+                        throw `No app found with displayName '${args.options.displayName}'.`;
                     }
                 }
                 else {
-                    if (this.verbose) {
-                        await logger.logToStderr('No apps found');
-                    }
+                    throw 'No apps found.';
                 }
             }
         }
@@ -82,7 +83,9 @@ class PaAppGetCommand extends PowerAppsCommand {
         const options = {
             output: 'json',
             debug: this.debug,
-            verbose: this.verbose
+            verbose: this.verbose,
+            environmentName: args.options.environmentName,
+            asAdmin: args.options.asAdmin
         };
         return await cli.executeCommandWithOutput(paAppListCommand, { options: { ...options, _: [] } });
     }
@@ -98,7 +101,9 @@ _PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = fun
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             name: typeof args.options.name !== 'undefined',
-            displayName: typeof args.options.displayName !== 'undefined'
+            displayName: typeof args.options.displayName !== 'undefined',
+            asAdmin: !!args.options.asAdmin,
+            environmentName: typeof args.options.environmentName !== 'undefined'
         });
     });
 }, _PaAppGetCommand_initOptions = function _PaAppGetCommand_initOptions() {
@@ -106,12 +111,22 @@ _PaAppGetCommand_instances = new WeakSet(), _PaAppGetCommand_initTelemetry = fun
         option: '-n, --name [name]'
     }, {
         option: '-d, --displayName [displayName]'
+    }, {
+        option: '-e, --environmentName [environmentName]'
+    }, {
+        option: '--asAdmin'
     });
 }, _PaAppGetCommand_initValidators = function _PaAppGetCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.name && !validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
+        if (args.options.asAdmin && !args.options.environmentName) {
+            return 'When specifying the asAdmin option, the environment option is required as well.';
+        }
+        if (args.options.environmentName && !args.options.asAdmin) {
+            return 'When specifying the environment option, the asAdmin option is required as well.';
+        }
         return true;
     });
 }, _PaAppGetCommand_initOptionSets = function _PaAppGetCommand_initOptionSets() {

package/dist/m365/pa/commands/app/app-remove.js

@@ -30,8 +30,13 @@ class PaAppRemoveCommand extends PowerAppsCommand {
             await logger.logToStderr(`Removing Microsoft Power App ${args.options.name}...`);
         }
         const removePaApp = async () => {
+            let endpoint = `${this.resource}/providers/Microsoft.PowerApps`;
+            if (args.options.asAdmin) {
+                endpoint += `/scopes/admin/environments/${formatting.encodeQueryParameter(args.options.environmentName)}`;
+            }
+            endpoint += `/apps/${formatting.encodeQueryParameter(args.options.name)}?api-version=2017-08-01`;
             const requestOptions = {
-                url: `${this.resource}/providers/Microsoft.PowerApps/apps/${formatting.encodeQueryParameter(args.options.name)}?api-version=2017-08-01`,
+                url: endpoint,
                 fullResponse: true,
                 headers: {
                     accept: 'application/json'
@@ -64,7 +69,9 @@ class PaAppRemoveCommand extends PowerAppsCommand {
 _PaAppRemoveCommand_instances = new WeakSet(), _PaAppRemoveCommand_initTelemetry = function _PaAppRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            force: typeof args.options.force !== 'undefined'
+            force: typeof args.options.force !== 'undefined',
+            asAdmin: !!args.options.asAdmin,
+            environmentName: typeof args.options.environmentName !== 'undefined'
         });
     });
 }, _PaAppRemoveCommand_initOptions = function _PaAppRemoveCommand_initOptions() {
@@ -72,12 +79,22 @@ _PaAppRemoveCommand_instances = new WeakSet(), _PaAppRemoveCommand_initTelemetry
         option: '-n, --name <name>'
     }, {
         option: '-f, --force'
+    }, {
+        option: '--asAdmin'
+    }, {
+        option: '-e, --environmentName [environmentName]'
     });
 }, _PaAppRemoveCommand_initValidators = function _PaAppRemoveCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!validation.isValidGuid(args.options.name)) {
             return `${args.options.name} is not a valid GUID`;
         }
+        if (args.options.asAdmin && !args.options.environmentName) {
+            return 'When specifying the asAdmin option, the environment option is required as well.';
+        }
+        if (args.options.environmentName && !args.options.asAdmin) {
+            return 'When specifying the environment option, the asAdmin option is required as well.';
+        }
         return true;
     });
 };

package/dist/m365/spo/commands/group/group-member-remove.js

@@ -8,7 +8,7 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../aad/commands/user/user-get.js';
+import aadUserGetCommand from '../../../entra/commands/user/user-get.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import SpoGroupMemberListCommand from './group-member-list.js';

package/dist/m365/spo/commands/group/group-set.js

@@ -7,7 +7,7 @@ var _SpoGroupSetCommand_instances, _SpoGroupSetCommand_initTelemetry, _SpoGroupS
 import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../aad/commands/user/user-get.js';
+import aadUserGetCommand from '../../../entra/commands/user/user-get.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 class SpoGroupSetCommand extends SpoCommand {

package/dist/m365/spo/commands/site/site-set.js

@@ -12,7 +12,7 @@ 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 aadM365GroupSetCommand from '../../../aad/commands/m365group/m365group-set.js';
+import aadM365GroupSetCommand from '../../../entra/commands/m365group/m365group-set.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { SharingCapabilities } from '../site/SharingCapabilities.js';

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

@@ -8,7 +8,7 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../aad/commands/user/user-get.js';
+import aadUserGetCommand from '../../../entra/commands/user/user-get.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 class TeamsAppInstallCommand extends GraphCommand {

package/dist/m365/teams/commands/meeting/meeting-attendancereport-list.js

@@ -9,7 +9,7 @@ import { cli } from '../../../../cli/cli.js';
 import { accessToken } from '../../../../utils/accessToken.js';
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
-import aadUserGetCommand from '../../../aad/commands/user/user-get.js';
+import aadUserGetCommand from '../../../entra/commands/user/user-get.js';
 import GraphCommand from "../../../base/GraphCommand.js";
 import commands from '../../commands.js';
 class TeamsMeetingAttendancereportListCommand extends GraphCommand {

package/docs/docs/cmd/adaptivecard/adaptivecard-send.mdx

@@ -47,7 +47,7 @@ The predefined card is automatically adjusted based on which options have been s
 
 If your custom card is a card template (card with placeholders like `${title}`), you can fill it with data either by specifying the complete data object using the `cardData` option, or by passing any number of arbitrary options that will be mapped onto the card. The arbitrary properties should not match any of the global options like `output`, `query`, `debug`, etc. Data options like `title`, `description`, `imageUrl` and `actionUrl` will be mapped onto the card as well.
 
-:::warning Escaping JSON in PowerShell
+:::warning[Escaping JSON in PowerShell]
 
 When using the `--card` and `--cardData` options 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.
 

package/docs/docs/cmd/{aad → entra}/administrativeunit/administrativeunit-add.mdx

@@ -2,12 +2,18 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# aad administrativeunit add
+# entra administrativeunit add
 
 Creates a new administrative unit
 
 ## Usage
 
+```sh
+m365 entra administrativeunit add [options]
+```
+
+## Alias
+
 ```sh
 m365 aad administrativeunit add [options]
 ```
@@ -40,19 +46,19 @@ To use this command you must be either **Global Administrator** or **Privileged
 Create an administrative unit with a specific display name
 
 ```sh
-m365 aad administrativeunit add --displayName 'Marketing Division'
+m365 entra administrativeunit add --displayName 'Marketing Division'
 ```
 
 Create an administrative unit with a specific display name and description
 
 ```sh
-m365 aad administrativeunit add --displayName 'Marketing Division' --description 'Marketing department administration'
+m365 entra administrativeunit add --displayName 'Marketing Division' --description 'Marketing department administration'
 ```
 
 Create a hidden administrative unit with a specific display name
 
 ```sh
-m365 aad administrativeunit add --displayName 'Marketing Division' --hiddenMembership
+m365 entra administrativeunit add --displayName 'Marketing Division' --hiddenMembership
 ```
 
 ## Response

package/docs/docs/cmd/{aad → entra}/administrativeunit/administrativeunit-get.mdx

@@ -2,12 +2,18 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# aad administrativeunit get
+# entra administrativeunit get
 
 Gets information about a specific administrative unit
 
 ## Usage
 
+```sh
+m365 entra administrativeunit get [options]
+```
+
+## Alias
+
 ```sh
 m365 aad administrativeunit get [options]
 ```
@@ -29,13 +35,13 @@ m365 aad administrativeunit get [options]
 Get information about the administrative unit by its id
 
 ```sh
-m365 aad administrativeunit get --id 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
+m365 entra administrativeunit get --id 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
 ```
 
 Get information about the administrative unit by its display name
 
 ```sh
-m365 aad administrativeunit get --displayName 'Marketing Division'
+m365 entra administrativeunit get --displayName 'Marketing Division'
 ```
 
 ## Response

package/docs/docs/cmd/{aad → entra}/administrativeunit/administrativeunit-list.mdx

@@ -2,12 +2,18 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# aad administrativeunit list
+# entra administrativeunit list
 
 Retrieves a list of administrative units
 
 ## Usage
 
+```sh
+m365 entra administrativeunit list [options]
+```
+
+## Alias
+
 ```sh
 m365 aad administrativeunit list [options]
 ```
@@ -21,7 +27,7 @@ m365 aad administrativeunit list [options]
 Retrieve a list of administrative units
 
 ```sh
-m365 aad administrativeunit list
+m365 entra administrativeunit list
 ```
 
 ## Response
@@ -65,7 +71,7 @@ m365 aad administrativeunit list
   <TabItem value="Markdown">
 
   ```md
-  # aad administrativeunit list
+  # entra administrativeunit list
 
   Date: 2023-10-16
 

package/docs/docs/cmd/{aad → entra}/administrativeunit/administrativeunit-member-add.mdx

@@ -2,12 +2,18 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# aad administrativeunit member add
+# entra administrativeunit member add
 
 Add a member (user, group, or device) to an administrative unit
 
 ## Usage
 
+```sh
+m365 entra administrativeunit member add [options]
+```
+
+## Alias
+
 ```sh
 m365 aad administrativeunit member add [options]
 ```
@@ -55,37 +61,37 @@ To use this command you must be either **Global Administrator** or **Privileged
 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
+m365 entra 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
+m365 entra 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
+m365 entra 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'
+m365 entra 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
+m365 entra 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'
+m365 entra administrativeunit member add --administrativeUnitName 'Marketing Division' --deviceName 'JohnDoe-PC'
 ```
 
 ## More information

package/docs/docs/cmd/{aad → entra}/administrativeunit/administrativeunit-member-get.mdx

@@ -2,12 +2,18 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# aad administrativeunit member get
+# entra administrativeunit member get
 
 Retrieves info about a specific member of an administrative unit
 
 ## Usage
 
+```sh
+m365 entra administrativeunit member get [options]
+```
+
+## Alias
+
 ```sh
 m365 aad administrativeunit member get [options]
 ```
@@ -41,13 +47,13 @@ When the `properties` option includes values with a `/`, for example: `manager/d
 Get information about a member specified by id from an administrative unit specified by id
 
 ```sh
-m365 aad administrativeunit member get --id 64131a70-beb9-4ccb-b590-4401e58446ec --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 
+m365 entra administrativeunit member get --id 64131a70-beb9-4ccb-b590-4401e58446ec --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 
 ```
 
 Get information about a member specified by id from an administrative unit specified by name
 
 ```sh
-m365 aad administrativeunit member get --id 64131a70-beb9-4ccb-b590-4401e58446ec --administrativeUnitName 'Marketing Division' 
+m365 entra administrativeunit member get --id 64131a70-beb9-4ccb-b590-4401e58446ec --administrativeUnitName 'Marketing Division' 
 ```
 
 ## Response

package/docs/docs/cmd/{aad → entra}/administrativeunit/administrativeunit-member-list.mdx

@@ -2,12 +2,18 @@ import Global from '/docs/cmd/_global.mdx';
 import Tabs from '@theme/Tabs';
 import TabItem from '@theme/TabItem';
 
-# aad administrativeunit member list
+# entra administrativeunit member list
 
 Retrieves members (users, groups, or devices) of an administrative unit
 
 ## Usage
 
+```sh
+m365 entra administrativeunit member list [options]
+```
+
+## Alias
+
 ```sh
 m365 aad administrativeunit member list [options]
 ```
@@ -44,55 +50,55 @@ When the `properties` option includes values with a `/`, for example: `manager/d
 List members of an administrative unit specified by id
 
 ```sh
-m365 aad administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
+m365 entra administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
 ```
 
 List members of an administrative unit specified by id. For each one return the `id` and the `displayName`
 
 ```sh
-m365 aad administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --properties 'id,displayName'
+m365 entra administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --properties 'id,displayName'
 ```
 
 List members of an administrative unit specified by name
 
 ```sh
-m365 aad administrativeunit member list --administrativeUnitName 'Marketing Division'
+m365 entra administrativeunit member list --administrativeUnitName 'Marketing Division'
 ```
 
 List users of an administrative unit specified by id
 
 ```sh
-m365 aad administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --type user
+m365 entra administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --type user
 ```
 
 List users of an administrative unit specified by id that are guest users
 
 ```sh
-m365 aad administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --type user --filter "userType eq 'Guest'"
+m365 entra administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --type user --filter "userType eq 'Guest'"
 ```
 
 List groups of an administrative unit specified by id
 
 ```sh
-m365 aad administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --type group
+m365 entra administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --type group
 ```
 
 List groups of an administrative unit specified by id and include owners names, for each member return the `id` and the `displayName`
 
 ```sh
-m365 aad administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --type group --properties 'id,displayName,owners/displayName'
+m365 entra administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --type group --properties 'id,displayName,owners/displayName'
 ```
 
 List devices of an administrative unit specified by id
 
 ```sh
-m365 aad administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --type device
+m365 entra administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --type device
 ```
 
 List devices with linux operating system of an administrative unit specified by id
 
 ```sh
-m365 aad administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --type device --filter "operatingSystem eq 'linux'"
+m365 entra administrativeunit member list --administrativeUnitId 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7 --type device --filter "operatingSystem eq 'linux'"
 ```
 
 ## Response

package/docs/docs/cmd/{aad → entra}/administrativeunit/administrativeunit-remove.mdx

@@ -1,11 +1,17 @@
 import Global from '/docs/cmd/_global.mdx';
 
-# aad administrativeunit remove
+# entra administrativeunit remove
 
 Removes an administrative unit
 
 ## Usage
 
+```sh
+m365 entra administrativeunit remove [options]
+```
+
+## Alias
+
 ```sh
 m365 aad administrativeunit remove [options]
 ```
@@ -38,13 +44,13 @@ To use this command you must be either **Global Administrator** or **Privileged
 Remove an administrative unit by its id
 
 ```sh
-m365 aad administrativeunit remove --id 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
+m365 entra administrativeunit remove --id 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
 ```
 
 Remove an administrative unit by it displayName
 
 ```sh
-m365 aad administrativeunit remove --displayName 'Marketing Division'
+m365 entra administrativeunit remove --displayName 'Marketing Division'
 ```
 
 ## Response