@pnp/cli-microsoft365 5.1.0-beta.c8f5fd7 → 5.1.0-beta.efdacec

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

@@ -20,21 +20,22 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
         return commands_1.default.CHAT_MESSAGE_SEND;
     }
     get description() {
-        return 'Send a message to an existing or new chat conversation.';
+        return 'Sends a chat message to a Microsoft Teams chat conversation.';
+    }
+    getTelemetryProperties(args) {
+        const telemetryProps = super.getTelemetryProperties(args);
+        telemetryProps.chatId = typeof args.options.chatId !== 'undefined';
+        telemetryProps.userEmails = typeof args.options.userEmails !== 'undefined';
+        telemetryProps.chatName = typeof args.options.chatName !== 'undefined';
+        return telemetryProps;
     }
     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);
-            }
-        });
+        this
+            .getChatId(logger, args)
+            .then(chatId => this.sendChatMessage(chatId, args))
+            .then(_ => {
+            cb();
+        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
     }
     options() {
         const options = [
@@ -78,36 +79,44 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
             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 !== '');
+            const userEmails = this.convertCommaSeparatedListToArray(args.options.userEmails);
             if (!userEmails || userEmails.length === 0 || userEmails.some(e => !utils_1.validation.isValidUserPrincipalName(e))) {
                 return `${args.options.userEmails} contains one or more invalid email addresses.`;
             }
         }
         return true;
     }
-    ensureChatIdByUserEmails(userEmailsOption) {
+    getChatId(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const userEmails = userEmailsOption.toLowerCase().replace(/\s/g, '').split(',').filter(e => e && e !== '');
+            if (args.options.chatId) {
+                return args.options.chatId;
+            }
+            return args.options.userEmails
+                ? this.ensureChatIdByUserEmails(args.options.userEmails, logger)
+                : this.getChatIdByName(args.options.chatName, logger);
+        });
+    }
+    ensureChatIdByUserEmails(userEmailsOption, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userEmails = this.convertCommaSeparatedListToArray(userEmailsOption);
             const currentUserEmail = utils_1.accessToken.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 existingChats = yield this.findExistingGroupChatsByMembers([currentUserEmail, ...userEmails], logger);
+            if (!existingChats || existingChats.length === 0) {
+                const chat = yield this.createConversation([currentUserEmail, ...userEmails]);
+                return chat.id;
             }
-            const chat = yield this.createConversation([currentUserEmail, ...userEmails]);
-            return chat.id;
+            if (existingChats.length === 1) {
+                return existingChats[0].id;
+            }
+            const disambiguationText = existingChats.map(c => {
+                return `- ${c.id}${c.topic && ' - '}${c.topic} - ${c.createdDateTime && new Date(c.createdDateTime).toLocaleString()}`;
+            }).join(os.EOL);
+            throw new Error(`Multiple chat conversations with this name found. Please disambiguate:${os.EOL}${disambiguationText}`);
         });
     }
-    getChatIdByName(chatName) {
+    getChatIdByName(chatName, logger) {
         return __awaiter(this, void 0, void 0, function* () {
-            const existingChats = yield this.findExistingGroupChatsByTopic(chatName);
+            const existingChats = yield this.findExistingGroupChatsByName(chatName, logger);
             if (!existingChats || existingChats.length === 0) {
                 throw new Error('No chat conversation was found with this name.');
             }
@@ -118,7 +127,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 topic found. Please disambiguate:${os.EOL}${disambiguationText}`);
+            throw new Error(`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.
@@ -159,7 +168,7 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
             }
         });
     }
-    sendChatMessage(chatId, options) {
+    sendChatMessage(chatId, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
                 url: `${this.resource}/v1.0/chats/${chatId}/messages`,
@@ -170,18 +179,18 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
                 responseType: 'json',
                 data: {
                     body: {
-                        content: options.message
+                        content: args.options.message
                     }
                 }
             };
             yield request_1.default.post(requestOptions);
         });
     }
-    findExistingGroupChatsByMembers(expectedMemberEmails) {
+    findExistingGroupChatsByMembers(expectedMemberEmails, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             const endpoint = `${this.resource}/v1.0/chats?$filter=chatType eq 'group'&$expand=members&$select=id,topic,createdDateTime,members`;
             const foundChats = [];
-            const chats = yield this.getAllChats(endpoint, []);
+            const chats = yield utils_1.odata.getAllItems(endpoint, logger);
             for (const chat of chats) {
                 const chatMembers = chat.members;
                 if (chatMembers.length === expectedMemberEmails.length) {
@@ -194,31 +203,14 @@ class TeamsChatMessageSendCommand extends GraphCommand_1.default {
             return foundChats;
         });
     }
-    findExistingGroupChatsByTopic(topic) {
+    findExistingGroupChatsByName(name, logger) {
         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;
+            const endpoint = `${this.resource}/v1.0/chats?$filter=topic eq '${encodeURIComponent(name)}'&$expand=members&$select=id,topic,createdDateTime,chatType`;
+            return utils_1.odata.getAllItems(endpoint, logger);
         });
     }
-    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;
-            }
-        });
+    convertCommaSeparatedListToArray(userEmailsString) {
+        return userEmailsString.toLowerCase().replace(/\s/g, '').split(',').filter(e => e && e !== '');
     }
 }
 module.exports = new TeamsChatMessageSendCommand();

package/dist/utils/formatting.js

@@ -61,6 +61,9 @@ exports.formatting = {
     },
     removeSingleLineComments(s) {
         return stripJsonComments(s);
+    },
+    splitAndTrim(s) {
+        return s.split(',').map(c => c.trim());
     }
 };
 //# sourceMappingURL=formatting.js.map

package/dist/utils/index.js

@@ -1,7 +1,11 @@
 "use strict";
 var __createBinding = (this && this.__createBinding) || (Object.create ? (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
-    Object.defineProperty(o, k2, { enumerable: true, get: function() { return m[k]; } });
+    var desc = Object.getOwnPropertyDescriptor(m, k);
+    if (!desc || ("get" in desc ? !m.__esModule : desc.writable || desc.configurable)) {
+      desc = { enumerable: true, get: function() { return m[k]; } };
+    }
+    Object.defineProperty(o, k2, desc);
 }) : (function(o, m, k, k2) {
     if (k2 === undefined) k2 = k;
     o[k2] = m[k];

package/docs/docs/cmd/pp/managementapp/managementapp-add.md

@@ -0,0 +1,50 @@
+# pp managementapp add
+
+Register management application for Power Platform
+
+## Usage
+
+```sh
+m365 pp managementapp add [options]
+```
+
+## Options
+
+`--appId [appId]`
+: Application (client) ID of the Azure AD application registration to register as a management app. Specify either `appId`, `objectId` or `name`
+
+`--objectId [objectId]`
+: Object ID of the Azure AD application registration to register as a management app. Specify either `appId`, `objectId` or `name`
+
+`--name [name]`
+: Name of the Azure AD application registration to register as a management app. Specify either `appId`, `objectId` or `name`
+
+--8<-- "docs/cmd/_global.md"
+
+## Remarks
+
+To execute this command the first time you'll need sign in using the Microsoft Azure PowerShell app registration. You can do this by executing `m365 login --appId 1950a258-227b-4e31-a9cf-717495945fc2`. To register the Azure AD app registration that CLI for Microsoft 365 uses by default, execute `m365 pp managementapp add--appId 31359c7f-bd7e-475c-86db-fdb8c937548e`.
+
+For best performance use the `appId` option to reference the Azure AD application registration to update. If you use `objectId` or `name`, this command will first need to find the corresponding `appId` for that application.
+
+If the command finds multiple Azure AD application registrations with the specified app name, it will prompt you to disambiguate which app it should use, listing the discovered object IDs.
+
+## Examples
+
+Register CLI for Microsoft 365 as a management application for the Power Platform
+
+```sh
+m365 pp managementapp add --appId 31359c7f-bd7e-475c-86db-fdb8c937548e
+```
+
+Register Azure AD application with the specified object ID as a management application for the Power Platform
+
+```sh
+m365 pp managementapp add --objectId d75be2e1-0204-4f95-857d-51a37cf40be8
+```
+
+Register Azure AD application named _My app_ as a management application for the Power Platform
+
+```sh
+m365 pp managementapp add --name "My app"
+```

package/docs/docs/cmd/spfx/project/project-upgrade.md

@@ -32,7 +32,7 @@ m365 spfx project upgrade [options]
 
 ## Remarks
 
-The `spfx project upgrade` command helps you upgrade your SharePoint Framework project to the specified version. If no version is specified, the command will upgrade to the latest version of the SharePoint Framework it supports (v1.14.0).
+The `spfx project upgrade` command helps you upgrade your SharePoint Framework project to the specified version. If no version is specified, the command will upgrade to the latest version of the SharePoint Framework it supports (v1.14.0). If you specify the `preview` option without a specific version, the command will upgrade your project to the latest preview version v1.15.0-beta.1.
 
 This command doesn't change your project files. Instead, it gives you a report with all steps necessary to upgrade your project to the specified version of the SharePoint Framework. Changing project files is error-prone, especially when it comes to updating your solution's code. This is why at this moment, this command produces a report that you can use yourself to perform the necessary updates and verify that everything is working as expected.
 

package/docs/docs/cmd/spo/site/site-recyclebinitem-restore.md

@@ -0,0 +1,27 @@
+# spo site recyclebinitem restore
+
+Restores given items from the site recycle bin
+
+## Usage
+
+```sh
+m365 spo site recyclebinitem restore [options]
+```
+
+## Options
+
+`-u, --siteUrl <siteUrl>`
+: URL of the site for which to restore the recycle bin items
+
+`-i, --ids <ids>`
+: List of ids of items which will be restored from the site recycle bin
+
+--8<-- "docs/cmd/_global.md"
+
+## Examples
+
+Restore specific items by given ids from recycle bin for site _https://contoso.sharepoint.com/site_
+
+```sh
+m365 spo site recyclebinitem restore --siteUrl https://contoso.sharepoint.com/site --ids "ae6f97a7-280e-48d6-b481-0ea986c323da,aadbf916-1f71-42ee-abf2-8ee4802ae291"
+```

package/docs/docs/cmd/teams/chat/chat-message-send.md

@@ -33,23 +33,23 @@ A new chat conversation will be created if no existing conversation with the par
 Send a message to a Microsoft Teams chat conversation by id
 
 ```sh
-m365 teams chat message send --chatId 19:2da4c29f6d7041eca70b638b43d45437@thread.v2
+m365 teams chat message send --chatId 19:2da4c29f6d7041eca70b638b43d45437@thread.v2 --message "Welcome to Teams"
 ```
 
 Send a message to a single person
 
 ```sh
-m365 teams chat message send --userEmails alexw@contoso.com
+m365 teams chat message send --userEmails alexw@contoso.com --message "Welcome to Teams"
 ```
 
 Send a message to a group of people
 
 ```sh
-m365 teams chat message send --userEmails alexw@contoso.com,meganb@contoso.com
+m365 teams chat message send --userEmails alexw@contoso.com,meganb@contoso.com --message "Welcome to Teams"
 ```
 
 Send a message to a chat conversation finding it by display name
 
 ```sh
-m365 teams chat message send --chatName "Just a conversation"
+m365 teams chat message send --chatName "Just a conversation" --message "Welcome to Teams"
 ```