@pnp/cli-microsoft365 6.9.0-beta.f6054b4 → 6.10.0-beta.6bf4ff9

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() {

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

@@ -65,37 +65,35 @@ class TeamsChannelMemberListCommand extends GraphCommand_1.default {
         });
     }
     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.channelId) {
-            return Promise.resolve(args.options.channelId);
-        }
-        const channelRequestOptions = {
-            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.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(this.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 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;
         });
     }
 }

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

@@ -42,6 +42,9 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const removeMember = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing member ${args.options.userId || args.options.id || args.options.userName} from channel ${args.options.channelId || args.options.channelName} from team ${args.options.teamId || args.options.teamName}`);
+                }
                 try {
                     yield this.removeMemberFromChannel(args);
                 }
@@ -69,17 +72,12 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
         });
     }
     removeMemberFromChannel(args) {
-        return this
-            .getTeamId(args)
-            .then((teamId) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const teamId = yield this.getTeamId(args);
             this.teamId = teamId;
-            return this.getChannelId(args);
-        })
-            .then((channelId) => {
+            const channelId = yield this.getChannelId(args);
             this.channelId = channelId;
-            return this.getMemberId(args);
-        })
-            .then((memberId) => {
+            const memberId = yield this.getMemberId(args);
             const requestOptions = {
                 url: `${this.resource}/v1.0/teams/${this.teamId}/channels/${this.channelId}/members/${memberId}`,
                 headers: {
@@ -91,56 +89,53 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
         });
     }
     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.channelId) {
-            return Promise.resolve(args.options.channelId);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.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(requestOptions)
-            .then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.channelId) {
+                return args.options.channelId;
+            }
+            const requestOptions = {
+                url: `${this.resource}/v1.0/teams/${formatting_1.formatting.encodeQueryParameter(this.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(requestOptions);
             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';
             }
             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;
         });
     }
     getMemberId(args) {
-        if (args.options.id) {
-            return Promise.resolve(args.options.id);
-        }
-        const requestOptions = {
-            url: `${this.resource}/v1.0/teams/${this.teamId}/channels/${this.channelId}/members`,
-            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/teams/${this.teamId}/channels/${this.channelId}/members`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
             const conversationMembers = response.value.filter(x => {
                 var _a, _b;
                 return args.options.userId && ((_a = x.userId) === null || _a === void 0 ? void 0 : _a.toLocaleLowerCase()) === args.options.userId.toLocaleLowerCase() ||
@@ -148,12 +143,12 @@ class TeamsChannelMemberRemoveCommand extends GraphCommand_1.default {
             });
             const conversationMember = conversationMembers[0];
             if (!conversationMember) {
-                return Promise.reject(`The specified member does not exist in the Microsoft Teams channel`);
+                throw 'The specified member does not exist in the Microsoft Teams channel';
             }
             if (conversationMembers.length > 1) {
-                return Promise.reject(`Multiple Microsoft Teams channel members with name ${args.options.userName} found: ${response.value.map(x => x.userId)}`);
+                throw `Multiple Microsoft Teams channel members with name ${args.options.userName} found: ${response.value.map(x => x.userId)}`;
             }
-            return Promise.resolve(conversationMember.id);
+            return conversationMember.id;
         });
     }
 }