@pnp/cli-microsoft365 7.3.0 → 7.4.0-beta.b16adf9

package/dist/m365/aad/commands/m365group/m365group-user-list.js

@@ -3,7 +3,7 @@ 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 _AadM365GroupUserListCommand_instances, _AadM365GroupUserListCommand_initTelemetry, _AadM365GroupUserListCommand_initOptions, _AadM365GroupUserListCommand_initValidators;
+var _AadM365GroupUserListCommand_instances, _AadM365GroupUserListCommand_initTelemetry, _AadM365GroupUserListCommand_initOptions, _AadM365GroupUserListCommand_initOptionSets, _AadM365GroupUserListCommand_initValidators;
 import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
@@ -21,18 +21,35 @@ class AadM365GroupUserListCommand extends GraphCommand {
         _AadM365GroupUserListCommand_instances.add(this);
         __classPrivateFieldGet(this, _AadM365GroupUserListCommand_instances, "m", _AadM365GroupUserListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _AadM365GroupUserListCommand_instances, "m", _AadM365GroupUserListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _AadM365GroupUserListCommand_instances, "m", _AadM365GroupUserListCommand_initOptionSets).call(this);
         __classPrivateFieldGet(this, _AadM365GroupUserListCommand_instances, "m", _AadM365GroupUserListCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
         try {
-            const isUnifiedGroup = await aadGroup.isUnifiedGroup(args.options.groupId);
+            if (args.options.role === 'Guest') {
+                this.warn(logger, `Value 'Guest' for the option role is deprecated. Use --filter "userType eq 'Guest'" instead.`);
+            }
+            const groupId = await this.getGroupId(args.options, logger);
+            const isUnifiedGroup = await aadGroup.isUnifiedGroup(groupId);
             if (!isUnifiedGroup) {
-                throw Error(`Specified group with id '${args.options.groupId}' is not a Microsoft 365 group.`);
+                throw Error(`Specified group '${args.options.groupId || args.options.groupDisplayName}' is not a Microsoft 365 group.`);
+            }
+            let users = [];
+            if (!args.options.role || args.options.role === 'Owner') {
+                const owners = await this.getUsers(args.options, 'Owners', groupId, logger);
+                owners.forEach(owner => users.push({ ...owner, roles: ['Owner'], userType: 'Owner' }));
             }
-            let users = await this.getOwners(args.options.groupId, logger);
-            if (args.options.role !== 'Owner') {
-                const membersAndGuests = await this.getMembersAndGuests(args.options.groupId, logger);
-                users = users.concat(membersAndGuests);
+            if (!args.options.role || args.options.role === 'Member' || args.options.role === 'Guest') {
+                const members = await this.getUsers(args.options, 'Members', groupId, logger);
+                members.forEach((member) => {
+                    const user = users.find((u) => u.id === member.id);
+                    if (user !== undefined) {
+                        user.roles.push('Member');
+                    }
+                    else {
+                        users.push({ ...member, roles: ['Member'] });
+                    }
+                });
             }
             if (args.options.role) {
                 users = users.filter(i => i.userType === args.options.role);
@@ -43,43 +60,82 @@ class AadM365GroupUserListCommand extends GraphCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    async getOwners(groupId, logger) {
+    async getGroupId(options, logger) {
+        if (options.groupId) {
+            return options.groupId;
+        }
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving owners of the group with id ${groupId}`);
+            await logger.logToStderr('Retrieving Group Id...');
         }
-        const endpoint = `${this.resource}/v1.0/groups/${groupId}/owners?$select=id,displayName,userPrincipalName,userType`;
-        const users = await odata.getAllItems(endpoint);
-        // Currently there is a bug in the Microsoft Graph that returns Owners as
-        // userType 'member'. We therefore update all returned user as owner
-        users.forEach(user => {
-            user.userType = 'Owner';
-        });
-        return users;
+        return await aadGroup.getGroupIdByDisplayName(options.groupDisplayName);
     }
-    async getMembersAndGuests(groupId, logger) {
+    async getUsers(options, role, groupId, logger) {
+        const { properties, filter } = options;
         if (this.verbose) {
-            await logger.logToStderr(`Retrieving members of the group with id ${groupId}`);
+            await logger.logToStderr(`Retrieving ${role} of the group with id ${groupId}`);
+        }
+        const selectProperties = properties ?
+            `${properties.split(',').filter(f => f.toLowerCase() !== 'id').concat('id').map(p => p.trim()).join(',')}` :
+            'id,displayName,userPrincipalName,givenName,surname,userType';
+        const allSelectProperties = selectProperties.split(',');
+        const propertiesWithSlash = allSelectProperties.filter(item => item.includes('/'));
+        const fieldsToExpand = [];
+        propertiesWithSlash.forEach(p => {
+            const propertiesSplit = p.split('/');
+            fieldsToExpand.push(`${propertiesSplit[0]}($select=${propertiesSplit[1]})`);
+        });
+        const fieldExpand = fieldsToExpand.join(',');
+        const expandParam = fieldExpand.length > 0 ? `&$expand=${fieldExpand}` : '';
+        const selectParam = allSelectProperties.filter(item => !item.includes('/'));
+        const endpoint = `${this.resource}/v1.0/groups/${groupId}/${role}/microsoft.graph.user?$select=${selectParam}${expandParam}`;
+        if (filter) {
+            // While using the filter, we need to specify the ConsistencyLevel header.
+            // Can be refactored when the header is no longer necessary.
+            const requestOptions = {
+                url: `${endpoint}&$filter=${encodeURIComponent(filter)}&$count=true`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    ConsistencyLevel: 'eventual'
+                },
+                responseType: 'json'
+            };
+            return await odata.getAllItems(requestOptions);
+        }
+        else {
+            return await odata.getAllItems(endpoint);
         }
-        const endpoint = `${this.resource}/v1.0/groups/${groupId}/members?$select=id,displayName,userPrincipalName,userType`;
-        return await odata.getAllItems(endpoint);
     }
 }
 _AadM365GroupUserListCommand_instances = new WeakSet(), _AadM365GroupUserListCommand_initTelemetry = function _AadM365GroupUserListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            role: args.options.role
+            groupId: typeof args.options.groupId !== 'undefined',
+            groupDisplayName: typeof args.options.groupDisplayName !== 'undefined',
+            role: typeof args.options.role !== 'undefined',
+            properties: typeof args.options.properties !== 'undefined',
+            filter: typeof args.options.filter !== 'undefined'
         });
     });
 }, _AadM365GroupUserListCommand_initOptions = function _AadM365GroupUserListCommand_initOptions() {
     this.options.unshift({
-        option: "-i, --groupId <groupId>"
+        option: "-i, --groupId [groupId]"
+    }, {
+        option: "-n, --groupDisplayName [groupDisplayName]"
     }, {
         option: "-r, --role [type]",
         autocomplete: ["Owner", "Member", "Guest"]
+    }, {
+        option: "-p, --properties [properties]"
+    }, {
+        option: "-f, --filter [filter]"
+    });
+}, _AadM365GroupUserListCommand_initOptionSets = function _AadM365GroupUserListCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['groupId', 'groupDisplayName']
     });
 }, _AadM365GroupUserListCommand_initValidators = function _AadM365GroupUserListCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (!validation.isValidGuid(args.options.groupId)) {
+        if (args.options.groupId && !validation.isValidGuid(args.options.groupId)) {
             return `${args.options.groupId} is not a valid GUID`;
         }
         if (args.options.role) {

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/docs/docs/cmd/aad/m365group/m365group-user-list.mdx

@@ -15,33 +15,52 @@ m365 aad m365group user list [options]
 ## Options
 
 ```md definition-list
-`-i, --groupId <groupId>`
-: The ID of the Microsoft 365 group for which to list users
+`-i, --groupId [groupId]`
+: The ID of the Microsoft 365 group. Specify `groupId` or `groupDisplayName` but not both.
+
+`-n, --groupDisplayName [groupDisplayName]`
+: The display name of the Microsoft 365 group. Specify `groupId` or `groupDisplayName` but not both.
 
 `-r, --role [role]`
-: Filter the results to only users with the given role: `Owner`, `Member`, `Guest`
+: Filter the results to only users with the given role. Allowed values: `Owner`, `Member`, or (Deprecated) `Guest`.
+
+`-p, --properties [properties]`
+: Comma-separated list of properties to retrieve.
+
+`-f, --filter [filter]`
+: OData filter to use to query the list of users with.
 ```
 
 <Global />
 
+## Remarks
+
+When the `properties` option includes values with a `/`, for example: `manager/displayName`, an additional `$expand` query parameter will be included on `manager`.
+
 ## Examples
 
-List all users and their role in the specified Microsoft 365 group
+List all users and their role from Microsoft 365 group specified by ID.
 
 ```sh
-m365 aad m365group user list --groupId '00000000-0000-0000-0000-000000000000'
+m365 aad m365group user list --groupId 00000000-0000-0000-0000-000000000000
+```
+
+List all owners from Microsoft 365 group specified by display name.
+
+```
+m365 aad m365group user list --groupDisplayName Developers --role Owner
 ```
 
-List all owners and their role in the specified Microsoft 365 group
+List specific properties for all group users from a group specified by ID.
 
 ```sh
-m365 aad m365group user list --groupId '00000000-0000-0000-0000-000000000000' --role Owner
+m365 aad m365group user list --groupId 03cba9da-3974-46c1-afaf-79caa2e45bbe --properties "id,jobTitle,companyName,accountEnabled"
 ```
 
- List all guests and their role in the specified Microsoft 365 group
+List all group members that are guest users.
 
 ```sh
-m365 aad m365group user list --groupId '00000000-0000-0000-0000-000000000000' --role Guest
+m365 aad m365group user list --groupDisplayName Developers --filter "userType eq 'Guest'"
 ```
 
 ## Response
@@ -55,7 +74,12 @@ m365 aad m365group user list --groupId '00000000-0000-0000-0000-000000000000' --
       "id": "da52218e-4822-4ac6-b41d-255e2059655e",
       "displayName": "Adele Vance",
       "userPrincipalName": "AdeleV@contoso.OnMicrosoft.com",
-      "userType": "Member"
+      "givenName": "Adele",
+      "surname": "Vance",
+      "roles": [
+        "Owner",
+        "Member"
+      ]
     }
   ]
   ```
@@ -64,17 +88,17 @@ m365 aad m365group user list --groupId '00000000-0000-0000-0000-000000000000' --
   <TabItem value="Text">
 
   ```text
-  id                                    displayName           userPrincipalName                     userType
-  ------------------------------------  --------------------  ------------------------------------  --------
-  da52218e-4822-4ac6-b41d-255e2059655e  Adele Vance           AdeleV@contoso.OnMicrosoft.com  Member
+  id                                    displayName           userPrincipalName                     userType      roles
+  ------------------------------------  --------------------  ------------------------------------  --------      --------
+  da52218e-4822-4ac6-b41d-255e2059655e  Adele Vance           AdeleV@contoso.OnMicrosoft.com        Owner,Member  Owner,Member
   ```
 
   </TabItem>
   <TabItem value="CSV">
 
   ```csv
-  id,displayName,userPrincipalName,userType
-  da52218e-4822-4ac6-b41d-255e2059655e,Adele Vance,AdeleV@contoso.OnMicrosoft.com,Member
+  id,displayName,userPrincipalName,givenName,surname,userType
+  da52218e-4822-4ac6-b41d-255e2059655e,Adele Vance,AdeleV@contoso.OnMicrosoft.com,Adele,Vance,Member
   ```
 
   </TabItem>
@@ -91,6 +115,8 @@ m365 aad m365group user list --groupId '00000000-0000-0000-0000-000000000000' --
   ---------|-------
   id | da52218e-4822-4ac6-b41d-255e2059655e
   displayName | Adele Vance
+  givenName | Adele
+  surname | Vance
   userPrincipalName | AdeleV@contoso.OnMicrosoft.com
   userType | Member
   ```

package/docs/docs/cmd/pa/app/app-get.mdx

@@ -20,6 +20,12 @@ m365 pa app get [options]
 
 `-d, --displayName [displayName]`
 : The display name of the Microsoft Power App to get information about.
+
+`--asAdmin`
+: Run the command as admin for apps you don't have permission to.
+
+`-e, --environmentName [environmentName]`
+: The name of the environment. Required when using `asAdmin`.
 ```
 
 <Global />
@@ -32,6 +38,9 @@ This command is based on an API that is currently in preview and is subject to c
 
 :::
 
+As a maker, you are able to retrieve the Power Apps you have permission to. As an administrator, you are also able to retrieve Power Apps from other users you don't have permission to. To get the app from another user, use the `asAdmin` option and make sure to specify the `environment` option as well.
+
+
 If you try to retrieve a non-existing Microsoft Power App, you will get the `Request failed with status code 404` error.
 
 ## Examples
@@ -48,6 +57,12 @@ Get information about the specified Microsoft Power App by the app's display nam
 m365 pa app get --displayName App
 ```
 
+Get information about the specific app you do not have access to.
+
+```sh
+m365 pa app get --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --asAdmin
+```
+
 ## Response
 
 <Tabs>

package/docs/docs/cmd/pa/app/app-remove.mdx

@@ -18,6 +18,12 @@ m365 pa app remove [options]
 
 `-f, --force`
 : Don't prompt for confirmation
+
+`--asAdmin`
+: Run the command as admin for apps you don't own.
+
+`-e, --environmentName [environmentName]`
+: The name of the environment. Required when using `asAdmin`.
 ```
 
 <Global />
@@ -26,6 +32,8 @@ m365 pa app remove [options]
 
 By default, the command will try to remove a Power App. As maker, you are able to delete the Power Apps you own. As administrator, you are also able to delete Power Apps from other users.
 
+To remove an app you do not own, use the `asAdmin` option and make sure to specify the `environmentName` option as well.
+
 To remove a model-driven Power App you need administrator permissions.
 
 If the Power App with the name you specified doesn't exist, you will get the `Error: App 'abc' does not exist` error.
@@ -44,6 +52,12 @@ Removes the specified Power App without confirmation
 m365 pa app remove --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --force
 ```
 
+Removes the specified Power App you don't own
+
+```sh
+m365 pa app remove --name 3989cb59-ce1a-4a5c-bb78-257c5c39381d --environmentName Default-d87a7535-dd31-4437-bfe1-95340acd55c5 --asAdmin
+```
+
 ## Response
 
 The command won't return a response on success.

package/npm-shrinkwrap.json

@@ -1,12 +1,12 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "7.3.0",
+  "version": "7.4.0",
   "lockfileVersion": 3,
   "requires": true,
   "packages": {
     "": {
       "name": "@pnp/cli-microsoft365",
-      "version": "7.3.0",
+      "version": "7.4.0",
       "license": "MIT",
       "dependencies": {
         "@azure/msal-common": "^14.5.0",

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "7.3.0",
+  "version": "7.4.0-beta.b16adf9",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",
@@ -301,4 +301,4 @@
     "sinon": "^17.0.0",
     "source-map-support": "^0.5.21"
   }
-}
+}