@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7920dfd

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

@@ -13,10 +13,11 @@ 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 _SpoFileCheckoutCommand_instances, _SpoFileCheckoutCommand_initTelemetry, _SpoFileCheckoutCommand_initOptions, _SpoFileCheckoutCommand_initValidators;
+var _SpoFileCheckoutCommand_instances, _SpoFileCheckoutCommand_initTelemetry, _SpoFileCheckoutCommand_initOptions, _SpoFileCheckoutCommand_initValidators, _SpoFileCheckoutCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileCheckoutCommand extends SpoCommand_1.default {
@@ -26,6 +27,7 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutCommand_instances, "m", _SpoFileCheckoutCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.FILE_CHECKOUT;
@@ -33,60 +35,61 @@ class SpoFileCheckoutCommand extends SpoCommand_1.default {
     get description() {
         return 'Checks out specified file';
     }
-    commandAction(logger, args, cb) {
-        let requestUrl = '';
-        if (args.options.id) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${encodeURIComponent(args.options.id)}')/checkout`;
-        }
-        if (args.options.fileUrl) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(args.options.fileUrl)}')/checkout`;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = '';
+            if (args.options.id) {
+                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 requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoFileCheckoutCommand_instances = new WeakSet(), _SpoFileCheckoutCommand_initTelemetry = function _SpoFileCheckoutCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             id: (!(!args.options.id)).toString(),
-            fileUrl: (!(!args.options.fileUrl)).toString()
+            url: (!(!args.options.url)).toString()
         });
     });
 }, _SpoFileCheckoutCommand_initOptions = function _SpoFileCheckoutCommand_initOptions() {
     this.options.unshift({
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-f, --fileUrl [fileUrl]'
+        option: '-f, --url [url]'
     }, {
         option: '-i, --id [id]'
     });
 }, _SpoFileCheckoutCommand_initValidators = function _SpoFileCheckoutCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.id) {
-            if (!utils_1.validation.isValidGuid(args.options.id)) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (args.options.id && args.options.fileUrl) {
-            return 'Specify either id or fileUrl but not both';
-        }
-        if (!args.options.id && !args.options.fileUrl) {
-            return 'Specify id or fileUrl, one is required';
-        }
         return true;
     }));
+}, _SpoFileCheckoutCommand_initOptionSets = function _SpoFileCheckoutCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'url'] });
 };
 module.exports = new SpoFileCheckoutCommand();
 //# sourceMappingURL=file-checkout.js.map

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

@@ -15,15 +15,16 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileCopyCommand_instances, _SpoFileCopyCommand_initTelemetry, _SpoFileCopyCommand_initOptions, _SpoFileCopyCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const url = require("url");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileCopyCommand extends SpoCommand_1.default {
     constructor() {
         super();
         _SpoFileCopyCommand_instances.add(this);
+        this.nameConflictBehaviorOptions = ['fail', 'replace', 'rename'];
         __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);
@@ -34,147 +35,58 @@ class SpoFileCopyCommand extends SpoCommand_1.default {
     get description() {
         return 'Copies a file to another location';
     }
-    getExcludedOptionsWithUrls() {
-        return ['targetUrl'];
-    }
-    commandAction(logger, args, cb) {
-        const webUrl = args.options.webUrl;
-        const parsedUrl = url.parse(webUrl);
-        const tenantUrl = `${parsedUrl.protocol}//${parsedUrl.hostname}`;
-        // Check if the source file exists.
-        // Called on purpose, we explicitly check if user specified file
-        // in the sourceUrl option.
-        // The CreateCopyJobs endpoint accepts file, folder or batch from both.
-        // A user might enter folder instead of file as source url by mistake
-        // then there are edge cases when deleteIfAlreadyExists flag is set
-        // the user can receive misleading error message.
-        this
-            .fileExists(tenantUrl, webUrl, args.options.sourceUrl)
-            .then(() => {
-            if (args.options.deleteIfAlreadyExists) {
-                // try delete target file, if deleteIfAlreadyExists flag is set
-                const filename = args.options.sourceUrl.replace(/^.*[\\\/]/, '');
-                return this.recycleFile(tenantUrl, args.options.targetUrl, filename, logger);
-            }
-            return Promise.resolve();
-        })
-            .then(() => {
-            // all preconditions met, now create copy job
-            const sourceAbsoluteUrl = utils_1.urlUtil.urlCombine(webUrl, args.options.sourceUrl);
-            const allowSchemaMismatch = args.options.allowSchemaMismatch || false;
-            const requestUrl = utils_1.urlUtil.urlCombine(webUrl, '/_api/site/CreateCopyJobs');
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata'
-                },
-                data: {
-                    exportObjectUris: [sourceAbsoluteUrl],
-                    destinationUri: utils_1.urlUtil.urlCombine(tenantUrl, args.options.targetUrl),
-                    options: {
-                        "AllowSchemaMismatch": allowSchemaMismatch,
-                        "IgnoreVersionHistory": true
-                    }
-                },
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((jobInfo) => {
-            return new Promise((resolve, reject) => {
-                this.dots = '';
-                const copyJobInfo = jobInfo.value[0];
-                const progressPollInterval = 30 * 60; //used previously implemented interval. The API does not provide guidance on what value should be used.
-                setTimeout(() => {
-                    utils_1.spo.waitUntilCopyJobFinished({
-                        copyJobInfo,
-                        siteUrl: webUrl,
-                        pollingInterval: progressPollInterval,
-                        resolve,
-                        reject,
-                        logger,
-                        dots: this.dots,
-                        debug: this.debug,
-                        verbose: this.verbose
-                    });
-                }, progressPollInterval);
-            });
-        })
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-    }
-    /**
-     * 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('${encodeURIComponent(fileServerRelativeUrl)}')/`;
-        const requestOptions = {
-            url: requestUrl,
-            method: 'GET',
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions);
-    }
-    /**
-     * Moves file in the site recycle bin
-     */
-    recycleFile(tenantUrl, targetUrl, filename, logger) {
-        return new Promise((resolve, reject) => {
-            const targetFolderAbsoluteUrl = utils_1.urlUtil.urlCombine(tenantUrl, targetUrl);
-            // since the target WebFullUrl is unknown we can use getRequestDigestForSite
-            // to get it from target folder absolute url.
-            // Similar approach used here Microsoft.SharePoint.Client.Web.WebUrlFromFolderUrlDirect
-            utils_1.spo
-                .getRequestDigest(targetFolderAbsoluteUrl)
-                .then((contextResponse) => {
-                if (this.debug) {
-                    logger.logToStderr(`contextResponse.WebFullUrl: ${contextResponse.WebFullUrl}`);
+    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}'...`);
                 }
-                if (targetUrl.charAt(0) !== '/') {
-                    targetUrl = `/${targetUrl}`;
+                const sourcePath = this.getAbsoluteUrl(args.options.webUrl, args.options.sourceUrl);
+                let destinationPath = this.getAbsoluteUrl(args.options.webUrl, args.options.targetUrl) + '/';
+                if (args.options.newName) {
+                    destinationPath += args.options.newName;
                 }
-                if (targetUrl.lastIndexOf('/') !== targetUrl.length - 1) {
-                    targetUrl = `${targetUrl}/`;
+                else {
+                    // Keep the original file name
+                    destinationPath += sourcePath.substring(sourcePath.lastIndexOf('/') + 1);
                 }
-                const requestUrl = `${contextResponse.WebFullUrl}/_api/web/GetFileByServerRelativeUrl('${encodeURIComponent(`${targetUrl}${filename}`)}')/recycle()`;
                 const requestOptions = {
-                    url: requestUrl,
-                    method: 'POST',
+                    url: `${args.options.webUrl}/_api/SP.MoveCopyUtil.CopyFileByPath`,
                     headers: {
-                        'X-HTTP-Method': 'DELETE',
-                        'If-Match': '*',
-                        'accept': 'application/json;odata=nometadata'
+                        accept: 'application/json;odata=nometadata'
                     },
-                    responseType: 'json'
-                };
-                request_1.default.post(requestOptions)
-                    .then(() => {
-                    resolve();
-                })
-                    .catch((err) => {
-                    if (err.statusCode === 404) {
-                        // file does not exist so can proceed
-                        return resolve();
+                    responseType: 'json',
+                    data: {
+                        srcPath: {
+                            DecodedUrl: sourcePath
+                        },
+                        destPath: {
+                            DecodedUrl: destinationPath
+                        },
+                        overwrite: args.options.nameConflictBehavior === 'replace',
+                        options: {
+                            KeepBoth: args.options.nameConflictBehavior === 'rename',
+                            ShouldBypassSharedLocks: !!args.options.bypassSharedLock
+                        }
                     }
-                    if (this.debug) {
-                        logger.logToStderr(`recycleFile error...`);
-                        logger.logToStderr(err);
-                    }
-                    reject(err);
-                });
-            }, (e) => reject(e));
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
         });
     }
+    getAbsoluteUrl(webUrl, url) {
+        return url.startsWith('https://') ? url : urlUtil_1.urlUtil.getAbsoluteUrl(webUrl, url);
+    }
 }
 _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry = function _SpoFileCopyCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            deleteIfAlreadyExists: args.options.deleteIfAlreadyExists || false,
-            allowSchemaMismatch: args.options.allowSchemaMismatch || false
+            newName: typeof args.options.newName !== 'undefined',
+            nameConflictBehavior: args.options.nameConflictBehavior || false,
+            bypassSharedLock: !!args.options.bypassSharedLock
         });
     });
 }, _SpoFileCopyCommand_initOptions = function _SpoFileCopyCommand_initOptions() {
@@ -185,12 +97,24 @@ _SpoFileCopyCommand_instances = new WeakSet(), _SpoFileCopyCommand_initTelemetry
     }, {
         option: '-t, --targetUrl <targetUrl>'
     }, {
-        option: '--deleteIfAlreadyExists'
+        option: '--newName [newName]'
+    }, {
+        option: '--nameConflictBehavior [nameConflictBehavior]',
+        autocomplete: this.nameConflictBehaviorOptions
     }, {
-        option: '--allowSchemaMismatch'
+        option: '--bypassSharedLock'
     });
 }, _SpoFileCopyCommand_initValidators = function _SpoFileCopyCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        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 true;
+    }));
 };
 module.exports = new SpoFileCopyCommand();
 //# sourceMappingURL=file-copy.js.map

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

@@ -13,14 +13,17 @@ 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 _SpoFileGetCommand_instances, _SpoFileGetCommand_initTelemetry, _SpoFileGetCommand_initOptions, _SpoFileGetCommand_initValidators;
+var _SpoFileGetCommand_instances, _SpoFileGetCommand_initTelemetry, _SpoFileGetCommand_initOptions, _SpoFileGetCommand_initValidators, _SpoFileGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
+const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
+const RoleType_1 = require("../roledefinition/RoleType");
 class SpoFileGetCommand extends SpoCommand_1.default {
     constructor() {
         super();
@@ -28,6 +31,7 @@ class SpoFileGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoFileGetCommand_instances, "m", _SpoFileGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoFileGetCommand_instances, "m", _SpoFileGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoFileGetCommand_instances, "m", _SpoFileGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileGetCommand_instances, "m", _SpoFileGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.FILE_GET;
@@ -38,78 +42,97 @@ class SpoFileGetCommand extends SpoCommand_1.default {
     getExcludedOptionsWithUrls() {
         return ['url'];
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving file from site ${args.options.webUrl}...`);
-        }
-        let requestUrl = '';
-        let options = '';
-        if (args.options.id) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${encodeURIComponent(args.options.id)}')`;
-        }
-        else if (args.options.url) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl=@f)`;
-        }
-        if (args.options.asListItem) {
-            options = '?$expand=ListItemAllFields';
-        }
-        else if (args.options.asFile || args.options.asString) {
-            options = '/$value';
-        }
-        if (args.options.url) {
-            if (options.indexOf('?') < 0) {
-                options += '?';
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving file from site ${args.options.webUrl}...`);
             }
-            else {
-                options += '&';
+            let requestUrl = '';
+            let options = '';
+            if (args.options.id) {
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
-            options += `@f='${encodeURIComponent(args.options.url)}'`;
-        }
-        const requestOptions = {
-            url: requestUrl + options,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            // Set responseType to arraybuffer, otherwise binary data will be encoded
-            // to utf8 and binary data is corrupt
-            responseType: args.options.asFile ? 'stream' : 'json'
-        };
-        if (args.options.asFile && args.options.path) {
-            request_1.default
-                .get(requestOptions)
-                .then((file) => {
-                return new Promise((resolve, reject) => {
-                    const writer = fs.createWriteStream(args.options.path);
-                    file.data.pipe(writer);
-                    writer.on('error', err => {
-                        reject(err);
-                    });
-                    writer.on('close', () => {
-                        resolve(args.options.path);
-                    });
-                });
-            })
-                .then((file) => {
-                if (this.verbose) {
-                    logger.logToStderr(`File saved to path ${file}`);
+            else if (args.options.url) {
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl=@f)`;
+            }
+            if (args.options.asListItem) {
+                options = '?$expand=ListItemAllFields';
+            }
+            else if (args.options.asFile || args.options.asString) {
+                options = '/$value';
+            }
+            if (args.options.url) {
+                if (options.indexOf('?') < 0) {
+                    options += '?';
                 }
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
-        else {
-            request_1.default
-                .get(requestOptions)
-                .then((file) => {
-                if (args.options.asString) {
-                    logger.log(file.toString());
+                else {
+                    options += '&';
+                }
+                options += `@f='${formatting_1.formatting.encodeQueryParameter(args.options.url)}'`;
+            }
+            const requestOptions = {
+                url: requestUrl + options,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                // Set responseType to arraybuffer, otherwise binary data will be encoded
+                // to utf8 and binary data is corrupt
+                responseType: args.options.asFile ? 'stream' : 'json'
+            };
+            try {
+                const file = yield request_1.default.get(requestOptions);
+                if (args.options.asFile && args.options.path) {
+                    // Not possible to use async/await for this promise
+                    yield new Promise((resolve, reject) => {
+                        const writer = fs.createWriteStream(args.options.path);
+                        file.data.pipe(writer);
+                        writer.on('error', err => {
+                            reject(err);
+                        });
+                        writer.on('close', () => {
+                            const filePath = args.options.path;
+                            if (this.verbose) {
+                                logger.logToStderr(`File saved to path ${filePath}`);
+                            }
+                            return resolve();
+                        });
+                    });
                 }
                 else {
-                    const fileProperties = JSON.parse(JSON.stringify(file));
-                    logger.log(args.options.asListItem ? fileProperties.ListItemAllFields : fileProperties);
+                    if (args.options.asString) {
+                        logger.log(file.toString());
+                    }
+                    else {
+                        const fileProperties = JSON.parse(JSON.stringify(file));
+                        if (args.options.withPermissions) {
+                            requestOptions.url = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(DecodedUrl='${file.ServerRelativeUrl}')/ListItemAllFields/RoleAssignments?$expand=Member,RoleDefinitionBindings`;
+                            const response = yield request_1.default.get(requestOptions);
+                            const roleAssignments = this.setFriendlyPermissions(response.value);
+                            fileProperties.RoleAssignments = roleAssignments;
+                            if (args.options.asListItem) {
+                                fileProperties.ListItemAllFields.RoleAssignments = roleAssignments;
+                            }
+                        }
+                        logger.log(args.options.asListItem ? fileProperties.ListItemAllFields : fileProperties);
+                    }
                 }
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        }
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    setFriendlyPermissions(response) {
+        response.forEach((r) => {
+            r.RoleDefinitionBindings.forEach((r) => {
+                const permissions = new base_permissions_1.BasePermissions();
+                permissions.high = r.BasePermissions.High;
+                permissions.low = r.BasePermissions.Low;
+                r.BasePermissionsValue = permissions.parse();
+                r.RoleTypeKindValue = RoleType_1.RoleType[r.RoleTypeKind];
+            });
+        });
+        return response;
     }
 }
 _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry = function _SpoFileGetCommand_initTelemetry() {
@@ -120,7 +143,8 @@ _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry =
             asString: args.options.asString || false,
             asListItem: args.options.asListItem || false,
             asFile: args.options.asFile || false,
-            path: (!(!args.options.path)).toString()
+            path: (!(!args.options.path)).toString(),
+            withPermissions: !!args.options.withPermissions
         });
     });
 }, _SpoFileGetCommand_initOptions = function _SpoFileGetCommand_initOptions() {
@@ -138,24 +162,20 @@ _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry =
         option: '--asFile'
     }, {
         option: '-p, --path [path]'
+    }, {
+        option: '--withPermissions'
     });
 }, _SpoFileGetCommand_initValidators = function _SpoFileGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.id) {
-            if (!utils_1.validation.isValidGuid(args.options.id)) {
+            if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;
             }
         }
-        if (args.options.id && args.options.url) {
-            return 'Specify id or url, but not both';
-        }
-        if (!args.options.id && !args.options.url) {
-            return 'Specify id or url, one is required';
-        }
         if (args.options.asFile && !args.options.path) {
             return 'The path should be specified when the --asFile option is used';
         }
@@ -174,6 +194,8 @@ _SpoFileGetCommand_instances = new WeakSet(), _SpoFileGetCommand_initTelemetry =
         }
         return true;
     }));
+}, _SpoFileGetCommand_initOptionSets = function _SpoFileGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'url'] });
 };
 module.exports = new SpoFileGetCommand();
 //# sourceMappingURL=file-get.js.map

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

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileListCommand_instances, _SpoFileListCommand_initTelemetry, _SpoFileListCommand_initOptions, _SpoFileListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFileListCommand extends SpoCommand_1.default {
@@ -33,20 +34,25 @@ class SpoFileListCommand extends SpoCommand_1.default {
     get description() {
         return 'Lists all available files in the specified folder and site';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Retrieving all files in folder ${args.options.folder} at site ${args.options.webUrl}...`);
-        }
-        this.getFiles(args.options.folder, args).then((files) => {
-            logger.log(files.value);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Retrieving all files in folder ${args.options.folder} at site ${args.options.webUrl}...`);
+            }
+            try {
+                const files = yield this.getFiles(args.options.folder, args);
+                logger.log(files.value);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     // Gets files from a folder recursively.
     getFiles(folderUrl, args, files = { value: [] }) {
         // If --recursive option is specified, retrieve both Files and Folder details, otherwise only Files.
         const expandParameters = args.options.recursive ? 'Files,Folders' : 'Files';
-        let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${utils_1.formatting.encodeQueryParameter(folderUrl)}')?$expand=${expandParameters}`;
+        let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(folderUrl)}')?$expand=${expandParameters}`;
         if (args.options.output !== 'json') {
             requestUrl += '&$select=Files/UniqueId,Files/Name,Files/ServerRelativeUrl';
         }
@@ -89,7 +95,7 @@ _SpoFileListCommand_instances = new WeakSet(), _SpoFileListCommand_initTelemetry
         option: '-r, --recursive'
     });
 }, _SpoFileListCommand_initValidators = function _SpoFileListCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.webUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.webUrl); }));
 };
 module.exports = new SpoFileListCommand();
 //# sourceMappingURL=file-list.js.map