@pnp/cli-microsoft365 6.2.0 → 6.3.0-beta.1336e33

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

@@ -15,8 +15,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoCustomActionGetCommand_instances, _SpoCustomActionGetCommand_initTelemetry, _SpoCustomActionGetCommand_initOptions, _SpoCustomActionGetCommand_initValidators, _SpoCustomActionGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -38,19 +38,8 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                let customAction;
-                if (args.options.scope && args.options.scope.toLowerCase() !== "all") {
-                    customAction = yield this.getCustomAction(args.options);
-                }
-                else {
-                    customAction = yield this.searchAllScopes(args.options);
-                }
-                if (customAction["odata.null"] === true) {
-                    if (this.verbose) {
-                        logger.logToStderr(`Custom action with id ${args.options.id} not found`);
-                    }
-                }
-                else {
+                const customAction = yield this.getCustomAction(args.options);
+                if (customAction) {
                     logger.log({
                         ClientSideComponentId: customAction.ClientSideComponentId,
                         ClientSideComponentProperties: customAction.ClientSideComponentProperties,
@@ -80,60 +69,22 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
         });
     }
     getCustomAction(options) {
-        const filter = options.id ?
-            `('${formatting_1.formatting.encodeQueryParameter(options.id)}')` :
-            `?$filter=Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`;
-        const requestOptions = {
-            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions${filter}`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        if (options.id) {
-            return request_1.default
-                .get(requestOptions)
-                .then((res) => {
-                return Promise.resolve(res);
-            });
-        }
-        return request_1.default
-            .get(requestOptions)
-            .then((res) => {
-            if (res.value.length === 1) {
-                return Promise.resolve(res.value[0]);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.id) {
+                const customAction = yield spo_1.spo.getCustomActionById(options.webUrl, options.id, options.scope);
+                if (!customAction) {
+                    throw `No user custom action with id '${options.id}' found`;
+                }
+                return customAction;
             }
-            if (res.value.length === 0) {
-                return Promise.reject(`No user custom action with title '${options.title}' found`);
+            const customActions = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`);
+            if (customActions.length === 1) {
+                return customActions[0];
             }
-            return Promise.reject(`Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${res.value.map(a => a.Id).join(', ')}`);
-        });
-    }
-    /**
-     * Get request with `web` scope is send first.
-     * If custom action not found then
-     * another get request is send with `site` scope.
-     */
-    searchAllScopes(options) {
-        return new Promise((resolve, reject) => {
-            options.scope = "Web";
-            this
-                .getCustomAction(options)
-                .then((webResult) => {
-                if (webResult["odata.null"] !== true) {
-                    return resolve(webResult);
-                }
-                options.scope = "Site";
-                this
-                    .getCustomAction(options)
-                    .then((siteResult) => {
-                    return resolve(siteResult);
-                }, (err) => {
-                    reject(err);
-                });
-            }, (err) => {
-                reject(err);
-            });
+            if (customActions.length === 0) {
+                throw `No user custom action with title '${options.title}' found`;
+            }
+            throw `Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${customActions.map(a => a.Id).join(', ')}`;
         });
     }
     humanizeScope(scope) {

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

@@ -15,7 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoCustomActionListCommand_instances, _SpoCustomActionListCommand_initTelemetry, _SpoCustomActionListCommand_initOptions, _SpoCustomActionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const odata_1 = require("../../../../utils/odata");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -44,13 +44,7 @@ class SpoCustomActionListCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Attempt to get custom actions list with scope: ${scope}`);
                     logger.logToStderr('');
                 }
-                let customActions;
-                if (scope && scope.toLowerCase() !== "all") {
-                    customActions = yield this.getCustomActions(args.options);
-                }
-                else {
-                    customActions = yield this.searchAllScopes(args.options);
-                }
+                const customActions = yield spo_1.spo.getCustomActions(args.options.webUrl, args.options.scope);
                 if (customActions.length === 0) {
                     if (this.verbose) {
                         logger.logToStderr(`Custom actions not found`);
@@ -68,34 +62,6 @@ class SpoCustomActionListCommand extends SpoCommand_1.default {
             }
         });
     }
-    getCustomActions(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const response = yield odata_1.odata.getAllItems(`${options.webUrl}/_api/${options.scope}/UserCustomActions`);
-            return response;
-        });
-    }
-    /**
-     * Two REST GET requests with `web` and `site` scope are sent.
-     * The results are combined in one array.
-     */
-    searchAllScopes(options) {
-        return new Promise((resolve, reject) => {
-            options.scope = "Web";
-            let webCustomActions = [];
-            this
-                .getCustomActions(options)
-                .then((customActions) => {
-                webCustomActions = customActions;
-                options.scope = "Site";
-                return this.getCustomActions(options);
-            })
-                .then((siteCustomActions) => {
-                resolve(siteCustomActions.concat(webCustomActions));
-            }, (err) => {
-                reject(err);
-            });
-        });
-    }
     humanizeScope(scope) {
         switch (scope) {
             case 2:

package/dist/m365/spo/commands/customaction/customaction-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 spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -74,26 +75,18 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
         });
     }
     getCustomActionId(options) {
-        if (options.id) {
-            return Promise.resolve(options.id);
-        }
-        const customActionRequestOptions = {
-            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions?$filter=Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(customActionRequestOptions)
-            .then((res) => {
-            if (res.value.length === 1) {
-                return Promise.resolve(res.value[0].Id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.id) {
+                return Promise.resolve(options.id);
+            }
+            const customActions = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`);
+            if (customActions.length === 1) {
+                return customActions[0].Id;
             }
-            if (res.value.length === 0) {
-                return Promise.reject(`No user custom action with title '${options.title}' found`);
+            if (customActions.length === 0) {
+                throw `No user custom action with title '${options.title}' found`;
             }
-            return Promise.reject(`Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${res.value.map(a => a.Id).join(', ')}`);
+            throw `Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${customActions.map(a => a.Id).join(', ')}`;
         });
     }
     removeScopedCustomAction(options) {

package/dist/m365/spo/commands/file/GraphFileDetails.js

@@ -1,3 +1,2 @@
 "use strict";
-Object.defineProperty(exports, "__esModule", { value: true });
 //# sourceMappingURL=GraphFileDetails.js.map

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

@@ -15,6 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileSharingInfoGetCommand_instances, _SpoFileSharingInfoGetCommand_initTelemetry, _SpoFileSharingInfoGetCommand_initOptions, _SpoFileSharingInfoGetCommand_initValidators, _SpoFileSharingInfoGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
@@ -60,7 +61,7 @@ class SpoFileSharingInfoGetCommand extends SpoCommand_1.default {
                 // typically, we don't do this, but in this case, we need to due to
                 // the complexity of the retrieved object and the fact that we can't
                 // use the generic way of simplifying the output
-                if (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(res);
                 }
                 else {

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileSharingLinkAddCommand_instances, _SpoFileSharingLinkAddCommand_initTelemetry, _SpoFileSharingLinkAddCommand_initOptions, _SpoFileSharingLinkAddCommand_initValidators, _SpoFileSharingLinkAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -41,7 +41,7 @@ class SpoFileSharingLinkAddCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Creating a sharing link for file ${args.options.fileId || args.options.fileUrl}...`);
             }
             try {
-                const fileDetails = yield this.getFileDetails(args.options.webUrl, args.options.fileId, args.options.fileUrl);
+                const fileDetails = yield spo_1.spo.getVroomFileDetails(args.options.webUrl, args.options.fileId, args.options.fileUrl);
                 const requestOptions = {
                     url: `https://graph.microsoft.com/v1.0/sites/${fileDetails.SiteId}/drives/${fileDetails.VroomDriveID}/items/${fileDetails.VroomItemID}/createLink`,
                     headers: {
@@ -62,26 +62,6 @@ class SpoFileSharingLinkAddCommand extends SpoCommand_1.default {
             }
         });
     }
-    getFileDetails(webUrl, fileId, fileUrl) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${webUrl}/_api/web/`;
-            if (fileId) {
-                requestUrl += `GetFileById('${fileId}')`;
-            }
-            else if (fileUrl) {
-                requestUrl += `GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(fileUrl)}')`;
-            }
-            const requestOptions = {
-                url: requestUrl += '?$select=SiteId,VroomItemId,VroomDriveId',
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const res = yield request_1.default.get(requestOptions);
-            return res;
-        });
-    }
 }
 _SpoFileSharingLinkAddCommand_instances = new WeakSet(), _SpoFileSharingLinkAddCommand_initTelemetry = function _SpoFileSharingLinkAddCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -0,0 +1,137 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoFileSharingLinkClearCommand_instances, _SpoFileSharingLinkClearCommand_initTelemetry, _SpoFileSharingLinkClearCommand_initOptions, _SpoFileSharingLinkClearCommand_initValidators, _SpoFileSharingLinkClearCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const Cli_1 = require("../../../../cli/Cli");
+const spoFileSharingLinkListCommand = require("./file-sharinglink-list");
+const request_1 = require("../../../../request");
+const spo_1 = require("../../../../utils/spo");
+class SpoFileSharingLinkClearCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.FILE_SHARINGLINK_CLEAR;
+    }
+    get description() {
+        return 'Removes sharing links of a file';
+    }
+    constructor() {
+        super();
+        _SpoFileSharingLinkClearCommand_instances.add(this);
+        this.allowedScopes = ['anonymous', 'users', 'organization'];
+        __classPrivateFieldGet(this, _SpoFileSharingLinkClearCommand_instances, "m", _SpoFileSharingLinkClearCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkClearCommand_instances, "m", _SpoFileSharingLinkClearCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkClearCommand_instances, "m", _SpoFileSharingLinkClearCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileSharingLinkClearCommand_instances, "m", _SpoFileSharingLinkClearCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const clearSharingLinks = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (this.verbose) {
+                        logger.logToStderr(`Clearing sharing links for file ${args.options.fileUrl || args.options.fileId}${args.options.scope ? ` with scope ${args.options.scope}` : ''}`);
+                    }
+                    const fileDetails = yield spo_1.spo.getVroomFileDetails(args.options.webUrl, args.options.fileId, args.options.fileUrl);
+                    const sharingLinks = yield this.getFileSharingLinks(args.options.webUrl, args.options.fileId, args.options.fileUrl, args.options.scope);
+                    const requestOptions = {
+                        headers: {
+                            accept: 'application/json;odata.metadata=none'
+                        },
+                        responseType: 'json'
+                    };
+                    for (const sharingLink of sharingLinks) {
+                        requestOptions.url = `https://graph.microsoft.com/v1.0/sites/${fileDetails.SiteId}/drives/${fileDetails.VroomDriveID}/items/${fileDetails.VroomItemID}/permissions/${sharingLink.id}`;
+                        yield request_1.default.delete(requestOptions);
+                    }
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield clearSharingLinks();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to clear the sharing links of file ${args.options.fileUrl || args.options.fileId}${args.options.scope ? ` with scope ${args.options.scope}` : ''}?`
+                });
+                if (result.continue) {
+                    yield clearSharingLinks();
+                }
+            }
+        });
+    }
+    getFileSharingLinks(webUrl, fileId, fileUrl, scope) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const sharingLinkListOptions = {
+                webUrl: webUrl,
+                fileId: fileId,
+                fileUrl: fileUrl,
+                scope: scope,
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const commandOutput = yield Cli_1.Cli.executeCommandWithOutput(spoFileSharingLinkListCommand, { options: Object.assign(Object.assign({}, sharingLinkListOptions), { _: [] }) });
+            const outputParsed = JSON.parse(commandOutput.stdout);
+            return outputParsed;
+        });
+    }
+}
+_SpoFileSharingLinkClearCommand_instances = new WeakSet(), _SpoFileSharingLinkClearCommand_initTelemetry = function _SpoFileSharingLinkClearCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            fileUrl: typeof args.options.fileUrl !== 'undefined',
+            fileId: typeof args.options.fileId !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoFileSharingLinkClearCommand_initOptions = function _SpoFileSharingLinkClearCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--fileUrl [fileUrl]'
+    }, {
+        option: '--fileId [fileId]'
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: this.allowedScopes
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFileSharingLinkClearCommand_initValidators = function _SpoFileSharingLinkClearCommand_initValidators() {
+    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.fileId && !validation_1.validation.isValidGuid(args.options.fileId)) {
+            return `${args.options.fileId} is not a valid GUID`;
+        }
+        if (args.options.scope && this.allowedScopes.indexOf(args.options.scope) === -1) {
+            return `'${args.options.scope}' is not a valid scope. Allowed values are: ${this.allowedScopes.join(',')}`;
+        }
+        return true;
+    }));
+}, _SpoFileSharingLinkClearCommand_initOptionSets = function _SpoFileSharingLinkClearCommand_initOptionSets() {
+    this.optionSets.push({ options: ['fileUrl', 'fileId'] });
+};
+module.exports = new SpoFileSharingLinkClearCommand();
+//# sourceMappingURL=file-sharinglink-clear.js.map

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

@@ -16,8 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileSharingLinkGetCommand_instances, _SpoFileSharingLinkGetCommand_initTelemetry, _SpoFileSharingLinkGetCommand_initOptions, _SpoFileSharingLinkGetCommand_initValidators, _SpoFileSharingLinkGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const formatting_1 = require("../../../../utils/formatting");
-const urlUtil_1 = require("../../../../utils/urlUtil");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -42,7 +41,7 @@ class SpoFileSharingLinkGetCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving sharing link for file ${args.options.fileUrl || args.options.fileId} with id ${args.options.id}...`);
             }
             try {
-                const fileDetails = yield this.getNeededFileInformation(args);
+                const fileDetails = yield spo_1.spo.getVroomFileDetails(args.options.webUrl, args.options.fileId, args.options.fileUrl);
                 const requestOptions = {
                     url: `https://graph.microsoft.com/v1.0/sites/${fileDetails.SiteId}/drives/${fileDetails.VroomDriveID}/items/${fileDetails.VroomItemID}/permissions/${args.options.id}`,
                     headers: {
@@ -58,28 +57,6 @@ class SpoFileSharingLinkGetCommand extends SpoCommand_1.default {
             }
         });
     }
-    getNeededFileInformation(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${args.options.webUrl}/_api/web/`;
-            if (args.options.fileUrl) {
-                const fileServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-                requestUrl += `GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(fileServerRelativeUrl)}')`;
-            }
-            else {
-                requestUrl += `GetFileById('${args.options.fileId}')`;
-            }
-            requestUrl += '?$select=SiteId,VroomItemId,VroomDriveId';
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const res = yield request_1.default.get(requestOptions);
-            return res;
-        });
-    }
 }
 _SpoFileSharingLinkGetCommand_instances = new WeakSet(), _SpoFileSharingLinkGetCommand_initTelemetry = function _SpoFileSharingLinkGetCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -15,9 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoFileSharingLinkListCommand_instances, _SpoFileSharingLinkListCommand_initTelemetry, _SpoFileSharingLinkListCommand_initOptions, _SpoFileSharingLinkListCommand_initValidators, _SpoFileSharingLinkListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const request_1 = require("../../../../request");
-const formatting_1 = require("../../../../utils/formatting");
+const Cli_1 = require("../../../../cli/Cli");
 const odata_1 = require("../../../../utils/odata");
+const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -45,13 +45,13 @@ class SpoFileSharingLinkListCommand extends SpoCommand_1.default {
                 logger.logToStderr(`Retrieving sharing links for file ${args.options.fileId || args.options.fileUrl}...`);
             }
             try {
-                const fileDetails = yield this.getFileDetails(args.options.webUrl, args.options.fileId, args.options.fileUrl);
+                const fileDetails = yield spo_1.spo.getVroomFileDetails(args.options.webUrl, args.options.fileId, args.options.fileUrl);
                 let url = `https://graph.microsoft.com/v1.0/sites/${fileDetails.SiteId}/drives/${fileDetails.VroomDriveID}/items/${fileDetails.VroomItemID}/permissions?$filter=Link ne null`;
                 if (args.options.scope) {
                     url += ` and Link/Scope eq '${args.options.scope}'`;
                 }
                 const sharingLinks = yield odata_1.odata.getAllItems(url);
-                if (!args.options.output || args.options.output === 'json' || args.options.output === 'md') {
+                if (!args.options.output || !Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(sharingLinks);
                 }
                 else {
@@ -71,26 +71,6 @@ class SpoFileSharingLinkListCommand extends SpoCommand_1.default {
             }
         });
     }
-    getFileDetails(webUrl, fileId, fileUrl) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${webUrl}/_api/web/`;
-            if (fileId) {
-                requestUrl += `GetFileById('${fileId}')`;
-            }
-            else if (fileUrl) {
-                requestUrl += `GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(fileUrl)}')`;
-            }
-            const requestOptions = {
-                url: requestUrl += '?$select=SiteId,VroomItemId,VroomDriveId',
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const res = yield request_1.default.get(requestOptions);
-            return res;
-        });
-    }
 }
 _SpoFileSharingLinkListCommand_instances = new WeakSet(), _SpoFileSharingLinkListCommand_initTelemetry = function _SpoFileSharingLinkListCommand_initTelemetry() {
     this.telemetry.push((args) => {
@@ -108,8 +88,8 @@ _SpoFileSharingLinkListCommand_instances = new WeakSet(), _SpoFileSharingLinkLis
     }, {
         option: '--fileUrl [fileUrl]'
     }, {
-        option: '--scope [scope]',
-        autocomplete: SpoFileSharingLinkListCommand.scope
+        option: '-s, --scope [scope]',
+        autocomplete: SpoFileSharingLinkListCommand.allowedScopes
     });
 }, _SpoFileSharingLinkListCommand_initValidators = function _SpoFileSharingLinkListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -120,14 +100,14 @@ _SpoFileSharingLinkListCommand_instances = new WeakSet(), _SpoFileSharingLinkLis
         if (args.options.fileId && !validation_1.validation.isValidGuid(args.options.fileId)) {
             return `${args.options.fileId} is not a valid GUID`;
         }
-        if (args.options.scope && SpoFileSharingLinkListCommand.scope.indexOf(args.options.scope) === -1) {
-            return `'${args.options.scope}' is not a valid scope. Allowed values are: ${SpoFileSharingLinkListCommand.scope.join(',')}`;
+        if (args.options.scope && SpoFileSharingLinkListCommand.allowedScopes.indexOf(args.options.scope) === -1) {
+            return `'${args.options.scope}' is not a valid scope. Allowed values are: ${SpoFileSharingLinkListCommand.allowedScopes.join(',')}`;
         }
         return true;
     }));
 }, _SpoFileSharingLinkListCommand_initOptionSets = function _SpoFileSharingLinkListCommand_initOptionSets() {
     this.optionSets.push({ options: ['fileId', 'fileUrl'] });
 };
-SpoFileSharingLinkListCommand.scope = ['anonymous', 'users', 'organization'];
+SpoFileSharingLinkListCommand.allowedScopes = ['anonymous', 'users', 'organization'];
 module.exports = new SpoFileSharingLinkListCommand();
 //# sourceMappingURL=file-sharinglink-list.js.map

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

@@ -17,8 +17,7 @@ var _SpoFileSharingLinkRemoveCommand_instances, _SpoFileSharingLinkRemoveCommand
 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 spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -44,7 +43,7 @@ class SpoFileSharingLinkRemoveCommand extends SpoCommand_1.default {
                     if (this.verbose) {
                         logger.logToStderr(`Removing sharing link of file ${args.options.fileUrl || args.options.fileId} with id ${args.options.id}...`);
                     }
-                    const fileDetails = yield this.getNeededFileInformation(args);
+                    const fileDetails = yield spo_1.spo.getVroomFileDetails(args.options.webUrl, args.options.fileId, args.options.fileUrl);
                     const requestOptions = {
                         url: `https://graph.microsoft.com/v1.0/sites/${fileDetails.SiteId}/drives/${fileDetails.VroomDriveID}/items/${fileDetails.VroomItemID}/permissions/${args.options.id}`,
                         headers: {
@@ -74,28 +73,6 @@ class SpoFileSharingLinkRemoveCommand extends SpoCommand_1.default {
             }
         });
     }
-    getNeededFileInformation(args) {
-        return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${args.options.webUrl}/_api/web/`;
-            if (args.options.fileUrl) {
-                const fileServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-                requestUrl += `GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(fileServerRelativeUrl)}')`;
-            }
-            else {
-                requestUrl += `GetFileById('${args.options.fileId}')`;
-            }
-            requestUrl += '?$select=SiteId,VroomItemId,VroomDriveId';
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            const res = yield request_1.default.get(requestOptions);
-            return res;
-        });
-    }
 }
 _SpoFileSharingLinkRemoveCommand_instances = new WeakSet(), _SpoFileSharingLinkRemoveCommand_initTelemetry = function _SpoFileSharingLinkRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {