@pnp/cli-microsoft365 6.0.0-beta.de4f962 → 6.0.0-beta.dee678a

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

@@ -15,6 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _OutlookMailSendCommand_instances, _OutlookMailSendCommand_initTelemetry, _OutlookMailSendCommand_initOptions, _OutlookMailSendCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
+const Command_1 = require("../../../../Command");
 const request_1 = require("../../../../request");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -30,12 +32,16 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
         return commands_1.default.MAIL_SEND;
     }
     get description() {
-        return 'Sends e-mail on behalf of the current user';
+        return 'Sends an e-mail';
     }
     commandAction(logger, args, cb) {
         const bodyContents = args.options.bodyContents;
+        const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
+        if (isAppOnlyAuth === true && !args.options.sender) {
+            return cb(new Command_1.CommandError(`Specify a upn or user id in the 'sender' option when using app only authentication.`));
+        }
         const requestOptions = {
-            url: `${this.resource}/v1.0/me/sendMail`,
+            url: `${this.resource}/v1.0/${args.options.sender ? 'users/' + encodeURIComponent(args.options.sender) : 'me'}/sendMail`,
             headers: {
                 accept: 'application/json;odata.metadata=none',
                 'content-type': 'application/json'
@@ -59,6 +65,13 @@ class OutlookMailSendCommand extends GraphCommand_1.default {
                 saveToSentItems: args.options.saveToSentItems
             }
         };
+        if (args.options.mailbox) {
+            requestOptions.data.message.from = {
+                emailAddress: {
+                    address: args.options.mailbox
+                }
+            };
+        }
         request_1.default
             .post(requestOptions)
             .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
@@ -69,7 +82,9 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
         Object.assign(this.telemetryProperties, {
             bodyContents: typeof args.options.bodyContents !== 'undefined',
             bodyContentType: args.options.bodyContentType,
-            saveToSentItems: args.options.saveToSentItems
+            saveToSentItems: args.options.saveToSentItems,
+            mailbox: typeof args.options.mailbox !== 'undefined',
+            sender: typeof args.options.sender !== 'undefined'
         });
     });
 }, _OutlookMailSendCommand_initOptions = function _OutlookMailSendCommand_initOptions() {
@@ -77,6 +92,10 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
         option: '-s, --subject <subject>'
     }, {
         option: '-t, --to <to>'
+    }, {
+        option: '--sender [sender]'
+    }, {
+        option: '-m, --mailbox [mailbox]'
     }, {
         option: '--bodyContents <bodyContents>'
     }, {

package/dist/m365/pp/commands/environment/environment-list.js

@@ -64,7 +64,7 @@ _PpEnvironmentListCommand_instances = new WeakSet(), _PpEnvironmentListCommand_i
     });
 }, _PpEnvironmentListCommand_initOptions = function _PpEnvironmentListCommand_initOptions() {
     this.options.unshift({
-        option: '-a, --asAdmin [teamId]'
+        option: '-a, --asAdmin'
     });
 };
 module.exports = new PpEnvironmentListCommand();

package/dist/utils/fsUtil.js

@@ -42,12 +42,10 @@ const addFileCommands = {
         addFileCommand: 'cat > [FILEPATH] << EOF [FILECONTENT]EOF'
     },
     powershell: {
-        addFileCommand: `@"[FILECONTENT]"@ | Out-File -FilePath "[FILEPATH]"
-    `
+        addFileCommand: `@"[FILECONTENT]"@ | Out-File -FilePath [FILEPATH]`
     },
     cmd: {
-        addFileCommand: `echo [FILECONTENT] > "[FILEPATH]"
-    `
+        addFileCommand: `echo [FILECONTENT] > [FILEPATH]`
     }
 };
 const removeFileCommands = {

package/dist/utils/md.js

@@ -46,7 +46,7 @@ function convertHyperlinks(md) {
     });
 }
 function convertCodeFences(md) {
-    const regex = new RegExp('^```.*?' + os_1.EOL + '(.*?)```' + os_1.EOL, 'gms');
+    const regex = new RegExp('^```.*?(?:\r\n|\n)(.*?)```(?:\r\n|\n)', 'gms');
     return md.replace(regex, (match, code) => {
         return `  ${code}${os_1.EOL}`;
     });

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

@@ -1,6 +1,6 @@
 # outlook mail send
 
-Sends e-mail on behalf of the current user
+Sends an e-mail
 
 ## Usage
 
@@ -16,6 +16,12 @@ m365 outlook mail send [options]
 `-t, --to <to>`
 : Comma-separated list of e-mails to send the message to
 
+`--sender [sender]`
+: Optional upn or user id to specify what account to send the message from. Also see the remarks section.
+
+`-m, --mailbox [mailbox]`
+: Specify this option to send the email on behalf of another mailbox, for example a shared mailbox, group or distribution list. The sender needs to be a delegate on the specified mailbox. Also see the remarks section.
+
 `--bodyContents <bodyContents>`
 : String containing the body of the e-mail to send
 
@@ -27,6 +33,25 @@ m365 outlook mail send [options]
 
 --8<-- "docs/cmd/_global.md"
 
+## Remarks
+
+### 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.
+- You can optionally also specify the `--mailbox` option to send mail on behalf of a shared mailbox, group or distribution list. The account used in the `--sender` option, needs to have 'Send on behalf of' permissions on the mailbox in question.
+
+!!! important
+    You need `Mail.Send` application permissions on the Microsoft Graph to be able to send mails using an application identity. 
+
+### If you are connected with a regular user account
+
+- Specify the `--mailbox` option if you want to send an email on behalf of another mailbox. This can be a shared mailbox, group or distribution list. It will be visible in the email that the email was sent by you. You need to be assigned `Send on behalf of` permissions on the mailbox in question.  
+- You can specify the `--sender` option if you want to send an email as if you were the other user.
+The sent email can optionally be saved in the sent folder of that user account. You'll need `Read and manage (Full Access)` permissions on the mailbox of the other user. You can combine the `--sender` and `--mailbox` options to let the other user send a mail on behalf of the specified mailbox.
+
+!!! important
+    You need at least `Mail.Send` delegated permissions on the Microsoft Graph to be able to send emails. When specifying another user as sender, you'll need `Mail.Send.Shared` permissions.
+
 ## Examples
 
 Send a text e-mail to the specified e-mail address
@@ -52,3 +77,21 @@ Send a text e-mail to the specified e-mail address. Don't store the e-mail in se
 ```sh
 m365 outlook mail send --to chris@contoso.com --subject "DG2000 Data Sheets" --bodyContents "The latest data sheets are in the team site" --saveToSentItems false
 ```
+
+Send an email on behalf of a shared mailbox using the signed in user
+
+```sh
+m365 outlook mail send --to chris@contoso.com --subject "DG2000 Data Sheets" --bodyContents "The latest data sheets are in the team site" --mailbox sales@contoso.com
+```
+
+Send an email as another user
+
+```sh
+m365 outlook mail send --to chris@contoso.com --subject "DG2000 Data Sheets" --bodyContents "The latest data sheets are in the team site" --sender svc_project@contoso.com
+```
+
+Send an email as another user, on behalf of a shared mailbox
+
+```sh
+m365 outlook mail send --to chris@contoso.com --subject "DG2000 Data Sheets" --bodyContents "The latest data sheets are in the team site" --sender svc_project@contoso.com --mailbox sales@contoso.com
+```

package/docs/docs/cmd/pp/environment/environment-list.md

@@ -10,7 +10,7 @@ m365 pp environment list [options]
 
 ## Options
 
-`-a, --asAdmin [teamId]`
+`-a, --asAdmin`
 Run the command as admin and retrieve all environments. Lists only environments you have explicitly are assigned permissions to by default.
 
 --8<-- "docs/cmd/_global.md"

package/docs/docs/cmd/spo/list/list-roleassignment-add.md

@@ -26,10 +26,10 @@ m365 spo list roleassignment add [options]
 : SharePoint ID of principal it may be either user id or group id we want to add permissions to. Specify principalId only when upn or groupName are not used.
 
 `--upn [upn]`
-: Upn/email of user to assign role to. Specify either upn or princpialId
+: Upn/email of user to assign role to. Specify either upn or principalId
 
 `--groupName [groupName]`
-: Enter group name of Azure AD or SharePoint group.. Specify either groupName or princpialId
+: Enter group name of Azure AD or SharePoint group.. Specify either groupName or principalId
 
 `--roleDefinitionId [roleDefinitionId]`
 : ID of role definition. Specify either roleDefinitionId or roleDefinitionName but not both

package/docs/docs/cmd/spo/list/list-roleassignment-remove.md

@@ -26,10 +26,10 @@ m365 spo list roleassignment remove [options]
 : SharePoint ID of principal it may be either user id or group id we want to remove permissions Specify principalId only when upn or groupName are not used.
 
 `--upn [upn]`
-: upn/email of user. Specify either upn or princpialId.
+: upn/email of user. Specify either upn or principalId.
 
 `--groupName [groupName]`
-: enter group name of Azure AD or SharePoint group. Specify either groupName or princpialId.
+: enter group name of Azure AD or SharePoint group. Specify either groupName or principalId.
 
 `--confirm`
 : Don't prompt for confirming removing the role assignment

package/docs/docs/cmd/spo/listitem/listitem-roleassignment-remove.md

@@ -29,10 +29,10 @@ m365 spo listitem roleassignment remove [options]
 : SharePoint ID of principal it may be either user id or group id we want to remove permissions Specify principalId only when upn or groupName are not used.
 
 `--upn [upn]`
-: upn/email of user. Specify either upn or princpialId.
+: upn/email of user. Specify either upn or principalId.
 
 `--groupName [groupName]`
-: enter group name of Azure AD or SharePoint group. Specify either groupName or princpialId.
+: enter group name of Azure AD or SharePoint group. Specify either groupName or principalId.
 
 `--confirm`
 : Don't prompt for confirming removing the role assignment

package/docs/docs/cmd/spo/web/web-roleassignment-add.md

@@ -17,10 +17,10 @@ m365 spo web roleassignment add [options]
 : SharePoint ID of principal it may be either user id or group id we want to add permissions to. Specify principalId only when upn or groupName are not used.
 
 `--upn [upn]`
-: upn/email of user to assign role to. Specify either upn or princpialId
+: upn/email of user to assign role to. Specify either upn or principalId
 
 `--groupName [groupName]`
-: enter group name of Azure AD or SharePoint group.. Specify either groupName or princpialId
+: enter group name of Azure AD or SharePoint group.. Specify either groupName or principalId
 
 `--roleDefinitionId [roleDefinitionId]`
 : ID of role definition. Specify either roleDefinitionId or roleDefinitionName but not both

package/package.json

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