@pnp/cli-microsoft365 5.2.0-beta.90d2227 → 5.2.0-beta.a814a27

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

@@ -144,7 +144,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;

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/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/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/teams/commands/channel/channel-membership-list.js

@@ -0,0 +1,150 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const utils_1 = require("../../../../utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+class TeamsChannelMembershipListCommand extends GraphCommand_1.default {
+    constructor() {
+        super(...arguments);
+        this.teamId = '';
+    }
+    get name() {
+        return commands_1.default.CHANNEL_MEMBERSHIP_LIST;
+    }
+    get description() {
+        return 'Lists memberships in the specified Microsoft Teams team channel';
+    }
+    defaultProperties() {
+        return ['id', 'roles', 'displayName', 'userId', 'email'];
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.teamId = typeof args.options.teamId !== 'undefined';
+        telemetryProps.teamName = typeof args.options.teamName !== 'undefined';
+        telemetryProps.channelId = typeof args.options.channelId !== 'undefined';
+        telemetryProps.channelName = typeof args.options.channelName !== 'undefined';
+        telemetryProps.role = typeof args.options.role;
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getTeamId(args)
+            .then((teamId) => {
+            this.teamId = teamId;
+            return this.getChannelId(args);
+        })
+            .then((channelId) => {
+            const endpoint = `${this.resource}/v1.0/teams/${this.teamId}/channels/${channelId}/members`;
+            return utils_1.odata.getAllItems(endpoint, logger);
+        })
+            .then((memberships) => {
+            if (args.options.role) {
+                if (args.options.role === 'member') {
+                    // Members have no role value
+                    memberships = memberships.filter(i => i.roles.length === 0);
+                }
+                else {
+                    memberships = memberships.filter(i => i.roles.indexOf(args.options.role) !== -1);
+                }
+            }
+            logger.log(memberships);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    getTeamId(args) {
+        if (args.options.teamId) {
+            return Promise.resolve(args.options.teamId);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const groupItem = response.value[0];
+            if (!groupItem) {
+                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+            }
+            if (groupItem.resourceProvisioningOptions.indexOf('Team') === -1) {
+                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+            }
+            if (response.value.length > 1) {
+                return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${response.value.map(x => x.id)}`);
+            }
+            return Promise.resolve(groupItem.id);
+        });
+    }
+    getChannelId(args) {
+        if (args.options.channelId) {
+            return Promise.resolve(args.options.channelId);
+        }
+        const channelRequestOptions = {
+            url: `${this.resource}/v1.0/teams/${encodeURIComponent(this.teamId)}/channels?$filter=displayName eq '${encodeURIComponent(args.options.channelName)}'`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(channelRequestOptions)
+            .then(response => {
+            const channelItem = response.value[0];
+            if (!channelItem) {
+                return Promise.reject(`The specified channel does not exist in the Microsoft Teams team`);
+            }
+            return Promise.resolve(channelItem.id);
+        });
+    }
+    options() {
+        const options = [
+            {
+                option: '--teamId [teamId]'
+            },
+            {
+                option: '--teamName [teamName]'
+            },
+            {
+                option: '--channelId [channelId]'
+            },
+            {
+                option: '--channelName [channelName]'
+            },
+            {
+                option: '-r, --role [role]',
+                autocomplete: ['owner', 'member', 'guest']
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (args.options.teamId && args.options.teamName) {
+            return 'Specify either teamId or teamName, but not both';
+        }
+        if (!args.options.teamId && !args.options.teamName) {
+            return 'Specify teamId or teamName, one is required';
+        }
+        if (args.options.teamId && !utils_1.validation.isValidGuid(args.options.teamId)) {
+            return `${args.options.teamId} is not a valid GUID`;
+        }
+        if (args.options.channelId && args.options.channelName) {
+            return 'Specify either channelId or channelName, but not both';
+        }
+        if (!args.options.channelId && !args.options.channelName) {
+            return 'Specify channelId or channelName, one is required';
+        }
+        if (args.options.role) {
+            if (['owner', 'member', 'guest'].indexOf(args.options.role) === -1) {
+                return `${args.options.role} is not a valid role value. Allowed values owner|member|guest`;
+            }
+        }
+        return true;
+    }
+}
+module.exports = new TeamsChannelMembershipListCommand();
+//# sourceMappingURL=channel-membership-list.js.map

package/dist/m365/teams/commands.js

@@ -11,6 +11,7 @@ exports.default = {
     CHANNEL_ADD: `${prefix} channel add`,
     CHANNEL_GET: `${prefix} channel get`,
     CHANNEL_LIST: `${prefix} channel list`,
+    CHANNEL_MEMBERSHIP_LIST: `${prefix} channel membership list`,
     CHANNEL_REMOVE: `${prefix} channel remove`,
     CHANNEL_SET: `${prefix} channel set`,
     CHAT_GET: `${prefix} chat get`,

package/dist/settingsNames.js

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

package/docs/docs/cmd/teams/channel/channel-membership-list.md

@@ -0,0 +1,48 @@
+# teams channel membership list
+
+Lists memberships in the specified Microsoft Teams team channel
+
+## Usage
+
+```sh
+m365 teams channel membership list [options]
+```
+
+## Options
+
+`--teamId [teamId]`
+: The Id of the Microsoft Teams team. Specify either `teamId` or `teamName` but not both
+
+`--teamName [teamName]`
+: The display name of the Microsoft Teams team. Specify either `teamId` or `teamName` but not both
+
+`--channelId [channelId]`
+: The Id of the Microsoft Teams team channel. Specify either `channelId` or `channelName` but not both
+
+`channelName [channelName]`
+: The display name of the Microsoft Teams team channel. Specify either `channelId` or `channelName` but not both
+
+`-r, --role [role]`
+: Filter the results to only users with the given role: owner, member, guest
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+  
+List the memberships in a specified Microsoft Teams team with id 00000000-0000-0000-0000-000000000000 and channel id 00:00000000000000000000000000000000@thread.skype
+
+```sh
+m365 teams channel membership list --teamId 00000000-0000-0000-0000-000000000000 --channelId 00:00000000000000000000000000000000@thread.skype
+```
+
+List the memberships in a specified Microsoft Teams team with name _Team Name_ and channel with name _Channel Name_
+
+```sh
+m365 teams channel membership list --teamName "Team Name" --channelName "Channel Name"
+```
+
+List all owner memberships in the specified Microsoft Teams team with id 00000000-0000-0000-0000-000000000000 and channel id 00:00000000000000000000000000000000@thread.skype
+
+```sh
+m365 teams channel membership list --teamId 00000000-0000-0000-0000-000000000000 --channelId 00:00000000000000000000000000000000@thread.skype --role owner
+```

package/package.json

@@ -1,6 +1,6 @@
 {
   "name": "@pnp/cli-microsoft365",
-  "version": "5.2.0-beta.90d2227",
+  "version": "5.2.0-beta.a814a27",
   "description": "Manage Microsoft 365 and SharePoint Framework projects on any platform",
   "license": "MIT",
   "main": "./dist/api.js",
@@ -25,7 +25,7 @@
     "test": "npm run test:version && npm run lint && npm run test:cov",
     "test:version": "node scripts/check-version.js",
     "test:cov": "c8 npm run test:test",
-    "test:test": "mocha \"dist/**/*.spec.js\" --timeout 10000",
+    "test:test": "mocha",
     "lint": "eslint --ext .ts src"
   },
   "keywords": [