@pnp/cli-microsoft365 10.0.0-beta.0b765ef → 10.0.0-beta.303b62c

package/dist/m365/entra/commands/user/user-license-list.js

@@ -10,7 +10,6 @@ import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
 import auth from '../../../../Auth.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserLicenseListCommand extends GraphCommand {
     get name() {
         return commands.USER_LICENSE_LIST;
@@ -18,9 +17,6 @@ class EntraUserLicenseListCommand extends GraphCommand {
     get description() {
         return 'Lists the license details for a given user';
     }
-    alias() {
-        return [aadCommands.USER_LICENSE_LIST];
-    }
     defaultProperties() {
         return ['id', 'skuId', 'skuPartNumber'];
     }
@@ -34,7 +30,6 @@ class EntraUserLicenseListCommand extends GraphCommand {
     }
     async commandAction(logger, args) {
         const isAppOnlyAccessToken = accessToken.isAppOnlyAccessToken(auth.connection.accessTokens[this.resource].accessToken);
-        await this.showDeprecationWarning(logger, aadCommands.USER_LICENSE_LIST, commands.USER_LICENSE_LIST);
         if (isAppOnlyAccessToken && !args.options.userId && !args.options.userName) {
             this.handleError(`Specify at least 'userId' or 'userName' when using application permissions.`);
         }

package/dist/m365/entra/commands/user/user-license-remove.js

@@ -9,7 +9,6 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import { cli } from '../../../../cli/cli.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserLicenseRemoveCommand extends GraphCommand {
     get name() {
         return commands.USER_LICENSE_REMOVE;
@@ -17,9 +16,6 @@ class EntraUserLicenseRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a license from a user';
     }
-    alias() {
-        return [aadCommands.USER_LICENSE_REMOVE];
-    }
     constructor() {
         super();
         _EntraUserLicenseRemoveCommand_instances.add(this);
@@ -29,7 +25,6 @@ class EntraUserLicenseRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserLicenseRemoveCommand_instances, "m", _EntraUserLicenseRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_LICENSE_REMOVE, commands.USER_LICENSE_REMOVE);
         if (this.verbose) {
             await logger.logToStderr(`Removing the licenses for the user '${args.options.userId || args.options.userName}'...`);
         }

package/dist/m365/entra/commands/user/user-list.js

@@ -8,7 +8,6 @@ import { formatting } from '../../../../utils/formatting.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserListCommand extends GraphCommand {
     get name() {
         return commands.USER_LIST;
@@ -16,9 +15,6 @@ class EntraUserListCommand extends GraphCommand {
     get description() {
         return 'Lists users matching specified criteria';
     }
-    alias() {
-        return [aadCommands.USER_LIST];
-    }
     allowUnknownOptions() {
         return true;
     }
@@ -34,7 +30,6 @@ class EntraUserListCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserListCommand_instances, "m", _EntraUserListCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_LIST, commands.USER_LIST);
         try {
             let url = `${this.resource}/v1.0/users`;
             if (args.options.properties) {

package/dist/m365/entra/commands/user/user-password-validate.js

@@ -6,7 +6,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraUserPasswordValidateCommand_instances, _EntraUserPasswordValidateCommand_initOptions;
 import request from '../../../../request.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
 class EntraUserPasswordValidateCommand extends GraphCommand {
     get name() {
@@ -15,16 +14,12 @@ class EntraUserPasswordValidateCommand extends GraphCommand {
     get description() {
         return "Check a user's password against the organization's password validation policy";
     }
-    alias() {
-        return [aadCommands.USER_PASSWORD_VALIDATE];
-    }
     constructor() {
         super();
         _EntraUserPasswordValidateCommand_instances.add(this);
         __classPrivateFieldGet(this, _EntraUserPasswordValidateCommand_instances, "m", _EntraUserPasswordValidateCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_PASSWORD_VALIDATE, commands.USER_PASSWORD_VALIDATE);
         try {
             const requestOptions = {
                 url: `${this.resource}/beta/users/validatePassword`,

package/dist/m365/entra/commands/user/user-recyclebinitem-clear.js

@@ -9,7 +9,6 @@ import request from '../../../../request.js';
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserRecycleBinItemClearCommand extends GraphCommand {
     get name() {
         return commands.USER_RECYCLEBINITEM_CLEAR;
@@ -17,9 +16,6 @@ class EntraUserRecycleBinItemClearCommand extends GraphCommand {
     get description() {
         return 'Removes all users from the tenant recycle bin';
     }
-    alias() {
-        return [aadCommands.USER_RECYCLEBINITEM_CLEAR];
-    }
     constructor() {
         super();
         _EntraUserRecycleBinItemClearCommand_instances.add(this);
@@ -27,7 +23,6 @@ class EntraUserRecycleBinItemClearCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserRecycleBinItemClearCommand_instances, "m", _EntraUserRecycleBinItemClearCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_RECYCLEBINITEM_CLEAR, commands.USER_RECYCLEBINITEM_CLEAR);
         const clearRecycleBinUsers = async () => {
             try {
                 const users = await odata.getAllItems(`${this.resource}/v1.0/directory/deletedItems/microsoft.graph.user?$select=id`);

package/dist/m365/entra/commands/user/user-recyclebinitem-list.js

@@ -1,7 +1,6 @@
 import { odata } from '../../../../utils/odata.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserRecycleBinItemListCommand extends GraphCommand {
     get name() {
         return commands.USER_RECYCLEBINITEM_LIST;
@@ -9,14 +8,10 @@ class EntraUserRecycleBinItemListCommand extends GraphCommand {
     get description() {
         return 'Lists users from the recycle bin in the current tenant';
     }
-    alias() {
-        return [aadCommands.USER_RECYCLEBINITEM_LIST];
-    }
     defaultProperties() {
         return ['id', 'displayName', 'userPrincipalName'];
     }
     async commandAction(logger) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_RECYCLEBINITEM_LIST, commands.USER_RECYCLEBINITEM_LIST);
         if (this.verbose) {
             await logger.logToStderr('Retrieving users from the recycle bin...');
         }

package/dist/m365/entra/commands/user/user-recyclebinitem-remove.js

@@ -8,7 +8,6 @@ import { cli } from '../../../../cli/cli.js';
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
 class EntraUserRecycleBinItemRemoveCommand extends GraphCommand {
     get name() {
@@ -17,9 +16,6 @@ class EntraUserRecycleBinItemRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a user from the recycle bin in the current tenant';
     }
-    alias() {
-        return [aadCommands.USER_RECYCLEBINITEM_REMOVE];
-    }
     constructor() {
         super();
         _EntraUserRecycleBinItemRemoveCommand_instances.add(this);
@@ -28,7 +24,6 @@ class EntraUserRecycleBinItemRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserRecycleBinItemRemoveCommand_instances, "m", _EntraUserRecycleBinItemRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_RECYCLEBINITEM_REMOVE, commands.USER_RECYCLEBINITEM_REMOVE);
         const clearRecycleBinItem = async () => {
             if (this.verbose) {
                 await logger.logToStderr(`Permanently deleting user with id ${args.options.id} from Microsoft Entra ID`);

package/dist/m365/entra/commands/user/user-recyclebinitem-restore.js

@@ -8,7 +8,6 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserRecycleBinItemRestoreCommand extends GraphCommand {
     get name() {
         return commands.USER_RECYCLEBINITEM_RESTORE;
@@ -16,9 +15,6 @@ class EntraUserRecycleBinItemRestoreCommand extends GraphCommand {
     get description() {
         return 'Restores a user from the tenant recycle bin';
     }
-    alias() {
-        return [aadCommands.USER_RECYCLEBINITEM_RESTORE];
-    }
     constructor() {
         super();
         _EntraUserRecycleBinItemRestoreCommand_instances.add(this);
@@ -26,7 +22,6 @@ class EntraUserRecycleBinItemRestoreCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserRecycleBinItemRestoreCommand_instances, "m", _EntraUserRecycleBinItemRestoreCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_RECYCLEBINITEM_RESTORE, commands.USER_RECYCLEBINITEM_RESTORE);
         if (this.verbose) {
             await logger.logToStderr(`Restoring user with id ${args.options.id} from the recycle bin.`);
         }

package/dist/m365/entra/commands/user/user-registrationdetails-list.js

@@ -6,7 +6,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _EntraUserRegistrationDetailsListCommand_instances, _EntraUserRegistrationDetailsListCommand_initTelemetry, _EntraUserRegistrationDetailsListCommand_initOptions, _EntraUserRegistrationDetailsListCommand_initValidators;
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import aadCommands from '../../aadCommands.js';
 import { odata } from '../../../../utils/odata.js';
 import { entraUser } from '../../../../utils/entraUser.js';
 import { validation } from '../../../../utils/validation.js';
@@ -20,9 +19,6 @@ class EntraUserRegistrationDetailsListCommand extends GraphCommand {
     get description() {
         return 'Retrieves a list of the authentication methods registered for users';
     }
-    alias() {
-        return [aadCommands.USER_REGISTRATIONDETAILS_LIST];
-    }
     defaultProperties() {
         return ['userPrincipalName', 'methodsRegistered', 'lastUpdatedDateTime'];
     }

package/dist/m365/entra/commands/user/user-remove.js

@@ -9,7 +9,6 @@ import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import { cli } from '../../../../cli/cli.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserRemoveCommand extends GraphCommand {
     get name() {
         return commands.USER_REMOVE;
@@ -17,9 +16,6 @@ class EntraUserRemoveCommand extends GraphCommand {
     get description() {
         return 'Removes a specific user';
     }
-    alias() {
-        return [aadCommands.USER_REMOVE];
-    }
     constructor() {
         super();
         _EntraUserRemoveCommand_instances.add(this);
@@ -29,7 +25,6 @@ class EntraUserRemoveCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserRemoveCommand_instances, "m", _EntraUserRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_REMOVE, commands.USER_REMOVE);
         if (this.verbose) {
             await logger.logToStderr(`Removing user '${args.options.id || args.options.userName}'...`);
         }

package/dist/m365/entra/commands/user/user-set.js

@@ -10,7 +10,6 @@ import { accessToken } from '../../../../utils/accessToken.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
-import aadCommands from '../../aadCommands.js';
 import commands from '../../commands.js';
 class EntraUserSetCommand extends GraphCommand {
     get name() {
@@ -19,9 +18,6 @@ class EntraUserSetCommand extends GraphCommand {
     get description() {
         return 'Updates information about the specified user';
     }
-    alias() {
-        return [aadCommands.USER_SET];
-    }
     allowUnknownOptions() {
         return true;
     }
@@ -35,7 +31,6 @@ class EntraUserSetCommand extends GraphCommand {
         __classPrivateFieldGet(this, _EntraUserSetCommand_instances, "m", _EntraUserSetCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_SET, commands.USER_SET);
         try {
             if (args.options.currentPassword) {
                 if (args.options.id && args.options.id !== accessToken.getUserIdFromAccessToken(auth.connection.accessTokens[auth.defaultResource].accessToken)) {

package/dist/m365/entra/commands/user/user-signin-list.js

@@ -9,7 +9,6 @@ import { odata } from '../../../../utils/odata.js';
 import { validation } from '../../../../utils/validation.js';
 import GraphCommand from '../../../base/GraphCommand.js';
 import commands from '../../commands.js';
-import aadCommands from '../../aadCommands.js';
 class EntraUserSigninListCommand extends GraphCommand {
     get name() {
         return commands.USER_SIGNIN_LIST;
@@ -17,9 +16,6 @@ class EntraUserSigninListCommand extends GraphCommand {
     get description() {
         return 'Retrieves the Entra ID user sign-ins for the tenant';
     }
-    alias() {
-        return [aadCommands.USER_SIGNIN_LIST];
-    }
     constructor() {
         super();
         _EntraUserSigninListCommand_instances.add(this);
@@ -31,7 +27,6 @@ class EntraUserSigninListCommand extends GraphCommand {
         return ['id', 'userPrincipalName', 'appId', 'appDisplayName', 'createdDateTime'];
     }
     async commandAction(logger, args) {
-        await this.showDeprecationWarning(logger, aadCommands.USER_SIGNIN_LIST, commands.USER_SIGNIN_LIST);
         try {
             let endpoint = `${this.resource}/v1.0/auditLogs/signIns`;
             let filter = "";

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

@@ -10,7 +10,7 @@ import commands from '../commands.js';
 import request from '../../../request.js';
 import { spo } from '../../../utils/spo.js';
 import { urlUtil } from '../../../utils/urlUtil.js';
-import { driveUtil } from '../../../utils/driveUtil.js';
+import { drive } from '../../../utils/drive.js';
 import { validation } from '../../../utils/validation.js';
 class FileMoveCommand extends GraphCommand {
     get name() {
@@ -60,9 +60,9 @@ class FileMoveCommand extends GraphCommand {
     }
     async getDriveIdAndItemId(webUrl, folderUrl, sourceUrl, logger, verbose) {
         const siteId = await spo.getSiteId(webUrl, logger, verbose);
-        const drive = await driveUtil.getDriveByUrl(siteId, new URL(folderUrl));
-        const itemId = await driveUtil.getDriveItemId(drive, new URL(folderUrl));
-        return { driveId: drive.id, itemId };
+        const driveDetails = await drive.getDriveByUrl(siteId, new URL(folderUrl), logger, verbose);
+        const itemId = await drive.getDriveItemId(driveDetails, new URL(folderUrl), logger, verbose);
+        return { driveId: driveDetails.id, itemId };
     }
     getRequestOptions(sourceDriveId, sourceItemId, targetDriveId, targetItemId, newName, sourcePath, nameConflictBehavior) {
         const apiUrl = sourceDriveId === targetDriveId

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCopyCommand_initOptions, _SpoFileCopyCommand_initValidators, _SpoFileCopyCommand_initOptionSets, _SpoFileCopyCommand_initTypes;
 import request from '../../../../request.js';
-import { CreateCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
+import { CreateFileCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -43,7 +43,7 @@ class SpoFileCopyCommand extends SpoCommand {
             if (newName && !newName.includes('.')) {
                 newName += sourceServerRelativePath.substring(sourceServerRelativePath.lastIndexOf('.'));
             }
-            const copyJobResponse = await spo.createCopyJob(args.options.webUrl, sourcePath, destinationPath, {
+            const copyJobResponse = await spo.createFileCopyJob(args.options.webUrl, sourcePath, destinationPath, {
                 nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
                 bypassSharedLock: !!args.options.bypassSharedLock,
                 ignoreVersionHistory: !!args.options.ignoreVersionHistory,
@@ -97,13 +97,13 @@ class SpoFileCopyCommand extends SpoCommand {
     getNameConflictBehaviorValue(nameConflictBehavior) {
         switch (nameConflictBehavior?.toLowerCase()) {
             case 'fail':
-                return CreateCopyJobsNameConflictBehavior.Fail;
+                return CreateFileCopyJobsNameConflictBehavior.Fail;
             case 'replace':
-                return CreateCopyJobsNameConflictBehavior.Replace;
+                return CreateFileCopyJobsNameConflictBehavior.Replace;
             case 'rename':
-                return CreateCopyJobsNameConflictBehavior.Rename;
+                return CreateFileCopyJobsNameConflictBehavior.Rename;
             default:
-                return CreateCopyJobsNameConflictBehavior.Fail;
+                return CreateFileCopyJobsNameConflictBehavior.Fail;
         }
     }
     getAbsoluteUrl(webUrl, url) {

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

@@ -5,7 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileMoveCommand_instances, _SpoFileMoveCommand_initTelemetry, _SpoFileMoveCommand_initOptions, _SpoFileMoveCommand_initValidators, _SpoFileMoveCommand_initOptionSets, _SpoFileMoveCommand_initTypes;
 import request from '../../../../request.js';
-import { CreateCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
+import { CreateFileCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -43,7 +43,7 @@ class SpoFileMoveCommand extends SpoCommand {
             if (newName && !newName.includes('.')) {
                 newName += sourceServerRelativePath.substring(sourceServerRelativePath.lastIndexOf('.'));
             }
-            const copyJobResponse = await spo.createCopyJob(args.options.webUrl, sourcePath, destinationPath, {
+            const copyJobResponse = await spo.createFileCopyJob(args.options.webUrl, sourcePath, destinationPath, {
                 nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
                 bypassSharedLock: !!args.options.bypassSharedLock,
                 includeItemPermissions: !!args.options.includeItemPermissions,
@@ -97,13 +97,13 @@ class SpoFileMoveCommand extends SpoCommand {
     getNameConflictBehaviorValue(nameConflictBehavior) {
         switch (nameConflictBehavior?.toLowerCase()) {
             case 'fail':
-                return CreateCopyJobsNameConflictBehavior.Fail;
+                return CreateFileCopyJobsNameConflictBehavior.Fail;
             case 'replace':
-                return CreateCopyJobsNameConflictBehavior.Replace;
+                return CreateFileCopyJobsNameConflictBehavior.Replace;
             case 'rename':
-                return CreateCopyJobsNameConflictBehavior.Rename;
+                return CreateFileCopyJobsNameConflictBehavior.Rename;
             default:
-                return CreateCopyJobsNameConflictBehavior.Fail;
+                return CreateFileCopyJobsNameConflictBehavior.Fail;
         }
     }
     getAbsoluteUrl(webUrl, url) {

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

@@ -59,6 +59,9 @@ class SpoFileRemoveCommand extends SpoCommand {
                 },
                 responseType: 'json'
             };
+            if (args.options.bypassSharedLock) {
+                requestOptions.headers.Prefer = 'bypass-shared-lock';
+            }
             try {
                 await request.post(requestOptions);
             }
@@ -83,6 +86,7 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
             id: typeof args.options.id !== 'undefined',
             url: typeof args.options.url !== 'undefined',
             recycle: !!args.options.recycle,
+            bypassSharedLock: !!args.options.bypassSharedLock,
             force: !!args.options.force
         });
     });
@@ -95,6 +99,8 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
         option: '--url [url]'
     }, {
         option: '--recycle'
+    }, {
+        option: '--bypassSharedLock'
     }, {
         option: '-f, --force'
     });
@@ -114,7 +120,7 @@ _SpoFileRemoveCommand_instances = new WeakSet(), _SpoFileRemoveCommand_initTelem
     this.optionSets.push({ options: ['id', 'url'] });
 }, _SpoFileRemoveCommand_initTypes = function _SpoFileRemoveCommand_initTypes() {
     this.types.string.push('webUrl', 'id', 'url');
-    this.types.boolean.push('recycle', 'force');
+    this.types.boolean.push('recycle', 'bypassSharedLock', 'force');
 };
 export default new SpoFileRemoveCommand();
 //# sourceMappingURL=file-remove.js.map

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

@@ -5,6 +5,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFolderCopyCommand_instances, _SpoFolderCopyCommand_initTelemetry, _SpoFolderCopyCommand_initOptions, _SpoFolderCopyCommand_initValidators, _SpoFolderCopyCommand_initOptionSets, _SpoFolderCopyCommand_initTypes;
 import request from '../../../../request.js';
+import { CreateFolderCopyJobsNameConflictBehavior, spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -31,45 +32,54 @@ class SpoFolderCopyCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            const sourcePath = await this.getSourcePath(logger, args.options);
+            const sourceServerRelativePath = await this.getSourcePath(logger, args.options);
+            const sourcePath = this.getAbsoluteUrl(args.options.webUrl, sourceServerRelativePath);
+            const destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl);
             if (this.verbose) {
-                await logger.logToStderr(`Copying folder ${sourcePath} to ${args.options.targetUrl}...`);
+                await logger.logToStderr(`Copying folder '${sourcePath}' to '${destinationPath}'...`);
             }
-            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;
+            const copyJobResponse = await spo.createFolderCopyJob(args.options.webUrl, sourcePath, destinationPath, {
+                nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
+                newName: args.options.newName,
+                operation: 'copy'
+            });
+            if (args.options.skipWait) {
+                return;
             }
-            else {
-                // Keep the original folder name
-                absoluteTargetPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            if (this.verbose) {
+                await logger.logToStderr('Waiting for the copy job to complete...');
+            }
+            const copyJobResult = await spo.getCopyJobResult(args.options.webUrl, copyJobResponse);
+            if (this.verbose) {
+                await logger.logToStderr('Getting information about the destination folder...');
             }
+            // Get destination folder data
+            const siteRelativeDestinationFolder = '/' + copyJobResult.TargetObjectSiteRelativeUrl.substring(0, copyJobResult.TargetObjectSiteRelativeUrl.lastIndexOf('/'));
+            const absoluteWebUrl = destinationPath.substring(0, destinationPath.toLowerCase().lastIndexOf(siteRelativeDestinationFolder.toLowerCase()));
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.CopyFolderByPath`,
+                url: `${absoluteWebUrl}/_api/Web/GetFolderById('${copyJobResult.TargetObjectUniqueId}')`,
                 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
-                    }
-                }
+                responseType: 'json'
             };
-            await request.post(requestOptions);
+            const destinationFile = await request.get(requestOptions);
+            await logger.log(destinationFile);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    getNameConflictBehaviorValue(nameConflictBehavior) {
+        switch (nameConflictBehavior?.toLowerCase()) {
+            case 'fail':
+                return CreateFolderCopyJobsNameConflictBehavior.Fail;
+            case 'rename':
+                return CreateFolderCopyJobsNameConflictBehavior.Rename;
+            default:
+                return CreateFolderCopyJobsNameConflictBehavior.Fail;
+        }
+    }
     async getSourcePath(logger, options) {
         if (options.sourceUrl) {
             return urlUtil.getServerRelativePath(options.webUrl, options.sourceUrl);
@@ -78,17 +88,18 @@ class SpoFolderCopyCommand extends SpoCommand {
             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`,
+            url: `${options.webUrl}/_api/Web/GetFolderById('${options.sourceId}')/ServerRelativePath`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
-        const file = await request.get(requestOptions);
-        return file.ServerRelativePath.DecodedUrl;
+        const path = await request.get(requestOptions);
+        return path.DecodedUrl;
     }
     getAbsoluteUrl(webUrl, url) {
-        return url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        const result = url.startsWith('https://') ? url : urlUtil.getAbsoluteUrl(webUrl, url);
+        return urlUtil.removeTrailingSlashes(result);
     }
 }
 _SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelemetry = function _SpoFolderCopyCommand_initTelemetry() {
@@ -98,8 +109,7 @@ _SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelem
             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
+            skipWait: !!args.options.skipWait
         });
     });
 }, _SpoFolderCopyCommand_initOptions = function _SpoFolderCopyCommand_initOptions() {
@@ -117,9 +127,7 @@ _SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelem
         option: '--nameConflictBehavior [nameConflictBehavior]',
         autocomplete: this.nameConflictBehaviorOptions
     }, {
-        option: '--resetAuthorAndCreated'
-    }, {
-        option: '--bypassSharedLock'
+        option: '--skipWait'
     });
 }, _SpoFolderCopyCommand_initValidators = function _SpoFolderCopyCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -139,7 +147,7 @@ _SpoFolderCopyCommand_instances = new WeakSet(), _SpoFolderCopyCommand_initTelem
     this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 }, _SpoFolderCopyCommand_initTypes = function _SpoFolderCopyCommand_initTypes() {
     this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('resetAuthorAndCreated', 'bypassSharedLock');
+    this.types.boolean.push('skipWait');
 };
 export default new SpoFolderCopyCommand();
 //# sourceMappingURL=folder-copy.js.map