@pnp/cli-microsoft365 6.3.0-beta.655c566 → 6.3.0-beta.82f99fc

package/dist/m365/purview/commands/retentionevent/retentionevent-get.js

@@ -36,14 +36,13 @@ class PurviewRetentionEventGetCommand 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.logToStderr(`Retrieving retention event with id ${args.options.id}`);
             }
             try {
-                const isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
-                if (isAppOnlyAccessToken) {
-                    throw 'This command currently does not support app only permissions.';
-                }
                 const requestOptions = {
                     url: `${this.resource}/beta/security/triggers/retentionEvents/${args.options.id}`,
                     headers: {

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

@@ -26,11 +26,10 @@ class PurviewRetentionEventListCommand 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 isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
-                if (isAppOnlyAccessToken) {
-                    throw 'This command currently does not support app only permissions.';
-                }
                 if (this.verbose) {
                     logger.logToStderr('Retrieving Purview retention events');
                 }

package/dist/m365/purview/commands/retentionevent/retentionevent-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 _PurviewRetentionEventRemoveCommand_instances, _PurviewRetentionEventRemoveCommand_initTelemetry, _PurviewRetentionEventRemoveCommand_initOptions, _PurviewRetentionEventRemoveCommand_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 PurviewRetentionEventRemoveCommand extends GraphCommand_1.default {
+    get name() {
+        return commands_1.default.RETENTIONEVENT_REMOVE;
+    }
+    get description() {
+        return 'Delete a retention event';
+    }
+    constructor() {
+        super();
+        _PurviewRetentionEventRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventRemoveCommand_instances, "m", _PurviewRetentionEventRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventRemoveCommand_instances, "m", _PurviewRetentionEventRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _PurviewRetentionEventRemoveCommand_instances, "m", _PurviewRetentionEventRemoveCommand_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 removeRetentionEvent = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const requestOptions = {
+                        url: `${this.resource}/beta/security/triggers/retentionEvents/${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 removeRetentionEvent();
+            }
+            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 ${args.options.id}?`
+                });
+                if (result.continue) {
+                    yield removeRetentionEvent();
+                }
+            }
+        });
+    }
+}
+_PurviewRetentionEventRemoveCommand_instances = new WeakSet(), _PurviewRetentionEventRemoveCommand_initTelemetry = function _PurviewRetentionEventRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: !!args.options.confirm
+        });
+    });
+}, _PurviewRetentionEventRemoveCommand_initOptions = function _PurviewRetentionEventRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '--confirm'
+    });
+}, _PurviewRetentionEventRemoveCommand_initValidators = function _PurviewRetentionEventRemoveCommand_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 PurviewRetentionEventRemoveCommand();
+//# sourceMappingURL=retentionevent-remove.js.map

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

@@ -15,10 +15,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PurviewRetentionEventTypeGetCommand_instances, _PurviewRetentionEventTypeGetCommand_initOptions, _PurviewRetentionEventTypeGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
+const accessToken_1 = require("../../../../utils/accessToken");
 class PurviewRetentionEventTypeGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.RETENTIONEVENTTYPE_GET;
@@ -34,6 +36,9 @@ class PurviewRetentionEventTypeGetCommand 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.');
+            }
             try {
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving retention event type with id ${args.options.id}`);

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

@@ -26,11 +26,10 @@ class PurviewRetentionEventTypeListCommand 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 isAppOnlyAccessToken = accessToken_1.accessToken.isAppOnlyAccessToken(Auth_1.default.service.accessTokens[this.resource].accessToken);
-                if (isAppOnlyAccessToken) {
-                    throw 'This command currently does not support app only permissions.';
-                }
                 const items = yield odata_1.odata.getAllItems(`${this.resource}/beta/security/triggerTypes/retentionEventTypes`);
                 logger.log(items);
             }

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

@@ -15,7 +15,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PurviewRetentionLabelAddCommand_instances, _PurviewRetentionLabelAddCommand_initTelemetry, _PurviewRetentionLabelAddCommand_initOptions, _PurviewRetentionLabelAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
 const request_1 = require("../../../../request");
+const accessToken_1 = require("../../../../utils/accessToken");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class PurviewRetentionLabelAddCommand extends GraphCommand_1.default {
@@ -34,6 +36,9 @@ class PurviewRetentionLabelAddCommand 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 retentionTrigger = args.options.retentionTrigger ? args.options.retentionTrigger : 'dateLabeled';
             const defaultRecordBehavior = args.options.defaultRecordBehavior ? args.options.defaultRecordBehavior : 'startLocked';
             const requestBody = {

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

@@ -15,10 +15,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _PurviewRetentionLabelGetCommand_instances, _PurviewRetentionLabelGetCommand_initOptions, _PurviewRetentionLabelGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
+const accessToken_1 = require("../../../../utils/accessToken");
 class PurviewRetentionLabelGetCommand extends GraphCommand_1.default {
     get name() {
         return commands_1.default.RETENTIONLABEL_GET;
@@ -34,6 +36,9 @@ class PurviewRetentionLabelGetCommand 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.');
+            }
             try {
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving retention label with id ${args.options.id}`);

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

@@ -9,6 +9,8 @@ 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");
@@ -24,6 +26,9 @@ 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,11 +15,13 @@ 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;
@@ -36,6 +38,9 @@ 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 = {

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

@@ -15,10 +15,12 @@ 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;
@@ -39,6 +41,9 @@ 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}`);
             }
@@ -51,7 +56,12 @@ class PurviewRetentionLabelSetCommand extends GraphCommand_1.default {
                 responseType: 'json',
                 data: requestBody
             };
-            yield request_1.default.patch(requestOptions);
+            try {
+                yield request_1.default.patch(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
         });
     }
     mapRequestBody(options) {

package/dist/m365/purview/commands.js

@@ -5,6 +5,7 @@ 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`,

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/utils/aadUser.js

@@ -0,0 +1,38 @@
+"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 });
+exports.aadUser = void 0;
+const request_1 = require("../request");
+const formatting_1 = require("./formatting");
+const graphResource = 'https://graph.microsoft.com';
+exports.aadUser = {
+    /**
+     * Retrieve the id of a user by its UPN.
+     * @param upn User UPN.
+     */
+    getUserIdByUpn(upn) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${graphResource}/v1.0/users?$filter=userPrincipalName eq '${formatting_1.formatting.encodeQueryParameter(upn)}'&$select=Id`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            if (res.value.length === 0) {
+                throw Error(`The specified user with user name ${upn} does not exist.`);
+            }
+            return res.value[0].id;
+        });
+    }
+};
+//# sourceMappingURL=aadUser.js.map

package/dist/utils/planner.js

@@ -57,15 +57,12 @@ exports.planner = {
      * @param groupId Owner group ID.
      * @param rosterId Roster ID.
      */
-    getPlanByTitle(title, groupId, rosterId, metadata = 'none') {
+    getPlanByTitle(title, groupId, metadata = 'none') {
         return __awaiter(this, void 0, void 0, function* () {
             let plans = [];
             if (groupId) {
                 plans = yield this.getPlansByGroupId(groupId, metadata);
             }
-            else if (rosterId) {
-                plans = yield this.getPlansByRosterId(rosterId, metadata);
-            }
             const filteredPlans = plans.filter(p => p.title && p.title.toLowerCase() === title.toLowerCase());
             if (!filteredPlans.length) {
                 throw Error(`The specified plan '${title}' does not exist.`);