@pnp/cli-microsoft365 6.3.0-beta.64eb7da → 6.3.0-beta.861847a

package/dist/m365/purview/commands/retentioneventtype/retentioneventtype-set.js

@@ -0,0 +1,90 @@
+"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 _PurviewRetentionEventTypeSetCommand_instances, _PurviewRetentionEventTypeSetCommand_initTelemetry, _PurviewRetentionEventTypeSetCommand_initOptions, _PurviewRetentionEventTypeSetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
+const validation_1 = require("../../../../utils/validation");
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+const accessToken_1 = require("../../../../utils/accessToken");
+class PurviewRetentionEventTypeSetCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.RETENTIONEVENTTYPE_SET;
+    }
+    get description() {
+        return 'Update a retention event type';
+    }
+    constructor() {
+        super();
+        _PurviewRetentionEventTypeSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventTypeSetCommand_instances, "m", _PurviewRetentionEventTypeSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventTypeSetCommand_instances, "m", _PurviewRetentionEventTypeSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventTypeSetCommand_instances, "m", _PurviewRetentionEventTypeSetCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken)) {
+                this.handleError('This command does not support application permissions.');
+            }
+            if (this.verbose) {
+                logger.log(`Updating retention event type with id ${args.options.id}`);
+            }
+            try {
+                const requestBody = {
+                    description: args.options.description
+                };
+                const requestOptions = {
+                    url: `${this.resource}/beta/security/triggerTypes/retentionEventTypes/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json'
+                    },
+                    responseType: 'json',
+                    data: requestBody
+                };
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_PurviewRetentionEventTypeSetCommand_instances = new WeakSet(), _PurviewRetentionEventTypeSetCommand_initTelemetry = function _PurviewRetentionEventTypeSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            description: typeof args.options.description !== 'undefined'
+        });
+    });
+}, _PurviewRetentionEventTypeSetCommand_initOptions = function _PurviewRetentionEventTypeSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '-d, --description [description]'
+    });
+}, _PurviewRetentionEventTypeSetCommand_initValidators = function _PurviewRetentionEventTypeSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
+            return `'${args.options.id}' is not a valid GUID.`;
+        }
+        if (!args.options.description) {
+            return 'Specify at least one option to update.';
+        }
+        return true;
+    }));
+};
+module.exports = new PurviewRetentionEventTypeSetCommand();
+//# sourceMappingURL=retentioneventtype-set.js.map

package/dist/m365/purview/commands.js

@@ -2,8 +2,14 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'purview';
 exports.default = {
-    RETENTIONEVENTTYPE_GET: `${prefix} retentioneventtype get`,
     AUDITLOG_LIST: `${prefix} auditlog list`,
+    RETENTIONEVENT_GET: `${prefix} retentionevent get`,
+    RETENTIONEVENT_LIST: `${prefix} retentionevent list`,
+    RETENTIONEVENTTYPE_ADD: `${prefix} retentioneventtype add`,
+    RETENTIONEVENTTYPE_GET: `${prefix} retentioneventtype get`,
+    RETENTIONEVENTTYPE_LIST: `${prefix} retentioneventtype list`,
+    RETENTIONEVENTTYPE_REMOVE: `${prefix} retentioneventtype remove`,
+    RETENTIONEVENTTYPE_SET: `${prefix} retentioneventtype set`,
     RETENTIONLABEL_ADD: `${prefix} retentionlabel add`,
     RETENTIONLABEL_GET: `${prefix} retentionlabel get`,
     RETENTIONLABEL_LIST: `${prefix} retentionlabel list`,

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

@@ -0,0 +1,95 @@
+"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 _SpoApplicationCustomizerAddCommand_instances, _SpoApplicationCustomizerAddCommand_initOptions, _SpoApplicationCustomizerAddCommand_initTelemetry, _SpoApplicationCustomizerAddCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const spoCustomActionAddCommand = require("../customaction/customaction-add");
+class SpoApplicationCustomizerAddCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.APPLICATIONCUSTOMIZER_ADD;
+    }
+    get description() {
+        return 'Add an application customizer to a site.';
+    }
+    constructor() {
+        super();
+        _SpoApplicationCustomizerAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerAddCommand_instances, "m", _SpoApplicationCustomizerAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerAddCommand_instances, "m", _SpoApplicationCustomizerAddCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerAddCommand_instances, "m", _SpoApplicationCustomizerAddCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Adding application customizer with title '${args.options.title}' and clientSideComponentId '${args.options.clientSideComponentId}' to the site`);
+            }
+            const options = {
+                webUrl: args.options.webUrl,
+                name: args.options.title,
+                title: args.options.title,
+                clientSideComponentId: args.options.clientSideComponentId,
+                clientSideComponentProperties: args.options.clientSideComponentProperties || '',
+                location: 'ClientSideExtension.ApplicationCustomizer',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            yield Cli_1.Cli.executeCommand(spoCustomActionAddCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        });
+    }
+}
+_SpoApplicationCustomizerAddCommand_instances = new WeakSet(), _SpoApplicationCustomizerAddCommand_initOptions = function _SpoApplicationCustomizerAddCommand_initOptions() {
+    this.options.unshift({
+        option: '-t, --title <title>'
+    }, {
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-i, --clientSideComponentId <clientSideComponentId>'
+    }, {
+        option: '--clientSideComponentProperties [clientSideComponentProperties]'
+    });
+}, _SpoApplicationCustomizerAddCommand_initTelemetry = function _SpoApplicationCustomizerAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined'
+        });
+    });
+}, _SpoApplicationCustomizerAddCommand_initValidators = function _SpoApplicationCustomizerAddCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.webUrl) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
+        }
+        if (!validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
+            return `${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        if (args.options.clientSideComponentProperties) {
+            try {
+                JSON.parse(args.options.clientSideComponentProperties);
+            }
+            catch (e) {
+                return `An error has occurred while parsing clientSideComponentProperties: ${e}`;
+            }
+        }
+        return true;
+    }));
+};
+module.exports = new SpoApplicationCustomizerAddCommand();
+//# sourceMappingURL=applicationcustomizer-add.js.map

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-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

@@ -16,9 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFileSharingLinkListCommand_instances, _SpoFileSharingLinkListCommand_initTelemetry, _SpoFileSharingLinkListCommand_initOptions, _SpoFileSharingLinkListCommand_initValidators, _SpoFileSharingLinkListCommand_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 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");
@@ -46,7 +45,7 @@ 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}'`;
@@ -72,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) => {
@@ -109,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* () {
@@ -121,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) => {