@pnp/cli-microsoft365 5.1.0-beta.6ab68db → 5.1.0-beta.7b2911b

package/dist/m365/spfx/commands/project/project-upgrade.js

@@ -3,6 +3,8 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const os = require("os");
 const path = require("path");
+// uncomment to support upgrading to preview releases
+const semver_1 = require("semver");
 const Command_1 = require("../../../../Command");
 const commands_1 = require("../../commands");
 const base_project_command_1 = require("./base-project-command");
@@ -43,7 +45,8 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             '1.12.1',
             '1.13.0',
             '1.13.1',
-            '1.14.0'
+            '1.14.0',
+            '1.15.0-beta.1'
         ];
     }
     get name() {
@@ -56,9 +59,9 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.toVersion = args.options.toVersion || this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
-        // if (prerelease(telemetryProps.toVersion) && !args.options.preview) {
-        //   telemetryProps.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if ((0, semver_1.prerelease)(telemetryProps.toVersion) && !args.options.preview) {
+            telemetryProps.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
         telemetryProps.packageManager = args.options.packageManager || 'npm';
         telemetryProps.shell = args.options.shell || 'bash';
         telemetryProps.preview = args.options.preview;
@@ -72,15 +75,15 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
         }
         this.toVersion = args.options.toVersion ? args.options.toVersion : this.supportedVersions[this.supportedVersions.length - 1];
         // uncomment to support upgrading to preview releases
-        // if (!args.options.toVersion &&
-        //   !args.options.preview &&
-        //   prerelease(this.toVersion)) {
-        //   // no version and no preview specified while the current version to
-        //   // upgrade to is a prerelease so let's grab the first non-preview version
-        //   // since we're supporting only one preview version, it's sufficient for
-        //   // us to take second to last version
-        //   this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
-        // }
+        if (!args.options.toVersion &&
+            !args.options.preview &&
+            (0, semver_1.prerelease)(this.toVersion)) {
+            // no version and no preview specified while the current version to
+            // upgrade to is a prerelease so let's grab the first non-preview version
+            // since we're supporting only one preview version, it's sufficient for
+            // us to take second to last version
+            this.toVersion = this.supportedVersions[this.supportedVersions.length - 2];
+        }
         this.packageManager = args.options.packageManager || 'npm';
         this.shell = args.options.shell || 'bash';
         if (this.supportedVersions.indexOf(this.toVersion) < 0) {
@@ -501,11 +504,11 @@ ${f.resolution}
             },
             {
                 option: '--packageManager [packageManager]',
-                autocomplete: ['npm', 'pnpm', 'yarn']
+                autocomplete: SpfxProjectUpgradeCommand.packageManagers
             },
             {
                 option: '--shell [shell]',
-                autocomplete: ['bash', 'powershell', 'cmd']
+                autocomplete: SpfxProjectUpgradeCommand.shells
             },
             {
                 option: '--preview'
@@ -521,18 +524,20 @@ ${f.resolution}
     }
     validate(args) {
         if (args.options.packageManager) {
-            if (['npm', 'pnpm', 'yarn'].indexOf(args.options.packageManager) < 0) {
-                return `${args.options.packageManager} is not a supported package manager. Supported package managers are npm, pnpm and yarn`;
+            if (SpfxProjectUpgradeCommand.packageManagers.indexOf(args.options.packageManager) < 0) {
+                return `${args.options.packageManager} is not a supported package manager. Supported package managers are ${SpfxProjectUpgradeCommand.packageManagers.join(', ')}`;
             }
         }
         if (args.options.shell) {
-            if (['bash', 'powershell', 'logger'].indexOf(args.options.shell) < 0) {
-                return `${args.options.shell} is not a supported shell. Supported shells are bash, powershell and cmd`;
+            if (SpfxProjectUpgradeCommand.shells.indexOf(args.options.shell) < 0) {
+                return `${args.options.shell} is not a supported shell. Supported shells are ${SpfxProjectUpgradeCommand.shells.join(', ')}`;
             }
         }
         return true;
     }
 }
+SpfxProjectUpgradeCommand.packageManagers = ['npm', 'pnpm', 'yarn'];
+SpfxProjectUpgradeCommand.shells = ['bash', 'powershell', 'cmd'];
 SpfxProjectUpgradeCommand.packageCommands = {
     npm: {
         install: 'npm i -SE',

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -481,6 +481,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
         return 'Verifies environment configuration for using the specific version of the SharePoint Framework';
     }
     commandAction(logger, args, cb) {
+        if (!args.options.output) {
+            args.options.output = 'text';
+        }
         logger.log(' ');
         logger.log('CLI for Microsoft 365 SharePoint Framework doctor');
         logger.log('Verifying configuration of your system for working with the SharePoint Framework');
@@ -758,6 +761,9 @@ class SpfxDoctorCommand extends AnonymousCommand_1.default {
                 return `${args.options.env} is not a valid SharePoint version. Valid versions are sp2016, sp2019 or spo`;
             }
         }
+        if (args.options.output && args.options.output !== 'text') {
+            return `The output option only accepts the type 'text'`;
+        }
         return true;
     }
 }

package/dist/m365/spo/commands/site/site-recyclebinitem-restore.js

@@ -0,0 +1,66 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const utils_1 = require("../../../../utils");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoSiteRecycleBinItemRestoreCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.SITE_RECYCLEBINITEM_RESTORE;
+    }
+    get description() {
+        return 'Restores given items from the site recycle bin';
+    }
+    commandAction(logger, args, cb) {
+        if (this.verbose) {
+            logger.logToStderr(`Restoring items from recycle bin at ${args.options.siteUrl}...`);
+        }
+        const requestUrl = `${args.options.siteUrl}/_api/site/RecycleBin/RestoreByIds`;
+        const ids = utils_1.formatting.splitAndTrim(args.options.ids);
+        const idsChunks = [];
+        while (ids.length) {
+            idsChunks.push(ids.splice(0, 20));
+        }
+        Promise.all(idsChunks.map((idsChunk) => {
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json',
+                data: {
+                    ids: idsChunk
+                }
+            };
+            return request_1.default.post(requestOptions);
+        })).then(_ => cb(), (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-u, --siteUrl <siteUrl>'
+            },
+            {
+                option: '-i, --ids <ids>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        const invalidIds = utils_1.formatting
+            .splitAndTrim(args.options.ids)
+            .filter(id => !utils_1.validation.isValidGuid(id));
+        if (invalidIds.length > 0) {
+            return `The following IDs are invalid: ${invalidIds.join(', ')}`;
+        }
+        return true;
+    }
+}
+module.exports = new SpoSiteRecycleBinItemRestoreCommand();
+//# sourceMappingURL=site-recyclebinitem-restore.js.map

package/dist/m365/spo/commands.js

@@ -185,6 +185,7 @@ exports.default = {
     SITE_LIST: `${prefix} site list`,
     SITE_INPLACERECORDSMANAGEMENT_SET: `${prefix} site inplacerecordsmanagement set`,
     SITE_RECYCLEBINITEM_LIST: `${prefix} site recyclebinitem list`,
+    SITE_RECYCLEBINITEM_RESTORE: `${prefix} site recyclebinitem restore`,
     SITE_REMOVE: `${prefix} site remove`,
     SITE_RENAME: `${prefix} site rename`,
     SITE_SET: `${prefix} site set`,

package/dist/m365/tenant/commands.js

@@ -2,7 +2,6 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'tenant';
 exports.default = {
-    AUDITLOG_REPORT: `${prefix} auditlog report`,
     ID_GET: `${prefix} id get`,
     REPORT_ACTIVEUSERCOUNTS: `${prefix} report activeusercounts`,
     REPORT_ACTIVEUSERDETAIL: `${prefix} report activeuserdetail`,
@@ -11,14 +10,10 @@ exports.default = {
     REPORT_OFFICE365ACTIVATIONSUSERCOUNTS: `${prefix} report office365activationsusercounts`,
     REPORT_SERVICESUSERCOUNTS: `${prefix} report servicesusercounts`,
     SERVICEANNOUNCEMENT_HEALTHISSUE_GET: `${prefix} serviceannouncement healthissue get`,
-    SERVICE_LIST: `${prefix} service list`,
-    SERVICE_MESSAGE_LIST: `${prefix} service message list`,
-    SERVICE_REPORT_HISTORICALSERVICESTATUS: `${prefix} service report historicalservicestatus`,
     SERVICEANNOUNCEMENT_HEALTH_GET: `${prefix} serviceannouncement health get`,
     SERVICEANNOUNCEMENT_HEALTH_LIST: `${prefix} serviceannouncement health list`,
     SERVICEANNOUNCEMENT_HEALTHISSUE_LIST: `${prefix} serviceannouncement healthissue list`,
     SERVICEANNOUNCEMENT_MESSAGE_GET: `${prefix} serviceannouncement message get`,
-    SERVICEANNOUNCEMENT_MESSAGE_LIST: `${prefix} serviceannouncement message list`,
-    STATUS_LIST: `${prefix} status list`
+    SERVICEANNOUNCEMENT_MESSAGE_LIST: `${prefix} serviceannouncement message list`
 };
 //# sourceMappingURL=commands.js.map

package/dist/settingsNames.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 exports.settingsNames = void 0;
 const settingsNames = {
     autoOpenBrowserOnLogin: 'autoOpenBrowserOnLogin',
+    copyDeviceCodeToClipboard: 'copyDeviceCodeToClipboard',
     csvEscape: 'csvEscape',
     csvHeader: 'csvHeader',
     csvQuote: 'csvQuote',

package/dist/utils/formatting.js

@@ -61,6 +61,9 @@ exports.formatting = {
     },
     removeSingleLineComments(s) {
         return stripJsonComments(s);
+    },
+    splitAndTrim(s) {
+        return s.split(',').map(c => c.trim());
     }
 };
 //# sourceMappingURL=formatting.js.map

package/docs/docs/cmd/aad/app/{app-delete.md → app-remove.md}

@@ -1,9 +1,15 @@
-# aad app delete
+# aad app remove
 
 Removes an Azure AD app registration
 
 ## Usage
 
+```sh
+m365 aad app remove [options]
+```
+
+## Alias
+
 ```sh
 m365 aad app delete [options]
 ```
@@ -20,32 +26,32 @@ m365 aad app delete [options]
 : Name of the Azure AD application registration to remove. Specify either `appId`, `objectId` or `name`
 
 `--confirm`:
-: Don't prompt for confirmation to delete the app
+: Don't prompt for confirmation to remove the app
 
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
 
-For best performance use the `objectId` option to reference the Azure AD application registration to delete. If you use `appId` or `name`, this command will first need to find the corresponding object ID for that application.
+For best performance use the `objectId` option to reference the Azure AD application registration to remove. If you use `appId` or `name`, this command will first need to find the corresponding object ID for that application.
 
 If the command finds multiple Azure AD application registrations with the specified app name, it will prompt you to disambiguate which app it should use, listing the discovered object IDs.
 
 ## Examples
 
-Delete the Azure AD application registration by its app (client) ID
+Remove the Azure AD application registration by its app (client) ID
 
 ```sh
-m365 aad app delete --appId d75be2e1-0204-4f95-857d-51a37cf40be8
+m365 aad app remove --appId d75be2e1-0204-4f95-857d-51a37cf40be8
 ```
 
-Delete the Azure AD application registration by its object ID
+Remove the Azure AD application registration by its object ID
 
 ```sh
-m365 aad app delete --objectId d75be2e1-0204-4f95-857d-51a37cf40be8
+m365 aad app remove --objectId d75be2e1-0204-4f95-857d-51a37cf40be8
 ```
 
-Delete the Azure AD application registration by its name. Will NOT prompt for confirmation before deleting.
+Remove the Azure AD application registration by its name. Will NOT prompt for confirmation before deleting.
 
 ```sh
-m365 aad app delete --name "My app" --confirm
+m365 aad app remove --name "My app" --confirm
 ```

package/docs/docs/cmd/aad/app/{app-role-delete.md → app-role-remove.md}

@@ -1,9 +1,15 @@
-# aad app role delete
+# aad app role remove
 
-Deletes role from the specified Azure AD app registration
+Removes role from the specified Azure AD app registration
 
 ## Usage
 
+```sh
+m365 aad app role remove [options]
+```
+
+## Alias
+
 ```sh
 m365 aad app role delete [options]
 ```
@@ -11,60 +17,60 @@ m365 aad app role delete [options]
 ## Options
 
 `--appId [appId]`
-: Application (client) ID of the Azure AD application registration from which role should be deleted. Specify either `appId`, `appObjectId` or `appName`
+: Application (client) ID of the Azure AD application registration from which role should be removed. Specify either `appId`, `appObjectId` or `appName`
 
 `--appObjectId [appObjectId]`
-: Object ID of the Azure AD application registration from which role should be deleted. Specify either `appId`, `appObjectId` or `appName`
+: Object ID of the Azure AD application registration from which role should be removed. Specify either `appId`, `appObjectId` or `appName`
 
 `--appName [appName]`
-: Name of the Azure AD application registration from which role should be deleted. Specify either `appId`, `appObjectId` or `appName`
+: Name of the Azure AD application registration from which role should be removed. Specify either `appId`, `appObjectId` or `appName`
 
 `-n, --name [name]`
-: Name of the role to delete. Specify either `name`, `id` or `claim`
+: Name of the role to remove. Specify either `name`, `id` or `claim`
 
 `-i, --id [id]`
-: Id of the role to delete. Specify either `name`, `id` or `claim`
+: Id of the role to remove. Specify either `name`, `id` or `claim`
 
 `-c, --claim [claim]`
-: Claim value of the role to delete. Specify either `name`, `id` or `claim`
+: Claim value of the role to remove. Specify either `name`, `id` or `claim`
 
 `--confirm`
-: Don't prompt for confirmation to delete the role.
+: Don't prompt for confirmation to remove the role.
 
 --8<-- "docs/cmd/_global.md"
 
 ## Remarks
 
-For best performance use the `appObjectId` option to reference the Azure AD application registration from which to delete the role. If you use `appId` or `appName`, this command will first need to find the corresponding object ID for that application.
+For best performance use the `appObjectId` option to reference the Azure AD application registration from which to remove the role. If you use `appId` or `appName`, this command will first need to find the corresponding object ID for that application.
 
 If the command finds multiple Azure AD application registrations with the specified app name, it will prompt you to disambiguate which app it should use, listing the discovered object IDs.
 
 If the command finds multiple roles with the specified role name, it will prompt you to disambiguate which role it should use, listing the claim values.
 
-If the role to be deleted is 'Enabled', this command will disable the role first and then delete.
+If the role to be removed is 'Enabled', this command will disable the role first and then remove.
 
 ## Examples
 
-Delete role from a Azure AD application registration using object ID and role name options. Will prompt for confirmation before deleting the role.
+Remove role from a Azure AD application registration using object ID and role name options. Will prompt for confirmation before deleting the role.
 
 ```sh
-m365 aad app role delete --appObjectId d75be2e1-0204-4f95-857d-51a37cf40be8 --name "Get Product"
+m365 aad app role remove --appObjectId d75be2e1-0204-4f95-857d-51a37cf40be8 --name "Get Product"
 ```
 
-Delete role from a Azure AD application registration using app (client) ID and role claim options. Will prompt for confirmation before deleting the role.
+Remove role from a Azure AD application registration using app (client) ID and role claim options. Will prompt for confirmation before deleting the role.
 
 ```sh
-m365 aad app role delete --appId e75be2e1-0204-4f95-857d-51a37cf40be8 --claim "Product.Get"
+m365 aad app role remove --appId e75be2e1-0204-4f95-857d-51a37cf40be8 --claim "Product.Get"
 ```
 
-Delete role from a Azure AD application registration using app name and role claim options. Will prompt for confirmation before deleting the role.
+Remove role from a Azure AD application registration using app name and role claim options. Will prompt for confirmation before deleting the role.
 
 ```sh
-m365 aad app role delete --appName "My app" --claim "Product.Get"
+m365 aad app role remove --appName "My app" --claim "Product.Get"
 ```
 
-Delete role from a Azure AD application registration using object ID and role id options. Will NOT prompt for confirmation before deleting the role.
+Remove role from a Azure AD application registration using object ID and role id options. Will NOT prompt for confirmation before deleting the role.
 
 ```sh
-m365 aad app role delete --appObjectId d75be2e1-0204-4f95-857d-51a37cf40be8 --id 15927ce6-1933-4b2f-b029-4dee3d53f4dd --confirm
+m365 aad app role remove --appObjectId d75be2e1-0204-4f95-857d-51a37cf40be8 --id 15927ce6-1933-4b2f-b029-4dee3d53f4dd --confirm
 ```

package/docs/docs/cmd/pp/managementapp/managementapp-add.md

@@ -0,0 +1,50 @@
+# pp managementapp add
+
+Register management application for Power Platform
+
+## Usage
+
+```sh
+m365 pp managementapp add [options]
+```
+
+## Options
+
+`--appId [appId]`
+: Application (client) ID of the Azure AD application registration to register as a management app. Specify either `appId`, `objectId` or `name`
+
+`--objectId [objectId]`
+: Object ID of the Azure AD application registration to register as a management app. Specify either `appId`, `objectId` or `name`
+
+`--name [name]`
+: Name of the Azure AD application registration to register as a management app. Specify either `appId`, `objectId` or `name`
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+To execute this command the first time you'll need sign in using the Microsoft Azure PowerShell app registration. You can do this by executing `m365 login --appId 1950a258-227b-4e31-a9cf-717495945fc2`. To register the Azure AD app registration that CLI for Microsoft 365 uses by default, execute `m365 pp managementapp add--appId 31359c7f-bd7e-475c-86db-fdb8c937548e`.
+
+For best performance use the `appId` option to reference the Azure AD application registration to update. If you use `objectId` or `name`, this command will first need to find the corresponding `appId` for that application.
+
+If the command finds multiple Azure AD application registrations with the specified app name, it will prompt you to disambiguate which app it should use, listing the discovered object IDs.
+
+## Examples
+
+Register CLI for Microsoft 365 as a management application for the Power Platform
+
+```sh
+m365 pp managementapp add --appId 31359c7f-bd7e-475c-86db-fdb8c937548e
+```
+
+Register Azure AD application with the specified object ID as a management application for the Power Platform
+
+```sh
+m365 pp managementapp add --objectId d75be2e1-0204-4f95-857d-51a37cf40be8
+```
+
+Register Azure AD application named _My app_ as a management application for the Power Platform
+
+```sh
+m365 pp managementapp add --name "My app"
+```

package/docs/docs/cmd/spfx/project/project-upgrade.md

@@ -32,7 +32,7 @@ m365 spfx project upgrade [options]
 
 ## Remarks
 
-The `spfx project upgrade` command helps you upgrade your SharePoint Framework project to the specified version. If no version is specified, the command will upgrade to the latest version of the SharePoint Framework it supports (v1.14.0).
+The `spfx project upgrade` command helps you upgrade your SharePoint Framework project to the specified version. If no version is specified, the command will upgrade to the latest version of the SharePoint Framework it supports (v1.14.0). If you specify the `preview` option without a specific version, the command will upgrade your project to the latest preview version v1.15.0-beta.1.
 
 This command doesn't change your project files. Instead, it gives you a report with all steps necessary to upgrade your project to the specified version of the SharePoint Framework. Changing project files is error-prone, especially when it comes to updating your solution's code. This is why at this moment, this command produces a report that you can use yourself to perform the necessary updates and verify that everything is working as expected.
 

package/docs/docs/cmd/spfx/spfx-doctor.md

@@ -20,7 +20,7 @@ m365 spfx doctor [options]
 : JMESPath query string. See [http://jmespath.org/](http://jmespath.org/) for more information and examples
 
 `-o, --output [output]`
-: Output type. `json,text,csv,md`. Default `json`
+: Output type. `text`. Default `text`
 
 `--verbose`
 : Runs command with verbose logging
@@ -43,6 +43,9 @@ If you miss any required tools or use a version that doesn't meet the SharePoint
 
 Next to verifying the readiness of your environment to use a particular version of the SharePoint Framework, you can also check if the version of the SharePoint Framework that you use is compatible with the specific version of SharePoint. Supported versions are `sp2016`, `sp2019` and `spo`.
 
+!!! important
+    This command supports only text output.
+
 ## Examples
 
 Verify if your environment meets the requirements to work with the SharePoint Framework

package/docs/docs/cmd/spo/site/site-recyclebinitem-restore.md

@@ -0,0 +1,27 @@
+# spo site recyclebinitem restore
+
+Restores given items from the site recycle bin
+
+## Usage
+
+```sh
+m365 spo site recyclebinitem restore [options]
+```
+
+## Options
+
+`-u, --siteUrl <siteUrl>`
+: URL of the site for which to restore the recycle bin items
+
+`-i, --ids <ids>`
+: List of ids of items which will be restored from the site recycle bin
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Restore specific items by given ids from recycle bin for site _https://contoso.sharepoint.com/site_
+
+```sh
+m365 spo site recyclebinitem restore --siteUrl https://contoso.sharepoint.com/site --ids "ae6f97a7-280e-48d6-b481-0ea986c323da,aadbf916-1f71-42ee-abf2-8ee4802ae291"
+```