@pnp/cli-microsoft365 9.0.0-beta.d6b190a → 9.0.0-beta.e69e8d0

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

@@ -0,0 +1,118 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _EntraMultitenantRemoveCommand_instances, _EntraMultitenantRemoveCommand_initTelemetry, _EntraMultitenantRemoveCommand_initOptions;
+import request from '../../../../request.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+import { odata } from '../../../../utils/odata.js';
+import { cli } from '../../../../cli/cli.js';
+class EntraMultitenantRemoveCommand extends GraphCommand {
+    get name() {
+        return commands.MULTITENANT_REMOVE;
+    }
+    get description() {
+        return 'Removes a multitenant organization';
+    }
+    constructor() {
+        super();
+        _EntraMultitenantRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraMultitenantRemoveCommand_instances, "m", _EntraMultitenantRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantRemoveCommand_instances, "m", _EntraMultitenantRemoveCommand_initOptions).call(this);
+    }
+    async commandAction(logger, args) {
+        const removeMultitenantOrg = async () => {
+            try {
+                const tenantId = await this.getCurrentTenantId();
+                let tenantsId = await this.getAllTenantsIds();
+                const tenantsCount = tenantsId.length;
+                if (tenantsCount > 0) {
+                    const tasks = tenantsId
+                        .filter(x => x !== tenantId)
+                        .map(t => this.removeTenant(logger, t));
+                    await Promise.all(tasks);
+                    do {
+                        if (this.verbose) {
+                            await logger.logToStderr(`Waiting 30 seconds...`);
+                        }
+                        await new Promise(resolve => setTimeout(resolve, 30000));
+                        // from current behavior, removing tenant can take a few seconds
+                        // current tenant must be removed once all previous ones were removed
+                        if (this.verbose) {
+                            await logger.logToStderr(`Checking all tenants were removed...`);
+                        }
+                        tenantsId = await this.getAllTenantsIds();
+                        if (this.verbose) {
+                            await logger.logToStderr(`Number of removed tenants: ${tenantsCount - tenantsId.length}`);
+                        }
+                    } while (tenantsId.length !== 1);
+                    // current tenant must be removed as the last one
+                    await this.removeTenant(logger, tenantId);
+                    await logger.logToStderr('Your Multi-Tenant organization is being removed. This can take up to 2 hours.');
+                }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        };
+        if (args.options.force) {
+            await removeMultitenantOrg();
+        }
+        else {
+            const result = await cli.promptForConfirmation({ message: 'Are you sure you want to remove multitenant organization?' });
+            if (result) {
+                await removeMultitenantOrg();
+            }
+        }
+    }
+    async getAllTenantsIds() {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization/tenants?$select=tenantId`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const tenants = await odata.getAllItems(requestOptions);
+        return tenants.map(x => x.tenantId);
+    }
+    async getCurrentTenantId() {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/organization?$select=id`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        const organizations = await odata.getAllItems(requestOptions);
+        return organizations[0].id;
+    }
+    async removeTenant(logger, tenantId) {
+        if (this.verbose) {
+            await logger.logToStderr(`Removing tenant: ${tenantId}`);
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization/tenants/${tenantId}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json'
+        };
+        await request.delete(requestOptions);
+    }
+}
+_EntraMultitenantRemoveCommand_instances = new WeakSet(), _EntraMultitenantRemoveCommand_initTelemetry = function _EntraMultitenantRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            force: !!args.options.force
+        });
+    });
+}, _EntraMultitenantRemoveCommand_initOptions = function _EntraMultitenantRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-f, --force'
+    });
+};
+export default new EntraMultitenantRemoveCommand();
+//# sourceMappingURL=multitenant-remove.js.map

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

@@ -0,0 +1,72 @@
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _EntraMultitenantSetCommand_instances, _EntraMultitenantSetCommand_initTelemetry, _EntraMultitenantSetCommand_initOptions, _EntraMultitenantSetCommand_initValidators, _EntraMultitenantSetCommand_initTypes;
+import request from '../../../../request.js';
+import GraphCommand from '../../../base/GraphCommand.js';
+import commands from '../../commands.js';
+class EntraMultitenantSetCommand extends GraphCommand {
+    get name() {
+        return commands.MULTITENANT_SET;
+    }
+    get description() {
+        return 'Updates the properties of a multitenant organization';
+    }
+    constructor() {
+        super();
+        _EntraMultitenantSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _EntraMultitenantSetCommand_instances, "m", _EntraMultitenantSetCommand_initTypes).call(this);
+    }
+    async commandAction(logger, args) {
+        if (this.verbose) {
+            await logger.logToStderr('Updating multitenant organization...');
+        }
+        const requestOptions = {
+            url: `${this.resource}/v1.0/tenantRelationships/multiTenantOrganization`,
+            headers: {
+                accept: 'application/json;odata.metadata=none'
+            },
+            responseType: 'json',
+            data: {
+                description: args.options.description,
+                displayName: args.options.displayName
+            }
+        };
+        try {
+            await request.patch(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+}
+_EntraMultitenantSetCommand_instances = new WeakSet(), _EntraMultitenantSetCommand_initTelemetry = function _EntraMultitenantSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            displayName: typeof args.options.displayName !== 'undefined',
+            description: typeof args.options.description !== 'undefined'
+        });
+    });
+}, _EntraMultitenantSetCommand_initOptions = function _EntraMultitenantSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --displayName [displayName]'
+    }, {
+        option: '-d, --description [description]'
+    });
+}, _EntraMultitenantSetCommand_initValidators = function _EntraMultitenantSetCommand_initValidators() {
+    this.validators.push(async (args) => {
+        if (!args.options.displayName && !args.options.description) {
+            return 'Specify either displayName or description or both.';
+        }
+        return true;
+    });
+}, _EntraMultitenantSetCommand_initTypes = function _EntraMultitenantSetCommand_initTypes() {
+    this.types.string.push('displayName', 'description');
+};
+export default new EntraMultitenantSetCommand();
+//# sourceMappingURL=multitenant-set.js.map

package/dist/m365/entra/commands.js

@@ -72,7 +72,10 @@ export default {
     M365GROUP_USER_LIST: `${prefix} m365group user list`,
     M365GROUP_USER_REMOVE: `${prefix} m365group user remove`,
     M365GROUP_USER_SET: `${prefix} m365group user set`,
+    MULTITENANT_ADD: `${prefix} multitenant add`,
     MULTITENANT_GET: `${prefix} multitenant get`,
+    MULTITENANT_REMOVE: `${prefix} multitenant remove`,
+    MULTITENANT_SET: `${prefix} multitenant set`,
     OAUTH2GRANT_ADD: `${prefix} oauth2grant add`,
     OAUTH2GRANT_LIST: `${prefix} oauth2grant list`,
     OAUTH2GRANT_REMOVE: `${prefix} oauth2grant remove`,

package/dist/m365/flow/commands/flow-get.js

@@ -29,7 +29,7 @@ class FlowGetCommand extends PowerAutomateCommand {
             await logger.logToStderr(`Retrieving information about Microsoft Flow ${args.options.name}...`);
         }
         const requestOptions = {
-            url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01`,
+            url: `${this.resource}/providers/Microsoft.ProcessSimple/${args.options.asAdmin ? 'scopes/admin/' : ''}environments/${formatting.encodeQueryParameter(args.options.environmentName)}/flows/${formatting.encodeQueryParameter(args.options.name)}?api-version=2016-11-01&$expand=swagger,properties.connectionreferences.apidefinition,properties.definitionsummary.operations.apioperation,operationDefinition,plan,properties.throttleData,properties.estimatedsuspensiondata,properties.licenseData`,
             headers: {
                 accept: 'application/json'
             },

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

@@ -30,20 +30,20 @@ class OutlookMessageGetCommand extends GraphCommand {
             }
             let requestUrl = '';
             if (isAppOnlyAccessToken) {
-                if (!args.options.userId && !args.options.userPrincipalName) {
-                    throw `The option 'userId' or 'userPrincipalName' is required when retrieving an email using app only credentials`;
+                if (!args.options.userId && !args.options.userName) {
+                    throw `The option 'userId' or 'userName' is required when retrieving an email using app only credentials`;
                 }
-                if (args.options.userId && args.options.userPrincipalName) {
-                    throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using app only credentials`;
+                if (args.options.userId && args.options.userName) {
+                    throw `Both options 'userId' and 'userName' cannot be set when retrieving an email using app only credentials`;
                 }
-                requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userName}`;
             }
             else {
-                if (args.options.userId && args.options.userPrincipalName) {
-                    throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using delegated credentials`;
+                if (args.options.userId && args.options.userName) {
+                    throw `Both options 'userId' and 'userName' cannot be set when retrieving an email using delegated credentials`;
                 }
-                if (args.options.userId || args.options.userPrincipalName) {
-                    requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                if (args.options.userId || args.options.userName) {
+                    requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userName}`;
                 }
                 else {
                     requestUrl += 'me';
@@ -69,7 +69,7 @@ _OutlookMessageGetCommand_instances = new WeakSet(), _OutlookMessageGetCommand_i
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             userId: typeof args.options.userId !== 'undefined',
-            userPrincipalName: typeof args.options.userPrincipalName !== 'undefined'
+            userName: typeof args.options.userName !== 'undefined'
         });
     });
 }, _OutlookMessageGetCommand_initOptions = function _OutlookMessageGetCommand_initOptions() {
@@ -78,7 +78,7 @@ _OutlookMessageGetCommand_instances = new WeakSet(), _OutlookMessageGetCommand_i
     }, {
         option: '--userId [userId]'
     }, {
-        option: '--userPrincipalName [userPrincipalName]'
+        option: '--userName [userName]'
     });
 };
 export default new OutlookMessageGetCommand();

package/dist/m365/pa/commands/app/app-export.js

@@ -3,7 +3,7 @@ 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 _PaAppExportCommand_instances, _PaAppExportCommand_initTelemetry, _PaAppExportCommand_initOptions, _PaAppExportCommand_initValidators;
+var _PaAppExportCommand_instances, _PaAppExportCommand_initTelemetry, _PaAppExportCommand_initOptions, _PaAppExportCommand_initValidators, _PaAppExportCommand_initTypes;
 import fs from 'fs';
 import path from 'path';
 import { setTimeout } from 'timers/promises';
@@ -26,14 +26,18 @@ class PaAppExportCommand extends PowerPlatformCommand {
         __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _PaAppExportCommand_instances, "m", _PaAppExportCommand_initTypes).call(this);
     }
     async commandAction(logger, args) {
         try {
             const location = await this.exportPackage(args, logger);
-            const packageLink = await this.getPackageLink(args, logger, location);
-            //Replace all illegal characters from the file name
-            const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
-            const filename = args.options.packageDisplayName.replace(illegalCharsRegEx, '_');
+            const packageLink = await this.getPackageLink(logger, location);
+            let filename = args.options.name;
+            if (args.options.packageDisplayName) {
+                //Replace all illegal characters from the file name
+                const illegalCharsRegEx = /[\\\/:*?"<>|]/g;
+                filename = args.options.packageDisplayName.replace(illegalCharsRegEx, '_');
+            }
             const requestOptions = {
                 url: packageLink,
                 // Set responseType to arraybuffer, otherwise binary data will be encoded
@@ -98,7 +102,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
                 details: {
                     creator: args.options.packageCreatedBy,
                     description: args.options.packageDescription,
-                    displayName: args.options.packageDisplayName,
+                    displayName: args.options.packageDisplayName || args.options.name,
                     sourceEnvironment: args.options.packageSourceEnvironment
                 },
                 resources: resources
@@ -108,7 +112,7 @@ class PaAppExportCommand extends PowerPlatformCommand {
         const response = await request.post(requestOptions);
         return response.headers.location;
     }
-    async getPackageLink(args, logger, location) {
+    async getPackageLink(logger, location) {
         if (this.verbose) {
             await logger.logToStderr('Retrieving the package link and waiting on the exported package.');
         }
@@ -172,6 +176,8 @@ _PaAppExportCommand_instances = new WeakSet(), _PaAppExportCommand_initTelemetry
         }
         return true;
     });
+}, _PaAppExportCommand_initTypes = function _PaAppExportCommand_initTypes() {
+    this.types.string.push('name', 'environmentName', 'packageDisplayName', 'packageDescription', 'packageCreatedBy', 'packageSourceEnvironment', 'path');
 };
 export default new PaAppExportCommand();
 //# sourceMappingURL=app-export.js.map

package/dist/m365/spfx/commands/project/DeployWorkflow.js

@@ -46,7 +46,7 @@ export const workflow = {
                     with: {
                         "APP_FILE_PATH": "sharepoint/solution/{{ solutionName }}.sppkg",
                         "SKIP_FEATURE_DEPLOYMENT": false,
-                        "OVERWRITE": false
+                        "OVERWRITE": true
                     }
                 }
             ]

package/dist/m365/spfx/commands/project/project-github-workflow-add.js

@@ -33,9 +33,6 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         if (this.projectRootPath === null) {
             throw new CommandError(`Couldn't find project root folder`, _a.ERROR_NO_PROJECT_ROOT_FOLDER);
         }
-        if (!args.options.overwrite) {
-            await this.warn(logger, `We recommend always using the --overwrite option and it will become the default behavior in next major release. Overwriting your sppkg file on every deployment is required to make continuous delivery of the latest version of your app which is the aim of the continuous delivery pipeline.`);
-        }
         const solutionPackageJsonFile = path.join(this.projectRootPath, 'package.json');
         const packageJson = fs.readFileSync(solutionPackageJsonFile, 'utf-8');
         const solutionName = JSON.parse(packageJson).name;
@@ -81,9 +78,6 @@ class SpfxProjectGithubWorkflowAddCommand extends BaseProjectCommand {
         if (options.skipFeatureDeployment) {
             this.getDeployAction(workflow).with.SKIP_FEATURE_DEPLOYMENT = true;
         }
-        if (options.overwrite) {
-            this.getDeployAction(workflow).with.OVERWRITE = true;
-        }
         if (options.loginMethod === 'user') {
             const loginAction = this.getLoginAction(workflow);
             loginAction.with = {
@@ -125,8 +119,7 @@ _a = SpfxProjectGithubWorkflowAddCommand, _SpfxProjectGithubWorkflowAddCommand_i
             manuallyTrigger: !!args.options.manuallyTrigger,
             loginMethod: typeof args.options.loginMethod !== 'undefined',
             scope: typeof args.options.scope !== 'undefined',
-            skipFeatureDeployment: !!args.options.skipFeatureDeployment,
-            overwrite: !!args.options.overwrite
+            skipFeatureDeployment: !!args.options.skipFeatureDeployment
         });
     });
 }, _SpfxProjectGithubWorkflowAddCommand_initOptions = function _SpfxProjectGithubWorkflowAddCommand_initOptions() {
@@ -146,8 +139,6 @@ _a = SpfxProjectGithubWorkflowAddCommand, _SpfxProjectGithubWorkflowAddCommand_i
         option: '-u, --siteUrl [siteUrl]'
     }, {
         option: '--skipFeatureDeployment'
-    }, {
-        option: '--overwrite'
     });
 }, _SpfxProjectGithubWorkflowAddCommand_initValidators = function _SpfxProjectGithubWorkflowAddCommand_initValidators() {
     this.validators.push(async (args) => {

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

@@ -5,6 +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 { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -30,39 +31,43 @@ class SpoFileCopyCommand extends SpoCommand {
         try {
             const sourceServerRelativePath = await this.getSourcePath(logger, args.options);
             const sourcePath = this.getAbsoluteUrl(args.options.webUrl, sourceServerRelativePath);
-            let destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
-            if (args.options.newName) {
-                destinationPath += args.options.newName;
+            const destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl);
+            if (this.verbose) {
+                await logger.logToStderr(`Copying file '${sourceServerRelativePath}' to '${args.options.targetUrl}'...`);
+            }
+            let newName = args.options.newName;
+            // Add original file extension if not provided
+            if (newName && !newName.includes('.')) {
+                newName += sourceServerRelativePath.substring(sourceServerRelativePath.lastIndexOf('.'));
             }
-            else {
-                // Keep the original file name
-                destinationPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
+            const copyJobResponse = await spo.createCopyJob(args.options.webUrl, sourcePath, destinationPath, {
+                nameConflictBehavior: this.getNameConflictBehaviorValue(args.options.nameConflictBehavior),
+                bypassSharedLock: !!args.options.bypassSharedLock,
+                ignoreVersionHistory: !!args.options.ignoreVersionHistory,
+                newName: newName
+            });
+            if (args.options.skipWait) {
+                return;
             }
             if (this.verbose) {
-                await logger.logToStderr(`Copying file '${sourcePath}' to '${destinationPath}'...`);
+                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 file...');
+            }
+            // Get destination file 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.CopyFileByPath`,
+                url: `${absoluteWebUrl}/_api/Web/GetFileById('${copyJobResult.TargetObjectUniqueId}')`,
                 headers: {
                     accept: 'application/json;odata=nometadata'
                 },
-                responseType: 'json',
-                data: {
-                    srcPath: {
-                        DecodedUrl: sourcePath
-                    },
-                    destPath: {
-                        DecodedUrl: destinationPath
-                    },
-                    overwrite: args.options.nameConflictBehavior === 'replace',
-                    options: {
-                        KeepBoth: args.options.nameConflictBehavior === 'rename',
-                        ResetAuthorAndCreatedOnCopy: !!args.options.resetAuthorAndCreated,
-                        ShouldBypassSharedLocks: !!args.options.bypassSharedLock
-                    }
-                }
+                responseType: 'json'
             };
-            await request.post(requestOptions);
+            const destinationFile = await request.get(requestOptions);
+            await logger.log(destinationFile);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
@@ -76,17 +81,30 @@ class SpoFileCopyCommand extends SpoCommand {
             await logger.logToStderr(`Retrieving server-relative path for file with ID '${options.sourceId}'...`);
         }
         const requestOptions = {
-            url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')?$select=ServerRelativePath`,
+            url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')/ServerRelativePath`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
             responseType: 'json'
         };
         const file = await request.get(requestOptions);
-        return file.ServerRelativePath.DecodedUrl;
+        return file.DecodedUrl;
+    }
+    getNameConflictBehaviorValue(nameConflictBehavior) {
+        switch (nameConflictBehavior?.toLowerCase()) {
+            case 'fail':
+                return CreateCopyJobsNameConflictBehavior.Fail;
+            case 'replace':
+                return CreateCopyJobsNameConflictBehavior.Replace;
+            case 'rename':
+                return CreateCopyJobsNameConflictBehavior.Rename;
+            default:
+                return CreateCopyJobsNameConflictBehavior.Fail;
+        }
     }
     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);
     }
 }
 _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry = function _SpoFileCopyCommand_initTelemetry() {
@@ -95,9 +113,10 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
             sourceUrl: typeof args.options.sourceUrl !== 'undefined',
             sourceId: typeof args.options.sourceId !== 'undefined',
             newName: typeof args.options.newName !== 'undefined',
-            nameConflictBehavior: args.options.nameConflictBehavior || false,
-            resetAuthorAndCreated: !!args.options.resetAuthorAndCreated,
-            bypassSharedLock: !!args.options.bypassSharedLock
+            nameConflictBehavior: typeof args.options.nameConflictBehavior !== 'undefined',
+            ignoreVersionHistory: !!args.options.ignoreVersionHistory,
+            bypassSharedLock: !!args.options.bypassSharedLock,
+            skipWait: !!args.options.skipWait
         });
     });
 }, _SpoFileCopyCommand_initOptions = function _SpoFileCopyCommand_initOptions() {
@@ -114,10 +133,12 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
     }, {
         option: '--nameConflictBehavior [nameConflictBehavior]',
         autocomplete: this.nameConflictBehaviorOptions
-    }, {
-        option: '--resetAuthorAndCreated'
     }, {
         option: '--bypassSharedLock'
+    }, {
+        option: '--ignoreVersionHistory'
+    }, {
+        option: '--skipWait'
     });
 }, _SpoFileCopyCommand_initValidators = function _SpoFileCopyCommand_initValidators() {
     this.validators.push(async (args) => {
@@ -128,7 +149,7 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
         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) {
+        if (args.options.nameConflictBehavior && !this.nameConflictBehaviorOptions.includes(args.options.nameConflictBehavior.toLowerCase())) {
             return `${args.options.nameConflictBehavior} is not a valid nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}.`;
         }
         return true;
@@ -137,7 +158,7 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
     this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 }, _SpoFileCopyCommand_initTypes = function _SpoFileCopyCommand_initTypes() {
     this.types.string.push('webUrl', 'sourceUrl', 'sourceId', 'targetUrl', 'newName', 'nameConflictBehavior');
-    this.types.boolean.push('resetAuthorAndCreated', 'bypassSharedLock');
+    this.types.boolean.push('bypassSharedLock', 'ignoreVersionHistory', 'skipWait');
 };
 export default new SpoFileCopyCommand();
 //# sourceMappingURL=file-copy.js.map

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

@@ -140,7 +140,7 @@ _SpoFileRoleAssignmentAddCommand_instances = new WeakSet(), _SpoFileRoleAssignme
     }, {
         option: '--fileUrl [fileUrl]'
     }, {
-        option: 'i, --fileId [fileId]'
+        option: '-i, --fileId [fileId]'
     }, {
         option: '--principalId [principalId]'
     }, {

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

@@ -90,7 +90,7 @@ _SpoFileRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoFileRoleInher
     }, {
         option: '--fileUrl [fileUrl]'
     }, {
-        option: 'i, --fileId [fileId]'
+        option: '-i, --fileId [fileId]'
     }, {
         option: '-c, --clearExistingPermissions'
     }, {

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

@@ -88,7 +88,7 @@ _SpoFileRoleInheritanceResetCommand_instances = new WeakSet(), _SpoFileRoleInher
     }, {
         option: '--fileUrl [fileUrl]'
     }, {
-        option: 'i, --fileId [fileId]'
+        option: '-i, --fileId [fileId]'
     }, {
         option: '-f, --force'
     });

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

@@ -83,7 +83,7 @@ _SpoFolderRetentionLabelEnsureCommand_instances = new WeakSet(), _SpoFolderReten
     }, {
         option: '--folderUrl [folderUrl]'
     }, {
-        option: 'i, --folderId [folderId]'
+        option: '-i, --folderId [folderId]'
     });
 }, _SpoFolderRetentionLabelEnsureCommand_initValidators = function _SpoFolderRetentionLabelEnsureCommand_initValidators() {
     this.validators.push(async (args) => {

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

@@ -18,9 +18,6 @@ class SpoFolderSetCommand extends SpoCommand {
     get description() {
         return 'Updates a folder';
     }
-    alias() {
-        return [commands.FOLDER_RENAME];
-    }
     constructor() {
         super();
         _SpoFolderSetCommand_instances.add(this);
@@ -34,7 +31,6 @@ class SpoFolderSetCommand extends SpoCommand {
     }
     async commandAction(logger, args) {
         try {
-            await this.showDeprecationWarning(logger, this.alias()[0], this.name);
             if (this.verbose) {
                 await logger.logToStderr(`Updating folder '${args.options.name}'...`);
             }