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

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

@@ -0,0 +1,97 @@
+"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 _PurviewRetentionEventTypeRemoveCommand_instances, _PurviewRetentionEventTypeRemoveCommand_initTelemetry, _PurviewRetentionEventTypeRemoveCommand_initOptions, _PurviewRetentionEventTypeRemoveCommand_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 PurviewRetentionEventTypeRemoveCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.RETENTIONEVENTTYPE_REMOVE;
+    }
+    get description() {
+        return 'Delete a retention event type';
+    }
+    constructor() {
+        super();
+        _PurviewRetentionEventTypeRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventTypeRemoveCommand_instances, "m", _PurviewRetentionEventTypeRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventTypeRemoveCommand_instances, "m", _PurviewRetentionEventTypeRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventTypeRemoveCommand_instances, "m", _PurviewRetentionEventTypeRemoveCommand_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.');
+            }
+            const removeRetentionEventType = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const requestOptions = {
+                        url: `${this.resource}/beta/security/triggerTypes/retentionEventTypes/${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 removeRetentionEventType();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the retention event type with id ${args.options.id}?`
+                });
+                if (result.continue) {
+                    yield removeRetentionEventType();
+                }
+            }
+        });
+    }
+}
+_PurviewRetentionEventTypeRemoveCommand_instances = new WeakSet(), _PurviewRetentionEventTypeRemoveCommand_initTelemetry = function _PurviewRetentionEventTypeRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: !!args.options.confirm
+        });
+    });
+}, _PurviewRetentionEventTypeRemoveCommand_initOptions = function _PurviewRetentionEventTypeRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '--confirm'
+    });
+}, _PurviewRetentionEventTypeRemoveCommand_initValidators = function _PurviewRetentionEventTypeRemoveCommand_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.`;
+        }
+        return true;
+    }));
+};
+module.exports = new PurviewRetentionEventTypeRemoveCommand();
+//# sourceMappingURL=retentioneventtype-remove.js.map

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,6 +2,15 @@
 Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'purview';
 exports.default = {
+    AUDITLOG_LIST: `${prefix} auditlog list`,
+    RETENTIONEVENT_GET: `${prefix} retentionevent get`,
+    RETENTIONEVENT_LIST: `${prefix} retentionevent list`,
+    RETENTIONEVENT_REMOVE: `${prefix} retentionevent remove`,
+    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/spfx/commands/project/WebApiPermissionRequests.js

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

package/dist/m365/spfx/commands/project/project-permissions-grant.js

@@ -0,0 +1,81 @@
+"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());
+    });
+};
+Object.defineProperty(exports, "__esModule", { value: true });
+const path = require("path");
+const fs = require("fs");
+const Command_1 = require("../../../../Command");
+const commands_1 = require("../../commands");
+const base_project_command_1 = require("./base-project-command");
+const SpoServicePrincipalGrantAddCommand = require("../../../spo/commands/serviceprincipal/serviceprincipal-grant-add");
+const Cli_1 = require("../../../../cli/Cli");
+class SpfxProjectPermissionSGrantCommand extends base_project_command_1.BaseProjectCommand {
+    get name() {
+        return commands_1.default.PROJECT_PERMISSIONS_GRANT;
+    }
+    get description() {
+        return 'Grant API permissions defined in the current SPFx project';
+    }
+    constructor() {
+        super();
+    }
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.projectRootPath = this.getProjectRoot(process.cwd());
+            if (this.projectRootPath === null) {
+                throw new Command_1.CommandError(`Couldn't find project root folder`, SpfxProjectPermissionSGrantCommand.ERROR_NO_PROJECT_ROOT_FOLDER);
+            }
+            if (this.debug) {
+                logger.logToStderr(`Granting API permissions defined in the current SPFx project`);
+            }
+            try {
+                const webApiPermissionsRequest = this.getWebApiPermissionRequest(path.join(this.projectRootPath, 'config', 'package-solution.json'));
+                for (const permission of webApiPermissionsRequest) {
+                    const options = {
+                        resource: permission.resource,
+                        scope: permission.scope,
+                        output: 'json',
+                        debug: this.debug,
+                        verbose: this.verbose
+                    };
+                    let output = null;
+                    try {
+                        output = yield Cli_1.Cli.executeCommandWithOutput(SpoServicePrincipalGrantAddCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+                    }
+                    catch (err) {
+                        if (err.error && err.error.message.indexOf('already exists') > -1) {
+                            this.warn(logger, err.error.message);
+                            continue;
+                        }
+                        else {
+                            throw err;
+                        }
+                    }
+                    const getGrantOutput = JSON.parse(output.stdout);
+                    logger.log(getGrantOutput);
+                }
+            }
+            catch (error) {
+                throw new Command_1.CommandError(error);
+            }
+        });
+    }
+    getWebApiPermissionRequest(filePath) {
+        if (!fs.existsSync(filePath)) {
+            throw (`The package-solution.json file could not be found`);
+        }
+        const existingContent = fs.readFileSync(filePath, 'utf-8');
+        const solutionContent = JSON.parse(existingContent);
+        return solutionContent.solution.webApiPermissionRequests;
+    }
+}
+SpfxProjectPermissionSGrantCommand.ERROR_NO_PROJECT_ROOT_FOLDER = 1;
+module.exports = new SpfxProjectPermissionSGrantCommand();
+//# sourceMappingURL=project-permissions-grant.js.map

package/dist/m365/spfx/commands.js

@@ -5,8 +5,9 @@ exports.default = {
     DOCTOR: `${prefix} doctor`,
     PACKAGE_GENERATE: `${prefix} package generate`,
     PROJECT_DOCTOR: `${prefix} project doctor`,
-    PROJECT_UPGRADE: `${prefix} project upgrade`,
     PROJECT_EXTERNALIZE: `${prefix} project externalize`,
-    PROJECT_RENAME: `${prefix} project rename`
+    PROJECT_PERMISSIONS_GRANT: `${prefix} project permissions grant`,
+    PROJECT_RENAME: `${prefix} project rename`,
+    PROJECT_UPGRADE: `${prefix} project upgrade`
 };
 //# sourceMappingURL=commands.js.map

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

@@ -17,6 +17,7 @@ var _SpoAppAddCommand_instances, _SpoAppAddCommand_initTelemetry, _SpoAppAddComm
 Object.defineProperty(exports, "__esModule", { value: true });
 const fs = require("fs");
 const path = require("path");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
@@ -58,7 +59,7 @@ class SpoAppAddCommand extends SpoAppBaseCommand_1.SpoAppBaseCommand {
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
-                if (args.options.output === 'json') {
+                if (!Cli_1.Cli.shouldTrimOutput(args.options.output)) {
                     logger.log(json);
                 }
                 else {

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