@pnp/cli-microsoft365 7.0.0-beta.4ebf3ad → 7.0.0-beta.669444a

package/dist/m365/spo/commands/file/file-move.js

@@ -3,17 +3,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMoveCommand_initOptions, _SpoFileMoveCommand_initValidators;
-import url from 'url';
-import { Cli } from '../../../../cli/Cli.js';
+var _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMoveCommand_initOptions, _SpoFileMoveCommand_initValidators, _SpoFileMoveCommand_initOptionSets;
 import request from '../../../../request.js';
-import { formatting } from '../../../../utils/formatting.js';
-import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import removeCommand from './file-remove.js';
 class SpoFileMoveCommand extends SpoCommand {
     get name() {
         return commands.FILE_MOVE;
@@ -24,143 +19,124 @@ class SpoFileMoveCommand extends SpoCommand {
     constructor() {
         super();
         _SpoFileMoveCommand_instances.add(this);
+        this.nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
         __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initOptionSets).call(this);
     }
     getExcludedOptionsWithUrls() {
         return ['targetUrl', 'sourceUrl'];
     }
     async commandAction(logger, args) {
-        const webUrl = args.options.webUrl;
-        const parsedUrl = url.parse(webUrl);
-        const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
         try {
-            const serverRelativePath = urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
-            // Check if the source file exists.
-            // Called on purpose, we explicitly check if user specified file
-            // in the sourceUrl option.
-            // The CreateCopyJobs endpoint accepts file, folder or batch from both.
-            // A user might enter folder instead of file as source url by mistake
-            // then there are edge cases when deleteIfAlreadyExists flag is set
-            // the user can receive misleading error message.
-            await this.fileExists(webUrl, serverRelativePath);
-            if (args.options.deleteIfAlreadyExists) {
-                // try delete target file, if deleteIfAlreadyExists flag is set
-                const filename = args.options.sourceUrl.replace(/^.*[\\\/]/, '');
-                await this.recycleFile(tenantUrl, args.options.targetUrl, filename, logger);
+            const sourcePath = await this.getSourcePath(logger, args.options);
+            if (this.verbose) {
+                await logger.logToStderr(`Moving file ${sourcePath} to ${args.options.targetUrl}...`);
+            }
+            const absoluteSourcePath = this.getAbsoluteUrl(args.options.webUrl, sourcePath);
+            let absoluteTargetPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
+            if (args.options.newName) {
+                absoluteTargetPath += args.options.newName;
+            }
+            else {
+                // Keep the original file name
+                absoluteTargetPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
             }
-            // all preconditions met, now create copy job
-            const sourceAbsoluteUrl = urlUtil.urlCombine(tenantUrl, serverRelativePath);
-            const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-            const requestUrl = urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {
-                url: requestUrl,
+                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.MoveFileByPath`,
                 headers: {
-                    'accept': 'application/json;odata=nometadata'
+                    accept: 'application/json;odata=nometadata'
                 },
+                responseType: 'json',
                 data: {
-                    exportObjectUris: [sourceAbsoluteUrl],
-                    destinationUri: urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
+                    srcPath: {
+                        DecodedUrl: absoluteSourcePath
+                    },
+                    destPath: {
+                        DecodedUrl: absoluteTargetPath
+                    },
+                    overwrite: args.options.nameConflictBehavior === 'replace',
                     options: {
-                        "AllowSchemaMismatch": allowSchemaMismatch,
-                        "IgnoreVersionHistory": true,
-                        "IsMoveMode": true
+                        KeepBoth: args.options.nameConflictBehavior === 'rename',
+                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock,
+                        RetainEditorAndModifiedOnMove: !!args.options.retainEditorAndModified
                     }
-                },
-                responseType: 'json'
+                }
             };
-            const jobInfo = await request.post(requestOptions);
-            const copyJobInfo = jobInfo.value[0];
-            const progressPollInterval = 1800; // 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
-            await new Promise((resolve, reject) => {
-                setTimeout(() => {
-                    spo.waitUntilCopyJobFinished({
-                        copyJobInfo,
-                        siteUrl: webUrl,
-                        pollingInterval: progressPollInterval,
-                        resolve,
-                        reject,
-                        logger,
-                        debug: this.debug,
-                        verbose: this.verbose
-                    });
-                }, progressPollInterval);
-            });
+            await request.post(requestOptions);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    /**
-     * Checks if a file exists on the server relative url
-     */
-    fileExists(webUrl, sourceUrl) {
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(sourceUrl)}')/`;
+    async getSourcePath(logger, options) {
+        if (options.sourceUrl) {
+            return urlUtil.getServerRelativePath(options.webUrl, options.sourceUrl);
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving server-relative path for file with ID '${options.sourceId}'...`);
+        }
         const requestOptions = {
-            url: requestUrl,
-            method: 'GET',
+            url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')?$select=ServerRelativePath`,
             headers: {
-                'accept': 'application/json;odata=nometadata'
+                accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
-        return request.get(requestOptions);
+        const file = await request.get(requestOptions);
+        return file.ServerRelativePath.DecodedUrl;
     }
-    /**
-     * Moves file in the site recycle bin
-     */
-    async recycleFile(tenantUrl, targetUrl, filename, logger) {
-        const targetFolderAbsoluteUrl = urlUtil.urlCombine(tenantUrl, targetUrl);
-        // since the target WebFullUrl is unknown we can use getRequestDigest
-        // to get it from target folder absolute url.
-        // Similar approach used here Microsoft.SharePoint.Client.Web.WebUrlFromFolderUrlDirect
-        const contextResponse = await spo.getRequestDigest(targetFolderAbsoluteUrl);
-        if (this.debug) {
-            await logger.logToStderr(`contextResponse.WebFullUrl: ${contextResponse.WebFullUrl}`);
-        }
-        const targetFileServerRelativeUrl = `${urlUtil.getServerRelativePath(contextResponse.WebFullUrl, targetUrl)}/${filename}`;
-        const removeOptions = {
-            webUrl: contextResponse.WebFullUrl,
-            url: targetFileServerRelativeUrl,
-            recycle: true,
-            force: true,
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        try {
-            await Cli.executeCommand(removeCommand, { options: { ...removeOptions, _: [] } });
-        }
-        catch (err) {
-            if (err !== undefined && err.message !== undefined && err.message.includes('does not exist')) {
-            }
-            else {
-                throw err;
-            }
-        }
+    getAbsoluteUrl(webUrl, url) {
+        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
     }
 }
 _SpoFileMoveCommand_instances = new WeakSet(), _SpoFileMoveCommand_initTelemetry = function _SpoFileMoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            deleteIfAlreadyExists: args.options.deleteIfAlreadyExists || false,
-            allowSchemaMismatch: args.options.allowSchemaMismatch || false
+            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
+            sourceId: typeof args.options.sourceId !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
+            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
+            retainEditorAndModified: !!args.options.retainEditorAndModified,
+            bypassSharedLock: !!args.options.bypassSharedLock
         });
     });
 }, _SpoFileMoveCommand_initOptions = function _SpoFileMoveCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-s, --sourceUrl <sourceUrl>'
+        option: '-s, --sourceUrl [sourceUrl]'
+    }, {
+        option: '-i, --sourceId [sourceId]'
     }, {
         option: '-t, --targetUrl <targetUrl>'
     }, {
-        option: '--deleteIfAlreadyExists'
+        option: '--newName [newName]'
+    }, {
+        option: '--nameConflictBehavior [nameConflictBehavior]',
+        autocomplete: this.nameConflictBehaviorOptions
     }, {
-        option: '--allowSchemaMismatch'
+        option: '--retainEditorAndModified'
+    }, {
+        option: '--bypassSharedLock'
     });
 }, _SpoFileMoveCommand_initValidators = function _SpoFileMoveCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.sourceId && !validation.isValidGuid(args.options.sourceId)) {
+            return `'${args.options.sourceId}' is not a valid GUID for sourceId.`;
+        }
+        if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
+            return `'${args.options.nameConflictBehavior}' is not a valid value for nameConflictBehavior. Allowed values are: ${this.nameConflictBehaviorOptions.join(', ')}.`;
+        }
+        return true;
+    });
+}, _SpoFileMoveCommand_initOptionSets = function _SpoFileMoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 };
 export default new SpoFileMoveCommand();
 //# sourceMappingURL=file-move.js.map

package/dist/m365/spo/commands/file/file-remove.js

@@ -43,7 +43,7 @@ class SpoFileRemoveCommand extends SpoCommand {
             }
             else {
                 const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')`;
             }
             if (args.options.recycle) {
                 requestUrl += `/recycle()`;
@@ -73,7 +73,7 @@ class SpoFileRemoveCommand extends SpoCommand {
                 type: 'confirm',
                 name: 'continue',
                 default: false,
-                message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the file ${args.options.id || args.options.url} located in site ${args.options.webUrl}?`
+                message: `Are you sure you want to ${args.options.recycle ? 'recycle' : 'remove'} the file ${args.options.id || args.options.url} located in site ${args.options.webUrl}?`
             });
             if (result.continue) {
                 await removeFile();
@@ -84,10 +84,10 @@ class SpoFileRemoveCommand extends SpoCommand {
 _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelemetry = function _SpoFileRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.url)).toString(),
-            recycle: (!(!args.options.recycle)).toString(),
-            force: (!(!args.options.force)).toString()
+            id: typeof args.options.id !== 'undefined',
+            url: typeof args.options.url !== 'undefined',
+            recycle: !!args.options.recycle,
+            force: !!args.options.force
         });
     });
 }, _SpoFileRemoveCommand_initOptions = function _SpoFileRemoveCommand_initOptions() {

package/dist/m365/spo/commands/file/file-rename.js

@@ -41,7 +41,7 @@ class SpoFileRenameCommand extends SpoCommand {
                     }]
             };
             const requestOptions = {
-                url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(originalFileServerRelativePath)}')/ListItemAllFields/ValidateUpdateListItem()`,
+                url: `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(originalFileServerRelativePath)}')/ListItemAllFields/ValidateUpdateListItem()`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -56,7 +56,7 @@ class SpoFileRenameCommand extends SpoCommand {
         }
     }
     async getFile(originalFileServerRelativeUrl, webUrl) {
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')?$select=UniqueId`;
+        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')?$select=UniqueId`;
         const requestOptions = {
             url: requestUrl,
             headers: {

package/dist/m365/spo/commands/file/file-retentionlabel-ensure.js

@@ -61,7 +61,7 @@ class SpoFileRetentionLabelEnsureCommand extends SpoCommand {
         }
         else {
             const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl += `GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
         const requestOptions = {
             url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,

package/dist/m365/spo/commands/file/file-retentionlabel-remove.js

@@ -80,7 +80,7 @@ class SpoFileRetentionLabelRemoveCommand extends SpoCommand {
         }
         else {
             const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl += `GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         }
         requestOptions.url = `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ListItemAllFields/ParentList/Id,ListItemAllFields/Id`;
         const response = await request.get(requestOptions);

package/dist/m365/spo/commands/file/file-roleassignment-add.js

@@ -55,7 +55,7 @@ class SpoFileRoleAssignmentAddCommand extends SpoCommand {
     }
     async addRoleAssignment(fileUrl, webUrl, principalId, roleDefinitionId) {
         const requestOptions = {
-            url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(fileUrl)}')/ListItemAllFields/roleassignments/addroleassignment(principalid='${principalId}',roledefid='${roleDefinitionId}')`,
+            url: `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(fileUrl)}')/ListItemAllFields/roleassignments/addroleassignment(principalid='${principalId}',roledefid='${roleDefinitionId}')`,
             method: 'POST',
             headers: {
                 'accept': 'application/json;odata=nometadata',

package/dist/m365/spo/commands/file/file-roleassignment-remove.js

@@ -48,7 +48,7 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand {
                 }
                 const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, fileURL);
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/ListItemAllFields/roleassignments/removeroleassignment(principalid='${principalId}')`,
+                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/ListItemAllFields/roleassignments/removeroleassignment(principalid='${principalId}')`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

package/dist/m365/spo/commands/file/file-roleinheritance-break.js

@@ -36,7 +36,7 @@ class SpoFileRoleInheritanceBreakCommand extends SpoCommand {
                 const fileURL = await this.getFileURL(args);
                 const keepExistingPermissions = !args.options.clearExistingPermissions;
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
+                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

package/dist/m365/spo/commands/file/file-roleinheritance-reset.js

@@ -35,7 +35,7 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand {
             try {
                 const fileURL = await this.getFileURL(args);
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/resetroleinheritance`,
+                    url: `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(fileURL)}')/ListItemAllFields/resetroleinheritance`,
                     headers: {
                         accept: 'application/json;odata=nometadata'
                     },

package/dist/m365/spo/commands/file/file-version-clear.js

@@ -54,7 +54,7 @@ class SpoFileVersionClearCommand extends SpoCommand {
         let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.fileUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl += `GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteAll()`;
+            requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteAll()`;
         }
         else {
             requestUrl += `GetFileById('${args.options.fileId}')/versions/DeleteAll()`;

package/dist/m365/spo/commands/file/file-version-get.js

@@ -42,7 +42,7 @@ class SpoFileVersionGetCommand extends SpoCommand {
         let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.fileUrl) {
             const serverRelUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl += `GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelUrl)}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
+            requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelUrl)}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
         }
         else {
             requestUrl += `GetFileById('${args.options.fileId}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;

package/dist/m365/spo/commands/file/file-version-list.js

@@ -36,7 +36,7 @@ class SpoFileVersionListCommand extends SpoCommand {
             let requestUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.fileUrl) {
                 const serverRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-                requestUrl += `/GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                requestUrl += `/GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
             }
             else {
                 requestUrl += `/GetFileById('${args.options.fileId}')`;

package/dist/m365/spo/commands/file/file-version-remove.js

@@ -55,7 +55,7 @@ class SpoFileVersionRemoveCommand extends SpoCommand {
         let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.fileUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl += `GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteByLabel('${args.options.label}')`;
+            requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteByLabel('${args.options.label}')`;
         }
         else {
             requestUrl += `GetFileById('${args.options.fileId}')/versions/DeleteByLabel('${args.options.label}')`;

package/dist/m365/spo/commands/file/file-version-restore.js

@@ -55,7 +55,7 @@ class SpoFileVersionRestoreCommand extends SpoCommand {
         let requestUrl = `${args.options.webUrl}/_api/web/`;
         if (args.options.fileUrl) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl += `GetFileByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')/versions/RestoreByLabel('${args.options.label}')`;
+            requestUrl += `GetFileByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')/versions/RestoreByLabel('${args.options.label}')`;
         }
         else {
             requestUrl += `GetFileById('${args.options.fileId}')/versions/RestoreByLabel('${args.options.label}')`;

package/dist/m365/spo/commands/folder/folder-add.js

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFolderAddCommand_instances, _SpoFolderAddCommand_initOptions, _SpoFolderAddCommand_initValidators;
 import request from '../../../../request.js';
+import { formatting } from '../../../../utils/formatting.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -28,15 +29,12 @@ class SpoFolderAddCommand extends SpoCommand {
         }
         const parentFolderServerRelativeUrl = urlUtil.getServerRelativePath(args.options.webUrl, args.options.parentFolderUrl);
         const serverRelativeUrl = `${parentFolderServerRelativeUrl}/${args.options.name}`;
-        const requestUrl = `${args.options.webUrl}/_api/web/folders`;
+        const requestUrl = `${args.options.webUrl}/_api/web/folders/addUsingPath(decodedUrl='${formatting.encodeQueryParameter(serverRelativeUrl)}')`;
         const requestOptions = {
             url: requestUrl,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
-            data: {
-                'ServerRelativeUrl': serverRelativeUrl
-            },
             responseType: 'json'
         };
         try {

package/dist/m365/spo/commands/folder/folder-copy.js

@@ -3,10 +3,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
-var _SpoFolderCopyCommand_instances, _SpoFolderCopyCommand_initTelemetry, _SpoFolderCopyCommand_initOptions, _SpoFolderCopyCommand_initValidators;
-import url from 'url';
+var _SpoFolderCopyCommand_instances, _SpoFolderCopyCommand_initTelemetry, _SpoFolderCopyCommand_initOptions, _SpoFolderCopyCommand_initValidators, _SpoFolderCopyCommand_initOptionSets;
 import request from '../../../../request.js';
-import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -21,77 +19,123 @@ class SpoFolderCopyCommand extends SpoCommand {
     constructor() {
         super();
         _SpoFolderCopyCommand_instances.add(this);
+        this.nameConflictBehaviorOptions = ['fail', 'rename'];
         __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initOptionSets).call(this);
     }
     getExcludedOptionsWithUrls() {
         return ['targetUrl', 'sourceUrl'];
     }
     async commandAction(logger, args) {
-        const webUrl = args.options.webUrl;
-        const parsedUrl = url.parse(webUrl);
-        const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-        const serverRelativePath = urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
-        const sourceAbsoluteUrl = urlUtil.urlCombine(tenantUrl, serverRelativePath);
-        const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-        const requestOptions = {
-            url: urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs'),
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: {
-                exportObjectUris: [sourceAbsoluteUrl],
-                destinationUri: urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
-                options: {
-                    "AllowSchemaMismatch": allowSchemaMismatch,
-                    "IgnoreVersionHistory": true
-                }
-            },
-            responseType: 'json'
-        };
         try {
-            const jobInfo = await request.post(requestOptions);
-            const copyJobInfo = jobInfo.value[0];
-            const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
-            await new Promise((resolve, reject) => {
-                setTimeout(() => {
-                    spo.waitUntilCopyJobFinished({
-                        copyJobInfo,
-                        siteUrl: webUrl,
-                        pollingInterval: progressPollInterval,
-                        resolve,
-                        reject,
-                        logger,
-                        debug: this.debug,
-                        verbose: this.verbose
-                    });
-                }, progressPollInterval);
-            });
+            const sourcePath = await this.getSourcePath(logger, args.options);
+            if (this.verbose) {
+                await logger.logToStderr(`Copying folder ${sourcePath} to ${args.options.targetUrl}...`);
+            }
+            const absoluteSourcePath = this.getAbsoluteUrl(args.options.webUrl, sourcePath);
+            let absoluteTargetPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
+            if (args.options.newName) {
+                absoluteTargetPath += args.options.newName;
+            }
+            else {
+                // Keep the original folder name
+                absoluteTargetPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.CopyFolderByPath`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json',
+                data: {
+                    srcPath: {
+                        DecodedUrl: absoluteSourcePath
+                    },
+                    destPath: {
+                        DecodedUrl: absoluteTargetPath
+                    },
+                    options: {
+                        KeepBoth: args.options.nameConflictBehavior === 'rename',
+                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock,
+                        ResetAuthorAndCreatedOnCopy: !!args.options.resetAuthorAndCreated
+                    }
+                }
+            };
+            await request.post(requestOptions);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    async getSourcePath(logger, options) {
+        if (options.sourceUrl) {
+            return urlUtil.getServerRelativePath(options.webUrl, options.sourceUrl);
+        }
+        if (this.verbose) {
+            await logger.logToStderr(`Retrieving server-relative path for folder with ID '${options.sourceId}'...`);
+        }
+        const requestOptions = {
+            url: `${options.webUrl}/_api/Web/GetFolderById('${options.sourceId}')?$select=ServerRelativePath`,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        const file = await request.get(requestOptions);
+        return file.ServerRelativePath.DecodedUrl;
+    }
+    getAbsoluteUrl(webUrl, url) {
+        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+    }
 }
 _SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelemetry = function _SpoFolderCopyCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            allowSchemaMismatch: args.options.allowSchemaMismatch || false
+            sourceUrl: typeof args.options.sourceUrl !== 'undefined',
+            sourceId: typeof args.options.sourceId !== 'undefined',
+            newName: typeof args.options.newName !== 'undefined',
+            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
+            resetAuthorAndCreated: !!args.options.resetAuthorAndCreated,
+            bypassSharedLock: !!args.options.bypassSharedLock
         });
     });
 }, _SpoFolderCopyCommand_initOptions = function _SpoFolderCopyCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-s, --sourceUrl <sourceUrl>'
+        option: '-s, --sourceUrl [sourceUrl]'
+    }, {
+        option: '-i, --sourceId [sourceId]'
     }, {
         option: '-t, --targetUrl <targetUrl>'
     }, {
-        option: '--allowSchemaMismatch'
+        option: '--newName [newName]'
+    }, {
+        option: '--nameConflictBehavior [nameConflictBehavior]',
+        autocomplete: this.nameConflictBehaviorOptions
+    }, {
+        option: '--resetAuthorAndCreated'
+    }, {
+        option: '--bypassSharedLock'
     });
 }, _SpoFolderCopyCommand_initValidators = function _SpoFolderCopyCommand_initValidators() {
-    this.validators.push(async (args) => validation.isValidSharePointUrl(args.options.webUrl));
+    this.validators.push(async (args) => {
+        const isValidSharePointUrl = validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.sourceId && !validation.isValidGuid(args.options.sourceId)) {
+            return `'${args.options.sourceId}' is not a valid GUID for sourceId.`;
+        }
+        if (args.options.nameConflictBehavior && this.nameConflictBehaviorOptions.indexOf(args.options.nameConflictBehavior) === -1) {
+            return `'${args.options.nameConflictBehavior}' is not a valid value for nameConflictBehavior. Allowed values are: ${this.nameConflictBehaviorOptions.join(', ')}.`;
+        }
+        return true;
+    });
+}, _SpoFolderCopyCommand_initOptionSets = function _SpoFolderCopyCommand_initOptionSets() {
+    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 };
 export default new SpoFolderCopyCommand();
 //# sourceMappingURL=folder-copy.js.map

package/dist/m365/spo/commands/folder/folder-get.js

@@ -40,7 +40,7 @@ class SpoFolderGetCommand extends SpoCommand {
         }
         else if (args.options.url) {
             const serverRelativePath = urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-            requestUrl += `/GetFolderByServerRelativeUrl('${formatting.encodeQueryParameter(serverRelativePath)}')`;
+            requestUrl += `/GetFolderByServerRelativePath(DecodedUrl='${formatting.encodeQueryParameter(serverRelativePath)}')`;
         }
         if (args.options.withPermissions) {
             requestUrl += `?$expand=ListItemAllFields/HasUniqueRoleAssignments,ListItemAllFields/RoleAssignments/Member,ListItemAllFields/RoleAssignments/RoleDefinitionBindings`;