@pnp/cli-microsoft365 5.1.0 → 5.2.0-beta.4df87d9

package/.eslintrc.js

@@ -37,6 +37,7 @@ const dictionary = [
   'list',
   'management',
   'member',
+  'membership',
   'messaging',
   'news',
   'oauth2',

package/.mocharc.json

@@ -5,5 +5,6 @@
   "spec": "dist/**/*.spec.js",
   "require": "source-map-support/register",
   "watch": "dist/**/*.js",
+  "timeout": 10000,
   "logpanel": true
 }

package/dist/Auth.js

@@ -301,7 +301,8 @@ class Auth {
             logger.logToStderr('');
         }
         logger.log(response.message);
-        if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenBrowserOnLogin, false)) {
+        if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenBrowserOnLogin, false)
+            || cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false)) {
             // _open is never set before hitting this line, but this check
             // is implemented so that we can support lazy loading
             // but also stub it for testing

package/dist/Command.js

@@ -47,6 +47,10 @@ class Command {
             logger.logToStderr(chalk.yellow(`Command '${deprecated}' is deprecated. Please use '${recommended}' instead`));
         }
     }
+    warn(logger, warning) {
+        const chalk = require('chalk');
+        logger.logToStderr(chalk.yellow(warning));
+    }
     getUsedCommandName() {
         const cli = cli_1.Cli.getInstance();
         const commandName = this.getCommandName();
@@ -144,7 +148,12 @@ class Command {
         return __awaiter(this, void 0, void 0, function* () {
         });
     }
-    getCommandName() {
+    getCommandName(alias) {
+        var _a;
+        if (alias &&
+            ((_a = this.alias()) === null || _a === void 0 ? void 0 : _a.includes(alias))) {
+            return alias;
+        }
         let commandName = this.name;
         let pos = commandName.indexOf('<');
         const pos1 = commandName.indexOf('[');

package/dist/cli/Cli.js

@@ -202,7 +202,7 @@ class Cli {
             // the command to execute
             const cli = Cli.getInstance();
             const parentCommandName = cli.currentCommandName;
-            cli.currentCommandName = command.getCommandName();
+            cli.currentCommandName = command.getCommandName(cli.currentCommandName);
             command.action(logger, args, (err) => {
                 // restore the original command name
                 cli.currentCommandName = parentCommandName;
@@ -586,23 +586,7 @@ class Cli {
         helpFilePath = path.join(...pathChunks);
         if (fs.existsSync(helpFilePath)) {
             Cli.log();
-            // because of prism, loading markshell slows down CLI a lot
-            // let's lazy-load it only when it's needed (help was requested)
-            const markshell = require('markshell');
-            const chalk = require('chalk');
-            const theme = markshell.getTheme();
-            const admonitionStyles = theme.admonitions.getStyles();
-            admonitionStyles.indent.beforeIndent = 0;
-            admonitionStyles.indent.titleIndent = 3;
-            admonitionStyles.indent.afterIndent = 0;
-            theme.admonitions.setStyles(admonitionStyles);
-            theme.indents.definitionList = 2;
-            theme.headline = chalk.white;
-            theme.inlineCode = chalk.cyan;
-            theme.sourceCodeTheme = 'solarizelight';
-            theme.includePath = path.join(this.commandsFolder, '..', '..', 'docs');
-            markshell.setTheme(theme);
-            Cli.log(markshell.toRawContent(helpFilePath));
+            Cli.log(utils_1.md.md2plain(fs.readFileSync(helpFilePath, 'utf8'), path.join(this.commandsFolder, '..', '..', 'docs')));
         }
     }
     printAvailableCommands() {

package/dist/m365/app/commands/app-get.js

@@ -21,6 +21,9 @@ class AppGetCommand extends AppCommand_1.default {
         cli_1.Cli
             .executeCommandWithOutput(AadAppGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
             .then((appGetOutput) => {
+            if (this.verbose) {
+                logger.logToStderr(appGetOutput.stderr);
+            }
             logger.log(JSON.parse(appGetOutput.stdout));
             cb();
         }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));

package/dist/m365/cli/commands/cli-reconsent.js

@@ -1,6 +1,8 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
+const cli_1 = require("../../../cli");
 const config_1 = require("../../../config");
+const settingsNames_1 = require("../../../settingsNames");
 const AnonymousCommand_1 = require("../../base/AnonymousCommand");
 const commands_1 = require("../commands");
 class CliReconsentCommand extends AnonymousCommand_1.default {
@@ -11,8 +13,24 @@ class CliReconsentCommand extends AnonymousCommand_1.default {
         return 'Returns Azure AD URL to open in the browser to re-consent CLI for Microsoft 365 permissions';
     }
     commandAction(logger, args, cb) {
-        logger.log(`To re-consent the PnP Microsoft 365 Management Shell Azure AD application navigate in your web browser to https://login.microsoftonline.com/${config_1.default.tenant}/oauth2/authorize?client_id=${config_1.default.cliAadAppId}&response_type=code&prompt=admin_consent`);
-        cb();
+        const url = `https://login.microsoftonline.com/${config_1.default.tenant}/oauth2/authorize?client_id=${config_1.default.cliAadAppId}&response_type=code&prompt=admin_consent`;
+        if (cli_1.Cli.getInstance().getSettingWithDefaultValue(settingsNames_1.settingsNames.autoOpenLinksInBrowser, false) === false) {
+            logger.log(`To re-consent the PnP Microsoft 365 Management Shell Azure AD application navigate in your web browser to ${url}`);
+            return cb();
+        }
+        logger.log(`Opening the following page in your browser: ${url}`);
+        // _open is never set before hitting this line, but this check
+        // is implemented so that we can support lazy loading
+        // but also stub it for testing
+        /* c8 ignore next 3 */
+        if (!this._open) {
+            this._open = require('open');
+        }
+        this._open(url).then(() => {
+            cb();
+        }, (error) => {
+            this.handleRejectedODataJsonPromise(error, logger, cb);
+        });
     }
 }
 module.exports = new CliReconsentCommand();

package/dist/m365/cli/commands/config/config-set.js

@@ -20,6 +20,7 @@ class CliConfigSetCommand extends AnonymousCommand_1.default {
         let value = undefined;
         switch (args.options.key) {
             case settingsNames_1.settingsNames.autoOpenBrowserOnLogin:
+            case settingsNames_1.settingsNames.autoOpenLinksInBrowser:
             case settingsNames_1.settingsNames.copyDeviceCodeToClipboard:
             case settingsNames_1.settingsNames.csvHeader:
             case settingsNames_1.settingsNames.csvQuoted:

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

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const commands_1 = require("../../commands");
+class PpEnvironmentListCommand extends PowerPlatformCommand_1.default {
+    get name() {
+        return commands_1.default.ENVIRONMENT_LIST;
+    }
+    get description() {
+        return 'Lists Microsoft Power Platform environments';
+    }
+    defaultProperties() {
+        return ['name', 'displayName'];
+    }
+    commandAction(logger, args, cb) {
+        if (this.verbose) {
+            logger.logToStderr(`Retrieving list of Microsoft Power Platform environments...`);
+        }
+        let url = '';
+        if (args.options.asAdmin) {
+            url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments`;
+        }
+        else {
+            url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments`;
+        }
+        const requestOptions = {
+            url: `${url}?api-version=2020-10-01`,
+            headers: {
+                accept: 'application/json'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            if (res.value && res.value.length > 0) {
+                res.value.forEach(e => {
+                    e.displayName = e.properties.displayName;
+                });
+                logger.log(res.value);
+            }
+            cb();
+        }, (rawRes) => this.handleRejectedODataJsonPromise(rawRes, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-a, --asAdmin [teamId]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new PpEnvironmentListCommand();
+//# sourceMappingURL=environment-list.js.map

package/dist/m365/pp/commands.js

@@ -2,6 +2,7 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'pp';
 exports.default = {
+    ENVIRONMENT_LIST: `${prefix} environment list`,
     MANAGEMENTAPP_ADD: `${prefix} managementapp add`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -242,6 +242,9 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
             }
         });
         switch (args.options.output) {
+            case 'text':
+                logger.log(this.getTextReport(findingsToReport));
+                break;
             case 'json':
                 logger.log(findingsToReport);
                 break;
@@ -252,7 +255,7 @@ class SpfxProjectUpgradeCommand extends base_project_command_1.BaseProjectComman
                 logger.log(this.getMdReport(findingsToReport));
                 break;
             default:
-                logger.log(this.getTextReport(findingsToReport));
+                logger.log(findingsToReport);
         }
         cb();
     }

package/dist/m365/spo/commands/file/file-checkout.js

@@ -62,10 +62,10 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
             }
         }
         if (args.options.id && args.options.fileUrl) {
-            return 'Specify either URL or UniqueId but not both';
+            return 'Specify either id or fileUrl but not both';
         }
         if (!args.options.id && !args.options.fileUrl) {
-            return 'Specify URL or UniqueId, one is required';
+            return 'Specify id or fileUrl, one is required';
         }
         return true;
     }

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

@@ -50,7 +50,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                             if (args.options.skipRecycleBin || args.options.wait) {
                                 logger.logToStderr(chalk.yellow(`Entered site is a groupified site. Hence, the parameters 'skipRecycleBin' and 'wait' will not be applicable.`));
                             }
-                            return this.deleteGroupifiedSite(group.id, logger);
+                            return this.deleteGroup(group.id, logger);
                         })
                             .catch((err) => {
                             if (err.response.status === 404) {
@@ -79,7 +79,8 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
                             else {
                                 return Promise.reject(err);
                             }
-                        });
+                        })
+                            .then(_ => this.deleteSite(args.options.url, args.options.wait, logger));
                     }
                 })
                     .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
@@ -296,7 +297,7 @@ class SpoSiteRemoveCommand extends SpoCommand_1.default {
             }
         });
     }
-    deleteGroupifiedSite(groupId, logger) {
+    deleteGroup(groupId, logger) {
         if (this.verbose) {
             logger.logToStderr(`Removing Microsoft 365 Group: ${groupId}...`);
         }

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

@@ -1,6 +1,5 @@
 "use strict";
 Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -18,58 +17,25 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand_1.default {
         return telemetryProps;
     }
     commandAction(logger, args, cb) {
-        this.dots = '';
         utils_1.spo
             .getSpoAdminUrl(logger, this.debug)
             .then((adminUrl) => {
-            this.spoAdminUrl = adminUrl;
-            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-        })
-            .then((res) => {
-            this.context = res;
-            if (this.verbose) {
-                logger.logToStderr(`Restoring deleted site collection ${args.options.url}...`);
-            }
             const requestOptions = {
-                url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                url: `${adminUrl}/_api/SPOInternalUseOnly.Tenant/RestoreDeletedSite`,
                 headers: {
-                    'X-RequestDigest': this.context.FormDigestValue
+                    accept: 'application/json;odata=nometadata',
+                    'content-type': 'application/json;charset=utf-8'
                 },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="RestoreDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                data: {
+                    siteUrl: args.options.url
+                }
             };
             return request_1.default.post(requestOptions);
         })
-            .then((res) => {
-            return new Promise((resolve, reject) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                }
-                else {
-                    const operation = json[json.length - 1];
-                    const isComplete = operation.IsComplete;
-                    if (!args.options.wait || isComplete) {
-                        resolve();
-                        return;
-                    }
-                    setTimeout(() => {
-                        utils_1.spo.waitUntilFinished({
-                            operationId: JSON.stringify(operation._ObjectIdentity_),
-                            siteUrl: this.spoAdminUrl,
-                            resolve,
-                            reject,
-                            logger,
-                            currentContext: this.context,
-                            dots: this.dots,
-                            debug: this.debug,
-                            verbose: this.verbose
-                        });
-                    }, operation.PollingInterval);
-                }
-            });
-        })
-            .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
+            .then(res => {
+            logger.log(JSON.parse(res));
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
     options() {
         const options = [

package/dist/m365/spo/commands/tenant/tenant-settings-set.js

@@ -13,6 +13,14 @@ class SpoTenantSettingsSetCommand extends SpoCommand_1.default {
     get description() {
         return 'Sets tenant global settings';
     }
+    types() {
+        return {
+            boolean: [
+                'EnableAzureADB2BIntegration',
+                'SyncAadB2BManagementPolicy'
+            ]
+        };
+    }
     getTelemetryProperties(args) {
         const telemetryProps = super.getTelemetryProperties(args);
         telemetryProps.MinCompatibilityLevel = (!(!args.options.MinCompatibilityLevel)).toString();
@@ -97,6 +105,8 @@ class SpoTenantSettingsSetCommand extends SpoCommand_1.default {
         telemetryProps.DisabledWebPartIds = (!(!args.options.DisabledWebPartIds)).toString();
         telemetryProps.AllowedDomainListForSyncClient = (!(!args.options.AllowedDomainListForSyncClient)).toString();
         telemetryProps.DisableCustomAppAuthentication = (!(!args.options.DisableCustomAppAuthentication)).toString();
+        telemetryProps.EnableAzureADB2BIntegration = typeof args.options.EnableAzureADB2BIntegration !== 'undefined';
+        telemetryProps.SyncAadB2BManagementPolicy = typeof args.options.SyncAadB2BManagementPolicy !== 'undefined';
         return telemetryProps;
     }
     getAllEnumOptions() {
@@ -176,6 +186,9 @@ class SpoTenantSettingsSetCommand extends SpoCommand_1.default {
                 cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
                 return;
             }
+            if (args.options.EnableAzureADB2BIntegration === true) {
+                this.warn(logger, 'WARNING: Make sure to also enable the Azure AD one-time passcode authentication preview. If it is not enabled then SharePoint will not use Azure AD B2B even if EnableAzureADB2BIntegration is set to true. Learn more at http://aka.ms/spo-b2b-integration.');
+            }
             cb();
         }, (err) => this.handleRejectedPromise(err, logger, cb));
     }
@@ -490,6 +503,14 @@ class SpoTenantSettingsSetCommand extends SpoCommand_1.default {
             {
                 option: '--DisableCustomAppAuthentication [DisableCustomAppAuthentication]',
                 autocomplete: ['true', 'false']
+            },
+            {
+                option: '--EnableAzureADB2BIntegration [EnableAzureADB2BIntegration]',
+                autocomplete: ['true', 'false']
+            },
+            {
+                option: '--SyncAadB2BManagementPolicy [SyncAadB2BManagementPolicy]',
+                autocomplete: ['true', 'false']
             }
         ];
         const parentOptions = super.options();

package/dist/m365/teams/commands/channel/channel-add.js

@@ -16,6 +16,8 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
         telemetryProps.description = typeof args.options.description !== 'undefined';
         telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
         telemetryProps.teamName = typeof args.options.teamName !== 'undefined';
+        telemetryProps.type = args.options.type || 'standard';
+        telemetryProps.owner = typeof args.options.owner !== 'undefined';
         return telemetryProps;
     }
     getTeamId(args) {
@@ -44,23 +46,35 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
             return Promise.resolve(matchingTeams[0]);
         });
     }
+    createChannel(args, teamId) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/teams/${teamId}/channels`,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            data: {
+                membershipType: args.options.type || 'standard',
+                displayName: args.options.name
+            },
+            responseType: 'json'
+        };
+        if (args.options.type === 'private') {
+            // Private channels must have at least 1 owner
+            requestOptions.data.members = [
+                {
+                    '@odata.type': '#microsoft.graph.aadUserConversationMember',
+                    'user@odata.bind': `https://graph.microsoft.com/v1.0/users('${args.options.owner}')`,
+                    roles: ['owner']
+                }
+            ];
+        }
+        return request_1.default.post(requestOptions);
+    }
     commandAction(logger, args, cb) {
         this
             .getTeamId(args)
-            .then((teamId) => {
-            const requestOptions = {
-                url: `${this.resource}/v1.0/teams/${teamId}/channels`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                data: {
-                    displayName: args.options.name
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
+            .then((teamId) => this.createChannel(args, teamId))
             .then((res) => {
             logger.log(res);
             cb();
@@ -79,6 +93,13 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
             },
             {
                 option: '-d, --description [description]'
+            },
+            {
+                option: '--type [type]',
+                autocomplete: ['standard', 'private']
+            },
+            {
+                option: '--owner [owner]'
             }
         ];
         const parentOptions = super.options();
@@ -94,6 +115,15 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.type && ['standard', 'private'].indexOf(args.options.type) === -1) {
+            return `${args.options.type} is not a valid type value. Allowed values standard|private.`;
+        }
+        if (args.options.type === 'private' && !args.options.owner) {
+            return 'Specify owner when creating a private channel.';
+        }
+        if (args.options.type !== 'private' && args.options.owner) {
+            return 'Specify owner only when creating a private channel.';
+        }
         return true;
     }
 }

package/dist/m365/teams/commands/channel/channel-list.js

@@ -49,7 +49,10 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
         this
             .getTeamId(args)
             .then((teamId) => {
-            const endpoint = `${this.resource}/v1.0/teams/${teamId}/channels`;
+            let endpoint = `${this.resource}/v1.0/teams/${teamId}/channels`;
+            if (args.options.type) {
+                endpoint += `?$filter=membershipType eq '${args.options.type}'`;
+            }
             return utils_1.odata.getAllItems(endpoint, logger);
         })
             .then((items) => {
@@ -64,6 +67,10 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
             },
             {
                 option: '--teamName [teamName]'
+            },
+            {
+                option: '--type [type]',
+                autocomplete: ['standard', 'private']
             }
         ];
         const parentOptions = super.options();
@@ -79,6 +86,9 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
         if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
             return `${args.options.teamId} is not a valid GUID`;
         }
+        if (args.options.type && ['standard', 'private'].indexOf(args.options.type.toLowerCase()) === -1) {
+            return `${args.options.type} is not a valid type value. Allowed values standard|private`;
+        }
         return true;
     }
 }