@pnp/cli-microsoft365 6.9.0-beta.f6054b4 → 6.10.0-beta.05cab2f

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.confirm) {
-                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.js

@@ -17,6 +17,7 @@ exports.default = {
     APPLICATIONCUSTOMIZER_GET: `${prefix} applicationcustomizer get`,
     APPLICATIONCUSTOMIZER_LIST: `${prefix} applicationcustomizer list`,
     APPLICATIONCUSTOMIZER_REMOVE: `${prefix} applicationcustomizer remove`,
+    APPLICATIONCUSTOMIZER_SET: `${prefix} applicationcustomizer set`,
     APPPAGE_ADD: `${prefix} apppage add`,
     APPPAGE_SET: `${prefix} apppage set`,
     CDN_GET: `${prefix} cdn get`,
@@ -60,6 +61,7 @@ exports.default = {
     FILE_ADD: `${prefix} file add`,
     FILE_CHECKIN: `${prefix} file checkin`,
     FILE_CHECKOUT: `${prefix} file checkout`,
+    FILE_CHECKOUT_UNDO: `${prefix} file checkout undo`,
     FILE_COPY: `${prefix} file copy`,
     FILE_GET: `${prefix} file get`,
     FILE_LIST: `${prefix} file list`,
@@ -141,6 +143,7 @@ exports.default = {
     LIST_ROLEASSIGNMENT_ADD: `${prefix} list roleassignment add`,
     LIST_ROLEINHERITANCE_BREAK: `${prefix} list roleinheritance break`,
     LIST_ROLEINHERITANCE_RESET: `${prefix} list roleinheritance reset`,
+    LIST_SENSITIVITYLABEL_ENSURE: `${prefix} list sensitivitylabel ensure`,
     LIST_SET: `${prefix} list set`,
     LIST_SITESCRIPT_GET: `${prefix} list sitescript get`,
     LIST_VIEW_ADD: `${prefix} list view add`,
@@ -295,8 +298,10 @@ exports.default = {
     TENANT_APPLICATIONCUSTOMIZER_GET: `${prefix} tenant applicationcustomizer get`,
     TENANT_APPLICATIONCUSTOMIZER_LIST: `${prefix} tenant applicationcustomizer list`,
     TENANT_APPLICATIONCUSTOMIZER_REMOVE: `${prefix} tenant applicationcustomizer remove`,
+    TENANT_APPLICATIONCUSTOMIZER_SET: `${prefix} tenant applicationcustomizer set`,
     TENANT_COMMANDSET_ADD: `${prefix} tenant commandset add`,
     TENANT_COMMANDSET_GET: `${prefix} tenant commandset get`,
+    TENANT_COMMANDSET_LIST: `${prefix} tenant commandset list`,
     TENANT_COMMANDSET_REMOVE: `${prefix} tenant commandset remove`,
     TENANT_COMMANDSET_SET: `${prefix} tenant commandset set`,
     TENANT_RECYCLEBINITEM_LIST: `${prefix} tenant recyclebinitem list`,

package/dist/m365/teams/commands/app/app-install.js

@@ -70,30 +70,32 @@ class TeamsAppInstallCommand extends GraphCommand_1.default {
     // we need this method, because passing an invalid user ID to the API
     // won't cause an error
     validateUser(args, logger) {
-        if (!args.options.userId) {
-            return Promise.resolve(true);
-        }
-        if (this.verbose) {
-            logger.logToStderr(`Checking if user ${args.options.userId} exists...`);
-        }
-        const options = {
-            id: args.options.userId,
-            output: 'json',
-            debug: args.options.debug,
-            verbose: args.options.verbose
-        };
-        return Cli_1.Cli
-            .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(res.stderr);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.userId) {
+                return true;
             }
-            return true;
-        }, (err) => {
             if (this.verbose) {
-                logger.logToStderr(err.stderr);
+                logger.logToStderr(`Checking if user ${args.options.userId} exists...`);
+            }
+            const options = {
+                id: args.options.userId,
+                output: 'json',
+                debug: args.options.debug,
+                verbose: args.options.verbose
+            };
+            try {
+                const res = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+                if (this.verbose) {
+                    logger.logToStderr(res.stderr);
+                }
+                return true;
+            }
+            catch (err) {
+                if (this.verbose) {
+                    logger.logToStderr(err.stderr);
+                }
+                throw `User with ID ${args.options.userId} not found. Original error: ${err.error.message}`;
             }
-            return Promise.reject(`User with ID ${args.options.userId} not found. Original error: ${err.error.message}`);
         });
     }
 }

package/dist/m365/teams/commands/app/app-remove.js

@@ -38,6 +38,9 @@ class TeamsAppRemoveCommand extends GraphCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const { id: appId } = args.options;
             const removeApp = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing app with ID ${args.options.id}`);
+                }
                 const requestOptions = {
                     url: `${this.resource}/v1.0/appCatalogs/teamsApps/${appId}`,
                     headers: {

package/dist/m365/teams/commands/app/app-uninstall.js

@@ -37,6 +37,9 @@ class TeamsAppUninstallCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const uninstallApp = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Uninstalling app with ID ${args.options.id} in team ${args.options.teamId}`);
+                }
                 const requestOptions = {
                     url: `${this.resource}/v1.0/teams/${args.options.teamId}/installedApps/${args.options.id}`,
                     headers: {

package/dist/m365/teams/commands/app/app-update.js

@@ -61,27 +61,26 @@ class TeamsAppUpdateCommand extends GraphCommand_1.default {
         });
     }
     getAppId(args) {
-        if (args.options.id) {
-            return Promise.resolve(args.options.id);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return args.options.id;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/appCatalogs/teamsApps?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
             const app = response.value[0];
             if (!app) {
-                return Promise.reject(`The specified Teams app does not exist`);
+                throw `The specified Teams app does not exist`;
             }
             if (response.value.length > 1) {
-                return Promise.reject(`Multiple Teams apps with name ${args.options.name} found. Please choose one of these ids: ${response.value.map(x => x.id).join(', ')}`);
+                throw `Multiple Teams apps with name ${args.options.name} found. Please choose one of these ids: ${response.value.map(x => x.id).join(', ')}`;
             }
-            return Promise.resolve(app.id);
+            return app.id;
         });
     }
 }

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

@@ -35,55 +35,56 @@ class TeamsChannelAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelAddCommand_instances, "m", _TeamsChannelAddCommand_initOptionSets).call(this);
     }
     getTeamId(args) {
-        if (args.options.teamId) {
-            return Promise.resolve(args.options.teamId);
-        }
-        const teamRequestOptions = {
-            url: `${this.resource}/v1.0/me/joinedTeams`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(teamRequestOptions)
-            .then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.teamId) {
+                return args.options.teamId;
+            }
+            const teamRequestOptions = {
+                url: `${this.resource}/v1.0/me/joinedTeams`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(teamRequestOptions);
             const matchingTeams = response.value
                 .filter(team => team.displayName === args.options.teamName)
                 .map(team => team.id);
             if (matchingTeams.length < 1) {
-                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+                throw `The specified team does not exist in the Microsoft Teams`;
             }
             if (matchingTeams.length > 1) {
-                return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${matchingTeams.join(', ')}`);
+                throw `Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${matchingTeams.join(', ')}`;
             }
-            return Promise.resolve(matchingTeams[0]);
+            return 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' || args.options.type === 'shared') {
-            // Private and Shared 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);
+        return __awaiter(this, void 0, void 0, function* () {
+            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' || args.options.type === 'shared') {
+                // Private and Shared 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) {
         return __awaiter(this, void 0, void 0, function* () {

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

@@ -38,40 +38,38 @@ class TeamsChannelGetCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelGetCommand_instances, "m", _TeamsChannelGetCommand_initOptionSets).call(this);
     }
     getTeamId(args) {
-        if (args.options.teamId) {
-            return Promise.resolve(args.options.teamId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.teamName)
-            .then(group => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.teamId) {
+                return args.options.teamId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(args.options.teamName);
             if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+                throw `The specified team does not exist in the Microsoft Teams`;
             }
             return group.id;
         });
     }
     getChannelId(args) {
-        if (args.options.id) {
-            return Promise.resolve(args.options.id);
-        }
-        if (args.options.primary) {
-            return Promise.resolve('');
-        }
-        const channelRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(channelRequestOptions)
-            .then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return args.options.id;
+            }
+            if (args.options.primary) {
+                return '';
+            }
+            const channelRequestOptions = {
+                url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.name)}'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(channelRequestOptions);
             const channelItem = response.value[0];
             if (!channelItem) {
-                return Promise.reject(`The specified channel does not exist in the Microsoft Teams team`);
+                throw `The specified channel does not exist in the Microsoft Teams team`;
             }
-            return Promise.resolve(channelItem.id);
+            return channelItem.id;
         });
     }
     commandAction(logger, args) {

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

@@ -39,14 +39,13 @@ class TeamsChannelListCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _TeamsChannelListCommand_instances, "m", _TeamsChannelListCommand_initOptionSets).call(this);
     }
     getTeamId(args) {
-        if (args.options.teamId) {
-            return Promise.resolve(args.options.teamId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.teamName)
-            .then(group => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.teamId) {
+                return args.options.teamId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(args.options.teamName);
             if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+                throw 'The specified team does not exist in the Microsoft Teams';
             }
             return group.id;
         });

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

@@ -57,89 +57,90 @@ class TeamsChannelMemberAddCommand extends GraphCommand_1.default {
         });
     }
     addUser(userId, endpoint, roles) {
-        const requestOptions = {
-            url: endpoint,
-            headers: {
-                'content-type': 'application/json;odata=nometadata',
-                'accept': 'application/json;odata.metadata=none'
-            },
-            responseType: 'json',
-            data: {
-                '@odata.type': '#microsoft.graph.aadUserConversationMember',
-                'roles': roles,
-                'user@odata.bind': `${this.resource}/v1.0/users('${userId}')`
-            }
-        };
-        return request_1.default.post(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: endpoint,
+                headers: {
+                    'content-type': 'application/json;odata=nometadata',
+                    'accept': 'application/json;odata.metadata=none'
+                },
+                responseType: 'json',
+                data: {
+                    '@odata.type': '#microsoft.graph.aadUserConversationMember',
+                    'roles': roles,
+                    'user@odata.bind': `${this.resource}/v1.0/users('${userId}')`
+                }
+            };
+            return request_1.default.post(requestOptions);
+        });
     }
     getTeamId(args) {
-        if (args.options.teamId) {
-            return Promise.resolve(args.options.teamId);
-        }
-        return aadGroup_1.aadGroup
-            .getGroupByDisplayName(args.options.teamName)
-            .then(group => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.teamId) {
+                return args.options.teamId;
+            }
+            const group = yield aadGroup_1.aadGroup.getGroupByDisplayName(args.options.teamName);
             if (group.resourceProvisioningOptions.indexOf('Team') === -1) {
-                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+                throw 'The specified team does not exist in the Microsoft Teams';
             }
             return group.id;
         });
     }
     getChannelId(teamId, args) {
-        if (args.options.channelId) {
-            return Promise.resolve(args.options.channelId);
-        }
-        const channelRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.channelName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(channelRequestOptions)
-            .then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.channelId) {
+                return args.options.channelId;
+            }
+            const channelRequestOptions = {
+                url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(teamId)}/channels?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.channelName)}'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(channelRequestOptions);
             const channelItem = response.value[0];
             if (!channelItem) {
-                return Promise.reject(`The specified channel '${args.options.channelName}' does not exist in the Microsoft Teams team with ID '${teamId}'`);
+                throw `The specified channel '${args.options.channelName}' does not exist in the Microsoft Teams team with ID '${teamId}'`;
             }
             if (channelItem.membershipType !== "private") {
-                return Promise.reject(`The specified channel is not a private channel`);
+                throw `The specified channel is not a private channel`;
             }
-            return Promise.resolve(channelItem.id);
+            return channelItem.id;
         });
     }
     getUserId(args) {
-        if (args.options.userId) {
-            return Promise.resolve(args.options.userId.split(',').map(u => u.trim()));
-        }
-        const tasks = [];
-        const userDisplayNames = args.options.userDisplayName && args.options.userDisplayName.split(',').map(u => u.trim());
-        for (const userName of userDisplayNames) {
-            tasks.push(this.getSingleUser(userName));
-        }
-        return Promise.all(tasks);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.userId) {
+                return args.options.userId.split(',').map(u => u.trim());
+            }
+            const tasks = [];
+            const userDisplayNames = args.options.userDisplayName && args.options.userDisplayName.split(',').map(u => u.trim());
+            for (const userName of userDisplayNames) {
+                tasks.push(this.getSingleUser(userName));
+            }
+            return Promise.all(tasks);
+        });
     }
     getSingleUser(userDisplayName) {
-        const userRequestOptions = {
-            url: `${this.resource}/v1.0/users?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(userDisplayName)}'`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(userRequestOptions)
-            .then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userRequestOptions = {
+                url: `${this.resource}/v1.0/users?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(userDisplayName)}'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(userRequestOptions);
             const userItem = response.value[0];
             if (!userItem) {
-                return Promise.reject(`The specified user '${userDisplayName}' does not exist`);
+                throw `The specified user '${userDisplayName}' does not exist`;
             }
             if (response.value.length > 1) {
-                return Promise.reject(`Multiple users with display name '${userDisplayName}' found. Please disambiguate:${os.EOL}${response.value.map(x => `- ${x.id}`).join(os.EOL)}`);
+                throw `Multiple users with display name '${userDisplayName}' found. Please disambiguate:${os.EOL}${response.value.map(x => `- ${x.id}`).join(os.EOL)}`;
             }
-            return Promise.resolve(userItem.id);
-        }, err => { return Promise.reject(err); });
+            return userItem.id;
+        });
     }
 }
 _TeamsChannelMemberAddCommand_instances = new WeakSet(), _TeamsChannelMemberAddCommand_initTelemetry = function _TeamsChannelMemberAddCommand_initTelemetry() {