@pnp/cli-microsoft365 6.10.0-beta.bd0bd83 → 6.10.0-beta.f43fa4d

package/dist/m365/planner/commands/bucket/bucket-remove.js

@@ -105,13 +105,17 @@ class PlannerBucketRemoveCommand extends GraphCommand_1.default {
     }
     getPlanId(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { planId, planTitle } = args.options;
+            const { planId, planTitle, rosterId } = args.options;
             if (planId) {
                 return planId;
             }
-            const groupId = yield this.getGroupId(args);
-            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
-            return plan.id;
+            if (planTitle) {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+                return plan.id;
+            }
+            const plans = yield planner_1.planner.getPlansByRosterId(rosterId);
+            return plans[0].id;
         });
     }
     getGroupId(args) {
@@ -132,6 +136,7 @@ _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveComma
             name: typeof args.options.name !== 'undefined',
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
             confirm: args.options.confirm || false
@@ -146,6 +151,8 @@ _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveComma
         option: '--planId [planId]'
     }, {
         option: "--planTitle [planTitle]"
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
@@ -156,38 +163,37 @@ _PlannerBucketRemoveCommand_instances = new WeakSet(), _PlannerBucketRemoveComma
 }, _PlannerBucketRemoveCommand_initValidators = function _PlannerBucketRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
         if (args.options.id) {
-            if (args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
-                return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
+            if (args.options.planId || args.options.planTitle || args.options.rosterId || args.options.ownerGroupId || args.options.ownerGroupName) {
+                return 'Don\'t specify planId, planTitle, rosterId, ownerGroupId or ownerGroupName when using id';
             }
         }
         else {
-            if (!args.options.planId && !args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name';
-            }
-            if (args.options.planId && args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name but not both';
-            }
             if (args.options.planTitle) {
-                if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
-                }
-                if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-                }
                 if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
                     return `${args.options.ownerGroupId} is not a valid GUID`;
                 }
             }
-            else {
+            else if (args.options.planId) {
                 if (args.options.ownerGroupId || args.options.ownerGroupName) {
                     return 'Don\'t specify ownerGroupId or ownerGroupName when using planId';
                 }
             }
+            else {
+                if (args.options.ownerGroupId || args.options.ownerGroupName) {
+                    return 'Don\'t specify ownerGroupId or ownerGroupName when using rosterId';
+                }
+            }
         }
         return true;
     }));
 }, _PlannerBucketRemoveCommand_initOptionSets = function _PlannerBucketRemoveCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
+    this.optionSets.push({ options: ['id', 'name'] }, {
+        options: ['planId', 'planTitle', 'rosterId'],
+        runsWhen: (args) => args.options.name !== undefined
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => args.options.planTitle !== undefined
+    });
 };
 module.exports = new PlannerBucketRemoveCommand();
 //# sourceMappingURL=bucket-remove.js.map

package/dist/m365/planner/commands/bucket/bucket-set.js

@@ -96,13 +96,17 @@ class PlannerBucketSetCommand extends GraphCommand_1.default {
     }
     getPlanId(args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const { planId, planTitle } = args.options;
+            const { planId, planTitle, rosterId } = args.options;
             if (planId) {
                 return planId;
             }
-            const groupId = yield this.getGroupId(args);
-            const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
-            return plan.id;
+            if (planTitle) {
+                const groupId = yield this.getGroupId(args);
+                const plan = yield planner_1.planner.getPlanByTitle(planTitle, groupId);
+                return plan.id;
+            }
+            const plans = yield planner_1.planner.getPlansByRosterId(rosterId);
+            return plans[0].id;
         });
     }
     getGroupId(args) {
@@ -123,6 +127,7 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
             name: typeof args.options.name !== 'undefined',
             planId: typeof args.options.planId !== 'undefined',
             planTitle: typeof args.options.planTitle !== 'undefined',
+            rosterId: typeof args.options.rosterId !== 'undefined',
             ownerGroupId: typeof args.options.ownerGroupId !== 'undefined',
             ownerGroupName: typeof args.options.ownerGroupName !== 'undefined',
             newName: typeof args.options.newName !== 'undefined',
@@ -138,6 +143,8 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
         option: '--planId [planId]'
     }, {
         option: "--planTitle [planTitle]"
+    }, {
+        option: '--rosterId [rosterId]'
     }, {
         option: '--ownerGroupId [ownerGroupId]'
     }, {
@@ -149,33 +156,18 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
     });
 }, _PlannerBucketSetCommand_initValidators = function _PlannerBucketSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id) {
-            if (args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName) {
-                return 'Don\'t specify planId, planTitle, ownerGroupId or ownerGroupName when using id';
-            }
+        if (args.options.id && (args.options.planId || args.options.planTitle || args.options.ownerGroupId || args.options.ownerGroupName || args.options.rosterId)) {
+            return 'Don\'t specify planId, planTitle, ownerGroupId, ownerGroupName or rosterId when using id';
         }
         if (args.options.name) {
-            if (!args.options.planId && !args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name';
+            if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
+                return `${args.options.ownerGroupId} is not a valid GUID`;
             }
-            if (args.options.planId && args.options.planTitle) {
-                return 'Specify either planId or planTitle when using name but not both';
-            }
-            if (args.options.planTitle) {
-                if (!args.options.ownerGroupId && !args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle';
-                }
-                if (args.options.ownerGroupId && args.options.ownerGroupName) {
-                    return 'Specify either ownerGroupId or ownerGroupName when using planTitle but not both';
-                }
-                if (args.options.ownerGroupId && !validation_1.validation.isValidGuid(args.options.ownerGroupId)) {
-                    return `${args.options.ownerGroupId} is not a valid GUID`;
-                }
+            if (args.options.planId && (args.options.ownerGroupId || args.options.ownerGroupName)) {
+                return 'Don\'t specify ownerGroupId or ownerGroupName when using planId';
             }
-            if (args.options.planId) {
-                if (args.options.ownerGroupId || args.options.ownerGroupName) {
-                    return 'Don\'t specify ownerGroupId or ownerGroupName when using planId';
-                }
+            if (args.options.rosterId && (args.options.ownerGroupId || args.options.ownerGroupName)) {
+                return 'Don\'t specify ownerGroupId or ownerGroupName when using rosterId';
             }
         }
         if (!args.options.newName && !args.options.orderHint) {
@@ -184,7 +176,13 @@ _PlannerBucketSetCommand_instances = new WeakSet(), _PlannerBucketSetCommand_ini
         return true;
     }));
 }, _PlannerBucketSetCommand_initOptionSets = function _PlannerBucketSetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'name'] });
+    this.optionSets.push({ options: ['id', 'name'] }, {
+        options: ['planId', 'planTitle', 'rosterId'],
+        runsWhen: (args) => args.options.name !== undefined
+    }, {
+        options: ['ownerGroupId', 'ownerGroupName'],
+        runsWhen: (args) => args.options.planTitle !== undefined
+    });
 };
 module.exports = new PlannerBucketSetCommand();
 //# sourceMappingURL=bucket-set.js.map

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

@@ -36,23 +36,8 @@ class PurviewRetentionEventRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRetentionEvent = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/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();
+                yield this.removeRetentionEvent(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -62,11 +47,28 @@ class PurviewRetentionEventRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the retention event ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeRetentionEvent();
+                    yield this.removeRetentionEvent(args.options);
                 }
             }
         });
     }
+    removeRetentionEvent(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/beta/security/triggers/retentionEvents/${options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _PurviewRetentionEventRemoveCommand_instances = new WeakSet(), _PurviewRetentionEventRemoveCommand_initTelemetry = function _PurviewRetentionEventRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -36,23 +36,8 @@ class PurviewRetentionEventTypeRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRetentionEventType = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const requestOptions = {
-                        url: `${this.resource}/v1.0/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();
+                yield this.removeRetentionEventType(args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -62,11 +47,28 @@ class PurviewRetentionEventTypeRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the retention event type with id ${args.options.id}?`
                 });
                 if (result.continue) {
-                    yield removeRetentionEventType();
+                    yield this.removeRetentionEventType(args.options);
                 }
             }
         });
     }
+    removeRetentionEventType(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/security/triggerTypes/retentionEventTypes/${options.id}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _PurviewRetentionEventTypeRemoveCommand_instances = new WeakSet(), _PurviewRetentionEventTypeRemoveCommand_initTelemetry = function _PurviewRetentionEventTypeRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/list/list-roleassignment-add.js

@@ -15,16 +15,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators, _SpoListRoleAssignmentAddCommand_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");
-const SpoUserGetCommand = require("../user/user-get");
-const SpoGroupGetCommand = require("../group/group-get");
-const SpoRoleDefinitionListCommand = require("../roledefinition/roledefinition-list");
+const spo_1 = require("../../../../utils/spo");
 class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.LIST_ROLEASSIGNMENT_ADD;
@@ -57,13 +54,15 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
                     const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                     requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                 }
-                args.options.roleDefinitionId = yield this.getRoleDefinitionId(args.options);
+                args.options.roleDefinitionId = yield this.getRoleDefinitionId(args.options, logger);
                 if (args.options.upn) {
-                    args.options.principalId = yield this.getUserPrincipalId(args.options);
+                    const user = yield spo_1.spo.getUserByEmail(args.options.webUrl, args.options.upn, logger, this.verbose);
+                    args.options.principalId = user.Id;
                     yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else if (args.options.groupName) {
-                    args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                    const group = yield spo_1.spo.getGroupByName(args.options.webUrl, args.options.groupName, logger, this.verbose);
+                    args.options.principalId = group.Id;
                     yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else {
@@ -89,50 +88,13 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             return request_1.default.post(requestOptions);
         });
     }
-    getRoleDefinitionId(options) {
+    getRoleDefinitionId(options, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!options.roleDefinitionName) {
                 return options.roleDefinitionId;
             }
-            const roleDefinitionListCommandOptions = {
-                webUrl: options.webUrl,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) });
-            const getRoleDefinitionListOutput = JSON.parse(output.stdout);
-            const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
-            return roleDefinitionId;
-        });
-    }
-    getGroupPrincipalId(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const groupGetCommandOptions = {
-                webUrl: options.webUrl,
-                name: options.groupName,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) });
-            const getGroupOutput = JSON.parse(output.stdout);
-            return getGroupOutput.Id;
-        });
-    }
-    getUserPrincipalId(options) {
-        return __awaiter(this, void 0, void 0, function* () {
-            const userGetCommandOptions = {
-                webUrl: options.webUrl,
-                email: options.upn,
-                id: undefined,
-                output: 'json',
-                debug: this.debug,
-                verbose: this.verbose
-            };
-            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) });
-            const getUserOutput = JSON.parse(output.stdout);
-            return getUserOutput.Id;
+            const roleDefinition = yield spo_1.spo.getRoleDefinitionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
+            return roleDefinition.Id;
         });
     }
 }

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

@@ -37,37 +37,8 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let requestDigest = '';
-            let pageName = args.options.name;
-            const removePage = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
-                    requestDigest = reqDigest.FormDigestValue;
-                    if (!pageName.endsWith('.aspx')) {
-                        pageName += '.aspx';
-                    }
-                    if (this.verbose) {
-                        logger.logToStderr(`Removing page ${pageName}...`);
-                    }
-                    const requestOptions = {
-                        url: `${args.options
-                            .webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
-                        headers: {
-                            'X-RequestDigest': requestDigest,
-                            'X-HTTP-Method': 'DELETE',
-                            'content-type': 'application/json;odata=nometadata',
-                            accept: 'application/json;odata=nometadata'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removePage();
+                yield this.removePage(logger, args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -77,11 +48,42 @@ class SpoPageRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the page '${args.options.name}'?`
                 });
                 if (result.continue) {
-                    yield removePage();
+                    yield this.removePage(logger, args);
                 }
             }
         });
     }
+    removePage(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestDigest = '';
+                let pageName = args.options.name;
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                requestDigest = reqDigest.FormDigestValue;
+                if (!pageName.endsWith('.aspx')) {
+                    pageName += '.aspx';
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Removing page ${pageName}...`);
+                }
+                const requestOptions = {
+                    url: `${args.options
+                        .webUrl}/_api/web/getfilebyserverrelativeurl('${urlUtil_1.urlUtil.getServerRelativeSiteUrl(args.options.webUrl)}/sitepages/${pageName}')`,
+                    headers: {
+                        'X-RequestDigest': requestDigest,
+                        'X-HTTP-Method': 'DELETE',
+                        'content-type': 'application/json;odata=nometadata',
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoPageRemoveCommand_instances = new WeakSet(), _SpoPageRemoveCommand_initOptions = function _SpoPageRemoveCommand_initOptions() {
     this.options.unshift({

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

@@ -36,29 +36,8 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeRoleDefinition = () => __awaiter(this, void 0, void 0, function* () {
-                if (this.verbose) {
-                    logger.logToStderr(`Removing role definition from site ${args.options.webUrl}...`);
-                }
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
-                    method: 'delete',
-                    headers: {
-                        'X-HTTP-Method': 'DELETE',
-                        'If-Match': '*',
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                try {
-                    yield request_1.default.delete(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeRoleDefinition();
+                yield this.removeRoleDefinition(logger, args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -68,11 +47,34 @@ class SpoRoleDefinitionRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to remove the role definition with id ${args.options.id} from site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
-                    yield removeRoleDefinition();
+                    yield this.removeRoleDefinition(logger, args);
                 }
             }
         });
     }
+    removeRoleDefinition(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing role definition from site ${args.options.webUrl}...`);
+            }
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/roledefinitions(${args.options.id})`,
+                method: 'delete',
+                headers: {
+                    'X-HTTP-Method': 'DELETE',
+                    'If-Match': '*',
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoRoleDefinitionRemoveCommand_instances = new WeakSet(), _SpoRoleDefinitionRemoveCommand_initTelemetry = function _SpoRoleDefinitionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/site/site-apppermission-add.js

@@ -47,10 +47,10 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         }
         let endpoint = "";
         if (args.options.appId) {
-            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
+            endpoint = `${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,displayName&$filter=appId eq '${formatting_1.formatting.encodeQueryParameter(args.options.appId)}'`;
         }
         else {
-            endpoint = `${this.resource}/v1.0/myorganization/applications?$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
+            endpoint = `${this.resource}/v1.0/myorganization/servicePrincipals?$select=appId,displayName&$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
         }
         const appRequestOptions = {
             url: endpoint,
@@ -168,7 +168,7 @@ _SpoSiteAppPermissionAddCommand_instances = new WeakSet(), _SpoSiteAppPermission
         return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 }, _SpoSiteAppPermissionAddCommand_initOptionSets = function _SpoSiteAppPermissionAddCommand_initOptionSets() {
-    this.optionSets.push({ options: ['appId', 'appDisplayName'] });
+    this.optionSets.push({ options: ['appId', 'appDisplayName'], runsWhen: (args) => !args.options.appId && !args.options.appDisplayName });
 };
 module.exports = new SpoSiteAppPermissionAddCommand();
 //# sourceMappingURL=site-apppermission-add.js.map

package/dist/m365/spo/commands/site/site-commsite-enable.js

@@ -15,10 +15,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const config_1 = require("../../../../config");
 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,26 +35,20 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const designPackageId = args.options.designPackageId || '{d604dac3-50d3-405e-9ab9-d4713cda74ef}';
+            const designPackageId = args.options.designPackageId || '96c933ac-3698-44c7-9f4a-5fd17d71af9e';
+            if (this.verbose) {
+                logger.logToStderr(`Enabling communication site at ${args.options.url}...`);
+            }
             try {
-                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                if (this.debug) {
-                    logger.logToStderr(`Retrieving request digest...`);
-                }
-                const ctxInfo = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${args.options.url}/_api/sitepages/communicationsite/enable`,
                     headers: {
-                        'X-RequestDigest': ctxInfo.FormDigestValue
+                        'accept': 'application/json;odata=nometadata'
                     },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Method Name="EnableCommSite" Id="5" ObjectPathId="3"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Parameter><Parameter Type="Guid">${formatting_1.formatting.escapeXml(designPackageId)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    data: { designPackageId },
+                    responseType: 'json'
                 };
-                const res = yield request_1.default.post(requestOptions);
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    throw response.ErrorInfo.ErrorMessage;
-                }
+                yield request_1.default.post(requestOptions);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);