@pnp/cli-microsoft365 5.0.0-beta.2e2ba7d → 5.0.0-beta.30c8613

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

@@ -0,0 +1,42 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Utils_1 = require("../../../../Utils");
+const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const commands_1 = require("../../commands");
+class TeamsChatMemberListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    get name() {
+        return commands_1.default.CHAT_MEMBER_LIST;
+    }
+    get description() {
+        return 'Lists all members from a chat';
+    }
+    defaultProperties() {
+        return ['userId', 'displayName', 'email'];
+    }
+    commandAction(logger, args, cb) {
+        const endpoint = `${this.resource}/v1.0/chats/${args.options.chatId}/members`;
+        this
+            .getAllItems(endpoint, logger, true)
+            .then(() => {
+            logger.log(this.items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --chatId <chatId>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (!Utils_1.default.isValidTeamsChatId(args.options.chatId)) {
+            return `${args.options.chatId} is not a valid Teams ChatId`;
+        }
+        return true;
+    }
+}
+module.exports = new TeamsChatMemberListCommand();
+//# sourceMappingURL=chat-member-list.js.map

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

@@ -0,0 +1,60 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const Utils_1 = require("../../../../Utils");
+const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const commands_1 = require("../../commands");
+class TeamsChatMessageListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    get name() {
+        return commands_1.default.CHAT_MESSAGE_LIST;
+    }
+    get description() {
+        return 'Lists all messages from a chat';
+    }
+    defaultProperties() {
+        return ['id', 'shortBody'];
+    }
+    commandAction(logger, args, cb) {
+        const endpoint = `${this.resource}/v1.0/chats/${args.options.chatId}/messages`;
+        this
+            .getAllItems(endpoint, logger, true)
+            .then(() => {
+            if (args.options.output !== 'json') {
+                this.items.forEach(i => {
+                    // hoist the content to body for readability
+                    i.body = i.body.content;
+                    let shortBody;
+                    const bodyToProcess = i.body;
+                    if (bodyToProcess) {
+                        let maxLength = 50;
+                        let addedDots = '...';
+                        if (bodyToProcess.length < maxLength) {
+                            maxLength = bodyToProcess.length;
+                            addedDots = '';
+                        }
+                        shortBody = bodyToProcess.replace(/\n/g, ' ').substring(0, maxLength) + addedDots;
+                    }
+                    i.shortBody = shortBody;
+                });
+            }
+            logger.log(this.items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --chatId <chatId>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (!Utils_1.default.isValidTeamsChatId(args.options.chatId)) {
+            return `${args.options.chatId} is not a valid Teams chat ID`;
+        }
+        return true;
+    }
+}
+module.exports = new TeamsChatMessageListCommand();
+//# sourceMappingURL=chat-message-list.js.map

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

@@ -0,0 +1,225 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const os = require("os");
+const Auth_1 = require("../../../../Auth");
+const request_1 = require("../../../../request");
+const Utils_1 = require("../../../../Utils");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class TeamsChatMessageSendCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.CHAT_MESSAGE_SEND;
+    }
+    get description() {
+        return 'Send a message to an existing or new chat conversation.';
+    }
+    commandAction(logger, args, cb) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const chatId = args.options.chatId
+                    || args.options.userEmails && (yield this.ensureChatIdByUserEmails(args.options.userEmails))
+                    || args.options.chatName && (yield this.getChatIdByName(args.options.chatName));
+                yield this.sendChatMessage(chatId, args.options);
+                cb();
+            }
+            catch (error) {
+                this.handleRejectedODataJsonPromise(error, logger, cb);
+            }
+        });
+    }
+    options() {
+        const options = [
+            {
+                option: '--chatId [chatId]'
+            },
+            {
+                option: '-e, --userEmails [userEmails]'
+            },
+            {
+                option: '--chatName [chatName]'
+            },
+            {
+                option: '-m, --message <message>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    validate(args) {
+        if (!args.options.chatId && !args.options.userEmails && !args.options.chatName) {
+            return 'Specify chatId or userEmails or chatName, one is required.';
+        }
+        let nrOfMutuallyExclusiveOptionsInUse = 0;
+        if (args.options.chatId) {
+            nrOfMutuallyExclusiveOptionsInUse++;
+        }
+        if (args.options.userEmails) {
+            nrOfMutuallyExclusiveOptionsInUse++;
+        }
+        if (args.options.chatName) {
+            nrOfMutuallyExclusiveOptionsInUse++;
+        }
+        if (nrOfMutuallyExclusiveOptionsInUse > 1) {
+            return 'Specify either chatId or userEmails or chatName, but not multiple.';
+        }
+        if (!args.options.message) {
+            return 'Specify a message to send.';
+        }
+        if (args.options.chatId && !Utils_1.default.isValidTeamsChatId(args.options.chatId)) {
+            return `${args.options.chatId} is not a valid Teams ChatId.`;
+        }
+        if (args.options.userEmails) {
+            const userEmails = args.options.userEmails.toLowerCase().replace(/\s/g, '').split(',').filter(e => e && e !== '');
+            if (!userEmails || userEmails.length === 0 || userEmails.some(e => !Utils_1.default.isValidUserPrincipalName(e))) {
+                return `${args.options.userEmails} contains one or more invalid email addresses.`;
+            }
+        }
+        return true;
+    }
+    ensureChatIdByUserEmails(userEmailsOption) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userEmails = userEmailsOption.toLowerCase().replace(/\s/g, '').split(',').filter(e => e && e !== '');
+            const currentUserEmail = Utils_1.default.getUserNameFromAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken).toLowerCase();
+            const existingChats = yield this.findExistingGroupChatsByMembers([currentUserEmail, ...userEmails]);
+            if (existingChats && existingChats.length > 0) {
+                if (existingChats.length > 1) {
+                    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 topic found. Please disambiguate:${os.EOL}${disambiguationText}`);
+                }
+                else {
+                    return existingChats[0].id;
+                }
+            }
+            const chat = yield this.createConversation([currentUserEmail, ...userEmails]);
+            return chat.id;
+        });
+    }
+    getChatIdByName(chatName) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const existingChats = yield this.findExistingGroupChatsByTopic(chatName);
+            if (!existingChats || existingChats.length === 0) {
+                throw new Error('No chat conversation was found with this name.');
+            }
+            if (existingChats.length === 1) {
+                return existingChats[0].id;
+            }
+            const disambiguationText = existingChats.map(c => {
+                const memberstring = c.members.map(m => m.email).join(', ');
+                return `- ${c.id} - ${c.createdDateTime && new Date(c.createdDateTime).toLocaleString()} - ${memberstring}`;
+            }).join(os.EOL);
+            throw new Error(`Multiple chat conversations with this topic found. Please disambiguate:${os.EOL}${disambiguationText}`);
+        });
+    }
+    // This Microsoft Graph API request throws an intermittent 404 exception, saying that it cannot find the principal.
+    // The same behavior occurs when creating the conversation through the Graph Explorer.
+    // It seems to happen when the userEmail casing does not match the casing of the actual UPN. 
+    // When the first request throws an error, the second request does succeed. 
+    // Therefore a retry-mechanism is implemented here. 
+    createConversation(memberEmails, retried = 0) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const jsonBody = {
+                    chatType: memberEmails.length > 2 ? 'group' : 'oneOnOne',
+                    members: memberEmails.map(email => {
+                        return {
+                            '@odata.type': '#microsoft.graph.aadUserConversationMember',
+                            roles: ['owner'],
+                            'user@odata.bind': `https://graph.microsoft.com/v1.0/users/${email}`
+                        };
+                    })
+                };
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/chats`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none',
+                        'content-type': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json',
+                    data: jsonBody
+                };
+                return yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                if (((_a = err.message) === null || _a === void 0 ? void 0 : _a.indexOf('404')) > -1 && retried < 4) {
+                    return yield this.createConversation(memberEmails, retried + 1);
+                }
+                throw err;
+            }
+        });
+    }
+    sendChatMessage(chatId, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${this.resource}/v1.0/chats/${chatId}/messages`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    body: {
+                        content: options.message
+                    }
+                }
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+    findExistingGroupChatsByMembers(expectedMemberEmails) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = `${this.resource}/v1.0/chats?$filter=chatType eq 'group'&$expand=members&$select=id,topic,createdDateTime,members`;
+            const foundChats = [];
+            const chats = yield this.getAllChats(endpoint, []);
+            for (const chat of chats) {
+                const chatMembers = chat.members;
+                if (chatMembers.length === expectedMemberEmails.length) {
+                    const chatMemberEmails = chatMembers.map(member => { var _a; return (_a = member.email) === null || _a === void 0 ? void 0 : _a.toLowerCase(); });
+                    if (expectedMemberEmails.every(email => chatMemberEmails.some(memberEmail => memberEmail === email))) {
+                        foundChats.push(chat);
+                    }
+                }
+            }
+            return foundChats;
+        });
+    }
+    findExistingGroupChatsByTopic(topic) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const endpoint = `${this.resource}/v1.0/chats?$filter=topic eq '${encodeURIComponent(topic)}'&$expand=members&$select=id,topic,createdDateTime,chatType`;
+            const chats = yield this.getAllChats(endpoint, []);
+            return chats;
+        });
+    }
+    getAllChats(url, items) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: url,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            items = items.concat(res.value);
+            if (res['@odata.nextLink']) {
+                return yield this.getAllChats(res['@odata.nextLink'], items);
+            }
+            else {
+                return items;
+            }
+        });
+    }
+}
+module.exports = new TeamsChatMessageSendCommand();
+//# sourceMappingURL=chat-message-send.js.map

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

@@ -13,7 +13,7 @@ class TeamsMessageGetCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args, cb) {
         const requestOptions = {
-            url: `${this.resource}/beta/teams/${args.options.teamId}/channels/${args.options.channelId}/messages/${args.options.messageId}`,
+            url: `${this.resource}/v1.0/teams/${args.options.teamId}/channels/${args.options.channelId}/messages/${args.options.messageId}`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },

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

@@ -30,24 +30,27 @@ class TeamsTabGetCommand extends GraphCommand_1.default {
         if (args.options.teamId) {
             return Promise.resolve(args.options.teamId);
         }
-        const teamRequestOptions = {
-            url: `${this.resource}/v1.0/me/joinedTeams?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
+        const requestOptions = {
+            url: `${this.resource}/v1.0/groups?$filter=displayName eq '${encodeURIComponent(args.options.teamName)}'`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
             responseType: 'json'
         };
         return request_1.default
-            .get(teamRequestOptions)
+            .get(requestOptions)
             .then(response => {
-            const teamItem = response.value[0];
-            if (!teamItem) {
+            const groupItem = response.value[0];
+            if (!groupItem) {
+                return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
+            }
+            if (groupItem.resourceProvisioningOptions.indexOf('Team') === -1) {
                 return Promise.reject(`The specified team does not exist in the Microsoft Teams`);
             }
             if (response.value.length > 1) {
                 return Promise.reject(`Multiple Microsoft Teams teams with name ${args.options.teamName} found: ${response.value.map(x => x.id)}`);
             }
-            return Promise.resolve(teamItem.id);
+            return Promise.resolve(groupItem.id);
         });
     }
     getChannelId(args) {

package/dist/m365/teams/commands.js

@@ -13,6 +13,10 @@ exports.default = {
     CHANNEL_LIST: `${prefix} channel list`,
     CHANNEL_REMOVE: `${prefix} channel remove`,
     CHANNEL_SET: `${prefix} channel set`,
+    CHAT_LIST: `${prefix} chat list`,
+    CHAT_MEMBER_LIST: `${prefix} chat member list`,
+    CHAT_MESSAGE_LIST: `${prefix} chat message list`,
+    CHAT_MESSAGE_SEND: `${prefix} chat message send`,
     CONVERSATIONMEMBER_ADD: `${prefix} conversationmember add`,
     CONVERSATIONMEMBER_LIST: `${prefix} conversationmember list`,
     FUNSETTINGS_LIST: `${prefix} funsettings list`,

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-get.js

@@ -0,0 +1,57 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const request_1 = require("../../../../request");
+const commands_1 = require("../../commands");
+class TenantServiceAnnouncementHealthGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.SERVICEANNOUNCEMENT_HEALTH_GET;
+    }
+    get description() {
+        return 'This operation provides the health information of a specified service for a tenant';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.issues = typeof args.options.issues !== 'undefined';
+        return telemetryProps;
+    }
+    defaultProperties() {
+        return ['id', 'status', 'service'];
+    }
+    commandAction(logger, args, cb) {
+        this
+            .getServiceHealth(args.options)
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    getServiceHealth(options) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/admin/serviceAnnouncement/healthOverviews/${options.serviceName}${options.issues && (!options.output || options.output.toLocaleLowerCase() === 'json') ? '?$expand=issues' : ''}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const serviceHealth = response;
+            if (!serviceHealth) {
+                return Promise.reject(`Error fetching service health`);
+            }
+            return Promise.resolve(serviceHealth);
+        });
+    }
+    options() {
+        const options = [
+            { option: '-s, --serviceName <serviceName>' },
+            { option: '-i, --issues' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new TenantServiceAnnouncementHealthGetCommand();
+//# sourceMappingURL=serviceannouncement-health-get.js.map

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-health-list.js

@@ -0,0 +1,56 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const request_1 = require("../../../../request");
+const commands_1 = require("../../commands");
+class TenantServiceAnnouncementHealthListCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.SERVICEANNOUNCEMENT_HEALTH_LIST;
+    }
+    get description() {
+        return 'This operation provides the health report of all subscribed services for a tenant';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.issues = typeof args.options.issues !== 'undefined';
+        return telemetryProps;
+    }
+    defaultProperties() {
+        return ['id', 'status', 'service'];
+    }
+    commandAction(logger, args, cb) {
+        this
+            .listServiceHealth(args.options)
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    listServiceHealth(options) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/admin/serviceAnnouncement/healthOverviews${options.issues && (!options.output || options.output.toLocaleLowerCase() === 'json') ? '?$expand=issues' : ''}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        return request_1.default
+            .get(requestOptions)
+            .then(response => {
+            const serviceHealthList = response.value;
+            if (!serviceHealthList) {
+                return Promise.reject(`Error fetching service health`);
+            }
+            return Promise.resolve(serviceHealthList);
+        });
+    }
+    options() {
+        const options = [
+            { option: '-i, --issues' }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new TenantServiceAnnouncementHealthListCommand();
+//# sourceMappingURL=serviceannouncement-health-list.js.map

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-healthissue-get.js

@@ -0,0 +1,39 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class TenantServiceAnnouncementHealthIssueGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.SERVICEANNOUNCEMENT_HEALTHISSUE_GET;
+    }
+    get description() {
+        return 'Gets a specified service health issue for tenant';
+    }
+    commandAction(logger, args, cb) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/admin/serviceAnnouncement/issues/${encodeURIComponent(args.options.id)}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --id <id>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new TenantServiceAnnouncementHealthIssueGetCommand();
+//# sourceMappingURL=serviceannouncement-healthissue-get.js.map

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-healthissue-list.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const commands_1 = require("../../commands");
+class TenantServiceAnnouncementHealthIssueListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    get name() {
+        return commands_1.default.SERVICEANNOUNCEMENT_HEALTHISSUE_LIST;
+    }
+    get description() {
+        return 'Gets all service health issues for the tenant';
+    }
+    defaultProperties() {
+        return ['id', 'title'];
+    }
+    commandAction(logger, args, cb) {
+        let endpoint = `${this.resource}/v1.0/admin/serviceAnnouncement/issues`;
+        if (args.options.service) {
+            endpoint += `?$filter=service eq '${encodeURIComponent(args.options.service)}'`;
+        }
+        this
+            .getAllItems(endpoint, logger, true)
+            .then(() => {
+            logger.log(this.items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-s, --service [service]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new TenantServiceAnnouncementHealthIssueListCommand();
+//# sourceMappingURL=serviceannouncement-healthissue-list.js.map

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-message-get.js

@@ -0,0 +1,51 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class TenantServiceAnnouncementMessageGetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.SERVICEANNOUNCEMENT_MESSAGE_GET;
+    }
+    get description() {
+        return 'Retrieves a specified service update message for the tenant';
+    }
+    commandAction(logger, args, cb) {
+        if (this.verbose) {
+            logger.logToStderr(`Retrieving service update message ${args.options.id}`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/admin/serviceAnnouncement/messages/${args.options.id}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        request_1.default
+            .get(requestOptions)
+            .then((res) => {
+            logger.log(res);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-i, --id <id>'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+    isValidId(id) {
+        return (/MC\d{6}/).test(id);
+    }
+    validate(args) {
+        if (!this.isValidId(args.options.id)) {
+            return `${args.options.id} is not a valid message ID`;
+        }
+        return true;
+    }
+}
+module.exports = new TenantServiceAnnouncementMessageGetCommand();
+//# sourceMappingURL=serviceannouncement-message-get.js.map

package/dist/m365/tenant/commands/serviceannouncement/serviceannouncement-message-list.js

@@ -0,0 +1,38 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+const GraphItemsListCommand_1 = require("../../../base/GraphItemsListCommand");
+const commands_1 = require("../../commands");
+class TenantServiceAnnouncementMessageListCommand extends GraphItemsListCommand_1.GraphItemsListCommand {
+    get name() {
+        return commands_1.default.SERVICEANNOUNCEMENT_MESSAGE_LIST;
+    }
+    get description() {
+        return 'Gets all service update messages for the tenant';
+    }
+    defaultProperties() {
+        return ['id', 'title'];
+    }
+    commandAction(logger, args, cb) {
+        let endpoint = `${this.resource}/v1.0/admin/serviceAnnouncement/messages`;
+        if (args.options.service) {
+            endpoint += `?$filter=services/any(c:c+eq+'${encodeURIComponent(args.options.service)}')`;
+        }
+        this
+            .getAllItems(endpoint, logger, true)
+            .then(() => {
+            logger.log(this.items);
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    }
+    options() {
+        const options = [
+            {
+                option: '-s, --service [service]'
+            }
+        ];
+        const parentOptions = super.options();
+        return options.concat(parentOptions);
+    }
+}
+module.exports = new TenantServiceAnnouncementMessageListCommand();
+//# sourceMappingURL=serviceannouncement-message-list.js.map