@pnp/cli-microsoft365 6.0.0-beta.37b9374 → 6.0.0-beta.3a04435

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

@@ -15,10 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteAppCatalogAddCommand_instances, _SpoSiteAppCatalogAddCommand_initOptions, _SpoSiteAppCatalogAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+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");
 class SpoSiteAppCatalogAddCommand extends SpoCommand_1.default {
@@ -34,42 +35,38 @@ class SpoSiteAppCatalogAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Creates a site collection app catalog in the specified site';
     }
-    commandAction(logger, args, cb) {
-        const url = args.options.siteUrl;
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Adding site collection app catalog...`);
-            }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue
-                },
-                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="38" ObjectPathId="37" /><ObjectPath Id="40" ObjectPathId="39" /><ObjectPath Id="42" ObjectPathId="41" /><ObjectPath Id="44" ObjectPathId="43" /><ObjectPath Id="46" ObjectPathId="45" /><ObjectPath Id="48" ObjectPathId="47" /></Actions><ObjectPaths><Constructor Id="37" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="39" ParentId="37" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="41" ParentId="39" Name="RootWeb" /><Property Id="43" ParentId="41" Name="TenantAppCatalog" /><Property Id="45" ParentId="43" Name="SiteCollectionAppCatalogsSites" /><Method Id="47" ParentId="45" Name="Add"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
-            }
-            else {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = args.options.siteUrl;
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const requestDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
-                    logger.logToStderr('Site collection app catalog created');
+                    logger.logToStderr(`Adding site collection app catalog...`);
+                }
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': requestDigest.FormDigestValue
+                    },
+                    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="38" ObjectPathId="37" /><ObjectPath Id="40" ObjectPathId="39" /><ObjectPath Id="42" ObjectPathId="41" /><ObjectPath Id="44" ObjectPathId="43" /><ObjectPath Id="46" ObjectPathId="45" /><ObjectPath Id="48" ObjectPathId="47" /></Actions><ObjectPaths><Constructor Id="37" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="39" ParentId="37" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="41" ParentId="39" Name="RootWeb" /><Property Id="43" ParentId="41" Name="TenantAppCatalog" /><Property Id="45" ParentId="43" Name="SiteCollectionAppCatalogsSites" /><Method Id="47" ParentId="45" Name="Add"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
                 }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('Site collection app catalog created');
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoSiteAppCatalogAddCommand_instances = new WeakSet(), _SpoSiteAppCatalogAddCommand_initOptions = function _SpoSiteAppCatalogAddCommand_initOptions() {
@@ -77,7 +74,7 @@ _SpoSiteAppCatalogAddCommand_instances = new WeakSet(), _SpoSiteAppCatalogAddCom
         option: '-u, --siteUrl <siteUrl>'
     });
 }, _SpoSiteAppCatalogAddCommand_initValidators = function _SpoSiteAppCatalogAddCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoSiteAppCatalogAddCommand();
 //# sourceMappingURL=site-appcatalog-add.js.map

package/dist/m365/spo/commands/site/site-appcatalog-remove.js

@@ -15,10 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteAppCatalogRemoveCommand_instances, _SpoSiteAppCatalogRemoveCommand_initOptions, _SpoSiteAppCatalogRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+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");
 class SpoSiteAppCatalogRemoveCommand extends SpoCommand_1.default {
@@ -34,42 +35,38 @@ class SpoSiteAppCatalogRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes site collection app catalog from the specified site';
     }
-    commandAction(logger, args, cb) {
-        const url = args.options.siteUrl;
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            if (this.verbose) {
-                logger.logToStderr(`Disabling site collection app catalog...`);
-            }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue
-                },
-                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="50" ObjectPathId="49" /><ObjectPath Id="52" ObjectPathId="51" /><ObjectPath Id="54" ObjectPathId="53" /><ObjectPath Id="56" ObjectPathId="55" /><ObjectPath Id="58" ObjectPathId="57" /><Method Name="Remove" Id="59" ObjectPathId="57"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="49" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="51" ParentId="49" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="53" ParentId="51" Name="RootWeb" /><Property Id="55" ParentId="53" Name="TenantAppCatalog" /><Property Id="57" ParentId="55" Name="SiteCollectionAppCatalogsSites" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
-            }
-            else {
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const url = args.options.siteUrl;
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const requestDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
-                    logger.logToStderr('Site collection app catalog disabled');
+                    logger.logToStderr(`Disabling site collection app catalog...`);
+                }
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': requestDigest.FormDigestValue
+                    },
+                    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="50" ObjectPathId="49" /><ObjectPath Id="52" ObjectPathId="51" /><ObjectPath Id="54" ObjectPathId="53" /><ObjectPath Id="56" ObjectPathId="55" /><ObjectPath Id="58" ObjectPathId="57" /><Method Name="Remove" Id="59" ObjectPathId="57"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="49" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="51" ParentId="49" Name="GetSiteByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Property Id="53" ParentId="51" Name="RootWeb" /><Property Id="55" ParentId="53" Name="TenantAppCatalog" /><Property Id="57" ParentId="55" Name="SiteCollectionAppCatalogsSites" /></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
                 }
+                else {
+                    if (this.verbose) {
+                        logger.logToStderr('Site collection app catalog disabled');
+                    }
+                }
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoSiteAppCatalogRemoveCommand_instances = new WeakSet(), _SpoSiteAppCatalogRemoveCommand_initOptions = function _SpoSiteAppCatalogRemoveCommand_initOptions() {
@@ -77,7 +74,7 @@ _SpoSiteAppCatalogRemoveCommand_instances = new WeakSet(), _SpoSiteAppCatalogRem
         option: '-u, --siteUrl <siteUrl>'
     });
 }, _SpoSiteAppCatalogRemoveCommand_initValidators = function _SpoSiteAppCatalogRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoSiteAppCatalogRemoveCommand();
 //# sourceMappingURL=site-appcatalog-remove.js.map

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

@@ -13,10 +13,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoSiteAppPermissionAddCommand_instances, _SpoSiteAppPermissionAddCommand_initTelemetry, _SpoSiteAppPermissionAddCommand_initOptions, _SpoSiteAppPermissionAddCommand_initValidators;
+var _SpoSiteAppPermissionAddCommand_instances, _SpoSiteAppPermissionAddCommand_initTelemetry, _SpoSiteAppPermissionAddCommand_initOptions, _SpoSiteAppPermissionAddCommand_initValidators, _SpoSiteAppPermissionAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
@@ -24,9 +24,11 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         super();
         _SpoSiteAppPermissionAddCommand_instances.add(this);
         this.siteId = '';
+        this.roles = ['read', 'write', 'manage', 'fullcontrol'];
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SITE_APPPERMISSION_ADD;
@@ -84,52 +86,83 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
             });
         });
     }
-    mapRequestBody(permission, appInfo) {
-        const requestBody = {
-            roles: [permission]
+    /**
+     * Checks if the requested permission needs elevation after the initial creation.
+     */
+    roleNeedsElevation(permission) {
+        return ['manage', 'fullcontrol'].indexOf(permission) > -1;
+    }
+    /**
+     * Grants the app 'read' or 'write' permissions to the site.
+     *
+     * Explanation:
+     * 'manage' and 'fullcontrol' permissions cannot be granted directly when adding app permissions.
+     * They can currently only be assigned when updating existing app permissions.
+     * We therefore assign 'write' permissions first, and update it to the requested role afterwards.
+     */
+    addPermissions(args, appInfo) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            data: {
+                roles: [this.roleNeedsElevation(args.options.permission) ? 'write' : args.options.permission],
+                grantedToIdentities: [{ application: { "id": appInfo.appId, "displayName": appInfo.displayName } }]
+            },
+            responseType: 'json'
         };
-        requestBody.grantedToIdentities = [];
-        requestBody.grantedToIdentities.push({ application: { "id": appInfo.appId, "displayName": appInfo.displayName } });
-        return requestBody;
+        return request_1.default.post(requestOptions);
     }
-    commandAction(logger, args, cb) {
-        this
-            .getSpoSiteId(args)
-            .then((siteId) => {
-            this.siteId = siteId;
-            return this.getAppInfo(args);
-        })
-            .then((appInfo) => {
-            const requestBody = this.mapRequestBody(args.options.permission, appInfo);
-            const requestOptions = {
-                url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
-                headers: {
-                    accept: 'application/json;odata.metadata=none',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                data: requestBody,
-                responseType: 'json'
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            logger.log(res);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    /**
+     * Updates the granted permissions to 'manage' or 'fullcontrol'.
+     */
+    elevatePermissions(args, permission) {
+        const requestOptions = {
+            url: `${this.resource}/v1.0/sites/${this.siteId}/permissions/${permission.id}`,
+            headers: {
+                accept: 'application/json;odata.metadata=none',
+                'content-type': 'application/json;odata=nometadata'
+            },
+            data: {
+                roles: [args.options.permission]
+            },
+            responseType: 'json'
+        };
+        return request_1.default.patch(requestOptions);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.siteId = yield this.getSpoSiteId(args);
+                const appInfo = yield this.getAppInfo(args);
+                let permission = yield this.addPermissions(args, appInfo);
+                if (this.roleNeedsElevation(args.options.permission)) {
+                    permission = yield this.elevatePermissions(args, permission);
+                }
+                logger.log(permission);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteAppPermissionAddCommand_instances = new WeakSet(), _SpoSiteAppPermissionAddCommand_initTelemetry = function _SpoSiteAppPermissionAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             appId: typeof args.options.appId !== 'undefined',
-            appDisplayName: typeof args.options.appDisplayName !== 'undefined'
+            appDisplayName: typeof args.options.appDisplayName !== 'undefined',
+            permissions: args.options.permissions
         });
     });
 }, _SpoSiteAppPermissionAddCommand_initOptions = function _SpoSiteAppPermissionAddCommand_initOptions() {
     this.options.unshift({
         option: '-u, --siteUrl <siteUrl>'
     }, {
-        option: '-p, --permission <permission>'
+        option: '-p, --permission <permission>',
+        autocomplete: this.roles
     }, {
         option: '-i, --appId [appId]'
     }, {
@@ -137,17 +170,16 @@ _SpoSiteAppPermissionAddCommand_instances = new WeakSet(), _SpoSiteAppPermission
     });
 }, _SpoSiteAppPermissionAddCommand_initValidators = function _SpoSiteAppPermissionAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.appId && !args.options.appDisplayName) {
-            return `Specify appId or appDisplayName, one is required`;
-        }
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        if (['read', 'write', 'owner'].indexOf(args.options.permission) === -1) {
-            return `${args.options.permission} is not a valid permission value. Allowed values are read|write|owner`;
+        if (this.roles.indexOf(args.options.permission) === -1) {
+            return `${args.options.permission} is not a valid permission value. Allowed values are ${this.roles.join('|')}`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
+}, _SpoSiteAppPermissionAddCommand_initOptionSets = function _SpoSiteAppPermissionAddCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appDisplayName']);
 };
 module.exports = new SpoSiteAppPermissionAddCommand();
 //# sourceMappingURL=site-apppermission-add.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionGetCommand_instances, _SpoSiteAppPermissionGetCommand_initOptions, _SpoSiteAppPermissionGetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionGetCommand extends GraphCommand_1.default {
@@ -55,23 +55,26 @@ class SpoSiteAppPermissionGetCommand extends GraphCommand_1.default {
         };
         return request_1.default.get(requestOptions);
     }
-    commandAction(logger, args, cb) {
-        this
-            .getSpoSiteId(args)
-            .then((siteId) => this.getApplicationPermission(args, siteId))
-            .then((permissionObject) => {
-            const transposed = [];
-            permissionObject.grantedToIdentities.forEach((permissionEntity) => {
-                transposed.push({
-                    appDisplayName: permissionEntity.application.displayName,
-                    appId: permissionEntity.application.id,
-                    permissionId: permissionObject.id,
-                    roles: permissionObject.roles.join()
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const siteId = yield this.getSpoSiteId(args);
+                const permissionObject = yield this.getApplicationPermission(args, siteId);
+                const transposed = [];
+                permissionObject.grantedToIdentities.forEach((permissionEntity) => {
+                    transposed.push({
+                        appDisplayName: permissionEntity.application.displayName,
+                        appId: permissionEntity.application.id,
+                        permissionId: permissionObject.id,
+                        roles: permissionObject.roles.join()
+                    });
                 });
-            });
-            logger.log(transposed);
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+                logger.log(transposed);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteAppPermissionGetCommand_instances = new WeakSet(), _SpoSiteAppPermissionGetCommand_initOptions = function _SpoSiteAppPermissionGetCommand_initOptions() {
@@ -81,7 +84,7 @@ _SpoSiteAppPermissionGetCommand_instances = new WeakSet(), _SpoSiteAppPermission
         option: '-i, --id <id>'
     });
 }, _SpoSiteAppPermissionGetCommand_initValidators = function _SpoSiteAppPermissionGetCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoSiteAppPermissionGetCommand();
 //# sourceMappingURL=site-apppermission-get.js.map

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAppPermissionListCommand_instances, _SpoSiteAppPermissionListCommand_initTelemetry, _SpoSiteAppPermissionListCommand_initOptions, _SpoSiteAppPermissionListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionListCommand extends GraphCommand_1.default {
@@ -92,24 +92,22 @@ class SpoSiteAppPermissionListCommand extends GraphCommand_1.default {
         };
         return request_1.default.get(requestOptions);
     }
-    commandAction(logger, args, cb) {
-        this
-            .getSpoSiteId(args)
-            .then((siteId) => {
-            this.siteId = siteId;
-            return this.getPermissions();
-        })
-            .then((res) => {
-            let permissions = res.value;
-            if (args.options.appId || args.options.appDisplayName) {
-                permissions = this.getFilteredPermissions(args, res.value);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                this.siteId = yield this.getSpoSiteId(args);
+                const permRes = yield this.getPermissions();
+                let permissions = permRes.value;
+                if (args.options.appId || args.options.appDisplayName) {
+                    permissions = this.getFilteredPermissions(args, permRes.value);
+                }
+                const res = yield Promise.all(permissions.map(g => this.getApplicationPermission(g.id)));
+                logger.log(this.getTransposed(res));
             }
-            return Promise.all(permissions.map(g => this.getApplicationPermission(g.id)));
-        })
-            .then((res) => {
-            logger.log(this.getTransposed(res));
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoSiteAppPermissionListCommand_instances = new WeakSet(), _SpoSiteAppPermissionListCommand_initTelemetry = function _SpoSiteAppPermissionListCommand_initTelemetry() {
@@ -132,7 +130,7 @@ _SpoSiteAppPermissionListCommand_instances = new WeakSet(), _SpoSiteAppPermissio
         if (args.options.appId && args.options.appDisplayName) {
             return `Provide either appId or appDisplayName, not both`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
 };
 module.exports = new SpoSiteAppPermissionListCommand();

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

@@ -13,11 +13,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     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 _SpoSiteAppPermissionRemoveCommand_instances, _SpoSiteAppPermissionRemoveCommand_initTelemetry, _SpoSiteAppPermissionRemoveCommand_initOptions, _SpoSiteAppPermissionRemoveCommand_initValidators;
+var _SpoSiteAppPermissionRemoveCommand_instances, _SpoSiteAppPermissionRemoveCommand_initTelemetry, _SpoSiteAppPermissionRemoveCommand_initOptions, _SpoSiteAppPermissionRemoveCommand_initValidators, _SpoSiteAppPermissionRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const GraphCommand_1 = require("../../../base/GraphCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
@@ -28,6 +28,7 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteAppPermissionRemoveCommand_instances, "m", _SpoSiteAppPermissionRemoveCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.SITE_APPPERMISSION_REMOVE;
@@ -93,44 +94,38 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         };
         return request_1.default.delete(spRequestOptions);
     }
-    commandAction(logger, args, cb) {
-        const removeSiteAppPermission = () => {
-            this
-                .getSpoSiteId(args)
-                .then((siteId) => {
-                this.siteId = siteId;
-                return this.getPermissionIds(args);
-            })
-                .then((permissionIdsToRemove) => {
-                const tasks = [];
-                for (const permissionId of permissionIdsToRemove) {
-                    tasks.push(this.removePermissions(permissionId));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeSiteAppPermission = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    this.siteId = yield this.getSpoSiteId(args);
+                    const permissionIdsToRemove = yield this.getPermissionIds(args);
+                    const tasks = [];
+                    for (const permissionId of permissionIdsToRemove) {
+                        tasks.push(this.removePermissions(permissionId));
+                    }
+                    const res = yield Promise.all(tasks);
+                    logger.log(res);
                 }
-                return Promise.all(tasks);
-            })
-                .then((res) => {
-                logger.log(res);
-                cb();
-            }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeSiteAppPermission();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
-                }
-                else {
-                    removeSiteAppPermission();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeSiteAppPermission();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?`
+                });
+                if (result.continue) {
+                    yield removeSiteAppPermission();
+                }
+            }
+        });
     }
 }
 _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermissionRemoveCommand_initTelemetry = function _SpoSiteAppPermissionRemoveCommand_initTelemetry() {
@@ -156,19 +151,13 @@ _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermiss
     });
 }, _SpoSiteAppPermissionRemoveCommand_initValidators = function _SpoSiteAppPermissionRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!args.options.appId && !args.options.appDisplayName && !args.options.id) {
-            return `Specify appId, appDisplayName, or id. One is required`;
-        }
-        if ((args.options.appId && args.options.appDisplayName) ||
-            (args.options.appId && args.options.id) ||
-            (args.options.id && args.options.appDisplayName)) {
-            return 'Use either appId, appDisplayName, or id, but not multiple';
-        }
-        if (args.options.appId && !utils_1.validation.isValidGuid(args.options.appId)) {
+        if (args.options.appId && !validation_1.validation.isValidGuid(args.options.appId)) {
             return `${args.options.appId} is not a valid GUID`;
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
     }));
+}, _SpoSiteAppPermissionRemoveCommand_initOptionSets = function _SpoSiteAppPermissionRemoveCommand_initOptionSets() {
+    this.optionSets.push(['appId', 'appDisplayName', 'id']);
 };
 module.exports = new SpoSiteAppPermissionRemoveCommand();
 //# sourceMappingURL=site-apppermission-remove.js.map