@pnp/cli-microsoft365 7.0.0-beta.99e75a7 → 7.0.0-beta.b2eab57

package/dist/m365/yammer/commands/message/message-like-set.js

@@ -24,34 +24,9 @@ class YammerMessageLikeSetCommand extends YammerCommand {
         __classPrivateFieldGet(this, _YammerMessageLikeSetCommand_instances, "m", _YammerMessageLikeSetCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const executeLikeAction = async () => {
-            const endpoint = `${this.resource}/v1/messages/liked_by/current.json`;
-            const requestOptions = {
-                url: endpoint,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: {
-                    message_id: args.options.messageId
-                }
-            };
-            try {
-                if (args.options.enable !== false) {
-                    await request.post(requestOptions);
-                }
-                else {
-                    await request.delete(requestOptions);
-                }
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.enable === false) {
             if (args.options.force) {
-                await executeLikeAction();
+                await this.executeLikeAction(args.options);
             }
             else {
                 const messagePrompt = `Are you sure you want to unlike message ${args.options.messageId}?`;
@@ -62,12 +37,36 @@ class YammerMessageLikeSetCommand extends YammerCommand {
                     message: messagePrompt
                 });
                 if (result.continue) {
-                    await executeLikeAction();
+                    await this.executeLikeAction(args.options);
                 }
             }
         }
         else {
-            await executeLikeAction();
+            await this.executeLikeAction(args.options);
+        }
+    }
+    async executeLikeAction(options) {
+        const requestOptions = {
+            url: `${this.resource}/v1/messages/liked_by/current.json`,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            responseType: 'json',
+            data: {
+                message_id: options.messageId
+            }
+        };
+        try {
+            if (options.enable !== false) {
+                await request.post(requestOptions);
+            }
+            else {
+                await request.delete(requestOptions);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

package/dist/m365/yammer/commands/message/message-list.js

@@ -25,91 +25,72 @@ class YammerMessageListCommand extends YammerCommand {
         __classPrivateFieldGet(this, _YammerMessageListCommand_instances, "m", _YammerMessageListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _YammerMessageListCommand_instances, "m", _YammerMessageListCommand_initValidators).call(this);
     }
-    getAllItems(logger, args, messageId) {
-        return new Promise((resolve, reject) => {
-            let endpoint = `${this.resource}/v1`;
-            if (args.options.threadId) {
-                endpoint += `/messages/in_thread/${args.options.threadId}.json`;
-            }
-            else if (args.options.groupId) {
-                endpoint += `/messages/in_group/${args.options.groupId}.json`;
-            }
-            else {
-                if (!args.options.feedType) {
-                    args.options.feedType = "All";
-                }
-                switch (args.options.feedType) {
-                    case 'Top':
-                        endpoint += `/messages/algo.json`;
-                        break;
-                    case 'My':
-                        endpoint += `/messages/my_feed.json`;
-                        break;
-                    case 'Following':
-                        endpoint += `/messages/following.json`;
-                        break;
-                    case 'Sent':
-                        endpoint += `/messages/sent.json`;
-                        break;
-                    case 'Private':
-                        endpoint += `/messages/private.json`;
-                        break;
-                    case 'Received':
-                        endpoint += `/messages/received.json`;
-                        break;
-                    default:
-                        endpoint += `/messages.json`;
-                }
+    async getAllItems(logger, args, messageId) {
+        let endpoint = `${this.resource}/v1`;
+        if (args.options.threadId) {
+            endpoint += `/messages/in_thread/${args.options.threadId}.json`;
+        }
+        else if (args.options.groupId) {
+            endpoint += `/messages/in_group/${args.options.groupId}.json`;
+        }
+        else {
+            if (!args.options.feedType) {
+                args.options.feedType = "All";
             }
-            if (messageId !== -1) {
-                endpoint += `?older_than=${messageId}`;
+            switch (args.options.feedType) {
+                case 'Top':
+                    endpoint += `/messages/algo.json`;
+                    break;
+                case 'My':
+                    endpoint += `/messages/my_feed.json`;
+                    break;
+                case 'Following':
+                    endpoint += `/messages/following.json`;
+                    break;
+                case 'Sent':
+                    endpoint += `/messages/sent.json`;
+                    break;
+                case 'Private':
+                    endpoint += `/messages/private.json`;
+                    break;
+                case 'Received':
+                    endpoint += `/messages/received.json`;
+                    break;
+                default:
+                    endpoint += `/messages.json`;
             }
-            else if (args.options.olderThanId) {
-                endpoint += `?older_than=${args.options.olderThanId}`;
+        }
+        if (messageId !== -1) {
+            endpoint += `?older_than=${messageId}`;
+        }
+        else if (args.options.olderThanId) {
+            endpoint += `?older_than=${args.options.olderThanId}`;
+        }
+        if (args.options.threaded) {
+            if (endpoint.indexOf("?") > -1) {
+                endpoint += "&";
             }
-            if (args.options.threaded) {
-                if (endpoint.indexOf("?") > -1) {
-                    endpoint += "&";
-                }
-                else {
-                    endpoint += "?";
-                }
-                endpoint += `threaded=true`;
+            else {
+                endpoint += "?";
             }
-            const requestOptions = {
-                url: endpoint,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            request
-                .get(requestOptions)
-                .then((res) => {
-                this.items = this.items.concat(res.messages);
-                if (args.options.limit && this.items.length > args.options.limit) {
-                    this.items = this.items.slice(0, args.options.limit);
-                    resolve();
-                }
-                else {
-                    if (res.meta.older_available === true) {
-                        this
-                            .getAllItems(logger, args, this.items[this.items.length - 1].id)
-                            .then(() => {
-                            resolve();
-                        }, (err) => {
-                            reject(err);
-                        });
-                    }
-                    else {
-                        resolve();
-                    }
-                }
-            }, (err) => {
-                reject(err);
-            });
-        });
+            endpoint += `threaded=true`;
+        }
+        const requestOptions = {
+            url: endpoint,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const res = await request.get(requestOptions);
+        this.items = this.items.concat(res.messages);
+        if (args.options.limit && this.items.length > args.options.limit) {
+            this.items = this.items.slice(0, args.options.limit);
+        }
+        else if ((res.meta.older_available === true)) {
+            await this.getAllItems(logger, args, this.items[this.items.length - 1].id);
+        }
     }
     async commandAction(logger, args) {
         this.items = []; // this will reset the items array in interactive mode

package/dist/m365/yammer/commands/message/message-remove.js

@@ -23,24 +23,8 @@ class YammerMessageRemoveCommand extends YammerCommand {
         __classPrivateFieldGet(this, _YammerMessageRemoveCommand_instances, "m", _YammerMessageRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const removeMessage = async () => {
-            try {
-                const requestOptions = {
-                    url: `${this.resource}/v1/messages/${args.options.id}.json`,
-                    headers: {
-                        accept: 'application/json;odata.metadata=none',
-                        'content-type': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                await request.delete(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeMessage();
+            await this.removeMessage(args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -50,10 +34,26 @@ class YammerMessageRemoveCommand extends YammerCommand {
                 message: `Are you sure you want to remove the Yammer message ${args.options.id}?`
             });
             if (result.continue) {
-                await removeMessage();
+                await this.removeMessage(args.options);
             }
         }
     }
+    async removeMessage(options) {
+        try {
+            const requestOptions = {
+                url: `${this.resource}/v1/messages/${options.id}.json`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none',
+                    'content-type': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            await request.delete(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _YammerMessageRemoveCommand_instances = new WeakSet(), _YammerMessageRemoveCommand_initTelemetry = function _YammerMessageRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/yammer/commands/yammer-search.js

@@ -33,76 +33,60 @@ class YammerSearchCommand extends YammerCommand {
         __classPrivateFieldGet(this, _YammerSearchCommand_instances, "m", _YammerSearchCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _YammerSearchCommand_instances, "m", _YammerSearchCommand_initValidators).call(this);
     }
-    getAllItems(logger, args, page) {
-        return new Promise((resolve, reject) => {
-            const endpoint = `${this.resource}/v1/search.json?search=${formatting.encodeQueryParameter(args.options.queryText)}&page=${page}`;
-            const requestOptions = {
-                url: endpoint,
-                responseType: 'json',
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                }
+    async getAllItems(logger, args, page) {
+        const endpoint = `${this.resource}/v1/search.json?search=${formatting.encodeQueryParameter(args.options.queryText)}&page=${page}`;
+        const requestOptions = {
+            url: endpoint,
+            responseType: 'json',
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            }
+        };
+        const results = await request.get(requestOptions);
+        // results count should only read once
+        if (page === 1) {
+            this.summary = {
+                messages: results.count.messages,
+                topics: results.count.topics,
+                users: results.count.users,
+                groups: results.count.groups
             };
-            request
-                .get(requestOptions)
-                .then((results) => {
-                // results count should only read once
-                if (page === 1) {
-                    this.summary = {
-                        messages: results.count.messages,
-                        topics: results.count.topics,
-                        users: results.count.users,
-                        groups: results.count.groups
-                    };
-                }
-                const resultMessages = results.messages.messages;
-                const resultTopics = results.topics;
-                const resultGroups = results.groups;
-                const resultUsers = results.users;
-                if (resultMessages.length > 0) {
-                    this.messages = this.messages.concat(resultMessages);
-                    if (args.options.limit && this.messages.length > args.options.limit) {
-                        this.messages = this.messages.slice(0, args.options.limit);
-                    }
-                }
-                if (resultTopics.length > 0) {
-                    this.topics = this.topics.concat(resultTopics);
-                    if (args.options.limit && this.topics.length > args.options.limit) {
-                        this.topics = this.topics.slice(0, args.options.limit);
-                    }
-                }
-                if (resultGroups.length > 0) {
-                    this.groups = this.groups.concat(resultGroups);
-                    if (args.options.limit && this.groups.length > args.options.limit) {
-                        this.groups = this.groups.slice(0, args.options.limit);
-                    }
-                }
-                if (resultUsers.length > 0) {
-                    this.users = this.users.concat(resultUsers);
-                    if (args.options.limit && this.users.length > args.options.limit) {
-                        this.users = this.users.slice(0, args.options.limit);
-                    }
-                }
-                const continueProcessing = resultMessages.length === 20 ||
-                    resultUsers.length === 20 ||
-                    resultGroups.length === 20 ||
-                    resultTopics.length === 20;
-                if (continueProcessing) {
-                    this
-                        .getAllItems(logger, args, ++page)
-                        .then(() => {
-                        resolve();
-                    }, (err) => {
-                        reject(err);
-                    });
-                }
-                else {
-                    resolve();
-                }
-            }, (err) => {
-                reject(err);
-            });
-        });
+        }
+        const resultMessages = results.messages.messages;
+        const resultTopics = results.topics;
+        const resultGroups = results.groups;
+        const resultUsers = results.users;
+        if (resultMessages.length > 0) {
+            this.messages = this.messages.concat(resultMessages);
+            if (args.options.limit && this.messages.length > args.options.limit) {
+                this.messages = this.messages.slice(0, args.options.limit);
+            }
+        }
+        if (resultTopics.length > 0) {
+            this.topics = this.topics.concat(resultTopics);
+            if (args.options.limit && this.topics.length > args.options.limit) {
+                this.topics = this.topics.slice(0, args.options.limit);
+            }
+        }
+        if (resultGroups.length > 0) {
+            this.groups = this.groups.concat(resultGroups);
+            if (args.options.limit && this.groups.length > args.options.limit) {
+                this.groups = this.groups.slice(0, args.options.limit);
+            }
+        }
+        if (resultUsers.length > 0) {
+            this.users = this.users.concat(resultUsers);
+            if (args.options.limit && this.users.length > args.options.limit) {
+                this.users = this.users.slice(0, args.options.limit);
+            }
+        }
+        const continueProcessing = resultMessages.length === 20 ||
+            resultUsers.length === 20 ||
+            resultGroups.length === 20 ||
+            resultTopics.length === 20;
+        if (continueProcessing) {
+            await this.getAllItems(logger, args, ++page);
+        }
     }
     async commandAction(logger, args) {
         this.summary = {

package/dist/utils/spo.js

@@ -93,47 +93,6 @@ export const spo = {
             }
         });
     },
-    waitUntilCopyJobFinished({ copyJobInfo, siteUrl, pollingInterval, resolve, reject, logger, debug, verbose }) {
-        const requestUrl = `${siteUrl}/_api/site/GetCopyJobProgress`;
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: { "copyJobInfo": copyJobInfo },
-            responseType: 'json'
-        };
-        request
-            .post(requestOptions)
-            .then(async (resp) => {
-            if (debug) {
-                await logger.logToStderr('getCopyJobProgress response...');
-                await logger.logToStderr(resp);
-            }
-            for (const item of resp.Logs) {
-                const log = JSON.parse(item);
-                // reject if progress error
-                if (log.Event === "JobError" || log.Event === "JobFatalError") {
-                    return reject(log.Message);
-                }
-            }
-            // two possible scenarios
-            // job done = success promise returned
-            // job in progress = recursive call using setTimeout returned
-            if (resp.JobState === 0) {
-                // job done
-                if (verbose) {
-                    process.stdout.write('\n');
-                }
-                resolve();
-            }
-            else {
-                setTimeout(() => {
-                    spo.waitUntilCopyJobFinished({ copyJobInfo, siteUrl, pollingInterval, resolve, reject, logger, debug, verbose });
-                }, pollingInterval);
-            }
-        });
-    },
     async getSpoUrl(logger, debug) {
         if (auth.service.spoUrl) {
             if (debug) {
@@ -619,12 +578,12 @@ export const spo = {
         return request.post(requestOptions);
     },
     /**
-      * Retrieves the spo group by name.
-      * @param webUrl Web url
-      * @param name The name of the group
-      * @param logger the Logger object
-      * @param debug set if debug logging should be logged
-      */
+    * Retrieves the spo group by name.
+    * @param webUrl Web url
+    * @param name The name of the group
+    * @param logger the Logger object
+    * @param debug set if debug logging should be logged
+    */
     async getGroupByName(webUrl, name, logger, debug) {
         if (debug) {
             await logger.logToStderr(`Retrieving the group by name ${name}`);
@@ -641,12 +600,12 @@ export const spo = {
         return groupInstance;
     },
     /**
-      * Retrieves the role definition by name.
-      * @param webUrl Web url
-      * @param name the name of the role definition
-      * @param logger the Logger object
-      * @param debug set if debug logging should be logged
-      */
+    * Retrieves the role definition by name.
+    * @param webUrl Web url
+    * @param name the name of the role definition
+    * @param logger the Logger object
+    * @param debug set if debug logging should be logged
+    */
     async getRoleDefinitionByName(webUrl, name, logger, debug) {
         if (debug) {
             await logger.logToStderr(`Retrieving the role definitions for ${name}`);

package/docs/docs/cmd/spo/file/file-move.mdx

@@ -14,53 +14,71 @@ m365 spo file move [options]
 
 ```md definition-list
 `-u, --webUrl <webUrl>`
-: The URL of the site where the file is located
+: The URL of the site where the file is located.
 
-`-s, --sourceUrl <sourceUrl>`
-: The server- or site-relative decoded URL of the file to move
+`-s, --sourceUrl [sourceUrl]`
+: The server-, site-relative or absolute decoded URL of the file to move. Specify either `sourceUrl` or `sourceId` but not both.
+
+`-i, --sourceId [sourceId]`
+: The ID of the file to move. Specify either `sourceUrl` or `sourceId` but not both.
 
 `-t, --targetUrl <targetUrl>`
-: Server-relative decoded URL where to move the file
+: Server-relative or absolute decoded URL where to move the file.
+
+`--newName [newName]`
+: The new name of the destination file.
 
-`--deleteIfAlreadyExists`
-: If a file already exists at the targetUrl, it will be moved to the recycle bin. If omitted, the move operation will be canceled if the file already exists at the targetUrl location
+`--nameConflictBehavior [nameConflictBehavior]`
+: Behavior when a file or folder with the same name is already present at the destination. Possible values: `fail`, `replace`, `rename`. The default is `fail`.
 
-`--allowSchemaMismatch`
-: Ignores any missing fields in the target document library and moves the file anyway
+`--retainEditorAndModified`
+: Use this option to retain the editor and modified date. When not specified, these values are reset when moving to another library.
+
+`--bypassSharedLock`
+: This indicates whether a file with a share lock can still be moved. Use this option to move a file that is locked.
 ```
 
 <Global />
 
 ## Remarks
 
-When you move a file using the `spo file move` command, all of the versions are being moved.
+All file versions are retained while moving a file.
+
+When you specify a value for `nameConflictBehavior`, consider the following:
+
+- `fail` will throw an error when the destination file already exists.
+- `replace` will replace the destination file if it already exists.
+- `rename` will add a suffix (e.g. Document1.pdf) when the destination file already exists.
 
 ## Examples
 
-Move file to a document library in another site collection
+Move a file to a document library in another site collection by server relative URL
 
 ```sh
-m365 spo file move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /sites/test1/Shared%20Documents/sp1.pdf --targetUrl /sites/test2/Shared%20Documents/
+m365 spo file move --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl "/sites/project-x/Shared Documents/sp1.pdf" --targetUrl "/sites/project-y/Archived documents"
 ```
 
-Move file to a document library in the same site collection
+Move a file specified by a server-relative URL to a document library and rename it
 
 ```sh
-m365 spo file move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /Shared%20Documents/sp1.pdf --targetUrl /sites/test1/HRDocuments/
+m365 spo file move --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl "/Shared Documents/sp1.pdf" --targetUrl "/sites/project-x/My Documents" --newName Report.pdf
 ```
 
-Move file to a document library in another site collection. If a file with the same name already exists in the target document library, move it to the recycle bin
+Move a file to another document library and replace a file with the same name
 
 ```sh
-m365 spo file move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /Shared%20Documents/sp1.pdf --targetUrl /sites/test2/Shared%20Documents/ --deleteIfAlreadyExists
+m365 spo file move --webUrl https://contoso.sharepoint.com/sites/project-x --sourceUrl "/Shared Documents/Report project-x.pdf" --targetUrl "/sites/project-x/My Documents" --newName Report.pdf --nameConflictBehavior replace
 ```
 
-Move file to a document library in another site collection. Allow for schema mismatch
+Move a file referenced by its ID to another document library and retain editor and modified date
 
- ```sh
-m365 spo file move --webUrl https://contoso.sharepoint.com/sites/test1 --sourceUrl /sites/test1/Shared%20Documents/sp1.pdf --targetUrl /sites/test2/Shared%20Documents/ --allowSchemaMismatch
+```sh
+m365 spo file move --webUrl https://contoso.sharepoint.com/sites/project-x --sourceId b8cc341b-9c11-4f2d-aa2b-0ce9c18bcba2 --targetUrl "/sites/project-x/My Documents" --retainEditorAndModified
 ```
 
+## Response
+
+The command won't return a response on success.
 
 ## More information