@pnp/cli-microsoft365 7.1.0-beta.d53f0d9 → 7.2.0-beta.194fd07

package/dist/m365/yammer/commands/group/group-user-remove.js

@@ -23,29 +23,8 @@ class YammerGroupUserRemoveCommand extends YammerCommand {
         __classPrivateFieldGet(this, _YammerGroupUserRemoveCommand_instances, "m", _YammerGroupUserRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const executeRemoveAction = async () => {
-            const endpoint = `${this.resource}/v1/group_memberships.json`;
-            const requestOptions = {
-                url: endpoint,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: {
-                    group_id: args.options.groupId,
-                    user_id: args.options.id
-                }
-            };
-            try {
-                await request.delete(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await executeRemoveAction();
+            await this.executeRemoveAction(args.options);
         }
         else {
             let messagePrompt = `Are you sure you want to leave group ${args.options.groupId}?`;
@@ -59,8 +38,28 @@ class YammerGroupUserRemoveCommand extends YammerCommand {
                 message: messagePrompt
             });
             if (result.continue) {
-                await executeRemoveAction();
+                await this.executeRemoveAction(args.options);
+            }
+        }
+    }
+    async executeRemoveAction(options) {
+        const requestOptions = {
+            url: `${this.resource}/v1/group_memberships.json`,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            data: {
+                group_id: options.groupId,
+                user_id: options.id
             }
+        };
+        try {
+            await request.delete(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

package/dist/utils/aadGroup.js

@@ -54,7 +54,9 @@ export const aadGroup = {
             throw Error(`The specified group '${displayName}' does not exist.`);
         }
         if (groups.length > 1) {
-            throw Error(`Multiple groups with name '${displayName}' found: ${groups.map(x => x.id).join(',')}.`);
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('id', groups);
+            const result = await Cli.handleMultipleResultsFound(`Multiple groups with name '${displayName}' found.`, resultAsKeyValuePair);
+            return result.id;
         }
         return groups[0].id;
     },

package/dist/utils/odata.js

@@ -1,23 +1,24 @@
 import request from "../request.js";
-export const odata = {
-    async getAllItems(url, metadata) {
-        let items = [];
-        const requestOptions = {
-            url: url,
-            headers: {
-                accept: `application/json;odata.metadata=${metadata ?? 'none'}`,
-                'odata-version': '4.0'
-            },
-            responseType: 'json'
-        };
-        const res = await request.get(requestOptions);
-        items = res.value;
-        const nextLink = res['@odata.nextLink'] ?? res.nextLink;
-        if (nextLink) {
-            const nextPageItems = await odata.getAllItems(nextLink, metadata);
-            items = items.concat(nextPageItems);
-        }
-        return items;
+async function getAllItems(param1, metadata) {
+    let items = [];
+    const requestOptions = typeof param1 !== 'string' ? param1 : {
+        url: param1,
+        headers: {
+            accept: `application/json;odata.metadata=${metadata ?? 'none'}`,
+            'odata-version': '4.0'
+        },
+        responseType: 'json'
+    };
+    const res = await request.get(requestOptions);
+    items = res.value;
+    const nextLink = res['@odata.nextLink'] ?? res.nextLink;
+    if (nextLink) {
+        const nextPageItems = await odata.getAllItems({ ...requestOptions, url: nextLink });
+        items = items.concat(nextPageItems);
     }
+    return items;
+}
+export const odata = {
+    getAllItems
 };
 //# sourceMappingURL=odata.js.map

package/dist/utils/prompt.js

@@ -0,0 +1,16 @@
+import { Cli } from '../cli/Cli.js';
+import { settingsNames } from '../settingsNames.js';
+let inquirer;
+export const prompt = {
+    /* c8 ignore next 10 */
+    async forInput(config, answers) {
+        if (!inquirer) {
+            inquirer = await import('inquirer');
+        }
+        const cli = Cli.getInstance();
+        const errorOutput = cli.getSettingWithDefaultValue(settingsNames.errorOutput, 'stderr');
+        const prompt = inquirer.createPromptModule({ output: errorOutput === 'stderr' ? process.stderr : process.stdout });
+        return await prompt(config, answers);
+    }
+};
+//# sourceMappingURL=prompt.js.map

package/docs/docs/cmd/aad/administrativeunit/administrativeunit-add.mdx

@@ -0,0 +1,115 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# aad administrativeunit add
+
+Creates a new administrative unit
+
+## Usage
+
+```sh
+m365 aad administrativeunit add [options]
+```
+
+## Options
+
+```md definition-list
+`-n, --displayname <displayName>`
+: Display name for the administrative unit.
+
+`-d, --description [description]`
+: Description for the administrative unit.
+
+`--hiddenMembership [hiddenMembership]`
+: Indicates whether the administrative unit and its members are hidden.
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command you must be either **Global Administrator** or **Privileged Role Administrator**.
+
+:::
+
+## Examples
+
+Create an administrative unit with a specific display name
+
+```sh
+m365 aad 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'
+```
+
+Create a hidden administrative unit with a specific display name
+
+```sh
+m365 aad administrativeunit add --displayName 'Marketing Division' --hiddenMembership
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  {
+    "id": "00b45a1b-7632-4e94-a3bd-f06aec976d31",
+    "deletedDateTime": null,
+    "displayName": "Marketing Division",
+    "description": "Marketing department administration",
+    "membershipRule": null,
+    "membershipType": null,
+    "membershipRuleProcessingState": null,
+    "visibility": null
+  }
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  deletedDateTime              : null
+  description                  : Marketing department administration
+  displayName                  : Marketing Division
+  id                           : 00b45a1b-7632-4e94-a3bd-f06aec976d31
+  membershipRule               : null
+  membershipRuleProcessingState: null
+  membershipType               : null
+  visibility                   : null
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  id,displayName,description,visibility
+  00b45a1b-7632-4e94-a3bd-f06aec976d31,Marketing Division,Marketing department administration,HiddenMembership
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  Date: 10/23/2023
+
+  ## Marketing Division (00b45a1b-7632-4e94-a3bd-f06aec976d31)
+
+  Property | Value
+  ---------|-------
+  id | 00b45a1b-7632-4e94-a3bd-f06aec976d31
+  displayName | Marketing Division
+  description | Marketing department administration
+  visibility | HiddenMembership
+  ```
+
+  </TabItem>
+</Tabs>

package/docs/docs/cmd/aad/administrativeunit/administrativeunit-get.mdx

@@ -0,0 +1,98 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# aad administrativeunit get
+
+Gets information about a specific administrative unit
+
+## Usage
+
+```sh
+m365 aad administrativeunit get [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --id [id]`
+: The id of the administrative unit. Specify either `id` or `displayName` but not both.
+
+`-n, --displayName [displayName]`
+: The display name of the administrative unit. Specify either `id` or `displayName` but not both.
+```
+
+<Global />
+
+## Examples
+
+Get information about the administrative unit by its id
+
+```sh
+m365 aad 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'
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  {
+    "id": "0a22c83d-c4ac-43e2-bb5e-87af3015d49f",
+    "deletedDateTime": null,
+    "displayName": "Marketing Division",
+    "description": "Marketing Department Administration",
+    "membershipRule": null,
+    "membershipType": null,
+    "membershipRuleProcessingState": null,
+    "visibility": "HiddenMembership"
+  }
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  deletedDateTime              : null
+  description                  : Marketing Department Administration
+  displayName                  : Marketing Division
+  id                           : 0a22c83d-c4ac-43e2-bb5e-87af3015d49f
+  membershipRule               : null
+  membershipRuleProcessingState: null
+  membershipType               : null
+  visibility                   : HiddenMembership
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  id,displayName,description,visibility
+  0a22c83d-c4ac-43e2-bb5e-87af3015d49f,Marketing Division,Marketing Department Administration,HiddenMembership
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  Date: 10/23/2023
+
+  ## Marketing Division (0a22c83d-c4ac-43e2-bb5e-87af3015d49f)
+
+  Property | Value
+  ---------|-------
+  id | 0a22c83d-c4ac-43e2-bb5e-87af3015d49f
+  displayName | Marketing Division
+  description | Marketing Department Administration
+  visibility | HiddenMembership
+  ```
+
+  </TabItem>
+</Tabs>

package/docs/docs/cmd/aad/administrativeunit/administrativeunit-list.mdx

@@ -0,0 +1,83 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# aad administrativeunit list
+
+Retrieves a list of administrative units
+
+## Usage
+
+```sh
+m365 aad administrativeunit list [options]
+```
+
+## Options
+
+<Global />
+
+## Examples
+
+Retrieve a list of administrative units
+
+```sh
+m365 aad administrativeunit list
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  [
+    {
+      "id": "0a22c83d-c4ac-43e2-bb5e-87af3015d49f",
+      "deletedDateTime": null,
+      "displayName": "Marketing Department",
+      "description": "Marketing Department Administration",
+      "membershipRule": null,
+      "membershipType": null,
+      "membershipRuleProcessingState": null,
+      "visibility": "HiddenMembership"
+    }
+  ]
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  displayName: 0a22c83d-c4ac-43e2-bb5e-87af3015d49f
+  id         : Marketing Department
+  visibility : HiddenMembership
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  id,displayName,description,visibility
+  0a22c83d-c4ac-43e2-bb5e-87af3015d49f,Marketing Department,Marketing Department Administration,HiddenMembership
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  # aad administrativeunit list
+
+  Date: 2023-10-16
+
+  ## Marketing Department (0a22c83d-c4ac-43e2-bb5e-87af3015d49f)
+
+  Property | Value
+  ---------|-------
+  id | 0a22c83d-c4ac-43e2-bb5e-87af3015d49f
+  displayName | Marketing Department
+  description | Marketing Department Administration
+  visibility | HiddenMembership
+  ```
+
+  </TabItem>
+</Tabs>

package/docs/docs/cmd/aad/administrativeunit/administrativeunit-remove.mdx

@@ -0,0 +1,52 @@
+import Global from '/docs/cmd/_global.mdx';
+
+# aad administrativeunit remove
+
+Removes an administrative unit
+
+## Usage
+
+```sh
+m365 aad administrativeunit remove [options]
+```
+
+## options
+
+```md definition-list
+`-i, --id [id]`
+: The id of the administrative unit. Specify either `id` or `displayName` but not both.
+
+`-n, --displayName [displayName]`
+: The display name of the administrative unit. Specify either `id` or `displayName` but not both.
+
+`-f, --force [force]`
+: Don't prompt for confirmation.
+```
+
+<Global />
+
+## Remarks
+
+:::info
+
+To use this command you must be either **Global Administrator** or **Privileged Role Administrator**.
+
+:::
+
+## Examples
+
+Remove an administrative unit by its id
+
+```sh
+m365 aad administrativeunit remove --id 03c4c9dc-6f0c-4c4f-a4e6-0c9ed80f54c7
+```
+
+Remove an administrative unit by it displayName
+
+```sh
+m365 aad administrativeunit remove --displayName 'Marketing Division'
+```
+
+## Response
+
+The command won't return a response on success

package/docs/docs/cmd/aad/group/group-user-list.mdx

@@ -0,0 +1,135 @@
+import Global from '/docs/cmd/_global.mdx';
+import Tabs from '@theme/Tabs';
+import TabItem from '@theme/TabItem';
+
+# aad group user list
+
+Lists users of a specific Azure AD group
+
+## Usage
+
+```sh
+m365 aad group user list [options]
+```
+
+## Options
+
+```md definition-list
+`-i, --groupId [groupId]`
+: The ID of the Azure AD group. Specify `groupId` or `groupDisplayName` but not both.
+
+`-n, --groupDisplayName [groupDisplayName]`
+: The display name of the Azure AD group. Specify `groupId` or `groupDisplayName` but not both.
+
+`-r, --role [role]`
+: Filter the results to only users with the given role: `Owner`, `Member`.
+
+`-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 group users from a group specified by ID.
+
+```sh
+m365 aad group user list --groupId 03cba9da-3974-46c1-afaf-79caa2e45bbe
+```
+
+List all owners from a group specified by display name.
+
+```sh
+m365 aad group user list --groupDisplayName Developers --role Owner
+```
+
+List all group users from a group specified by name. For each one return the display name, e-mail address, and manager display name.
+
+```sh
+m365 aad group user list --groupDisplayName Developers --properties "displayName,mail,manager/displayName"
+```
+
+List all group users from a group specified by name. For each one return the display name, e-mail address, and manager information.
+
+```sh
+m365 aad group user list --groupDisplayName Developers --properties "displayName,mail,manager/*"
+```
+
+List all group members that are guest users.
+
+```sh
+m365 aad group user list --groupDisplayName Developers --filter "userType eq 'Guest'"
+```
+
+## Response
+
+<Tabs>
+  <TabItem value="JSON">
+
+  ```json
+  [
+    {
+      "id": "da52218e-4822-4ac6-b41d-255e2059655e",
+      "displayName": "Adele Vance",
+      "userPrincipalName": "AdeleV@contoso.OnMicrosoft.com",
+      "givenName": "Adele",
+      "surname": "Vance",
+      "roles": [
+        "Owner",
+        "Member"
+      ]
+    }
+  ]
+  ```
+
+  </TabItem>
+  <TabItem value="Text">
+
+  ```text
+  id                                    displayName           userPrincipalName                     roles
+  ------------------------------------  --------------------  ------------------------------------  --------
+  da52218e-4822-4ac6-b41d-255e2059655e  Adele Vance           AdeleV@contoso.OnMicrosoft.com        Owner,Member
+  ```
+
+  </TabItem>
+  <TabItem value="CSV">
+
+  ```csv
+  id,displayName,userPrincipalName,givenName,surname
+  da52218e-4822-4ac6-b41d-255e2059655e,Adele Vance,AdeleV@contoso.OnMicrosoft.com,Adele,Vance
+  ```
+
+  </TabItem>
+  <TabItem value="Markdown">
+
+  ```md
+  # aad group user list --groupId "1deaa428-8dde-4043-b028-5492226d6114"
+
+  Date: 2023-10-02
+
+  ## Adele Vance (da52218e-4822-4ac6-b41d-255e2059655e)
+
+  Property | Value
+  ---------|-------
+  id | da52218e-4822-4ac6-b41d-255e2059655e
+  displayName | Adele Vance
+  userPrincipalName | AdeleV@contoso.OnMicrosoft.com
+  givenName | Adele
+  surname | Vance
+  ```
+
+  </TabItem>
+</Tabs>
+
+
+## More information
+
+- View the documentation to see what userproperties can be included: [https://pnp.github.io/cli-microsoft365/cmd/aad/user/user-get#more-information](https://pnp.github.io/cli-microsoft365/cmd/aad/user/user-get#more-information)

package/docs/docs/cmd/aad/m365group/m365group-remove.mdx

@@ -27,7 +27,17 @@ m365 aad m365group remove [options]
 
 ## Remarks
 
-If the specified _id_ doesn't refer to an existing group, you will get a `Resource does not exist` error.
+If the specified _id_ doesn't refer to an existing group, you will get a `Resource does not exist` error. Additionally, if you do not have access to the group or the associated group-connected site, you will get an `Access denied` error.
+
+When you use `--skipRecycleBin` flag to remove a Microsoft 365 group permanently, the process involves deleting the associated group-connected site and the group, and then checking if the group has been moved to the deleted groups list. In some cases, it may take a few seconds for the group to appear in the deleted groups list.
+
+To ensure a smooth deletion process, the command employs a retry mechanism with the following parameters:
+
+- `maxRetries`: This parameter is set to 10 by default. It specifies the maximum number of times the command will check if the group has been moved to the deleted groups list.
+
+- `intervalInMs`: This parameter is set to 5000 milliseconds (5 seconds) by default. It defines the time interval between each retry attempt.
+
+If the group is successfully moved to the deleted groups list within the specified number of retries, the command will then proceed to permanently remove it from the tenant. If the group cannot be removed after all retries, it will remain in the deleted groups list.
 
 ## Examples
 

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

@@ -31,7 +31,7 @@ m365 spo field get [options]
 : The ID of the field to retrieve. Specify `id` or `title` but not both.
 
 `-t, --title [title]`
-: The display name (case-sensitive) of the field to remove. Specify `id` or `title` but not both.
+: The display name (case-sensitive) of the field to retrieve. Specify `id` or `title` but not both.
 ```
 
 <Global />

package/npm-shrinkwrap.json

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