@pnp/cli-microsoft365 7.0.0-beta.90ef876 → 7.0.0-beta.e25bf4a

package/dist/m365/spo/commands/tenant/tenant-appcatalog-add.js

@@ -62,7 +62,8 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
         });
     }
     ensureNoExistingSite(url, force, logger) {
-        return new Promise((resolve, reject) => {
+        var _a, _b;
+        return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Checking if site ${url} exists...`);
             }
@@ -74,14 +75,13 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
                     _: []
                 }
             };
-            Cli_1.Cli
-                .executeCommandWithOutput(spoSiteGetCommand, siteGetOptions)
-                .then(() => {
+            try {
+                yield Cli_1.Cli.executeCommandWithOutput(spoSiteGetCommand, siteGetOptions);
                 if (this.verbose) {
                     logger.logToStderr(`Found site ${url}`);
                 }
                 if (!force) {
-                    return reject(new Command_1.CommandError(`Another site exists at ${url}`));
+                    throw new Command_1.CommandError(`Another site exists at ${url}`);
                 }
                 if (this.verbose) {
                     logger.logToStderr(`Deleting site ${url}...`);
@@ -90,24 +90,21 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand_1.default {
                     url: url,
                     skipRecycleBin: true,
                     wait: true,
-                    force: true,
+                    confirm: true,
                     verbose: this.verbose,
                     debug: this.debug
                 };
-                Cli_1.Cli
-                    .executeCommand(spoSiteRemoveCommand, { options: Object.assign(Object.assign({}, siteRemoveOptions), { _: [] }) })
-                    .then(() => resolve(), (err) => reject(err));
-            }, (err) => {
-                if (err.error.message !== 'File Not Found.' && err.error.message !== '404 FILE NOT FOUND') {
-                    // some other error occurred
-                    return reject(err.error);
+                yield Cli_1.Cli.executeCommand(spoSiteRemoveCommand, { options: Object.assign(Object.assign({}, siteRemoveOptions), { _: [] }) });
+            }
+            catch (err) {
+                if (((_a = err.error) === null || _a === void 0 ? void 0 : _a.message) !== 'File not Found' && ((_b = err.error) === null || _b === void 0 ? void 0 : _b.message) !== '404 FILE NOT FOUND') {
+                    throw err.error || err;
                 }
                 if (this.verbose) {
                     logger.logToStderr(`No site found at ${url}`);
                 }
-                // site not found. continue
-                resolve();
-            });
+                // Site not found. Continue
+            }
         });
     }
     createAppCatalog(options, logger) {

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

@@ -23,6 +23,8 @@ const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const os = require("os");
+const Cli_1 = require("../../../../cli/Cli");
+const spoListItemListCommand = require("../listitem/listitem-list");
 const request_1 = require("../../../../request");
 class SpoTenantApplicationCustomizerSetCommand extends SpoCommand_1.default {
     get name() {
@@ -46,6 +48,20 @@ class SpoTenantApplicationCustomizerSetCommand extends SpoCommand_1.default {
                 if (!appCatalogUrl) {
                     throw 'No app catalog URL found';
                 }
+                if (args.options.newClientSideComponentId !== undefined) {
+                    const componentManifest = yield this.getComponentManifest(appCatalogUrl, args.options.newClientSideComponentId, logger);
+                    const clientComponentManifest = JSON.parse(componentManifest.ClientComponentManifest);
+                    if (clientComponentManifest.extensionType !== "ApplicationCustomizer") {
+                        throw `The extension type of this component is not of type 'ApplicationCustomizer' but of type '${clientComponentManifest.extensionType}'`;
+                    }
+                    const solution = yield this.getSolutionFromAppCatalog(appCatalogUrl, componentManifest.SolutionId, logger);
+                    if (!solution.ContainsTenantWideExtension) {
+                        throw `The solution does not contain an extension that can be deployed to all sites. Make sure that you've entered the correct component Id.`;
+                    }
+                    else if (!solution.SkipFeatureDeployment) {
+                        throw 'The solution has not been deployed to all sites. Make sure to deploy this solution to all sites.';
+                    }
+                }
                 const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
                 const listItemId = yield this.getListItemId(appCatalogUrl, args.options, listServerRelativeUrl, logger);
                 yield this.updateTenantWideExtension(appCatalogUrl, args.options, listServerRelativeUrl, listItemId, logger);
@@ -72,9 +88,59 @@ class SpoTenantApplicationCustomizerSetCommand extends SpoCommand_1.default {
             return listItemInstances[0].Id;
         });
     }
+    getComponentManifest(appCatalogUrl, clientSideComponentId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Retrieving component manifest item from the ComponentManifests list on the app catalog site so that we get the solution id');
+            }
+            const camlQuery = `<View><ViewFields><FieldRef Name='ClientComponentId'></FieldRef><FieldRef Name='SolutionId'></FieldRef><FieldRef Name='ClientComponentManifest'></FieldRef></ViewFields><Query><Where><Eq><FieldRef Name='ClientComponentId' /><Value Type='Guid'>${clientSideComponentId}</Value></Eq></Where></Query></View>`;
+            const commandOptions = {
+                webUrl: appCatalogUrl,
+                listUrl: `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/Lists/ComponentManifests`,
+                camlQuery: camlQuery,
+                verbose: this.verbose,
+                debug: this.debug,
+                output: 'json'
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(spoListItemListCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
+            if (this.verbose) {
+                logger.logToStderr(output.stderr);
+            }
+            const outputParsed = JSON.parse(output.stdout);
+            if (outputParsed.length === 0) {
+                throw 'No component found with the specified clientSideComponentId found in the component manifest list. Make sure that the application is added to the application catalog';
+            }
+            return outputParsed[0];
+        });
+    }
+    getSolutionFromAppCatalog(appCatalogUrl, solutionId, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving solution with id ${solutionId} from the application catalog`);
+            }
+            const camlQuery = `<View><ViewFields><FieldRef Name='SkipFeatureDeployment'></FieldRef><FieldRef Name='ContainsTenantWideExtension'></FieldRef></ViewFields><Query><Where><Eq><FieldRef Name='AppProductID' /><Value Type='Guid'>${solutionId}</Value></Eq></Where></Query></View>`;
+            const commandOptions = {
+                webUrl: appCatalogUrl,
+                listUrl: `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(appCatalogUrl)}/AppCatalog`,
+                camlQuery: camlQuery,
+                verbose: this.verbose,
+                debug: this.debug,
+                output: 'json'
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(spoListItemListCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
+            if (this.verbose) {
+                logger.logToStderr(output.stderr);
+            }
+            const outputParsed = JSON.parse(output.stdout);
+            if (outputParsed.length === 0) {
+                throw `No component found with the solution id ${solutionId}. Make sure that the solution is available in the app catalog`;
+            }
+            return outputParsed[0];
+        });
+    }
     updateTenantWideExtension(appCatalogUrl, options, listServerRelativeUrl, itemId, logger) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { title, id, clientSideComponentId, newTitle, clientSideComponentProperties, webTemplate } = options;
+            const { title, id, clientSideComponentId, newTitle, newClientSideComponentId, clientSideComponentProperties, webTemplate } = options;
             if (this.verbose) {
                 logger.logToStderr(`Updating tenant-wide application customizer: "${title || id || clientSideComponentId}"...`);
             }
@@ -85,6 +151,12 @@ class SpoTenantApplicationCustomizerSetCommand extends SpoCommand_1.default {
                     FieldValue: newTitle
                 });
             }
+            if (newClientSideComponentId !== undefined) {
+                formValues.push({
+                    FieldName: 'TenantWideExtensionComponentId',
+                    FieldValue: newClientSideComponentId
+                });
+            }
             if (clientSideComponentProperties !== undefined) {
                 formValues.push({
                     FieldName: 'TenantWideExtensionComponentProperties',
@@ -118,6 +190,7 @@ _SpoTenantApplicationCustomizerSetCommand_instances = new WeakSet(), _SpoTenantA
             id: typeof args.options.id !== 'undefined',
             clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
             newTitle: typeof args.options.newTitle !== 'undefined',
+            newClientSideComponentId: typeof args.options.newClientSideComponentId !== 'undefined',
             clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
             webTemplate: typeof args.options.webTemplate !== 'undefined'
         });
@@ -131,6 +204,8 @@ _SpoTenantApplicationCustomizerSetCommand_instances = new WeakSet(), _SpoTenantA
         option: '-c, --clientSideComponentId  [clientSideComponentId]'
     }, {
         option: '--newTitle [newTitle]'
+    }, {
+        option: '--newClientSideComponentId [newClientSideComponentId]'
     }, {
         option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
     }, {
@@ -144,7 +219,10 @@ _SpoTenantApplicationCustomizerSetCommand_instances = new WeakSet(), _SpoTenantA
         if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
-        if (!args.options.newTitle && !args.options.clientSideComponentProperties && !args.options.webTemplate) {
+        if (args.options.newClientSideComponentId && !validation_1.validation.isValidGuid(args.options.newClientSideComponentId)) {
+            return `${args.options.newClientSideComponentId} is not a valid GUID`;
+        }
+        if (!args.options.newTitle && !args.options.newClientSideComponentId && !args.options.clientSideComponentProperties && !args.options.webTemplate) {
             return `Please specify an option to be updated`;
         }
         return true;

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

@@ -39,54 +39,8 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeDeletedSite = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    this.spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                    const res = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-                    if (this.verbose) {
-                        logger.logToStderr(`Removing deleted site collection ${args.options.siteUrl}...`);
-                    }
-                    const requestOptions = {
-                        url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                        headers: {
-                            'X-RequestDigest': res.FormDigestValue
-                        },
-                        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="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                    };
-                    const processQuery = yield request_1.default.post(requestOptions);
-                    const json = JSON.parse(processQuery);
-                    const response = json[0];
-                    if (response.ErrorInfo) {
-                        throw response.ErrorInfo.ErrorMessage;
-                    }
-                    else {
-                        const operation = json[json.length - 1];
-                        const isComplete = operation.IsComplete;
-                        if (!args.options.wait || isComplete) {
-                            return;
-                        }
-                        yield new Promise((resolve, reject) => {
-                            setTimeout(() => {
-                                spo_1.spo.waitUntilFinished({
-                                    operationId: JSON.stringify(operation._ObjectIdentity_),
-                                    siteUrl: this.spoAdminUrl,
-                                    resolve,
-                                    reject,
-                                    logger,
-                                    currentContext: this.context,
-                                    debug: this.debug,
-                                    verbose: this.verbose
-                                });
-                            }, operation.PollingInterval);
-                        });
-                    }
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.force) {
-                yield removeDeletedSite();
+                yield this.removeDeletedSite(logger, args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -96,11 +50,57 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the deleted site collection ${args.options.siteUrl} from tenant recycle bin?`
                 });
                 if (result.continue) {
-                    yield removeDeletedSite();
+                    yield this.removeDeletedSite(logger, args);
                 }
             }
         });
     }
+    removeDeletedSite(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.ensureFormDigest(spoAdminUrl, logger, this.context, this.debug);
+                if (this.verbose) {
+                    logger.logToStderr(`Removing deleted site collection ${args.options.siteUrl}...`);
+                }
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': res.FormDigestValue
+                    },
+                    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="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                };
+                const processQuery = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(processQuery);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                const operation = json[json.length - 1];
+                const isComplete = operation.IsComplete;
+                if (!args.options.wait || isComplete) {
+                    return;
+                }
+                yield new Promise((resolve, reject) => {
+                    setTimeout(() => {
+                        spo_1.spo.waitUntilFinished({
+                            operationId: JSON.stringify(operation._ObjectIdentity_),
+                            siteUrl: spoAdminUrl,
+                            resolve,
+                            reject,
+                            logger,
+                            currentContext: this.context,
+                            debug: this.debug,
+                            verbose: this.verbose
+                        });
+                    }, operation.PollingInterval);
+                });
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoTenantRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRemoveCommand_initTelemetry = function _SpoTenantRecycleBinItemRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/theme/theme-get.js

@@ -54,8 +54,7 @@ class SpoThemeGetCommand extends SpoCommand_1.default {
                 if (contents && contents.ErrorInfo) {
                     throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
                 }
-                const json2 = yield Promise.resolve(json);
-                const theme = json2[6];
+                const theme = json[6];
                 delete theme._ObjectType_;
                 logger.log(theme);
             }

package/dist/m365/spo/commands/user/user-get.js

@@ -47,8 +47,8 @@ class SpoUserGetCommand extends SpoCommand_1.default {
             else if (args.options.email) {
                 requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByEmail('${formatting_1.formatting.encodeQueryParameter(args.options.email)}')`;
             }
-            else if (args.options.loginName) {
-                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${formatting_1.formatting.encodeQueryParameter(args.options.loginName)}')`;
+            else if (args.options.userName) {
+                requestUrl = `${args.options.webUrl}/_api/web/siteusers/GetByLoginName('${formatting_1.formatting.encodeQueryParameter(args.options.userName)}')`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -73,7 +73,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
         Object.assign(this.telemetryProperties, {
             id: (!(!args.options.id)).toString(),
             email: (!(!args.options.email)).toString(),
-            loginName: (!(!args.options.loginName)).toString()
+            userName: (!(!args.options.userName)).toString()
         });
     });
 }, _SpoUserGetCommand_initOptions = function _SpoUserGetCommand_initOptions() {
@@ -84,7 +84,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
     }, {
         option: '--email [email]'
     }, {
-        option: '--loginName [loginName]'
+        option: '--userName [userName]'
     });
 }, _SpoUserGetCommand_initValidators = function _SpoUserGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -95,7 +95,7 @@ _SpoUserGetCommand_instances = new WeakSet(), _SpoUserGetCommand_initTelemetry =
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoUserGetCommand_initOptionSets = function _SpoUserGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'email', 'loginName'] });
+    this.optionSets.push({ options: ['id', 'email', 'userName'] });
 };
 module.exports = new SpoUserGetCommand();
 //# sourceMappingURL=user-get.js.map

package/dist/m365/spo/commands.js

@@ -132,8 +132,6 @@ exports.default = {
     LIST_CONTENTTYPE_REMOVE: `${prefix} list contenttype remove`,
     LIST_CONTENTTYPE_DEFAULT_SET: `${prefix} list contenttype default set`,
     LIST_GET: `${prefix} list get`,
-    LIST_LABEL_GET: `${prefix} list label get`,
-    LIST_LABEL_SET: `${prefix} list label set`,
     LIST_LIST: `${prefix} list list`,
     LIST_REMOVE: `${prefix} list remove`,
     LIST_RETENTIONLABEL_ENSURE: `${prefix} list retentionlabel ensure`,

package/dist/m365/teams/commands/chat/chat-get.js

@@ -79,7 +79,7 @@ class TeamsChatGetCommand extends GraphCommand_1.default {
             const currentUserEmail = accessToken_1.accessToken.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken).toLowerCase();
             const existingChats = yield chatUtil_1.chatUtil.findExistingChatsByParticipants([currentUserEmail, ...participants]);
             if (!existingChats || existingChats.length === 0) {
-                throw new Error('No chat conversation was found with these participants.');
+                throw 'No chat conversation was found with these participants.';
             }
             if (existingChats.length === 1) {
                 return existingChats[0].id;
@@ -87,14 +87,14 @@ class TeamsChatGetCommand extends GraphCommand_1.default {
             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}`);
+            throw `Multiple chat conversations with these participants found. Please disambiguate:${os.EOL}${disambiguationText}`;
         });
     }
     getChatIdByName(name) {
         return __awaiter(this, void 0, void 0, function* () {
             const existingChats = yield chatUtil_1.chatUtil.findExistingGroupChatsByName(name);
             if (!existingChats || existingChats.length === 0) {
-                throw new Error('No chat conversation was found with this name.');
+                throw 'No chat conversation was found with this name.';
             }
             if (existingChats.length === 1) {
                 return existingChats[0].id;
@@ -103,7 +103,7 @@ class TeamsChatGetCommand extends GraphCommand_1.default {
                 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}`);
+            throw `Multiple chat conversations with this name found. Please disambiguate:${os.EOL}${disambiguationText}`;
         });
     }
 }

package/dist/m365/teams/commands/chat/chat-member-add.js

@@ -0,0 +1,117 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _TeamsChatMemberAddCommand_instances, _TeamsChatMemberAddCommand_initTelemetry, _TeamsChatMemberAddCommand_initOptions, _TeamsChatMemberAddCommand_initValidators, _TeamsChatMemberAddCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const validation_1 = require("../../../../utils/validation");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+class TeamsChatMemberAddCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.CHAT_MEMBER_ADD;
+    }
+    get description() {
+        return 'Adds a member to a Microsoft Teams chat conversation.';
+    }
+    constructor() {
+        super();
+        _TeamsChatMemberAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _TeamsChatMemberAddCommand_instances, "m", _TeamsChatMemberAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _TeamsChatMemberAddCommand_instances, "m", _TeamsChatMemberAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _TeamsChatMemberAddCommand_instances, "m", _TeamsChatMemberAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _TeamsChatMemberAddCommand_instances, "m", _TeamsChatMemberAddCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Adding member ${args.options.userId || args.options.userName} to chat with id ${args.options.chatId}...`);
+                }
+                const chatMemberAddOptions = {
+                    url: `${this.resource}/v1.0/chats/${args.options.chatId}/members`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        '@odata.type': '#microsoft.graph.aadUserConversationMember',
+                        'user@odata.bind': `https://graph.microsoft.com/v1.0/users/${args.options.userId || formatting_1.formatting.encodeQueryParameter(args.options.userName)}`,
+                        visibleHistoryStartDateTime: args.options.includeAllHistory ? '0001-01-01T00:00:00Z' : args.options.visibleHistoryStartDateTime,
+                        roles: [args.options.role || 'owner']
+                    }
+                };
+                yield request_1.default.post(chatMemberAddOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_TeamsChatMemberAddCommand_instances = new WeakSet(), _TeamsChatMemberAddCommand_initTelemetry = function _TeamsChatMemberAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userName: typeof args.options.userName !== 'undefined',
+            role: typeof args.options.role !== 'undefined',
+            visibleHistoryStartDateTime: typeof args.options.visibleHistoryStartDateTime !== 'undefined',
+            includeAllHistory: !!args.options.includeAllHistory
+        });
+    });
+}, _TeamsChatMemberAddCommand_initOptions = function _TeamsChatMemberAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --chatId <chatId>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userName [userName]'
+    }, {
+        option: '--role [role]',
+        autocomplete: TeamsChatMemberAddCommand.roles
+    }, {
+        option: '--visibleHistoryStartDateTime [visibleHistoryStartDateTime]'
+    }, {
+        option: '--includeAllHistory'
+    });
+}, _TeamsChatMemberAddCommand_initValidators = function _TeamsChatMemberAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidTeamsChatId(args.options.chatId)) {
+            return `${args.options.chatId} is not a valid chatId.`;
+        }
+        if (args.options.userId && !validation_1.validation.isValidGuid(args.options.userId)) {
+            return `${args.options.userId} is not a valid userId.`;
+        }
+        if (args.options.userName && !validation_1.validation.isValidUserPrincipalName(args.options.userName)) {
+            return `${args.options.userName} is not a valid userName.`;
+        }
+        if (args.options.role && TeamsChatMemberAddCommand.roles.indexOf(args.options.role) < 0) {
+            return `${args.options.role} is not a valid role. Allowed values are ${TeamsChatMemberAddCommand.roles.join(', ')}`;
+        }
+        if (args.options.visibleHistoryStartDateTime && !validation_1.validation.isValidISODateTime(args.options.visibleHistoryStartDateTime)) {
+            return `'${args.options.visibleHistoryStartDateTime}' is not a valid visibleHistoryStartDateTime.`;
+        }
+        return true;
+    }));
+}, _TeamsChatMemberAddCommand_initOptionSets = function _TeamsChatMemberAddCommand_initOptionSets() {
+    this.optionSets.push({ options: ['userId', 'userName'] }, {
+        options: ['visibleHistoryStartDateTime', 'includeAllHistory'],
+        runsWhen: (args) => args.options.visibleHistoryStartDateTime || args.options.includeAllHistory
+    });
+};
+TeamsChatMemberAddCommand.roles = ['owner', 'guest'];
+module.exports = new TeamsChatMemberAddCommand();
+//# sourceMappingURL=chat-member-add.js.map

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

@@ -74,14 +74,14 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
             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 this name found. Please disambiguate:${os.EOL}${disambiguationText}`);
+            throw `Multiple chat conversations with this name found. Please disambiguate:${os.EOL}${disambiguationText}`;
         });
     }
     getChatIdByName(chatName) {
         return __awaiter(this, void 0, void 0, function* () {
             const existingChats = yield chatUtil_1.chatUtil.findExistingGroupChatsByName(chatName);
             if (!existingChats || existingChats.length === 0) {
-                throw new Error('No chat conversation was found with this name.');
+                throw 'No chat conversation was found with this name.';
             }
             if (existingChats.length === 1) {
                 return existingChats[0].id;
@@ -90,7 +90,7 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
                 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}`);
+            throw `Multiple chat conversations with this name found. Please disambiguate:${os.EOL}${disambiguationText}`;
         });
     }
     // This Microsoft Graph API request throws an intermittent 404 exception, saying that it cannot find the principal.
@@ -146,7 +146,7 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
                     }
                 }
             };
-            yield request_1.default.post(requestOptions);
+            return request_1.default.post(requestOptions);
         });
     }
 }

package/dist/m365/teams/commands/meeting/meeting-get.js

@@ -16,13 +16,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _TeamsMeetingGetCommand_instances, _TeamsMeetingGetCommand_initTelemetry, _TeamsMeetingGetCommand_initOptions, _TeamsMeetingGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Auth_1 = require("../../../../Auth");
-const Cli_1 = require("../../../../cli/Cli");
 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 AadUserGetCommand = require("../../../aad/commands/user/user-get");
+const aadUser_1 = require("../../../../utils/aadUser");
+const formatting_1 = require("../../../../utils/formatting");
 class TeamsMeetingGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.MEETING_GET;
@@ -37,20 +37,6 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsMeetingGetCommand_instances, "m", _TeamsMeetingGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _TeamsMeetingGetCommand_instances, "m", _TeamsMeetingGetCommand_initValidators).call(this);
     }
-    getUserId(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const commandOptions = {
-                email: options.email,
-                userName: options.userName,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, commandOptions), { _: [] }) });
-            const getUserOutput = JSON.parse(output.stdout);
-            return getUserOutput.id;
-        });
-    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
@@ -71,18 +57,13 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
                 let requestUrl = `${this.resource}/v1.0/`;
                 if (isAppOnlyAccessToken) {
                     requestUrl += 'users/';
-                    if (args.options.userId) {
-                        requestUrl += args.options.userId;
-                    }
-                    else {
-                        const userId = yield this.getUserId(args.options);
-                        requestUrl += userId;
-                    }
+                    const userId = yield this.getUserId(args.options);
+                    requestUrl += userId;
                 }
                 else {
                     requestUrl += `me`;
                 }
-                requestUrl += `/onlineMeetings?$filter=JoinWebUrl eq '${encodeURIComponent(args.options.joinUrl)}'`;
+                requestUrl += `/onlineMeetings?$filter=JoinWebUrl eq '${formatting_1.formatting.encodeQueryParameter(args.options.joinUrl)}'`;
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -103,6 +84,17 @@ class TeamsMeetingGetCommand extends GraphCommand_1.default {
             }
         });
     }
+    getUserId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.userId) {
+                return options.userId;
+            }
+            if (options.userName) {
+                return aadUser_1.aadUser.getUserIdByUpn(options.userName);
+            }
+            return aadUser_1.aadUser.getUserIdByEmail(options.email);
+        });
+    }
 }
 _TeamsMeetingGetCommand_instances = new WeakSet(), _TeamsMeetingGetCommand_initTelemetry = function _TeamsMeetingGetCommand_initTelemetry() {
     this.telemetry.push((args) => {