@pnp/cli-microsoft365 6.8.0-beta.62006d7 → 6.8.0-beta.f473be5

package/.mocharc.json

@@ -3,6 +3,7 @@
     "ts"
   ],
   "spec": "dist/**/*.spec.js",
+  "reporter": "min",
   "require": "source-map-support/register",
   "watch": "dist/**/*.js",
   "timeout": 10000,

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

@@ -17,6 +17,7 @@ var _SpoFileCheckinCommand_instances, _SpoFileCheckinCommand_initTelemetry, _Spo
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -41,6 +42,9 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileCheckinCommand_instances, "m", _SpoFileCheckinCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoFileCheckinCommand_instances, "m", _SpoFileCheckinCommand_initOptionSets).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             let type = CheckinType.Major;
@@ -62,7 +66,8 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
                 requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/checkin(comment='${comment}',checkintype=${type})`;
             }
             if (args.options.url) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.url)}')/checkin(comment='${comment}',checkintype=${type})`;
+                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})`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -83,8 +88,8 @@ class SpoFileCheckinCommand extends SpoCommand_1.default {
 _SpoFileCheckinCommand_instances = new WeakSet(), _SpoFileCheckinCommand_initTelemetry = function _SpoFileCheckinCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.url)).toString(),
+            id: typeof args.options.id !== 'undefined',
+            url: typeof args.options.url !== 'undefined',
             type: args.options.type || 'Major',
             comment: typeof args.options.comment !== 'undefined'
         });

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

@@ -17,6 +17,7 @@ var _SpoFileCheckoutCommand_instances, _SpoFileCheckoutCommand_initTelemetry, _S
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -35,6 +36,9 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initOptionSets).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             let requestUrl = '';
@@ -42,7 +46,8 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
                 requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/checkout`;
             }
             if (args.options.url) {
-                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.url)}')/checkout`;
+                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`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -63,8 +68,8 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
 _SpoFileCheckoutCommand_instances = new WeakSet(), _SpoFileCheckoutCommand_initTelemetry = function _SpoFileCheckoutCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            url: (!(!args.options.url)).toString()
+            id: typeof args.options.id !== 'undefined',
+            url: typeof args.options.url !== 'undefined'
         });
     });
 }, _SpoFileCheckoutCommand_initOptions = function _SpoFileCheckoutCommand_initOptions() {

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

@@ -38,10 +38,7 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                if (this.verbose) {
-                    logger.logToStderr(`Copying file '${args.options.sourceUrl}' to '${args.options.targetUrl}'...`);
-                }
-                const sourcePath = this.getAbsoluteUrl(args.options.webUrl, args.options.sourceUrl);
+                const sourcePath = this.getAbsoluteUrl(args.options.webUrl, urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl));
                 let destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
                 if (args.options.newName) {
                     destinationPath += args.options.newName;
@@ -50,6 +47,9 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
                     // Keep the original file name
                     destinationPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
                 }
+                if (this.verbose) {
+                    logger.logToStderr(`Copying file '${sourcePath}' to '${destinationPath}'...`);
+                }
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.CopyFileByPath`,
                     headers: {

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

@@ -19,6 +19,7 @@ const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -66,7 +67,8 @@ class SpoFileGetCommand extends SpoCommand_1.default {
                 else {
                     options += '&';
                 }
-                options += `@f='${formatting_1.formatting.encodeQueryParameter(args.options.url)}'`;
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                options += `@f='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}'`;
             }
             const requestOptions = {
                 url: requestUrl + options,

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

@@ -69,8 +69,8 @@ class SpoFileListCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving files in folder '${folderUrl}'${page > 1 ? ', page ' + page : ''}...`);
             }
             const allFiles = [];
-            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, folderUrl);
-            const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl(@url)/Files?@url='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}'`;
+            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 queryParams = [`$skip=${skip}`, `$top=${SpoFileListCommand.pageSize}`];
             if (fieldProperties.expandProperties.length > 0) {
                 queryParams.push(`$expand=${fieldProperties.expandProperties.join(',')}`);

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

@@ -40,7 +40,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileMoveCommand_instances, "m", _SpoFileMoveCommand_initValidators).call(this);
     }
     getExcludedOptionsWithUrls() {
-        return ['targetUrl'];
+        return ['targetUrl', 'sourceUrl'];
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
@@ -48,6 +48,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
             const parsedUrl = url.parse(webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
             try {
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
                 // Check if the source file exists.
                 // Called on purpose, we explicitly check if user specified file
                 // in the sourceUrl option.
@@ -55,14 +56,14 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                 // A user might enter folder instead of file as source url by mistake
                 // then there are edge cases when deleteIfAlreadyExists flag is set
                 // the user can receive misleading error message.
-                yield this.fileExists(tenantUrl, webUrl, args.options.sourceUrl);
+                yield this.fileExists(webUrl, serverRelativePath);
                 if (args.options.deleteIfAlreadyExists) {
                     // try delete target file, if deleteIfAlreadyExists flag is set
                     const filename = args.options.sourceUrl.replace(/^.*[\\\/]/, '');
                     yield this.recycleFile(tenantUrl, args.options.targetUrl, filename, logger);
                 }
                 // all preconditions met, now create copy job
-                const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+                const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(tenantUrl, serverRelativePath);
                 const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
                 const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
                 const requestOptions = {
@@ -107,10 +108,8 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
     /**
      * Checks if a file exists on the server relative url
      */
-    fileExists(tenantUrl, webUrl, sourceUrl) {
-        const webServerRelativeUrl = webUrl.replace(tenantUrl, '');
-        const fileServerRelativeUrl = `${webServerRelativeUrl}${sourceUrl}`;
-        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileServerRelativeUrl)}')/`;
+    fileExists(webUrl, sourceUrl) {
+        const requestUrl = `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(sourceUrl)}')/`;
         const requestOptions = {
             url: requestUrl,
             method: 'GET',

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -50,18 +51,8 @@ class SpoFileRemoveCommand extends SpoCommand_1.default {
                     requestUrl = `${args.options.webUrl}/_api/web/GetFileById(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
                 }
                 else {
-                    // concatenate trailing '/' if not provided
-                    // so if the provided url is for the root site, the substr bellow will get the right value
-                    let serverRelativeSiteUrl = args.options.webUrl;
-                    if (!serverRelativeSiteUrl.endsWith('/')) {
-                        serverRelativeSiteUrl = `${serverRelativeSiteUrl}/`;
-                    }
-                    serverRelativeSiteUrl = serverRelativeSiteUrl.substr(serverRelativeSiteUrl.indexOf('/', 8));
-                    let fileUrl = args.options.url;
-                    if (!fileUrl.startsWith(serverRelativeSiteUrl)) {
-                        fileUrl = `${serverRelativeSiteUrl}${fileUrl}`;
-                    }
-                    requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(fileUrl)}')`;
+                    const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                    requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
                 }
                 if (args.options.recycle) {
                     requestUrl += `/recycle()`;

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

@@ -40,9 +40,9 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const webUrl = args.options.webUrl;
-            const originalFileServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl);
+            const originalFileServerRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.sourceUrl);
             try {
-                yield this.getFile(originalFileServerRelativeUrl, webUrl);
+                yield this.getFile(originalFileServerRelativePath, webUrl);
                 if (args.options.force) {
                     yield this.deleteFile(webUrl, args.options.sourceUrl, args.options.targetFileName);
                 }
@@ -53,7 +53,7 @@ class SpoFileRenameCommand extends SpoCommand_1.default {
                         }]
                 };
                 const requestOptions = {
-                    url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativeUrl)}')/ListItemAllFields/ValidateUpdateListItem()`,
+                    url: `${webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(originalFileServerRelativePath)}')/ListItemAllFields/ValidateUpdateListItem()`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },

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

@@ -25,6 +25,7 @@ const validation_1 = require("../../../../utils/validation");
 const formatting_1 = require("../../../../utils/formatting");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 class SpoFileRoleAssignmentAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.FILE_ROLEASSIGNMENT_ADD;
@@ -148,7 +149,7 @@ class SpoFileRoleAssignmentAddCommand extends SpoCommand_1.default {
     getFileURL(args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (args.options.fileUrl) {
-                return args.options.fileUrl;
+                return urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
             }
             const options = {
                 webUrl: args.options.webUrl,

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

@@ -55,9 +55,9 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                     else {
                         principalId = args.options.principalId;
                     }
-                    const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, fileURL);
+                    const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, fileURL);
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields/roleassignments/removeroleassignment(principalid='${principalId}')`,
+                        url: `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/ListItemAllFields/roleassignments/removeroleassignment(principalid='${principalId}')`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },
@@ -88,7 +88,7 @@ class SpoFileRoleAssignmentRemoveCommand extends SpoCommand_1.default {
     getFileURL(args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (args.options.fileUrl) {
-                return args.options.fileUrl;
+                return urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
             }
             const options = {
                 webUrl: args.options.webUrl,

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

@@ -22,6 +22,7 @@ const formatting_1 = require("../../../../utils/formatting");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SpoFileGetCommand = require("./file-get");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 class SpoFileRoleInheritanceBreakCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.FILE_ROLEINHERITANCE_BREAK;
@@ -75,7 +76,7 @@ class SpoFileRoleInheritanceBreakCommand extends SpoCommand_1.default {
     getFileURL(args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (args.options.fileUrl) {
-                return args.options.fileUrl;
+                return urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
             }
             const options = {
                 webUrl: args.options.webUrl,

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

@@ -22,6 +22,7 @@ const formatting_1 = require("../../../../utils/formatting");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 const SpoFileGetCommand = require("./file-get");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 class SpoFileRoleInheritanceResetCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.FILE_ROLEINHERITANCE_RESET;
@@ -74,7 +75,7 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand_1.default {
     getFileURL(args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (args.options.fileUrl) {
-                return args.options.fileUrl;
+                return urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
             }
             const options = {
                 webUrl: args.options.webUrl,

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -95,10 +96,11 @@ class SpoFileSharingInfoGetCommand extends SpoCommand_1.default {
     getNeededFileInformation(args) {
         let requestUrl = '';
         if (args.options.fileId) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${escape(args.options.fileId)}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${args.options.fileId}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
         }
         else {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
+            const serverRelPath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelPath)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
         }
         const requestOptions = {
             url: requestUrl,

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -66,7 +67,8 @@ class SpoFileVersionClearCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.fileUrl) {
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')/versions/DeleteAll()`;
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteAll()`;
             }
             else {
                 requestUrl += `GetFileById('${args.options.fileId}')/versions/DeleteAll()`;

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

@@ -17,6 +17,7 @@ var _SpoFileVersionGetCommand_instances, _SpoFileVersionGetCommand_initTelemetry
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -54,7 +55,8 @@ class SpoFileVersionGetCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.fileUrl) {
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
+                const serverRelUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelUrl)}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;
             }
             else {
                 requestUrl += `GetFileById('${args.options.fileId}')/versions/?$filter=VersionLabel eq '${args.options.label}'`;

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -67,7 +68,8 @@ class SpoFileVersionRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.fileUrl) {
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')/versions/DeleteByLabel('${args.options.label}')`;
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/versions/DeleteByLabel('${args.options.label}')`;
             }
             else {
                 requestUrl += `GetFileById('${args.options.fileId}')/versions/DeleteByLabel('${args.options.label}')`;

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -67,7 +68,8 @@ class SpoFileVersionRestoreCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.fileUrl) {
-                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.fileUrl)}')/versions/RestoreByLabel('${args.options.label}')`;
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                requestUrl += `GetFileByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')/versions/RestoreByLabel('${args.options.label}')`;
             }
             else {
                 requestUrl += `GetFileById('${args.options.fileId}')/versions/RestoreByLabel('${args.options.label}')`;

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

@@ -37,18 +37,18 @@ class SpoFolderCopyCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderCopyCommand_instances, "m", _SpoFolderCopyCommand_initValidators).call(this);
     }
     getExcludedOptionsWithUrls() {
-        return ['targetUrl'];
+        return ['targetUrl', 'sourceUrl'];
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const webUrl = args.options.webUrl;
             const parsedUrl = url.parse(webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+            const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
+            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(tenantUrl, serverRelativePath);
             const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-            const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {
-                url: requestUrl,
+                url: urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs'),
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },

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

@@ -38,6 +38,9 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoFolderGetCommand_instances, "m", _SpoFolderGetCommand_initOptionSets).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
@@ -48,8 +51,8 @@ class SpoFolderGetCommand extends SpoCommand_1.default {
                 requestUrl += `/GetFolderById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
             else if (args.options.url) {
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                requestUrl += `/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                requestUrl += `/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
             }
             if (args.options.withPermissions) {
                 requestUrl += `?$expand=ListItemAllFields/HasUniqueRoleAssignments,ListItemAllFields/RoleAssignments/Member,ListItemAllFields/RoleAssignments/RoleDefinitionBindings`;

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

@@ -37,14 +37,15 @@ class SpoFolderMoveCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderMoveCommand_instances, "m", _SpoFolderMoveCommand_initValidators).call(this);
     }
     getExcludedOptionsWithUrls() {
-        return ['targetUrl'];
+        return ['targetUrl', 'sourceUrl'];
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const webUrl = args.options.webUrl;
             const parsedUrl = url.parse(webUrl);
             const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
+            const sourceRelUrl = urlUtil_1.urlUtil.getServerRelativePath(webUrl, args.options.sourceUrl);
+            const sourceAbsoluteUrl = urlUtil_1.urlUtil.urlCombine(tenantUrl, sourceRelUrl);
             const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
             const requestUrl = urlUtil_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
             const requestOptions = {

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

@@ -35,6 +35,9 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFolderRenameCommand_instances, "m", _SpoFolderRenameCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFolderRenameCommand_instances, "m", _SpoFolderRenameCommand_initValidators).call(this);
     }
+    getExcludedOptionsWithUrls() {
+        return ['url'];
+    }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
@@ -45,8 +48,8 @@ class SpoFolderRenameCommand extends SpoCommand_1.default {
                 if (this.verbose) {
                     logger.logToStderr(`Renaming folder ${args.options.url} to ${args.options.name}`);
                 }
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                const serverRelativeUrlWithoutOldFolder = serverRelativeUrl.substring(0, serverRelativeUrl.lastIndexOf('/'));
+                const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                const serverRelativeUrlWithoutOldFolder = serverRelativePath.substring(0, serverRelativePath.lastIndexOf('/'));
                 const renamedServerRelativeUrl = `${serverRelativeUrlWithoutOldFolder}/${args.options.name}`;
                 const requestOptions = {
                     url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-list.js

@@ -46,8 +46,21 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand_1.defau
                     throw response.ErrorInfo.ErrorMessage;
                 }
                 else {
+                    let spoWebAppServicePrincipalPermissionRequestResult = [];
                     const result = json[json.length - 1]._Child_Items_;
-                    logger.log(result.map(r => {
+                    if (result.length > 0) {
+                        const spoClientExtensibilityWebApplicationPrincipalId = yield this.getSPOClientExtensibilityWebApplicationPrincipalId();
+                        if (spoClientExtensibilityWebApplicationPrincipalId !== null) {
+                            const oAuth2PermissionGrants = yield this.getOAuth2PermissionGrants(spoClientExtensibilityWebApplicationPrincipalId);
+                            if (oAuth2PermissionGrants) {
+                                spoWebAppServicePrincipalPermissionRequestResult = result.filter(x => oAuth2PermissionGrants.indexOf(x.Scope) === -1);
+                            }
+                        }
+                    }
+                    if (spoWebAppServicePrincipalPermissionRequestResult.length === 0) {
+                        spoWebAppServicePrincipalPermissionRequestResult = result;
+                    }
+                    logger.log(spoWebAppServicePrincipalPermissionRequestResult.map(r => {
                         return {
                             Id: r.Id.replace('/Guid(', '').replace(')/', ''),
                             Resource: r.Resource,
@@ -62,6 +75,38 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand_1.defau
             }
         });
     }
+    getOAuth2PermissionGrants(spoClientExtensibilityWebApplicationPrincipalId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `https://graph.microsoft.com/v1.0/oAuth2Permissiongrants/?$filter=clientId eq '${spoClientExtensibilityWebApplicationPrincipalId}' and consentType eq 'AllPrincipals'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            if (response.value && response.value.length > 0) {
+                return response.value[0].scope.split(' ');
+            }
+            return null;
+        });
+    }
+    getSPOClientExtensibilityWebApplicationPrincipalId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `https://graph.microsoft.com/v1.0/servicePrincipals/?$filter=displayName eq 'SharePoint Online Client Extensibility Web Application Principal'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            if (response.value && response.value.length > 0) {
+                return response.value[0].id;
+            }
+            return null;
+        });
+    }
 }
 module.exports = new SpoServicePrincipalPermissionRequestListCommand();
 //# sourceMappingURL=serviceprincipal-permissionrequest-list.js.map

package/dist/utils/spo.js

@@ -453,7 +453,7 @@ exports.spo = {
      * Retrieves the SiteId, VroomItemId and VroomDriveId from a specific file.
      * @param webUrl Web url
      * @param fileId GUID ID of the file
-     * @param fileUrl Decoded URL of the file
+     * @param fileUrl Decoded site-relative or server-relative URL of the file
      */
     getVroomFileDetails(webUrl, fileId, fileUrl) {
         return __awaiter(this, void 0, void 0, function* () {

package/docs/docs/cmd/spo/file/file-add.md

@@ -14,7 +14,7 @@ m365 spo file add [options]
 : The URL of the site where the file should be uploaded to
 
 `-f, --folder <folder>`
-: Site-relative or server-relative URL to the folder where the file should be uploaded
+: The server- or site-relative URL to the folder where the file should be uploaded
 
 `-p, --path <path>`
 : Local path to the file to upload

package/docs/docs/cmd/spo/file/file-checkin.md

@@ -14,7 +14,7 @@ m365 spo file checkin [options]
 : The URL of the site where the file is located
 
 `-f, --url [url]`
-: The server-relative URL of the file to retrieve. Specify either `url` or `id` but not both
+: The server- or site-relative URL of the file to retrieve. Specify either `url` or `id` but not both
 
 `-i, --id [id]`
 : The UniqueId (GUID) of the file to retrieve. Specify either `url` or `id` but not both

package/docs/docs/cmd/spo/file/file-checkout.md

@@ -14,7 +14,7 @@ m365 spo file checkout [options]
 : The URL of the site where the file is located
 
 `-f, --url [url]`
-: The server-relative URL of the file to retrieve. Specify either `url` or `id` but not both
+: The server- or site-relative URL of the file to retrieve. Specify either `url` or `id` but not both
 
 `-i, --id [id]`
 : The UniqueId (GUID) of the file to retrieve. Specify either `url` or `id` but not both

package/docs/docs/cmd/spo/file/file-copy.md

@@ -14,7 +14,7 @@ m365 spo file copy [options]
 : The URL of the site where the file is located.
 
 `-s, --sourceUrl <sourceUrl>`
-: Server-relative or absolute URL of the file.
+: Site-relative, server-relative or absolute URL of the file.
 
 `-t, --targetUrl <targetUrl>`
 : Server-relative or absolute URL of the location.