@pnp/cli-microsoft365 6.11.0-beta.ee225fb → 6.11.0

package/dist/m365/spfx/commands/spfx-doctor.js

@@ -535,14 +535,14 @@ class SpfxDoctorCommand extends base_project_command_1.BaseProjectCommand {
                     fix: 'npm i -g yo@4'
                 }
             },
-            '1.18.0-beta.1': {
+            '1.18.0-beta.5': {
                 gulpCli: {
                     range: '^1 || ^2',
                     fix: 'npm i -g gulp-cli@2'
                 },
                 node: {
-                    range: '>=16.13.0 <17.0.0',
-                    fix: 'Install Node.js >=16.13.0 <17.0.0'
+                    range: '>=16.14.0 <17.0.0',
+                    fix: 'Install Node.js >=16.14.0 <17.0.0'
                 },
                 sp: SharePointVersion.SPO,
                 yo: {
@@ -614,28 +614,22 @@ class SpfxDoctorCommand extends base_project_command_1.BaseProjectCommand {
         });
     }
     checkSharePointCompatibility(spfxVersion, prerequisites, args, fixes, logger) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (args.options.env) {
                 const sp = this.spVersionStringToEnum(args.options.env);
                 if ((prerequisites.sp & sp) === sp) {
                     logger.log(formatting_1.formatting.getStatus(formatting_1.CheckStatus.Success, `Supported in ${SharePointVersion[sp]}`));
-                    resolve();
-                }
-                else {
-                    logger.log(formatting_1.formatting.getStatus(formatting_1.CheckStatus.Failure, `Not supported in ${SharePointVersion[sp]}`));
-                    fixes.push(`Use SharePoint Framework v${(sp === SharePointVersion.SP2016 ? '1.1' : '1.4.1')}`);
-                    reject(`SharePoint Framework v${spfxVersion} is not supported in ${SharePointVersion[sp]}`);
+                    return;
                 }
-            }
-            else {
-                resolve();
+                logger.log(formatting_1.formatting.getStatus(formatting_1.CheckStatus.Failure, `Not supported in ${SharePointVersion[sp]}`));
+                fixes.push(`Use SharePoint Framework v${(sp === SharePointVersion.SP2016 ? '1.1' : '1.4.1')}`);
+                throw `SharePoint Framework v${spfxVersion} is not supported in ${SharePointVersion[sp]}`;
             }
         });
     }
     checkNodeVersion(prerequisites, fixes, logger) {
-        return Promise
-            .resolve(this.getNodeVersion())
-            .then((nodeVersion) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const nodeVersion = this.getNodeVersion();
             this.checkStatus('Node', nodeVersion, prerequisites.node, OptionalOrRequired.Required, fixes, logger);
         });
     }
@@ -659,9 +653,8 @@ class SpfxDoctorCommand extends base_project_command_1.BaseProjectCommand {
         });
     }
     checkYo(prerequisites, fixes, logger) {
-        return this
-            .getPackageVersion('yo', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then((yoVersion) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const yoVersion = yield this.getPackageVersion('yo', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
             if (yoVersion) {
                 this.checkStatus('yo', yoVersion, prerequisites.yo, OptionalOrRequired.Required, fixes, logger);
             }
@@ -672,9 +665,8 @@ class SpfxDoctorCommand extends base_project_command_1.BaseProjectCommand {
         });
     }
     checkGulpCli(prerequisites, fixes, logger) {
-        return this
-            .getPackageVersion('gulp-cli', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then((gulpCliVersion) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const gulpCliVersion = yield this.getPackageVersion('gulp-cli', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
             if (gulpCliVersion) {
                 this.checkStatus('gulp-cli', gulpCliVersion, prerequisites.gulpCli, OptionalOrRequired.Required, fixes, logger);
             }
@@ -685,9 +677,8 @@ class SpfxDoctorCommand extends base_project_command_1.BaseProjectCommand {
         });
     }
     checkGulp(fixes, logger) {
-        return this
-            .getPackageVersion('gulp', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger)
-            .then((gulpVersion) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const gulpVersion = yield this.getPackageVersion('gulp', PackageSearchMode.GlobalOnly, HandlePromise.Continue, logger);
             if (gulpVersion) {
                 logger.log(formatting_1.formatting.getStatus(formatting_1.CheckStatus.Failure, `gulp should be removed`));
                 fixes.push('npm un -g gulp');
@@ -695,9 +686,8 @@ class SpfxDoctorCommand extends base_project_command_1.BaseProjectCommand {
         });
     }
     checkTypeScript(fixes, logger) {
-        return this
-            .getPackageVersion('typescript', PackageSearchMode.LocalOnly, HandlePromise.Continue, logger)
-            .then((typeScriptVersion) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const typeScriptVersion = yield this.getPackageVersion('typescript', PackageSearchMode.LocalOnly, HandlePromise.Continue, logger);
             if (typeScriptVersion) {
                 logger.log(formatting_1.formatting.getStatus(formatting_1.CheckStatus.Failure, `typescript v${typeScriptVersion} installed in the project`));
                 fixes.push('npm un typescript');
@@ -757,41 +747,35 @@ class SpfxDoctorCommand extends base_project_command_1.BaseProjectCommand {
         });
     }
     getPackageVersion(packageName, searchMode, handlePromise, logger) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             const args = ['ls', packageName, '--depth=0', '--json'];
             if (searchMode === PackageSearchMode.GlobalOnly) {
                 args.push('-g');
             }
-            this
-                .getPackageVersionFromNpm(args, logger)
-                .then((version) => {
-                return Promise.resolve(version);
-            })
-                .catch(() => {
+            let version;
+            try {
+                version = yield this.getPackageVersionFromNpm(args, logger);
+            }
+            catch (_a) {
                 if (searchMode === PackageSearchMode.LocalAndGlobal) {
                     args.push('-g');
-                    return this.getPackageVersionFromNpm(args, logger);
+                    version = yield this.getPackageVersionFromNpm(args, logger);
                 }
                 else {
-                    return Promise.resolve('');
+                    version = '';
                 }
-            })
-                .then((version) => {
-                if (version) {
-                    resolve(version);
+            }
+            if (version) {
+                return version;
+            }
+            else {
+                if (handlePromise === HandlePromise.Continue) {
+                    return '';
                 }
                 else {
-                    if (handlePromise === HandlePromise.Continue) {
-                        resolve('');
-                    }
-                    else {
-                        reject();
-                    }
+                    throw new Error();
                 }
-            })
-                .catch((err) => {
-                reject(err);
-            });
+            }
         });
     }
     getPackageVersionFromNpm(args, logger) {

package/dist/m365/spfx/commands.js

@@ -6,6 +6,7 @@ exports.default = {
     PACKAGE_GENERATE: `${prefix} package generate`,
     PROJECT_DOCTOR: `${prefix} project doctor`,
     PROJECT_EXTERNALIZE: `${prefix} project externalize`,
+    PROJECT_GITHUB_WORKFLOW_ADD: `${prefix} project github workflow add`,
     PROJECT_PERMISSIONS_GRANT: `${prefix} project permissions grant`,
     PROJECT_RENAME: `${prefix} project rename`,
     PROJECT_UPGRADE: `${prefix} project upgrade`

package/dist/m365/spo/commands/app/SpoAppBaseCommand.js

@@ -1,16 +1,34 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpoAppBaseCommand = void 0;
 const request_1 = require("../../../../request");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 class SpoAppBaseCommand extends SpoCommand_1.default {
     getAppCatalogSiteUrl(logger, authSiteUrl, args) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (args.options.appCatalogScope === 'sitecollection') {
-                return resolve(args.options.appCatalogUrl.toLowerCase().replace('/appcatalog', ''));
+                // trim trailing slashes if there are any
+                const appCatalogUrl = args.options.appCatalogUrl.replace(/\/$/, '');
+                const appCatalogUrlChunks = appCatalogUrl.split('/');
+                // Trim the last part of the URL if it ends on '/appcatalog', but don't trim it if the site URL is called like that (/sites/appcatalog).
+                if (appCatalogUrl.toLowerCase().endsWith('/appcatalog') && appCatalogUrlChunks.length !== 5) {
+                    return appCatalogUrl.substring(0, appCatalogUrl.lastIndexOf('/'));
+                }
             }
             if (args.options.appCatalogUrl) {
-                return resolve(args.options.appCatalogUrl);
+                return args.options.appCatalogUrl.replace(/\/$/, '');
+            }
+            if (this.verbose) {
+                logger.logToStderr('Getting tenant app catalog url...');
             }
             const requestOptions = {
                 url: `${authSiteUrl}/_api/SP_TenantSettings_Current`,
@@ -19,17 +37,11 @@ class SpoAppBaseCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            request_1.default
-                .get(requestOptions)
-                .then((res) => {
-                if (res.CorporateCatalogUrl) {
-                    return resolve(res.CorporateCatalogUrl);
-                }
-                reject('Tenant app catalog is not configured.');
-            })
-                .catch((err) => {
-                reject(err);
-            });
+            const response = yield request_1.default.get(requestOptions);
+            if (response.CorporateCatalogUrl) {
+                return response.CorporateCatalogUrl;
+            }
+            throw new Error('Tenant app catalog is not configured.');
         });
     }
 }

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

@@ -33,6 +33,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
     constructor() {
         super();
         _SpoAppAddCommand_instances.add(this);
+        this.appCatalogScopeOptions = ['tenant', 'sitecollection'];
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoAppAddCommand_instances, "m", _SpoAppAddCommand_initValidators).call(this);
@@ -75,9 +76,9 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
 _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = function _SpoAppAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            overwrite: (!(!args.options.overwrite)).toString(),
+            overwrite: !!args.options.overwrite,
             appCatalogScope: args.options.appCatalogScope || 'tenant',
-            appCatalogUrl: (!(!args.options.appCatalogUrl)).toString()
+            appCatalogUrl: typeof args.options.appCatalogUrl !== 'undefined'
         });
     });
 }, _SpoAppAddCommand_initOptions = function _SpoAppAddCommand_initOptions() {
@@ -85,7 +86,7 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
         option: '-p, --filePath <filePath>'
     }, {
         option: '-s, --appCatalogScope [appCatalogScope]',
-        autocomplete: ['tenant', 'sitecollection']
+        autocomplete: this.appCatalogScopeOptions
     }, {
         option: '-u, --appCatalogUrl [appCatalogUrl]'
     }, {
@@ -93,14 +94,13 @@ _SpoAppAddCommand_instances = new WeakSet(), _SpoAppAddCommand_initTelemetry = f
     });
 }, _SpoAppAddCommand_initValidators = function _SpoAppAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        // verify either 'tenant' or 'sitecollection' specified if scope provided
         if (args.options.appCatalogScope) {
-            const testScope = args.options.appCatalogScope.toLowerCase();
-            if (!(testScope === 'tenant' || testScope === 'sitecollection')) {
-                return `appCatalogScope must be either 'tenant' or 'sitecollection'`;
+            const appCatalogScope = args.options.appCatalogScope.toLowerCase();
+            if (this.appCatalogScopeOptions.indexOf(appCatalogScope) === -1) {
+                return `${args.options.appCatalogScope} is not a valid appCatalogScope. Allowed values are: ${this.appCatalogScopeOptions.join(', ')}`;
             }
-            if (testScope === 'sitecollection' && !args.options.appCatalogUrl) {
-                return `You must specify appCatalogUrl when the appCatalogScope is sitecollection`;
+            if (appCatalogScope === 'sitecollection' && !args.options.appCatalogUrl) {
+                return `You must specify appCatalogUrl when appCatalogScope is sitecollection`;
             }
         }
         const fullPath = path.resolve(args.options.filePath);

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

@@ -66,7 +66,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
             try {
                 try {
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         }
@@ -100,7 +100,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     // initiate chunked upload session
                     const uploadId = (0, uuid_1.v4)();
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files/GetByPathOrAddStub(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(fileName)}')/StartUpload(uploadId=guid'${uploadId}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         }
@@ -128,7 +128,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                             logger.logToStderr('Cancelling upload session due to error...');
                         }
                         const requestOptions = {
-                            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/cancelupload(uploadId=guid'${uploadId}')`,
+                            url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/cancelupload(uploadId=guid'${uploadId}')`,
                             headers: {
                                 'accept': 'application/json;odata=nometadata'
                             }
@@ -150,7 +150,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     const fileBody = fs.readFileSync(fullPath);
                     const bodyLength = fileBody.byteLength;
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files/Add(url='${formatting_1.formatting.encodeQueryParameter(fileName)}', overwrite=true)`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files/Add(url='${formatting_1.formatting.encodeQueryParameter(fileName)}', overwrite=true)`,
                         data: fileBody,
                         headers: {
                             'accept': 'application/json;odata=nometadata',
@@ -192,7 +192,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     }
                     // approve the existing file with given comment
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/approve(comment='${formatting_1.formatting.encodeQueryParameter(args.options.approveComment || '')}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/approve(comment='${formatting_1.formatting.encodeQueryParameter(args.options.approveComment || '')}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -209,7 +209,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     }
                     // publish the existing file with given comment
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/publish(comment='${formatting_1.formatting.encodeQueryParameter(args.options.publishComment || '')}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/publish(comment='${formatting_1.formatting.encodeQueryParameter(args.options.publishComment || '')}')`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -223,7 +223,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     // in a case the command has done checkout
                     // then have to rollback the checkout
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/UndoCheckOut()`
+                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/UndoCheckOut()`
                     };
                     try {
                         yield request_1.default.post(requestOptions);
@@ -266,14 +266,14 @@ class SpoFileAddCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             // check if file already exists, otherwise it can't be checked out
             const requestOptionsGetFile = {
-                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')`,
+                url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 }
             };
             yield request_1.default.get(requestOptionsGetFile);
             const requestOptionsCheckOut = {
-                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/CheckOut()`,
+                url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/CheckOut()`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -299,7 +299,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                     fileBuffer = fileBuffer.slice(0, readCount);
                 }
                 const requestOptions = {
-                    url: `${info.WebUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(info.FolderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,
+                    url: `${info.WebUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(info.FolderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(info.Name)}')/${isLastChunk ? 'Finish' : 'Continue'}Upload(uploadId=guid'${info.Id}',fileOffset=${offset})`,
                     data: fileBuffer,
                     headers: {
                         'accept': 'application/json;odata=nometadata',
@@ -358,7 +358,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Getting list details in order to get its available content types afterwards...`);
             }
             const requestOptions = {
-                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
+                url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ParentList?$Select=Id,EnableModeration,EnableVersioning,EnableMinorVersions`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -383,7 +383,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
             }
             // update the existing file list item fields
             const requestOptions = {
-                url: `${webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
+                url: `${webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(folderPath)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/ListItemAllFields/ValidateUpdateListItem()`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -404,7 +404,7 @@ class SpoFileAddCommand extends SpoCommand_1.default {
     fileCheckIn(args, fileName) {
         return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/CheckIn(comment='${formatting_1.formatting.encodeQueryParameter(args.options.checkInComment || '')}',checkintype=0)`,
+                url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(args.options.folder)}')/Files('${formatting_1.formatting.encodeQueryParameter(fileName)}')/CheckIn(comment='${formatting_1.formatting.encodeQueryParameter(args.options.checkInComment || '')}',checkintype=0)`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },

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

@@ -67,7 +67,7 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
             }
             if (args.options.url) {
                 const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/checkin(comment='${comment}',checkintype=${type})`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/checkin(comment='${comment}',checkintype=${type})`;
             }
             const requestOptions = {
                 url: requestUrl,

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

@@ -47,7 +47,7 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
             }
             if (args.options.url) {
                 const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/checkout`;
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/checkout`;
             }
             const requestOptions = {
                 url: requestUrl,

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

@@ -13,7 +13,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 _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCopyCommand_initOptions, _SpoFileCopyCommand_initValidators;
+var _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCopyCommand_initOptions, _SpoFileCopyCommand_initValidators, _SpoFileCopyCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const urlUtil_1 = require("../../../../utils/urlUtil");
@@ -34,11 +34,13 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileCopyCommand_instances, "m", _SpoFileCopyCommand_initOptionSets).call(this);
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const sourcePath = this.getAbsoluteUrl(args.options.webUrl, urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl));
+                const sourceServerRelativePath = yield 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;
@@ -66,6 +68,7 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
                         overwrite: args.options.nameConflictBehavior === 'replace',
                         options: {
                             KeepBoth: args.options.nameConflictBehavior === 'rename',
+                            ResetAuthorAndCreatedOnCopy: !!args.options.resetAuthorAndCreated,
                             ShouldBypassSharedLocks: !!args.options.bypassSharedLock
                         }
                     }
@@ -77,6 +80,25 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
             }
         });
     }
+    getSourcePath(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.sourceUrl) {
+                return urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.sourceUrl);
+            }
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving server-relative path for file with ID '${options.sourceId}'...`);
+            }
+            const requestOptions = {
+                url: `${options.webUrl}/_api/Web/GetFileById('${options.sourceId}')?$select=ServerRelativePath`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const file = yield request_1.default.get(requestOptions);
+            return file.ServerRelativePath.DecodedUrl;
+        });
+    }
     getAbsoluteUrl(webUrl, url) {
         return url.startsWith('https://') ? url : urlUtil_1.urlUtil.getAbsoluteUrl(webUrl, url);
     }
@@ -84,8 +106,11 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
 _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry = function _SpoFileCopyCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            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
         });
     });
@@ -93,7 +118,9 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-s, --sourceUrl <sourceUrl>'
+        option: '-s, --sourceUrl [sourceUrl]'
+    }, {
+        option: '-i, --sourceId [sourceId]'
     }, {
         option: '-t, --targetUrl <targetUrl>'
     }, {
@@ -101,6 +128,8 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
     }, {
         option: '--nameConflictBehavior [nameConflictBehavior]',
         autocomplete: this.nameConflictBehaviorOptions
+    }, {
+        option: '--resetAuthorAndCreated'
     }, {
         option: '--bypassSharedLock'
     });
@@ -110,11 +139,16 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
+        if (args.options.sourceId && !validation_1.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 nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}`;
+            return `${args.options.nameConflictBehavior} is not a valid nameConflictBehavior value. Allowed values: ${this.nameConflictBehaviorOptions.join(', ')}.`;
         }
         return true;
     }));
+}, _SpoFileCopyCommand_initOptionSets = function _SpoFileCopyCommand_initOptionSets() {
+    this.optionSets.push({ options: ['sourceUrl', 'sourceId'] });
 };
 module.exports = new SpoFileCopyCommand();
 //# sourceMappingURL=file-copy.js.map

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

@@ -75,7 +75,7 @@ class SpoFileListCommand extends SpoCommand_1.default {
             }
             const allFiles = [];
             const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, folderUrl);
-            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Files?@url='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}'`;
+            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/Files`;
             const queryParams = [`$skip=${skip}`, `$top=${SpoFileListCommand.pageSize}`];
             if (fieldProperties.expandProperties.length > 0) {
                 queryParams.push(`$expand=${fieldProperties.expandProperties.join(',')}`);
@@ -87,7 +87,7 @@ class SpoFileListCommand extends SpoCommand_1.default {
                 queryParams.push(`$filter=${args.options.filter}`);
             }
             const requestOptions = {
-                url: `${requestUrl}&${queryParams.join('&')}`,
+                url: `${requestUrl}?${queryParams.join('&')}`,
                 method: 'GET',
                 headers: {
                     'accept': 'application/json;odata=nometadata'
@@ -111,9 +111,9 @@ class SpoFileListCommand extends SpoCommand_1.default {
             }
             const allFolders = [];
             const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, folderUrl);
-            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Folders?@url='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}'`;
+            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/Folders`;
             const requestOptions = {
-                url: `${requestUrl}&$skip=${skip}&$top=${SpoFileListCommand.pageSize}&$select=ServerRelativeUrl`,
+                url: `${requestUrl}?$skip=${skip}&$top=${SpoFileListCommand.pageSize}&$select=ServerRelativeUrl`,
                 method: 'GET',
                 headers: {
                     'accept': 'application/json;odata=nometadata'

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

@@ -69,7 +69,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
-                        'accept': 'application/json;odata=nometadata'
+                        accept: 'application/json;odata=nometadata'
                     },
                     data: {
                         exportObjectUris: [sourceAbsoluteUrl],
@@ -109,7 +109,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
      * Checks if a file exists on the server relative url
      */
     fileExists(webUrl, sourceUrl) {
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(sourceUrl)}')/`;
+        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(sourceUrl)}')/`;
         const requestOptions = {
             url: requestUrl,
             method: 'GET',

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

@@ -55,7 +55,7 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
                 }
                 else {
                     const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                    requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
+                    requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
                 }
                 if (args.options.recycle) {
                     requestUrl += `/recycle()`;
@@ -85,7 +85,7 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
                     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) {
                     yield removeFile();
@@ -97,10 +97,10 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
 _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(),
-            confirm: (!(!args.options.confirm)).toString()
+            id: typeof args.options.id !== 'undefined',
+            url: typeof args.options.url !== 'undefined',
+            recycle: !!args.options.recycle,
+            confirm: !!args.options.confirm
         });
     });
 }, _SpoFileRemoveCommand_initOptions = function _SpoFileRemoveCommand_initOptions() {

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

@@ -53,7 +53,7 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
                         }]
                 };
                 const requestOptions = {
-                    url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativePath)}')/ListItemAllFields/ValidateUpdateListItem()`,
+                    url: `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativePath)}')/ListItemAllFields/ValidateUpdateListItem()`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -70,7 +70,7 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
     }
     getFile(originalFileServerRelativeUrl, webUrl) {
         return __awaiter(this, void 0, void 0, function* () {
-            const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')?$select=UniqueId`;
+            const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')?$select=UniqueId`;
             const requestOptions = {
                 url: requestUrl,
                 headers: {