@pnp/cli-microsoft365 6.0.0-beta.a0a813f → 6.0.0-beta.b5f756a

package/dist/m365/outlook/commands/mail/mail-send.js

@@ -15,10 +15,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OutlookMailSendCommand_instances, _OutlookMailSendCommand_initTelemetry, _OutlookMailSendCommand_initOptions, _OutlookMailSendCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const fs = require("fs");
+const path = require("path");
 const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const validation_1 = require("../../../../utils/validation");
 class OutlookMailSendCommand extends GraphCommand_1.default {
     constructor() {
         super();
@@ -34,7 +37,6 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
         return 'Sends an email';
     }
     commandAction(logger, args) {
-        var _a, _b;
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
@@ -48,28 +50,8 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
                         'content-type': 'application/json'
                     },
                     responseType: 'json',
-                    data: {
-                        message: {
-                            subject: args.options.subject,
-                            body: {
-                                contentType: args.options.bodyContentType || 'Text',
-                                content: args.options.bodyContents
-                            },
-                            toRecipients: this.mapEmailAddressesToRecipients(args.options.to.split(',')),
-                            ccRecipients: this.mapEmailAddressesToRecipients((_a = args.options.cc) === null || _a === void 0 ? void 0 : _a.split(',')),
-                            bccRecipients: this.mapEmailAddressesToRecipients((_b = args.options.bcc) === null || _b === void 0 ? void 0 : _b.split(',')),
-                            importance: args.options.importance
-                        },
-                        saveToSentItems: args.options.saveToSentItems
-                    }
+                    data: this.getRequestBody(args.options)
                 };
-                if (args.options.mailbox) {
-                    requestOptions.data.message.from = {
-                        emailAddress: {
-                            address: args.options.mailbox
-                        }
-                    };
-                }
                 yield request_1.default.post(requestOptions);
             }
             catch (err) {
@@ -77,15 +59,40 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
             }
         });
     }
-    mapEmailAddressesToRecipients(emailAddresses) {
-        if (!emailAddresses) {
-            return emailAddresses;
+    mapEmailAddressToRecipient(email) {
+        if (!email) {
+            return undefined;
         }
-        return emailAddresses.map(email => ({
+        return {
             emailAddress: {
                 address: email.trim()
             }
+        };
+    }
+    getRequestBody(options) {
+        var _a, _b;
+        const attachments = typeof options.attachment === 'string' ? [options.attachment] : options.attachment;
+        const attachmentContents = attachments === null || attachments === void 0 ? void 0 : attachments.map(a => ({
+            '@odata.type': '#microsoft.graph.fileAttachment',
+            name: path.basename(a),
+            contentBytes: fs.readFileSync(a, { encoding: 'base64' })
         }));
+        return ({
+            message: {
+                subject: options.subject,
+                body: {
+                    contentType: options.bodyContentType || 'Text',
+                    content: options.bodyContents
+                },
+                from: this.mapEmailAddressToRecipient(options.mailbox),
+                toRecipients: options.to.split(',').map(mail => this.mapEmailAddressToRecipient(mail)),
+                ccRecipients: (_a = options.cc) === null || _a === void 0 ? void 0 : _a.split(',').map(mail => this.mapEmailAddressToRecipient(mail)),
+                bccRecipients: (_b = options.bcc) === null || _b === void 0 ? void 0 : _b.split(',').map(mail => this.mapEmailAddressToRecipient(mail)),
+                importance: options.importance,
+                attachments: attachmentContents
+            },
+            saveToSentItems: options.saveToSentItems
+        });
     }
 }
 _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initTelemetry = function _OutlookMailSendCommand_initTelemetry() {
@@ -97,7 +104,8 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
             saveToSentItems: args.options.saveToSentItems,
             importance: args.options.importance,
             mailbox: typeof args.options.mailbox !== 'undefined',
-            sender: typeof args.options.sender !== 'undefined'
+            sender: typeof args.options.sender !== 'undefined',
+            attachment: typeof args.options.attachment !== 'undefined'
         });
     });
 }, _OutlookMailSendCommand_initOptions = function _OutlookMailSendCommand_initOptions() {
@@ -121,6 +129,8 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
     }, {
         option: '--importance [importance]',
         autocomplete: ['low', 'normal', 'high']
+    }, {
+        option: '--attachment [attachment]'
     }, {
         option: '--saveToSentItems [saveToSentItems]'
     });
@@ -131,14 +141,28 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
             args.options.bodyContentType !== 'HTML') {
             return `${args.options.bodyContentType} is not a valid value for the bodyContentType option. Allowed values are Text|HTML`;
         }
-        if (args.options.saveToSentItems &&
-            args.options.saveToSentItems !== 'true' &&
-            args.options.saveToSentItems !== 'false') {
+        if (args.options.saveToSentItems && !validation_1.validation.isValidBoolean(args.options.saveToSentItems)) {
             return `${args.options.saveToSentItems} is not a valid value for the saveToSentItems option. Allowed values are true|false`;
         }
         if (args.options.importance && ['low', 'normal', 'high'].indexOf(args.options.importance) === -1) {
             return `'${args.options.importance}' is not a valid value for the importance option. Allowed values are low|normal|high`;
         }
+        if (args.options.attachment) {
+            const attachments = typeof args.options.attachment === 'string' ? [args.options.attachment] : args.options.attachment;
+            for (const attachment of attachments) {
+                if (!fs.existsSync(attachment)) {
+                    return `File with path '${attachment}' was not found.`;
+                }
+                if (!fs.lstatSync(attachment).isFile()) {
+                    return `'${attachment}' is not a file.`;
+                }
+            }
+            const requestBody = this.getRequestBody(args.options);
+            // The max body size of the request is 4 194 304 chars before getting a 413 response
+            if (JSON.stringify(requestBody).length > 4194304) {
+                return 'Exceeded the max total size of attachments which is 3MB.';
+            }
+        }
         return true;
     }));
 };

package/dist/m365/planner/commands/plan/plan-get.js

@@ -46,12 +46,6 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
                 this.handleError('This command does not support application permissions.');
                 return;
             }
-            if (args.options.planId) {
-                args.options.id = args.options.planId;
-            }
-            if (args.options.planTitle) {
-                args.options.title = args.options.planTitle;
-            }
             try {
                 if (args.options.id) {
                     const plan = yield planner_1.planner.getPlanById(args.options.id);
@@ -99,8 +93,6 @@ class PlannerPlanGetCommand extends GraphCommand_1.default {
 _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTelemetry = function _PlannerPlanGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            planId: typeof args.options.planId !== 'undefined',
-            planTitle: typeof args.options.planTitle !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
@@ -109,10 +101,6 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
     });
 }, _PlannerPlanGetCommand_initOptions = function _PlannerPlanGetCommand_initOptions() {
     this.options.unshift({
-        option: '--planId [planId]'
-    }, {
-        option: '--planTitle [planTitle]'
-    }, {
         option: '-i, --id [id]'
     }, {
         option: '-t, --title [title]'
@@ -123,20 +111,17 @@ _PlannerPlanGetCommand_instances = new WeakSet(), _PlannerPlanGetCommand_initTel
     });
 }, _PlannerPlanGetCommand_initValidators = function _PlannerPlanGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.planId && args.options.planTitle ||
-            args.options.id && args.options.title ||
-            args.options.planId && args.options.title ||
-            args.options.id && args.options.planTitle) {
+        if (args.options.id && args.options.title) {
             return 'Specify either id or title but not both';
         }
-        if (!args.options.planId && !args.options.id) {
-            if (!args.options.planTitle && !args.options.title) {
+        if (!args.options.id) {
+            if (!args.options.title) {
                 return 'Specify either id or title';
             }
-            if ((args.options.title || args.options.planTitle) && !args.options.ownerGroupId && !args.options.ownerGroupName) {
+            if (args.options.title && !args.options.ownerGroupId && !args.options.ownerGroupName) {
                 return 'Specify either ownerGroupId or ownerGroupName';
             }
-            if ((args.options.title || args.options.planTitle) && args.options.ownerGroupId && args.options.ownerGroupName) {
+            if (args.options.title && args.options.ownerGroupId && args.options.ownerGroupName) {
                 return 'Specify either ownerGroupId or ownerGroupName but not both';
             }
             if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {

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

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListWebhookListCommand_instances, _SpoListWebhookListCommand_initTelemetry, _SpoListWebhookListCommand_initOptions, _SpoListWebhookListCommand_initValidators, _SpoListWebhookListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const chalk = require("chalk");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const urlUtil_1 = require("../../../../utils/urlUtil");
@@ -42,28 +41,16 @@ class SpoListWebhookListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.title && this.verbose) {
-                logger.logToStderr(chalk.yellow(`Option 'title' is deprecated. Please use 'listTitle' instead`));
-            }
-            if (args.options.id && this.verbose) {
-                logger.logToStderr(chalk.yellow(`Option 'id' is deprecated. Please use 'listId' instead`));
-            }
             if (this.verbose) {
-                logger.logToStderr(`Retrieving webhook information for list ${args.options.id || args.options.listId || args.options.listUrl} in site at ${args.options.webUrl}...`);
+                logger.logToStderr(`Retrieving webhook information for list ${args.options.listTitle || args.options.listId || args.options.listUrl} in site at ${args.options.webUrl}...`);
             }
             let requestUrl = `${args.options.webUrl}/_api/web`;
-            if (args.options.id) {
-                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/Subscriptions`;
-            }
-            else if (args.options.listId) {
+            if (args.options.listId) {
                 requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions`;
             }
             else if (args.options.listTitle) {
                 requestUrl += `/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions`;
             }
-            else if (args.options.title) {
-                requestUrl += `/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')/Subscriptions`;
-            }
             else if (args.options.listUrl) {
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Subscriptions`;
@@ -99,11 +86,9 @@ class SpoListWebhookListCommand extends SpoCommand_1.default {
 _SpoListWebhookListCommand_instances = new WeakSet(), _SpoListWebhookListCommand_initTelemetry = function _SpoListWebhookListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: typeof args.options.id !== 'undefined',
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            listUrl: typeof args.options.listUrl !== 'undefined',
-            title: typeof args.options.title !== 'undefined'
+            listUrl: typeof args.options.listUrl !== 'undefined'
         });
     });
 }, _SpoListWebhookListCommand_initOptions = function _SpoListWebhookListCommand_initOptions() {
@@ -115,10 +100,6 @@ _SpoListWebhookListCommand_instances = new WeakSet(), _SpoListWebhookListCommand
         option: '-t, --listTitle [listTitle]'
     }, {
         option: '--listUrl [listUrl]'
-    }, {
-        option: '--id [id]'
-    }, {
-        option: '--title [title]'
     });
 }, _SpoListWebhookListCommand_initValidators = function _SpoListWebhookListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -126,11 +107,6 @@ _SpoListWebhookListCommand_instances = new WeakSet(), _SpoListWebhookListCommand
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.id) {
-            if (!validation_1.validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
-            }
-        }
         if (args.options.listId) {
             if (!validation_1.validation.isValidGuid(args.options.listId)) {
                 return `${args.options.listId} is not a valid GUID`;
@@ -139,7 +115,7 @@ _SpoListWebhookListCommand_instances = new WeakSet(), _SpoListWebhookListCommand
         return true;
     }));
 }, _SpoListWebhookListCommand_initOptionSets = function _SpoListWebhookListCommand_initOptionSets() {
-    this.optionSets.push(['id', 'title', 'listId', 'listTitle', 'listUrl']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListWebhookListCommand();
 //# sourceMappingURL=list-webhook-list.js.map

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

@@ -15,7 +15,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteAddCommand_instances, _SpoSiteAddCommand_initTelemetry, _SpoSiteAddCommand_initOptions, _SpoSiteAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const chalk = require("chalk");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
@@ -59,9 +58,6 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
             const isTeamSite = args.options.type !== 'CommunicationSite';
             try {
                 const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
-                if (args.options.allowFileSharingForGuestUsers && this.verbose) {
-                    logger.logToStderr(chalk.yellow(`Option 'allowFileSharingForGuestUsers' is deprecated. Please use 'shareByEmailEnabled' instead`));
-                }
                 if (this.verbose) {
                     logger.logToStderr(`Creating new site...`);
                 }
@@ -130,7 +126,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                             request: {
                                 Title: args.options.title,
                                 Url: args.options.url,
-                                ShareByEmailEnabled: args.options.shareByEmailEnabled || args.options.allowFileSharingForGuestUsers,
+                                ShareByEmailEnabled: args.options.shareByEmailEnabled,
                                 Description: args.options.description || '',
                                 Classification: args.options.classification || '',
                                 WebTemplate: 'SITEPAGEPUBLISHING#0',
@@ -388,7 +384,6 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
         telemetryProps.lcid = args.options.lcid;
         telemetryProps.owners = typeof args.options.owners !== 'undefined';
         if (isCommunicationSite) {
-            telemetryProps.allowFileSharingForGuestUsers = args.options.allowFileSharingForGuestUsers || false;
             telemetryProps.shareByEmailEnabled = args.options.shareByEmailEnabled || false;
             telemetryProps.siteDesign = args.options.siteDesign;
             telemetryProps.siteDesignId = (!(!args.options.siteDesignId)).toString();
@@ -431,8 +426,6 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
         autocomplete: ['Topic', 'Showcase', 'Blank']
     }, {
         option: '--siteDesignId [siteDesignId]'
-    }, {
-        option: '--allowFileSharingForGuestUsers'
     }, {
         option: '--shareByEmailEnabled'
     }, {
@@ -466,7 +459,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
             if (!args.options.alias) {
                 return 'Required option alias missing';
             }
-            if (args.options.url || args.options.siteDesign || args.options.removeDeletedSite || args.options.wait || args.options.shareByEmailEnabled || args.options.allowFileSharingForGuestUsers || args.options.siteDesignId || args.options.timeZone || args.options.resourceQuota || args.options.resourceQuotaWarningLevel || args.options.storageQuota || args.options.storageQuotaWarningLevel || args.options.webTemplate) {
+            if (args.options.url || args.options.siteDesign || args.options.removeDeletedSite || args.options.wait || args.options.shareByEmailEnabled || args.options.siteDesignId || args.options.timeZone || args.options.resourceQuota || args.options.resourceQuotaWarningLevel || args.options.storageQuota || args.options.storageQuotaWarningLevel || args.options.webTemplate) {
                 return "Type TeamSite supports only the parameters title, lcid, alias, owners, classification, isPublic, and description";
             }
         }
@@ -497,7 +490,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
                 return 'Specify siteDesign or siteDesignId but not both';
             }
             if (args.options.timeZone || args.options.isPublic || args.options.removeDeletedSite || args.options.wait || args.options.alias || args.options.resourceQuota || args.options.resourceQuotaWarningLevel || args.options.storageQuota || args.options.storageQuotaWarningLevel || args.options.webTemplate) {
-                return "Type CommunicationSite supports only the parameters url, title, lcid, classification, siteDesign, shareByEmailEnabled, allowFileSharingForGuestUsers, siteDesignId, owners, and description";
+                return "Type CommunicationSite supports only the parameters url, title, lcid, classification, siteDesign, shareByEmailEnabled, siteDesignId, owners, and description";
             }
         }
         else {
@@ -550,7 +543,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
             if (args.options.storageQuotaWarningLevel > args.options.storageQuota) {
                 return `storageQuotaWarningLevel cannot exceed storageQuota`;
             }
-            if (args.options.classification || args.options.shareByEmailEnabled || args.options.allowFileSharingForGuestUsers || args.options.siteDesignId || args.options.siteDesignId || args.options.alias || args.options.isPublic) {
+            if (args.options.classification || args.options.shareByEmailEnabled || args.options.siteDesignId || args.options.siteDesignId || args.options.alias || args.options.isPublic) {
                 return "Type ClassicSite supports only the parameters url, title, lcid, storageQuota, storageQuotaWarningLevel, resourceQuota, resourceQuotaWarningLevel, webTemplate, owners, and description";
             }
         }

package/dist/m365/spo/commands/{hubsite/hubsite-connect.js → site/site-hubsite-connect.js}

@@ -13,22 +13,22 @@ 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 _SpoHubSiteConnectCommand_instances, _SpoHubSiteConnectCommand_initOptions, _SpoHubSiteConnectCommand_initValidators;
+var _SpoSiteHubSiteConnectCommand_instances, _SpoSiteHubSiteConnectCommand_initOptions, _SpoSiteHubSiteConnectCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoHubSiteConnectCommand extends SpoCommand_1.default {
+class SpoSiteHubSiteConnectCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoHubSiteConnectCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteConnectCommand_instances, "m", _SpoHubSiteConnectCommand_initValidators).call(this);
+        _SpoSiteHubSiteConnectCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteConnectCommand_instances, "m", _SpoSiteHubSiteConnectCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteConnectCommand_instances, "m", _SpoSiteHubSiteConnectCommand_initValidators).call(this);
     }
     get name() {
-        return commands_1.default.HUBSITE_CONNECT;
+        return commands_1.default.SITE_HUBSITE_CONNECT;
     }
     get description() {
         return 'Connects the specified site collection to the given hub site';
@@ -53,13 +53,13 @@ class SpoHubSiteConnectCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoHubSiteConnectCommand_instances = new WeakSet(), _SpoHubSiteConnectCommand_initOptions = function _SpoHubSiteConnectCommand_initOptions() {
+_SpoSiteHubSiteConnectCommand_instances = new WeakSet(), _SpoSiteHubSiteConnectCommand_initOptions = function _SpoSiteHubSiteConnectCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '-i, --id <id>'
     });
-}, _SpoHubSiteConnectCommand_initValidators = function _SpoHubSiteConnectCommand_initValidators() {
+}, _SpoSiteHubSiteConnectCommand_initValidators = function _SpoSiteHubSiteConnectCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         if (isValidSharePointUrl !== true) {
@@ -71,5 +71,5 @@ _SpoHubSiteConnectCommand_instances = new WeakSet(), _SpoHubSiteConnectCommand_i
         return true;
     }));
 };
-module.exports = new SpoHubSiteConnectCommand();
-//# sourceMappingURL=hubsite-connect.js.map
+module.exports = new SpoSiteHubSiteConnectCommand();
+//# sourceMappingURL=site-hubsite-connect.js.map

package/dist/m365/spo/commands/{hubsite/hubsite-disconnect.js → site/site-hubsite-disconnect.js}

@@ -13,7 +13,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 _SpoHubSiteDisconnectCommand_instances, _SpoHubSiteDisconnectCommand_initTelemetry, _SpoHubSiteDisconnectCommand_initOptions, _SpoHubSiteDisconnectCommand_initValidators;
+var _SpoSiteHubSiteDisconnectCommand_instances, _SpoSiteHubSiteDisconnectCommand_initTelemetry, _SpoSiteHubSiteDisconnectCommand_initOptions, _SpoSiteHubSiteDisconnectCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
@@ -21,16 +21,16 @@ const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
+class SpoSiteHubSiteDisconnectCommand extends SpoCommand_1.default {
     constructor() {
         super();
-        _SpoHubSiteDisconnectCommand_instances.add(this);
-        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initTelemetry).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initOptions).call(this);
-        __classPrivateFieldGet(this, _SpoHubSiteDisconnectCommand_instances, "m", _SpoHubSiteDisconnectCommand_initValidators).call(this);
+        _SpoSiteHubSiteDisconnectCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initValidators).call(this);
     }
     get name() {
-        return commands_1.default.HUBSITE_DISCONNECT;
+        return commands_1.default.SITE_HUBSITE_DISCONNECT;
     }
     get description() {
         return 'Disconnects the specifies site collection from its hub site';
@@ -44,7 +44,7 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
                         logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hubsite...`);
                     }
                     const requestOptions = {
-                        url: `${args.options.url}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
+                        url: `${args.options.siteUrl}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
                         headers: {
                             'X-RequestDigest': res.FormDigestValue,
                             accept: 'application/json;odata=nometadata'
@@ -74,20 +74,20 @@ class SpoHubSiteDisconnectCommand extends SpoCommand_1.default {
         });
     }
 }
-_SpoHubSiteDisconnectCommand_instances = new WeakSet(), _SpoHubSiteDisconnectCommand_initTelemetry = function _SpoHubSiteDisconnectCommand_initTelemetry() {
+_SpoSiteHubSiteDisconnectCommand_instances = new WeakSet(), _SpoSiteHubSiteDisconnectCommand_initTelemetry = function _SpoSiteHubSiteDisconnectCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             confirm: args.options.confirm || false
         });
     });
-}, _SpoHubSiteDisconnectCommand_initOptions = function _SpoHubSiteDisconnectCommand_initOptions() {
+}, _SpoSiteHubSiteDisconnectCommand_initOptions = function _SpoSiteHubSiteDisconnectCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '--confirm'
     });
-}, _SpoHubSiteDisconnectCommand_initValidators = function _SpoHubSiteDisconnectCommand_initValidators() {
+}, _SpoSiteHubSiteDisconnectCommand_initValidators = function _SpoSiteHubSiteDisconnectCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
-module.exports = new SpoHubSiteDisconnectCommand();
-//# sourceMappingURL=hubsite-disconnect.js.map
+module.exports = new SpoSiteHubSiteDisconnectCommand();
+//# sourceMappingURL=site-hubsite-disconnect.js.map

package/dist/m365/spo/commands.js

@@ -86,9 +86,7 @@ exports.default = {
     HOMESITE_GET: `${prefix} homesite get`,
     HOMESITE_REMOVE: `${prefix} homesite remove`,
     HOMESITE_SET: `${prefix} homesite set`,
-    HUBSITE_CONNECT: `${prefix} hubsite connect`,
     HUBSITE_DATA_GET: `${prefix} hubsite data get`,
-    HUBSITE_DISCONNECT: `${prefix} hubsite disconnect`,
     HUBSITE_GET: `${prefix} hubsite get`,
     HUBSITE_LIST: `${prefix} hubsite list`,
     HUBSITE_REGISTER: `${prefix} hubsite register`,
@@ -207,6 +205,8 @@ exports.default = {
     SITE_ENSURE: `${prefix} site ensure`,
     SITE_GET: `${prefix} site get`,
     SITE_GROUPIFY: `${prefix} site groupify`,
+    SITE_HUBSITE_DISCONNECT: `${prefix} site hubsite disconnect`,
+    SITE_HUBSITE_CONNECT: `${prefix} site hubsite connect`,
     SITE_LIST: `${prefix} site list`,
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
     SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,

package/dist/m365/teams/commands/team/team-set.js

@@ -54,10 +54,6 @@ class TeamsTeamSetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.displayName) {
-                args.options.name = args.options.displayName;
-                this.warn(logger, `Option 'displayName' is deprecated. Please use 'name' instead.`);
-            }
             const data = this.mapRequestBody(args.options);
             const requestOptions = {
                 url: `${this.resource}/v1.0/groups/${encodeURIComponent(args.options.id)}`,
@@ -87,8 +83,6 @@ _TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemet
         option: '-i, --id [id]'
     }, {
         option: '-n, --name [name]'
-    }, {
-        option: '--displayName [displayName]'
     }, {
         option: '--description [description]'
     }, {
@@ -113,7 +107,6 @@ _TeamsTeamSetCommand_instances = new WeakSet(), _TeamsTeamSetCommand_initTelemet
     }));
 };
 TeamsTeamSetCommand.props = [
-    'displayName',
     'description',
     'mailNickName',
     'classification',

package/docs/docs/_clisettings.md

@@ -0,0 +1,18 @@
+## Available settings
+
+Following is the list of configuration settings available in CLI for Microsoft 365.
+
+Setting name|Definition|Default value
+------------|----------|-------------
+`autoOpenLinksInBrowser`|Automatically open the browser for all commands which return a url and expect the user to copy paste this to the browser. For example when logging in, using `m365 login` in device code mode.|`false`
+`copyDeviceCodeToClipboard`|Automatically copy the device code to the clipboard when running `m365 login` command in device code mode|`false`
+`csvEscape`|Single character used for escaping; only apply to characters matching the quote and the escape options|`"`
+`csvHeader`|Display the column names on the first line|`true`
+`csvQuote`|The quote characters surrounding a field. An empty quote value will preserve the original field, whether it contains quotation marks or not.|` `
+`csvQuoted`|Quote all the non-empty fields even if not required|`false`
+`csvQuotedEmpty`|Quote empty strings and overrides quoted_string on empty strings when defined|`false`
+`errorOutput`|Defines if errors should be written to `stdout` or `stderr`|`stderr`
+`output`|Defines the default output when issuing a command|`json`
+`printErrorsAsPlainText`|When output mode is set to `json`, print error messages as plain-text rather than JSON|`true`
+`prompt`|Prompts for missing values in required options|`false`
+`showHelpOnFailure`|Automatically display help when executing a command failed|`true`

package/docs/docs/cmd/outlook/mail/mail-send.md

@@ -37,6 +37,9 @@ m365 outlook mail send [options]
 `--importance [importance]`
 : The importance of the message. Available options: `low`, `normal` or `high`. Default is `normal`.
 
+`--attachment [attachment]`
+: Path to the file that will be added as attachment to the email. This option can be used multiple times to attach multiple attachments.
+
 `--saveToSentItems [saveToSentItems]`
 : Save email in the sent items folder. Default `true`.
 
@@ -44,6 +47,10 @@ m365 outlook mail send [options]
 
 ## Remarks
 
+### Attachments
+
+When using the `attachment` option, note that the total size of all attachment files cannot exceed 3 MB.
+
 ### If you are connected using app only authentication
 
 - Always specify a user id or upn in the `--sender` option. The email will be sent as if it came from the specified user, and can optionally be saved in the sent folder of that user account.
@@ -110,3 +117,9 @@ Send an email with cc and bcc recipients marked as important
 ```sh
 m365 outlook mail send --to chris@contoso.com --cc claire@contoso.com --bcc randy@contoso.com --subject "DG2000 Data Sheets" --bodyContents "The latest data sheets are in the team site" --importance high
 ```
+
+Send an email with multiple attachments
+
+```sh
+m365 outlook mail send --to chris@contoso.com --subject "Monthly reports" --bodyContents "Here are the reports of this month." --attachment "C:/Reports/File1.jpg" --attachment "C:/Reports/File2.docx" --attachment "C:/Reports/File3.xlsx"
+```

package/docs/docs/cmd/planner/plan/plan-get.md

@@ -16,12 +16,6 @@ m365 planner plan get [options]
 `-t, --title [title]`
 : Title of the plan. Specify either `id` or `title` but not both.
 
-`--planId [planId]`
-: (deprecated. Use `id` instead) ID of the plan. Specify either `planId` or `planTitle` but not both.
-
-`---planTitle [planTitle]`
-: (deprecated. Use `title` instead) Title of the plan. Specify either `planId` or `planTitle` but not both.
-
 `--ownerGroupId [ownerGroupId]`
 : ID of the Group that owns the plan. Specify either `ownerGroupId` or `ownerGroupName` when using `title` or the deprecated `planTitle`.
 

package/docs/docs/cmd/planner/task/task-get.md

@@ -22,9 +22,6 @@ m365 planner task details get [options]
 `-t, --title [title]`
 : Title of the task. Specify either `id` or `title` but not both.
 
-`--taskId [taskId]`
-: (deprecated. Use `id` instead) ID of the task.
-
 `--bucketId [bucketId]`
 : ID of the bucket to which the task belongs. Specify `bucketId` or `bucketName` when using `title`.
 

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

@@ -14,19 +14,13 @@ m365 spo list webhook list [options]
 : URL of the site where the list is located.
 
 `-i, --listId [listId]`
-: ID of the list. Specify either `id`, `title`, `listTitle`, `listId` or `listUrl`.
+: ID of the list. Specify either `listTitle`, `listId` or `listUrl`.
 
 `-t, --listTitle [listTitle]`
-: Title of the list. Specify either `id`, `title`, `listTitle`, `listId` or `listUrl`.
+: Title of the list. Specify either `listTitle`, `listId` or `listUrl`.
 
 `--listUrl [listUrl]`
-: Server- or site-relative URL of the list. Specify either `id`, `title`, `listTitle`, `listId` or `listUrl`.
-
-`--id [id]`
-: (deprecated. Use `listId` instead) ID of the list to retrieve all webhooks for. Specify either `id`, `title`, `listTitle`, `listId` or `listUrl`.
-
-`--title [title]`
-: (deprecated. Use `listTitle` instead) Title of the list to retrieve all webhooks for. Specify either `id`, `title`, `listTitle`, `listId` or `listUrl`.
+: Server- or site-relative URL of the list. Specify either `listTitle`, `listId` or `listUrl`.
 
 --8<-- "docs/cmd/_global.md"
 

package/docs/docs/cmd/spo/site/site-add.md

@@ -46,9 +46,6 @@ m365 spo site add [options]
 `--siteDesignId [siteDesignId]`
 : Id of the custom site design to use to create the site. When creating a communication site, specify either `siteDesign` or `siteDesignId` (applies to type CommunicationSite)
 
-`--allowFileSharingForGuestUsers`
-: (deprecated. Use `shareByEmailEnabled` instead) Determines whether it's allowed to share file with guests (applies to type CommunicationSite)
-
 `--shareByEmailEnabled`
 : Determines whether it's allowed to share file with guests (applies to type CommunicationSite)
 

package/docs/docs/cmd/spo/{hubsite/hubsite-connect.md → site/site-hubsite-connect.md}

@@ -1,11 +1,11 @@
-# spo hubsite connect
+# spo site hubsite connect
 
 Connects the specified site collection to the given hub site
 
 ## Usage
 
 ```sh
-m365 spo hubsite connect [options]
+m365 spo site hubsite connect [options]
 ```
 
 ## Options
@@ -29,10 +29,10 @@ If the specified `id` doesn't point to a valid hub site, you will get a `Resourc
 
 ## Examples
 
-Connect the site collection with URL _https://contoso.sharepoint.com/sites/contoso-sales_ to the hub site with ID _255a50b2-527f-4413-8485-57f4c17a24d1_
+Connect a specific site collection to a hub site
 
 ```sh
-m365 spo hubsite connect --siteUrl https://contoso.sharepoint.com/sites/contoso-sales --id 255a50b2-527f-4413-8485-57f4c17a24d1
+m365 spo site hubsite connect --siteUrl https://contoso.sharepoint.com/sites/contoso-sales --id 255a50b2-527f-4413-8485-57f4c17a24d1
 ```
 
 ## More information

package/docs/docs/cmd/spo/{hubsite/hubsite-disconnect.md → site/site-hubsite-disconnect.md}

@@ -1,11 +1,11 @@
-# spo hubsite disconnect
+# spo site hubsite disconnect
 
 Disconnects the specified site collection from its hub site
 
 ## Usage
 
 ```sh
-m365 spo hubsite disconnect [options]
+m365 spo site hubsite disconnect [options]
 ```
 
 ## Options
@@ -14,7 +14,7 @@ m365 spo hubsite disconnect [options]
 : URL of the site collection to disconnect from its hub site
 
 `--confirm`
-: Don't prompt for confirming disconnecting from the hub site
+: Don't prompt for confirmation
 
 --8<-- "docs/cmd/_global.md"
 
@@ -25,16 +25,16 @@ m365 spo hubsite disconnect [options]
 
 ## Examples
 
-Disconnect the site collection with URL _https://contoso.sharepoint.com/sites/sales_ from its hub site. Will prompt for confirmation before disconnecting from the hub site.
+Disconnect a specific site collection from its hub site. Will prompt for confirmation before disconnecting from the hub site.
 
 ```sh
-m365 spo hubsite disconnect --siteUrl https://contoso.sharepoint.com/sites/sales
+m365 spo site hubsite disconnect --siteUrl https://contoso.sharepoint.com/sites/sales
 ```
 
-Disconnect the site collection with URL _https://contoso.sharepoint.com/sites/sales_ from its hub site without prompting for confirmation
+Disconnect a specific site collection from its hub site without prompting for confirmation.
 
 ```sh
-m365 spo hubsite disconnect --siteUrl https://contoso.sharepoint.com/sites/sales --confirm
+m365 spo site hubsite disconnect --siteUrl https://contoso.sharepoint.com/sites/sales --confirm
 ```
 
 ## More information

package/docs/docs/cmd/teams/team/team-clone.md

@@ -16,9 +16,6 @@ m365 teams team clone [options]
 `-n, --name [name]`
 : The display name for the new Microsoft Teams Team to clone
 
-`--displayName [displayName]`
-: (deprecated. Use `name` instead) The display name for the new Microsoft Teams Team to clone
-
 `-p, --partsToClone <partsToClone>`
 : A comma-separated list of the parts to clone. Allowed values are `apps,channels,members,settings,tabs`
 

package/docs/docs/cmd/teams/team/team-set.md

@@ -16,9 +16,6 @@ m365 teams team set [options]
 `-n, --name [name]`
 : The display name for the Microsoft Teams team for which to update settings
 
-`--displayName [displayName]`
-: (deprecated. Use `name` instead) The display name for the Microsoft Teams team for which to update settings
-
 `--description [description]`
 : The description for the Microsoft Teams team
 

package/package.json

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