@pnp/cli-microsoft365 5.4.0-beta.0f3627d → 5.4.0-beta.5d38887

package/dist/m365/aad/commands/o365group/o365group-recyclebinitem-remove.js

@@ -0,0 +1,129 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../../cli");
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadO365GroupRecycleBinItemRemoveCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.O365GROUP_RECYCLEBINITEM_REMOVE;
+    }
+    get description() {
+        return 'Permanently deletes a Microsoft 365 Group from the recycle bin in the current tenant';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.id = typeof args.options.id !== 'undefined';
+        telemetryProps.displayName = typeof args.options.displayName !== 'undefined';
+        telemetryProps.mailNickname = typeof args.options.mailNickname !== 'undefined';
+        telemetryProps.confirm = !!args.options.confirm;
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        const removeGroup = () => __awaiter(this, void 0, void 0, function* () {
+            try {
+                const groupId = yield this.getGroupId(args.options);
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/directory/deletedItems/${groupId}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+                cb();
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err, logger, cb);
+            }
+        });
+        if (args.options.confirm) {
+            removeGroup();
+        }
+        else {
+            cli_1.Cli.prompt({
+                type: 'confirm',
+                name: 'continue',
+                default: false,
+                message: `Are you sure you want to remove the group '${args.options.id || args.options.displayName || args.options.mailNickname}'?`
+            }, (result) => {
+                if (!result.continue) {
+                    cb();
+                }
+                else {
+                    removeGroup();
+                }
+            });
+        }
+    }
+    getGroupId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { id, displayName, mailNickname } = options;
+            if (id) {
+                return id;
+            }
+            let filterValue = '';
+            if (displayName) {
+                filterValue = `displayName eq '${utils_1.formatting.encodeQueryParameter(displayName)}'`;
+            }
+            if (mailNickname) {
+                filterValue = `mailNickname eq '${utils_1.formatting.encodeQueryParameter(mailNickname)}'`;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/directory/deletedItems/Microsoft.Graph.Group?$filter=${filterValue}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            const groups = response.value;
+            if (groups.length === 0) {
+                throw Error(`The specified group '${displayName || mailNickname}' does not exist.`);
+            }
+            if (groups.length > 1) {
+                throw Error(`Multiple groups with name '${displayName || mailNickname}' found: ${groups.map(x => x.id).join(',')}.`);
+            }
+            return groups[0].id;
+        });
+    }
+    optionSets() {
+        return [['id', 'displayName', 'mailNickname']];
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --id [id]'
+            },
+            {
+                option: '-d, --displayName [displayName]'
+            },
+            {
+                option: '-m, --mailNickname [mailNickname]'
+            },
+            {
+                option: '--confirm'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.id && !utils_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        return true;
+    }
+}
+module.exports = new AadO365GroupRecycleBinItemRemoveCommand();
+//# sourceMappingURL=o365group-recyclebinitem-remove.js.map

package/dist/m365/aad/commands.js

@@ -29,6 +29,7 @@ exports.default = {
     O365GROUP_CONVERSATION_POST_LIST: `${prefix} o365group conversation post list`,
     O365GROUP_RECYCLEBINITEM_CLEAR: `${prefix} o365group recyclebinitem clear`,
     O365GROUP_RECYCLEBINITEM_LIST: `${prefix} o365group recyclebinitem list`,
+    O365GROUP_RECYCLEBINITEM_REMOVE: `${prefix} o365group recyclebinitem remove`,
     O365GROUP_RECYCLEBINITEM_RESTORE: `${prefix} o365group recyclebinitem restore`,
     O365GROUP_SET: `${prefix} o365group set`,
     O365GROUP_TEAMIFY: `${prefix} o365group teamify`,

package/dist/m365/spo/commands/hubsite/hubsite-list.js

@@ -42,7 +42,7 @@ class SpoHubSiteListCommand extends SpoCommand_1.default {
         })
             .then((res) => {
             hubSites = res.value;
-            if (args.options.includeAssociatedSites !== true || args.options.output !== 'json') {
+            if (args.options.includeAssociatedSites !== true || args.options.output && args.options.output !== 'json') {
                 return Promise.resolve();
             }
             else {

package/dist/m365/spo/commands/list/ListPrincipalType.js

@@ -0,0 +1,13 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+exports.ListPrincipalType = void 0;
+var ListPrincipalType;
+(function (ListPrincipalType) {
+    ListPrincipalType[ListPrincipalType["None"] = 0] = "None";
+    ListPrincipalType[ListPrincipalType["User"] = 1] = "User";
+    ListPrincipalType[ListPrincipalType["DistributionList"] = 2] = "DistributionList";
+    ListPrincipalType[ListPrincipalType["SecurityGroup"] = 4] = "SecurityGroup";
+    ListPrincipalType[ListPrincipalType["SharePointGroup"] = 8] = "SharePointGroup";
+    ListPrincipalType[ListPrincipalType["All"] = 15] = "All";
+})(ListPrincipalType = exports.ListPrincipalType || (exports.ListPrincipalType = {}));
+//# sourceMappingURL=ListPrincipalType.js.map

package/dist/m365/spo/commands/list/list-get.js

@@ -4,6 +4,7 @@ const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const ListPrincipalType_1 = require("./ListPrincipalType");
 class SpoListGetCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.LIST_GET;
@@ -42,6 +43,11 @@ class SpoListGetCommand extends SpoCommand_1.default {
         request_1.default
             .get(requestOptions)
             .then((listInstance) => {
+            if (args.options.withPermissions) {
+                listInstance.RoleAssignments.forEach(r => {
+                    r.Member.PrincipalTypeString = ListPrincipalType_1.ListPrincipalType[r.Member.PrincipalType];
+                });
+            }
             logger.log(listInstance);
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));

package/docs/docs/cmd/aad/o365group/o365group-recyclebinitem-remove.md

@@ -0,0 +1,45 @@
+# aad o365group recyclebinitem remove
+
+Permanently deletes a Microsoft 365 Group from the recycle bin in the current tenant
+
+## Usage
+
+```sh
+m365 aad o365group recyclebinitem remove [options]
+```
+
+## Options
+
+`-i, --id [id]`
+: The ID of the Microsoft 365 Group to remove. Specify either `id`, `displayName` or `mailNickname` but not multiple.
+
+`-d, --displayName [displayName]`
+: Display name for the Microsoft 365 Group to remove. Specify either `id`, `displayName` or `mailNickname` but not multiple.
+
+`-m, --mailNickname [mailNickname]`
+: Name of the group e-mail (part before the @). Specify either `id`, `displayName` or `mailNickname` but not multiple.
+
+`--confirm`
+: Don't prompt for confirmation.
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Removes the Microsoft 365 Group with specific ID
+
+```sh
+m365 aad o365group recyclebinitem remove --id "00000000-0000-0000-0000-000000000000"
+```
+
+Removes the Microsoft 365 Group with specific name
+
+```sh
+m365 aad o365group recyclebinitem remove --displayName "My Group"
+```
+
+Remove the Microsoft 365 Group with specific mail nickname without confirmation
+
+```sh
+m365 aad o365group recyclebinitem remove --mailNickname "Mygroup" --confirm
+```

package/docs/docs/cmd/spo/hubsite/hubsite-list.md

@@ -17,10 +17,7 @@ m365 spo hubsite list [options]
 
 ## Remarks
 
-!!! attention
-    This command is based on a SharePoint API that is currently in preview and is subject to change once the API reached general availability.
-
-When using the text output type (default), the command lists only the values of the `ID`, `SiteUrl` and `Title` properties of the hub site. When setting the output type to JSON, all available properties are included in the command output.
+When using the text or csv output type, the command lists only the values of the `ID`, `SiteUrl` and `Title` properties of the hub site. With the output type as JSON, all available properties are included in the command output.
 
 ## Examples
 

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "5.4.0-beta.0f3627d",
+  "version": "5.4.0-beta.5d38887",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",