@pnp/cli-microsoft365 5.8.0-beta.85a4dec → 5.8.0-beta.9cf7616

package/dist/m365/commands/status.js

@@ -13,18 +13,29 @@ class StatusCommand extends Command_1.default {
     }
     commandAction(logger, args, cb) {
         if (Auth_1.default.service.connected) {
-            if (this.debug) {
-                logger.logToStderr({
-                    connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
-                    authType: Auth_1.AuthType[Auth_1.default.service.authType],
-                    accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2)
-                });
-            }
-            else {
-                logger.log({
-                    connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
-                });
-            }
+            Auth_1.default
+                .ensureAccessToken(Auth_1.default.defaultResource, logger, this.debug)
+                .then(() => {
+                if (this.debug) {
+                    logger.logToStderr({
+                        connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken),
+                        authType: Auth_1.AuthType[Auth_1.default.service.authType],
+                        accessTokens: JSON.stringify(Auth_1.default.service.accessTokens, null, 2)
+                    });
+                }
+                else {
+                    logger.log({
+                        connectedAs: utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[Auth_1.default.defaultResource].accessToken)
+                    });
+                }
+                cb();
+            }, (rej) => {
+                if (this.debug) {
+                    logger.logToStderr(rej);
+                }
+                Auth_1.default.service.logout();
+                cb(new Command_1.CommandError(`Your login has expired. Sign in again to continue. ${rej.message}`));
+            });
         }
         else {
             if (this.verbose) {
@@ -33,8 +44,8 @@ class StatusCommand extends Command_1.default {
             else {
                 logger.log('Logged out');
             }
+            cb();
         }
-        cb();
     }
     action(logger, args, cb) {
         Auth_1.default

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,15 +32,19 @@ 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';
     }
     alias() {
         return [commands_1.default.SENDMAIL];
     }
     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'
@@ -62,6 +68,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));
@@ -72,7 +85,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() {
@@ -80,6 +95,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/spfx/commands/project/project-upgrade/rules/FN010008_YORC_nodeVersion.js

@@ -19,7 +19,7 @@ class FN010008_YORC_nodeVersion extends JsonRule_1.JsonRule {
     get resolution() {
         return `{
   "@microsoft/generator-sharepoint": {
-    "nodeVersion": ${process.version.substring(1)}
+    "nodeVersion": "${process.version.substring(1)}"
   }
 }`;
     }

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

@@ -0,0 +1,112 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _SpoRoleDefinitionAddCommand_instances, _SpoRoleDefinitionAddCommand_initTelemetry, _SpoRoleDefinitionAddCommand_initOptions, _SpoRoleDefinitionAddCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const base_permissions_1 = require("../../base-permissions");
+const commands_1 = require("../../commands");
+class SpoRoleDefinitionAddCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoRoleDefinitionAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoRoleDefinitionAddCommand_instances, "m", _SpoRoleDefinitionAddCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.ROLEDEFINITION_ADD;
+    }
+    get description() {
+        return 'Adds a new roledefinition to web';
+    }
+    get permissionsKindMap() {
+        const result = [];
+        for (const kind in base_permissions_1.PermissionKind) {
+            if (typeof base_permissions_1.PermissionKind[kind] === 'number') {
+                result.push(kind);
+            }
+        }
+        return result;
+    }
+    commandAction(logger, args, cb) {
+        if (this.verbose) {
+            logger.logToStderr(`Adding role definition to ${args.options.webUrl}...`);
+        }
+        const description = args.options.description || '';
+        const permissions = new base_permissions_1.BasePermissions();
+        if (args.options.rights) {
+            const rights = args.options.rights.split(',');
+            for (const item of rights) {
+                const kind = base_permissions_1.PermissionKind[item.trim()];
+                permissions.set(kind);
+            }
+        }
+        const requestOptions = {
+            url: `${args.options.webUrl}/_api/web/roledefinitions`,
+            headers: {
+                'accept': 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            data: {
+                'BasePermissions': {
+                    'High': permissions.high.toString(),
+                    'Low': permissions.low.toString()
+                },
+                'Description': `${description}`,
+                'Name': `${args.options.name}`
+            }
+        };
+        request_1.default
+            .post(requestOptions)
+            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+}
+_SpoRoleDefinitionAddCommand_instances = new WeakSet(), _SpoRoleDefinitionAddCommand_initTelemetry = function _SpoRoleDefinitionAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            rights: args.options.rights,
+            description: (!(!args.options.description)).toString()
+        });
+    });
+}, _SpoRoleDefinitionAddCommand_initOptions = function _SpoRoleDefinitionAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-n, --name <name>'
+    }, {
+        option: '-d, --description [description]'
+    }, {
+        option: '--rights [rights]',
+        autocomplete: this.permissionsKindMap
+    });
+}, _SpoRoleDefinitionAddCommand_initValidators = function _SpoRoleDefinitionAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.rights) {
+            const rights = args.options.rights.split(',');
+            for (const item of rights) {
+                const kind = base_permissions_1.PermissionKind[item.trim()];
+                if (!kind) {
+                    return `Rights option '${item}' is not recognized as valid PermissionKind choice. Please note it is case-sensitive. Allowed values are ${this.permissionsKindMap.join('|')}.`;
+                }
+            }
+        }
+        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+};
+module.exports = new SpoRoleDefinitionAddCommand();
+//# sourceMappingURL=roledefinition-add.js.map

package/dist/m365/spo/commands.js

@@ -173,6 +173,7 @@ exports.default = {
     REPORT_SITEUSAGEPAGES: `${prefix} report siteusagepages`,
     REPORT_SITEUSAGESITECOUNTS: `${prefix} report siteusagesitecounts`,
     REPORT_SITEUSAGESTORAGE: `${prefix} report siteusagestorage`,
+    ROLEDEFINITION_ADD: `${prefix} roledefinition add`,
     ROLEDEFINITION_GET: `${prefix} roledefinition get`,
     ROLEDEFINITION_LIST: `${prefix} roledefinition list`,
     ROLEDEFINITION_REMOVE: `${prefix} roledefinition remove`,

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 sendmail
 
-Sends e-mail on behalf of the current user
+Sends an e-mail
 
 ## Usage
 
@@ -22,6 +22,12 @@ m365 outlook sendmail [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
 
@@ -33,6 +39,25 @@ m365 outlook sendmail [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
@@ -58,3 +83,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/spo/roledefinition/roledefinition-add.md

@@ -0,0 +1,43 @@
+# spo roledefinition add
+
+Adds a new roledefinition to web
+
+## Usage
+
+```sh
+m365 spo roledefinition add [options]
+```
+
+## Options
+
+`-u, --webUrl <webUrl>`
+: URL of the site to which role should be added
+
+`-n, --name <name>`
+: role definition name
+
+`-d, --description [description]`
+: role definition description
+
+`--rights [rights]`
+: A case-sensitive string array that contain the permissions needed for the custom action. Allowed values `EmptyMask,ViewListItems,AddListItems,EditListItems,DeleteListItems,ApproveItems,OpenItems,ViewVersions,DeleteVersions,CancelCheckout,ManagePersonalViews,ManageLists,ViewFormPages,AnonymousSearchAccessList,Open,ViewPages,AddAndCustomizePages,ApplyThemeAndBorder,ApplyStyleSheets,ViewUsageData,CreateSSCSite,ManageSubwebs,CreateGroups,ManagePermissions,BrowseDirectories,BrowseUserInfo,AddDelPrivateWebParts,UpdatePersonalWebParts,ManageWeb,AnonymousSearchAccessWebLists,UseClientIntegration,UseRemoteAPIs,ManageAlerts,CreateAlerts,EditMyUserInfo,EnumeratePermissions,FullMask`. Default `EmptyMask`
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+The `--rights` option accepts **case-sensitive** values.
+
+## Examples
+
+Adds the role definition for site _https://contoso.sharepoint.com/sites/project-x_ with name _test_
+
+```sh
+m365 spo roledefinition add --webUrl https://contoso.sharepoint.com/sites/project-x --name test
+```
+
+Adds the role definition for site _https://contoso.sharepoint.com/sites/project-x_ with name _test_ and description _test description_ and rights _ViewListItems,AddListItems,EditListItems,DeleteListItems_
+
+```sh
+m365 spo roledefinition add --webUrl https://contoso.sharepoint.com/sites/project-x --name test --description "test description" --rights "ViewListItems,AddListItems,EditListItems,DeleteListItems"
+```

package/package.json

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