@pnp/cli-microsoft365 6.9.0-beta.6a23aba → 6.9.0-beta.8393174

package/dist/m365/purview/commands/retentionlabel/retentionlabel-list.js

@@ -9,8 +9,6 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
     });
 };
 Object.defineProperty(exports, "__esModule", { value: true });
-const Auth_1 = require("../../../../Auth");
-const accessToken_1 = require("../../../../utils/accessToken");
 const odata_1 = require("../../../../utils/odata");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
@@ -26,9 +24,6 @@ class PurviewRetentionLabelListCommand extends GraphCommand_1.default {
     }
     commandAction(logger) {
         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.');
-            }
             try {
                 const items = yield odata_1.odata.getAllItems(`${this.resource}/beta/security/labels/retentionLabels`);
                 logger.log(items);

package/dist/m365/purview/commands/retentionlabel/retentionlabel-remove.js

@@ -15,13 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PurviewRetentionLabelRemoveCommand_instances, _PurviewRetentionLabelRemoveCommand_initTelemetry, _PurviewRetentionLabelRemoveCommand_initOptions, _PurviewRetentionLabelRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Auth_1 = require("../../../../Auth");
 const Cli_1 = require("../../../../cli/Cli");
 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 PurviewRetentionLabelRemoveCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.RETENTIONLABEL_REMOVE;
@@ -38,26 +36,8 @@ class PurviewRetentionLabelRemoveCommand extends GraphCommand_1.default {
     }
     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.');
-            }
-            const removeRetentionLabel = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const requestOptions = {
-                        url: `${this.resource}/beta/security/labels/retentionLabels/${args.options.id}`,
-                        headers: {
-                            accept: 'application/json;odata.metadata=none'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeRetentionLabel();
+                yield this.removeRetentionLabel(args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -67,11 +47,28 @@ class PurviewRetentionLabelRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the retention label ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeRetentionLabel();
+                    yield this.removeRetentionLabel(args);
                 }
             }
         });
     }
+    removeRetentionLabel(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/beta/security/labels/retentionLabels/${args.options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _PurviewRetentionLabelRemoveCommand_instances = new WeakSet(), _PurviewRetentionLabelRemoveCommand_initTelemetry = function _PurviewRetentionLabelRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -15,12 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PurviewRetentionLabelSetCommand_instances, _PurviewRetentionLabelSetCommand_initTelemetry, _PurviewRetentionLabelSetCommand_initOptions, _PurviewRetentionLabelSetCommand_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 PurviewRetentionLabelSetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.RETENTIONLABEL_SET;
@@ -41,9 +39,6 @@ class PurviewRetentionLabelSetCommand extends GraphCommand_1.default {
     }
     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(`Starting to update retention label with id ${args.options.id}`);
             }

package/dist/m365/spfx/commands/project/JsonRule.js

@@ -39,7 +39,7 @@ class JsonRule extends Rule_1.Rule {
         return this.getAstNodeForProperty(jsonFile.ast, jsonProperty);
     }
     getAstNodeForProperty(node, jsonProperty) {
-        if (node.children.length === 0) {
+        if (!node.children || node.children.length === 0) {
             return node;
         }
         if (jsonProperty === '') {

package/dist/m365/spfx/commands/project/project-upgrade/rules/FN021003_PKG_engines_node.js

@@ -37,6 +37,7 @@ class FN021003_PKG_engines_node extends JsonRule_1.JsonRule {
             return;
         }
         if (!project.packageJson.engines ||
+            typeof project.packageJson.engines !== 'object' ||
             !project.packageJson.engines.node ||
             project.packageJson.engines.node !== this.version) {
             const node = this.getAstNodeFromFile(project.packageJson, 'engines.node');

package/dist/m365/spo/commands/app/app-teamspackage-download.js

@@ -85,15 +85,14 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand_1.SpoAppBaseCo
         });
     }
     ensureAppInfo(logger, args, appInfo) {
-        if (appInfo.id && appInfo.packageFileName) {
-            return Promise.resolve();
-        }
-        if (args.options.appName && !appInfo.packageFileName) {
-            appInfo.packageFileName = this.getPackageNameFromFileName(args.options.appName);
-        }
-        return this
-            .loadAppCatalogUrl(logger, args)
-            .then(_ => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (appInfo.id && appInfo.packageFileName) {
+                return;
+            }
+            if (args.options.appName && !appInfo.packageFileName) {
+                appInfo.packageFileName = this.getPackageNameFromFileName(args.options.appName);
+            }
+            yield this.loadAppCatalogUrl(logger, args);
             const appCatalogListName = 'AppCatalog';
             const serverRelativeAppCatalogListUrl = `${urlUtil_1.urlUtil.getServerRelativeSiteUrl(this.appCatalogUrl)}/${appCatalogListName}`;
             let url = `${this.appCatalogUrl}/_api/web/`;
@@ -113,39 +112,33 @@ class SpoAppTeamsPackageDownloadCommand extends SpoAppBaseCommand_1.SpoAppBaseCo
                 },
                 responseType: 'json'
             };
-            return request_1.default.get(requestOptions);
-        })
-            .then(res => {
+            const res = yield request_1.default.get(requestOptions);
             if (args.options.appItemUniqueId) {
                 appInfo.id = parseInt(res.Id);
                 if (!appInfo.packageFileName) {
                     appInfo.packageFileName = this.getPackageNameFromFileName(res.File.Name);
                 }
-                return Promise.resolve();
+                return;
             }
             if (args.options.appItemId) {
                 if (!appInfo.packageFileName) {
                     appInfo.packageFileName = this.getPackageNameFromFileName(res.File.Name);
                 }
-                return Promise.resolve();
+                return;
             }
-            // if (args.options.appName)
-            // skipped 'if' clause to provide a default code branch
             appInfo.id = parseInt(res.Id);
-            return Promise.resolve();
         });
     }
     getPackageNameFromFileName(fileName) {
         return `${path.basename(fileName, path.extname(fileName))}.zip`;
     }
     loadAppCatalogUrl(logger, args) {
-        if (this.appCatalogUrl) {
-            return Promise.resolve();
-        }
-        return spo_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then(spoUrl => this.getAppCatalogSiteUrl(logger, spoUrl, args))
-            .then(appCatalogUrl => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.appCatalogUrl) {
+                return;
+            }
+            const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+            const appCatalogUrl = yield this.getAppCatalogSiteUrl(logger, spoUrl, args);
             this.appCatalogUrl = appCatalogUrl;
         });
     }

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

@@ -0,0 +1,154 @@
+"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 _SpoApplicationCustomizerSetCommand_instances, _SpoApplicationCustomizerSetCommand_initOptions, _SpoApplicationCustomizerSetCommand_initTelemetry, _SpoApplicationCustomizerSetCommand_initValidators, _SpoApplicationCustomizerSetCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const spo_1 = require("../../../../utils/spo");
+const formatting_1 = require("../../../../utils/formatting");
+const os = require("os");
+class SpoApplicationCustomizerSetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.APPLICATIONCUSTOMIZER_SET;
+    }
+    get description() {
+        return 'Updates an existing Application Customizer on a site';
+    }
+    constructor() {
+        super();
+        _SpoApplicationCustomizerSetCommand_instances.add(this);
+        this.allowedScopes = ['Site', 'Web', 'All'];
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerSetCommand_instances, "m", _SpoApplicationCustomizerSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerSetCommand_instances, "m", _SpoApplicationCustomizerSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerSetCommand_instances, "m", _SpoApplicationCustomizerSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoApplicationCustomizerSetCommand_instances, "m", _SpoApplicationCustomizerSetCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const appCustomizer = yield this.getAppCustomizerToUpdate(logger, args.options);
+                yield this.updateAppCustomizer(logger, args.options, appCustomizer);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    updateAppCustomizer(logger, options, appCustomizer) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { clientSideComponentProperties, webUrl, newTitle } = options;
+            if (this.verbose) {
+                logger.logToStderr(`Updating application customizer with ID '${appCustomizer.Id}' on the site '${webUrl}'...`);
+            }
+            const requestBody = {};
+            if (newTitle) {
+                requestBody.Title = newTitle;
+            }
+            if (clientSideComponentProperties !== undefined) {
+                requestBody.ClientSideComponentProperties = clientSideComponentProperties;
+            }
+            const requestOptions = {
+                url: `${webUrl}/_api/${appCustomizer.Scope.toString() === '2' ? 'Site' : 'Web'}/UserCustomActions('${appCustomizer.Id}')`,
+                headers: {
+                    accept: 'application/json;odata=nometadata',
+                    'X-HTTP-Method': 'MERGE'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+    getAppCustomizerToUpdate(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const { id, webUrl, title, clientSideComponentId, scope } = options;
+            const resolvedScope = scope || 'All';
+            if (this.verbose) {
+                logger.logToStderr(`Getting application customizer ${title || clientSideComponentId || id} to update...`);
+            }
+            let appCustomizers = [];
+            if (id) {
+                const appCustomizer = yield spo_1.spo.getCustomActionById(webUrl, id, resolvedScope);
+                if (appCustomizer && appCustomizer.Location === 'ClientSideExtension.ApplicationCustomizer') {
+                    appCustomizers.push(appCustomizer);
+                }
+            }
+            else if (title) {
+                appCustomizers = yield spo_1.spo.getCustomActions(webUrl, resolvedScope, `(Title eq '${formatting_1.formatting.encodeQueryParameter(title)}') and (startswith(Location,'ClientSideExtension.ApplicationCustomizer'))`);
+            }
+            else {
+                appCustomizers = yield spo_1.spo.getCustomActions(webUrl, resolvedScope, `(ClientSideComponentId eq guid'${clientSideComponentId}') and (startswith(Location,'ClientSideExtension.ApplicationCustomizer'))`);
+            }
+            if (appCustomizers.length === 0) {
+                throw `No application customizer with ${title && `title '${title}'` || clientSideComponentId && `ClientSideComponentId '${clientSideComponentId}'` || id && `id '${id}'`} found`;
+            }
+            if (appCustomizers.length > 1) {
+                throw `Multiple application customizer with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found. Please disambiguate using IDs: ${os.EOL}${appCustomizers.map(a => `- ${a.Id}`).join(os.EOL)}`;
+            }
+            return appCustomizers[0];
+        });
+    }
+}
+_SpoApplicationCustomizerSetCommand_instances = new WeakSet(), _SpoApplicationCustomizerSetCommand_initOptions = function _SpoApplicationCustomizerSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-c, --clientSideComponentId [clientSideComponentId]'
+    }, {
+        option: '--newTitle [newTitle]'
+    }, {
+        option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
+    }, {
+        option: '-s, --scope [scope]', autocomplete: this.allowedScopes
+    });
+}, _SpoApplicationCustomizerSetCommand_initTelemetry = function _SpoApplicationCustomizerSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            title: typeof args.options.title !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            newTitle: typeof args.options.newTitle !== 'undefined',
+            clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined'
+        });
+    });
+}, _SpoApplicationCustomizerSetCommand_initValidators = function _SpoApplicationCustomizerSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
+            return `${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        if (args.options.scope && this.allowedScopes.indexOf(args.options.scope) === -1) {
+            return `'${args.options.scope}' is not a valid application customizer scope. Allowed values are: ${this.allowedScopes.join(',')}`;
+        }
+        if (!args.options.newTitle && !args.options.clientSideComponentProperties) {
+            return `Please specify an option to be updated`;
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+}, _SpoApplicationCustomizerSetCommand_initOptionSets = function _SpoApplicationCustomizerSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title', 'clientSideComponentId'] });
+};
+module.exports = new SpoApplicationCustomizerSetCommand();
+//# sourceMappingURL=applicationcustomizer-set.js.map

package/dist/m365/spo/commands/commandset/commandset-set.js

@@ -39,7 +39,7 @@ class SpoCommandSetSetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Updating ListView Command Set ${args.options.clientSideComponentId} to site '${args.options.webUrl}'...`);
+                logger.logToStderr(`Updating ListView Command Set ${args.options.id || args.options.title || args.options.clientSideComponentId} to site '${args.options.webUrl}'...`);
             }
             if (!args.options.scope) {
                 args.options.scope = 'All';
@@ -59,6 +59,9 @@ class SpoCommandSetSetCommand extends SpoCommand_1.default {
                 if (args.options.clientSideComponentProperties) {
                     requestBody.ClientSideComponentProperties = args.options.clientSideComponentProperties;
                 }
+                if (args.options.newClientSideComponentId) {
+                    requestBody.ClientSideComponentId = args.options.newClientSideComponentId;
+                }
                 const customAction = yield this.getCustomAction(args.options);
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/${customAction.Scope === 3 ? "Web" : "Site"}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(customAction.Id)}')`,
@@ -127,6 +130,7 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
             title: typeof args.options.title !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            newClientSideComponentId: typeof args.options.newClientSideComponentId !== 'undefined',
             listType: typeof args.options.listType !== 'undefined',
             clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
             scope: typeof args.options.scope !== 'undefined',
@@ -142,6 +146,8 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
         option: '-i, --id [id]'
     }, {
         option: '-c, --clientSideComponentId  [clientSideComponentId]'
+    }, {
+        option: '--newClientSideComponentId  [newClientSideComponentId]'
     }, {
         option: '--newTitle [newTitle]'
     }, {
@@ -161,6 +167,9 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
         if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;
         }
+        if (args.options.newClientSideComponentId && !validation_1.validation.isValidGuid(args.options.newClientSideComponentId)) {
+            return `${args.options.newClientSideComponentId} is not a valid GUID`;
+        }
         if (args.options.listType && SpoCommandSetSetCommand.listTypes.indexOf(args.options.listType) < 0) {
             return `${args.options.listType} is not a valid list type. Allowed values are ${SpoCommandSetSetCommand.listTypes.join(', ')}`;
         }
@@ -170,7 +179,7 @@ _SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_ini
         if (args.options.location && SpoCommandSetSetCommand.locations.indexOf(args.options.location) < 0) {
             return `${args.options.location} is not a valid location. Allowed values are ${SpoCommandSetSetCommand.locations.join(', ')}`;
         }
-        if (!args.options.newTitle && !args.options.listType && !args.options.clientSideComponentProperties && !args.options.location) {
+        if (!args.options.newTitle && !args.options.listType && !args.options.clientSideComponentProperties && !args.options.location && !args.options.newClientSideComponentId) {
             return `Please specify option to be updated`;
         }
         return validation_1.validation.isValidSharePointUrl(args.options.webUrl);

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

@@ -0,0 +1,119 @@
+"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 _SpoFileCheckoutUndoCommand_instances, _SpoFileCheckoutUndoCommand_initTelemetry, _SpoFileCheckoutUndoCommand_initOptions, _SpoFileCheckoutUndoCommand_initValidators, _SpoFileCheckoutUndoCommand_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 urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoFileCheckoutUndoCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.FILE_CHECKOUT_UNDO;
+    }
+    get description() {
+        return 'Discards a checked out file';
+    }
+    constructor() {
+        super();
+        _SpoFileCheckoutUndoCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutUndoCommand_instances, "m", _SpoFileCheckoutUndoCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutUndoCommand_instances, "m", _SpoFileCheckoutUndoCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutUndoCommand_instances, "m", _SpoFileCheckoutUndoCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoFileCheckoutUndoCommand_instances, "m", _SpoFileCheckoutUndoCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const undoCheckout = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    if (this.verbose) {
+                        logger.logToStderr(`Undoing checkout for file ${args.options.fileId || args.options.fileUrl} on web ${args.options.webUrl}`);
+                    }
+                    let requestUrl = `${args.options.webUrl}/_api/web/`;
+                    if (args.options.fileId) {
+                        requestUrl += `getFileById('${args.options.fileId}')`;
+                    }
+                    else if (args.options.fileUrl) {
+                        const serverRelativePath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                        requestUrl += `getFileByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativePath)}')`;
+                    }
+                    requestUrl += '/undocheckout';
+                    const requestOptions = {
+                        url: requestUrl,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield undoCheckout();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to undo the checkout for file ${args.options.fileId || args.options.fileUrl} ?`
+                });
+                if (result.continue) {
+                    yield undoCheckout();
+                }
+            }
+        });
+    }
+}
+_SpoFileCheckoutUndoCommand_instances = new WeakSet(), _SpoFileCheckoutUndoCommand_initTelemetry = function _SpoFileCheckoutUndoCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            fileId: typeof args.options.fileId !== 'undefined',
+            fileUrl: typeof args.options.fileUrl !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoFileCheckoutUndoCommand_initOptions = function _SpoFileCheckoutUndoCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-f, --fileUrl [fileUrl]'
+    }, {
+        option: '-i, --fileId [fileId]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFileCheckoutUndoCommand_initValidators = function _SpoFileCheckoutUndoCommand_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`;
+        }
+        return true;
+    }));
+}, _SpoFileCheckoutUndoCommand_initOptionSets = function _SpoFileCheckoutUndoCommand_initOptionSets() {
+    this.optionSets.push({ options: ['fileId', 'fileUrl'] });
+};
+module.exports = new SpoFileCheckoutUndoCommand();
+//# sourceMappingURL=file-checkout-undo.js.map

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

@@ -58,7 +58,7 @@ class SpoHomeSiteRemoveCommand extends SpoCommand_1.default {
                     }
                 }
                 catch (err) {
-                    this.handleRejectedPromise(err);
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
             if (args.options.confirm) {