@pnp/cli-microsoft365 5.2.0-beta.0f1c454 → 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;
@@ -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/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/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/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/chat/chat-get.js

@@ -0,0 +1,143 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
+const os = require("os");
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const validation_1 = require("../../../../utils/validation");
+const accessToken_1 = require("../../../../utils/accessToken");
+const chatUtil_1 = require("./chatUtil");
+class TeamsChatGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.CHAT_GET;
+    }
+    get description() {
+        return 'Get a Microsoft Teams chat conversation by id, participants or chat name.';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.id = typeof args.options.id !== 'undefined';
+        telemetryProps.participants = typeof args.options.participants !== 'undefined';
+        telemetryProps.name = typeof args.options.name !== 'undefined';
+        return telemetryProps;
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getChatId(logger, args)
+            .then(chatId => this.getChatDetailsById(chatId))
+            .then((chat) => {
+            logger.log(chat);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --id [id]'
+            },
+            {
+                option: '-p, --participants [participants]'
+            },
+            {
+                option: '-n, --name [name]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (!args.options.id && !args.options.participants && !args.options.name) {
+            return 'Specify id or participants or name, one is required.';
+        }
+        let nrOfMutuallyExclusiveOptionsInUse = 0;
+        if (args.options.id) {
+            nrOfMutuallyExclusiveOptionsInUse++;
+        }
+        if (args.options.participants) {
+            nrOfMutuallyExclusiveOptionsInUse++;
+        }
+        if (args.options.name) {
+            nrOfMutuallyExclusiveOptionsInUse++;
+        }
+        if (nrOfMutuallyExclusiveOptionsInUse > 1) {
+            return 'Specify either id or participants or name, but not multiple.';
+        }
+        if (args.options.id && !validation_1.validation.isValidTeamsChatId(args.options.id)) {
+            return `${args.options.id} is not a valid Teams ChatId.`;
+        }
+        if (args.options.participants) {
+            const participants = chatUtil_1.chatUtil.convertParticipantStringToArray(args.options.participants);
+            if (!participants || participants.length === 0 || participants.some(e => !validation_1.validation.isValidUserPrincipalName(e))) {
+                return `${args.options.participants} contains one or more invalid email addresses.`;
+            }
+        }
+        return true;
+    }
+    getChatId(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return args.options.id;
+            }
+            return args.options.participants
+                ? this.getChatIdByParticipants(args.options.participants, logger)
+                : this.getChatIdByName(args.options.name, logger);
+        });
+    }
+    getChatDetailsById(id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/chats/${encodeURIComponent(id)}`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
+    }
+    getChatIdByParticipants(participantsString, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const participants = chatUtil_1.chatUtil.convertParticipantStringToArray(participantsString);
+            const currentUserEmail = accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken).toLowerCase();
+            const existingChats = yield chatUtil_1.chatUtil.findExistingChatsByParticipants([currentUserEmail, ...participants], logger);
+            if (!existingChats || existingChats.length === 0) {
+                throw new Error('No chat conversation was found with these participants.');
+            }
+            if (existingChats.length === 1) {
+                return existingChats[0].id;
+            }
+            const disambiguationText = existingChats.map(c => {
+                return `- ${c.id}${c.topic && ' - '}${c.topic} - ${c.createdDateTime && new Date(c.createdDateTime).toLocaleString()}`;
+            }).join(os.EOL);
+            throw new Error(`Multiple chat conversations with these participants found. Please disambiguate:${os.EOL}${disambiguationText}`);
+        });
+    }
+    getChatIdByName(name, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const existingChats = yield chatUtil_1.chatUtil.findExistingGroupChatsByName(name, logger);
+            if (!existingChats || existingChats.length === 0) {
+                throw new Error('No chat conversation was found with this name.');
+            }
+            if (existingChats.length === 1) {
+                return existingChats[0].id;
+            }
+            const disambiguationText = existingChats.map(c => {
+                const memberstring = c.members.map(m => m.email).join(', ');
+                return `- ${c.id} - ${c.createdDateTime && new Date(c.createdDateTime).toLocaleString()} - ${memberstring}`;
+            }).join(os.EOL);
+            throw new Error(`Multiple chat conversations with this name found. Please disambiguate:${os.EOL}${disambiguationText}`);
+        });
+    }
+}
+module.exports = new TeamsChatGetCommand();
+//# sourceMappingURL=chat-get.js.map

package/dist/m365/teams/commands/chat/chat-message-send.js

@@ -15,6 +15,7 @@ const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
+const chatUtil_1 = require("./chatUtil");
 class TeamsChatMessageSendCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.CHAT_MESSAGE_SEND;
@@ -79,7 +80,7 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
             return `${args.options.chatId} is not a valid Teams ChatId.`;
         }
         if (args.options.userEmails) {
-            const userEmails = this.convertCommaSeparatedListToArray(args.options.userEmails);
+            const userEmails = chatUtil_1.chatUtil.convertParticipantStringToArray(args.options.userEmails);
             if (!userEmails || userEmails.length === 0 || userEmails.some(e => !utils_1.validation.isValidUserPrincipalName(e))) {
                 return `${args.options.userEmails} contains one or more invalid email addresses.`;
             }
@@ -98,9 +99,9 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
     }
     ensureChatIdByUserEmails(userEmailsOption, logger) {
         return __awaiter(this, void 0, void 0, function* () {
-            const userEmails = this.convertCommaSeparatedListToArray(userEmailsOption);
+            const userEmails = chatUtil_1.chatUtil.convertParticipantStringToArray(userEmailsOption);
             const currentUserEmail = utils_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken).toLowerCase();
-            const existingChats = yield this.findExistingGroupChatsByMembers([currentUserEmail, ...userEmails], logger);
+            const existingChats = yield chatUtil_1.chatUtil.findExistingChatsByParticipants([currentUserEmail, ...userEmails], logger);
             if (!existingChats || existingChats.length === 0) {
                 const chat = yield this.createConversation([currentUserEmail, ...userEmails]);
                 return chat.id;
@@ -116,7 +117,7 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
     }
     getChatIdByName(chatName, logger) {
         return __awaiter(this, void 0, void 0, function* () {
-            const existingChats = yield this.findExistingGroupChatsByName(chatName, logger);
+            const existingChats = yield chatUtil_1.chatUtil.findExistingGroupChatsByName(chatName, logger);
             if (!existingChats || existingChats.length === 0) {
                 throw new Error('No chat conversation was found with this name.');
             }
@@ -186,32 +187,6 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
             yield request_1.default.post(requestOptions);
         });
     }
-    findExistingGroupChatsByMembers(expectedMemberEmails, logger) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const endpoint = `${this.resource}/v1.0/chats?$filter=chatType eq 'group'&$expand=members&$select=id,topic,createdDateTime,members`;
-            const foundChats = [];
-            const chats = yield utils_1.odata.getAllItems(endpoint, logger);
-            for (const chat of chats) {
-                const chatMembers = chat.members;
-                if (chatMembers.length === expectedMemberEmails.length) {
-                    const chatMemberEmails = chatMembers.map(member => { var _a; return (_a = member.email) === null || _a === void 0 ? void 0 : _a.toLowerCase(); });
-                    if (expectedMemberEmails.every(email => chatMemberEmails.some(memberEmail => memberEmail === email))) {
-                        foundChats.push(chat);
-                    }
-                }
-            }
-            return foundChats;
-        });
-    }
-    findExistingGroupChatsByName(name, logger) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const endpoint = `${this.resource}/v1.0/chats?$filter=topic eq '${encodeURIComponent(name)}'&$expand=members&$select=id,topic,createdDateTime,chatType`;
-            return utils_1.odata.getAllItems(endpoint, logger);
-        });
-    }
-    convertCommaSeparatedListToArray(userEmailsString) {
-        return userEmailsString.toLowerCase().replace(/\s/g, '').split(',').filter(e => e && e !== '');
-    }
 }
 module.exports = new TeamsChatMessageSendCommand();
 //# sourceMappingURL=chat-message-send.js.map