@pnp/cli-microsoft365 6.11.0-beta.ee225fb → 6.11.0

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

@@ -141,18 +141,16 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                         requestOptions.data.request.Owner = args.options.owners;
                     }
                 }
-                const res = yield request_1.default.post(requestOptions);
+                const response = yield request_1.default.post(requestOptions);
                 if (isTeamSite) {
-                    if (res.ErrorMessage !== null) {
-                        throw res.ErrorMessage;
-                    }
-                    else {
-                        logger.log(res.SiteUrl);
+                    if (response.ErrorMessage !== null) {
+                        throw response.ErrorMessage;
                     }
+                    logger.log(response.SiteUrl);
                 }
                 else {
-                    if (res.SiteStatus === 2) {
-                        logger.log(res.SiteUrl);
+                    if (response.SiteStatus === 2) {
+                        logger.log(response.SiteUrl);
                     }
                     else {
                         throw 'An error has occurred while creating the site';
@@ -171,7 +169,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                 this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
                 let exists;
                 if (args.options.removeDeletedSite) {
-                    exists = yield this.siteExistsInTheRecycleBin(args.options.url, logger);
+                    exists = yield this.siteExists(args.options.url, logger);
                 }
                 else {
                     // assume site doesn't exist
@@ -205,153 +203,18 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                     },
                     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" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query></Query><Query Id="8" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="CreateSite"><Parameters><Parameter TypeId="{11f84fff-b8cf-47b6-8b50-34e692656606}"><Property Name="CompatibilityLevel" Type="Int32">0</Property><Property Name="Lcid" Type="UInt32">${lcid}</Property><Property Name="Owner" Type="String">${formatting_1.formatting.escapeXml(args.options.owners)}</Property><Property Name="StorageMaximumLevel" Type="Int64">${storageQuota}</Property><Property Name="StorageWarningLevel" Type="Int64">${storageQuotaWarningLevel}</Property><Property Name="Template" Type="String">${formatting_1.formatting.escapeXml(webTemplate)}</Property><Property Name="TimeZoneId" Type="Int32">${args.options.timeZone}</Property><Property Name="Title" Type="String">${formatting_1.formatting.escapeXml(args.options.title)}</Property><Property Name="Url" Type="String">${formatting_1.formatting.escapeXml(args.options.url)}</Property><Property Name="UserCodeMaximumLevel" Type="Double">${resourceQuota}</Property><Property Name="UserCodeWarningLevel" Type="Double">${resourceQuotaWarningLevel}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`
                 };
-                const res = yield request_1.default.post(requestOptions);
-                yield new Promise((resolve, reject) => {
-                    const json = JSON.parse(res);
-                    const response = json[0];
-                    if (response.ErrorInfo) {
-                        reject(response.ErrorInfo.ErrorMessage);
-                    }
-                    else {
-                        const operation = json[json.length - 1];
-                        const isComplete = operation.IsComplete;
-                        if (!args.options.wait || isComplete) {
-                            resolve();
-                            return;
-                        }
-                        setTimeout(() => {
-                            spo_1.spo.waitUntilFinished({
-                                operationId: JSON.stringify(operation._ObjectIdentity_),
-                                siteUrl: this.spoAdminUrl,
-                                resolve,
-                                reject,
-                                logger,
-                                currentContext: this.context,
-                                verbose: this.verbose,
-                                debug: this.debug
-                            });
-                        }, operation.PollingInterval);
-                    }
-                });
-            }
-            catch (err) {
-                this.handleRejectedPromise(err);
-            }
-        });
-    }
-    siteExistsInTheRecycleBin(url, logger) {
-        return new Promise((resolve, reject) => {
-            spo_1.spo
-                .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
-                .then((res) => {
-                this.context = res;
-                if (this.verbose) {
-                    logger.logToStderr(`Checking if the site ${url} exists...`);
-                }
-                const requestOptions = {
-                    url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': this.context.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="197" ObjectPathId="196" /><ObjectPath Id="199" ObjectPathId="198" /><Query Id="200" ObjectPathId="198"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="196" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="198" ParentId="196" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter><Parameter Type="Boolean">false</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) {
-                    if (response.ErrorInfo.ErrorTypeName === 'Microsoft.Online.SharePoint.Common.SpoNoSiteException') {
-                        return Promise.resolve(false);
-                    }
-                    else {
-                        return Promise.reject(response.ErrorInfo.ErrorMessage);
-                    }
-                }
-                else {
-                    const site = json[json.length - 1];
-                    if (site.Status === 'Recycled') {
-                        return Promise.reject(true);
-                    }
-                    else {
-                        return Promise.resolve(false);
-                    }
-                }
-            })
-                .then(() => {
-                if (this.verbose) {
-                    logger.logToStderr(`Site doesn't exist. Checking if the site ${url} exists in the recycle bin...`);
+                const response = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(response);
+                const responseContent = json[0];
+                if (responseContent.ErrorInfo) {
+                    throw responseContent.ErrorInfo.ErrorMessage;
                 }
-                const requestOptions = {
-                    url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': this.context.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="181" ObjectPathId="180" /><Query Id="182" ObjectPathId="180"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="180" ParentId="175" Name="GetDeletedSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    if (response.ErrorInfo.ErrorTypeName === 'Microsoft.SharePoint.Client.UnknownError') {
-                        resolve(false);
-                    }
-                    else {
-                        reject(response.ErrorInfo.ErrorMessage);
-                    }
+                const operation = json[json.length - 1];
+                const isComplete = operation.IsComplete;
+                if (!args.options.wait || isComplete) {
+                    return;
                 }
-                else {
-                    const site = json[json.length - 1];
-                    if (site.Status === 'Recycled') {
-                        resolve(true);
-                    }
-                    else {
-                        resolve(false);
-                    }
-                }
-            }, (error) => {
-                if (typeof error === 'boolean') {
-                    resolve(error);
-                }
-                else {
-                    reject(error);
-                }
-            });
-        });
-    }
-    deleteSiteFromTheRecycleBin(url, wait, logger) {
-        return new Promise((resolve, reject) => {
-            spo_1.spo
-                .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
-                .then((res) => {
-                this.context = res;
-                if (this.verbose) {
-                    logger.logToStderr(`Deleting site ${url} from the recycle bin...`);
-                }
-                const requestOptions = {
-                    url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': this.context.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="185" ObjectPathId="184" /><Query Id="186" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="184" ParentId="175" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                }
-                else {
-                    const operation = json[json.length - 1];
-                    const isComplete = operation.IsComplete;
-                    if (!wait || isComplete) {
-                        resolve();
-                        return;
-                    }
+                yield new Promise((resolve, reject) => {
                     setTimeout(() => {
                         spo_1.spo.waitUntilFinished({
                             operationId: JSON.stringify(operation._ObjectIdentity_),
@@ -364,7 +227,103 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                             debug: this.debug
                         });
                     }, operation.PollingInterval);
+                });
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
+    }
+    siteExists(url, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            if (this.verbose) {
+                logger.logToStderr(`Checking if the site ${url} exists...`);
+            }
+            const requestOptions = {
+                url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.context.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="197" ObjectPathId="196" /><ObjectPath Id="199" ObjectPathId="198" /><Query Id="200" ObjectPathId="198"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Constructor Id="196" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="198" ParentId="196" Name="GetSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method></ObjectPaths></Request>`
+            };
+            const response = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(response);
+            const responseContent = json[0];
+            if (responseContent.ErrorInfo) {
+                if (responseContent.ErrorInfo.ErrorTypeName === 'Microsoft.Online.SharePoint.Common.SpoNoSiteException') {
+                    return yield this.siteExistsInTheRecycleBin(url, logger);
                 }
+                throw responseContent.ErrorInfo.ErrorMessage;
+            }
+            else {
+                const site = json[json.length - 1];
+                return site.Status === 'Recycled';
+            }
+        });
+    }
+    siteExistsInTheRecycleBin(url, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Site doesn't exist. Checking if the site ${url} exists in the recycle bin...`);
+            }
+            const requestOptions = {
+                url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.context.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="181" ObjectPathId="180" /><Query Id="182" ObjectPathId="180"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="180" ParentId="175" Name="GetDeletedSitePropertiesByUrl"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+            };
+            const res = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(res);
+            const response = json[0];
+            if (response.ErrorInfo) {
+                if (response.ErrorInfo.ErrorTypeName === 'Microsoft.SharePoint.Client.UnknownError') {
+                    return false;
+                }
+                throw response.ErrorInfo.ErrorMessage;
+            }
+            const site = json[json.length - 1];
+            return site.Status === 'Recycled';
+        });
+    }
+    deleteSiteFromTheRecycleBin(url, wait, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+            if (this.verbose) {
+                logger.logToStderr(`Deleting site ${url} from the recycle bin...`);
+            }
+            const requestOptions = {
+                url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.context.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="185" ObjectPathId="184" /><Query Id="186" ObjectPathId="184"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="184" ParentId="175" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+            };
+            const response = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(response);
+            const responseContent = json[0];
+            if (responseContent.ErrorInfo) {
+                throw responseContent.ErrorInfo.ErrorMessage;
+            }
+            const operation = json[json.length - 1];
+            const isComplete = operation.IsComplete;
+            if (!wait || isComplete) {
+                return;
+            }
+            yield new Promise((resolve, reject) => {
+                setTimeout(() => {
+                    spo_1.spo.waitUntilFinished({
+                        operationId: JSON.stringify(operation._ObjectIdentity_),
+                        siteUrl: this.spoAdminUrl,
+                        resolve,
+                        reject,
+                        logger,
+                        currentContext: this.context,
+                        verbose: this.verbose,
+                        debug: this.debug
+                    });
+                }, operation.PollingInterval);
             });
         });
     }

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

@@ -39,40 +39,39 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand_1.default {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initOptionSets).call(this);
     }
     getAppInfo(args) {
-        if (args.options.appId && args.options.appDisplayName) {
-            return Promise.resolve({
-                appId: args.options.appId,
-                displayName: args.options.appDisplayName
-            });
-        }
-        let endpoint = "";
-        if (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/servicePrincipals?$select=appId,displayName&$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
-        }
-        const appRequestOptions = {
-            url: endpoint,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(appRequestOptions)
-            .then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.appId && args.options.appDisplayName) {
+                return {
+                    appId: args.options.appId,
+                    displayName: args.options.appDisplayName
+                };
+            }
+            let endpoint = "";
+            if (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/servicePrincipals?$select=appId,displayName&$filter=displayName eq '${formatting_1.formatting.encodeQueryParameter(args.options.appDisplayName)}'`;
+            }
+            const appRequestOptions = {
+                url: endpoint,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(appRequestOptions);
             const appItem = response.value[0];
             if (!appItem) {
-                return Promise.reject("The specified Azure AD app does not exist");
+                throw "The specified Azure AD app does not exist";
             }
             if (response.value.length > 1) {
-                return Promise.reject(`Multiple Azure AD app with displayName ${args.options.appDisplayName} found: ${response.value.map(x => x.appId)}`);
+                throw `Multiple Azure AD app with displayName ${args.options.appDisplayName} found: ${response.value.map(x => x.appId)}`;
             }
-            return Promise.resolve({
+            return {
                 appId: appItem.appId,
                 displayName: appItem.displayName
-            });
+            };
         });
     }
     /**

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

@@ -31,15 +31,14 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
     constructor() {
         super();
         _SpoSiteAppPermissionRemoveCommand_instances.add(this);
-        this.siteId = '';
         __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);
     }
-    getPermissions() {
+    getPermissions(siteId) {
         const requestOptions = {
-            url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
+            url: `${this.resource}/v1.0/sites/${siteId}/permissions`,
             headers: {
                 accept: 'application/json;odata.metadata=none'
             },
@@ -47,34 +46,33 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
         };
         return request_1.default.get(requestOptions);
     }
-    getFilteredPermissions(args, permissions) {
+    getFilteredPermissions(options, permissions) {
         let filterProperty = 'displayName';
-        let filterValue = args.options.appDisplayName;
-        if (args.options.appId) {
+        let filterValue = options.appDisplayName;
+        if (options.appId) {
             filterProperty = 'id';
-            filterValue = args.options.appId;
+            filterValue = options.appId;
         }
         return permissions.filter((p) => {
             return p.grantedToIdentities.some(({ application }) => application[filterProperty] === filterValue);
         });
     }
-    getPermissionIds(args) {
-        if (args.options.id) {
-            return Promise.resolve([args.options.id]);
-        }
-        return this
-            .getPermissions()
-            .then((res) => {
-            let permissions = res.value;
-            if (args.options.appId || args.options.appDisplayName) {
-                permissions = this.getFilteredPermissions(args, res.value);
+    getPermissionIds(siteId, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.id) {
+                return Promise.resolve([options.id]);
+            }
+            const permissionsObject = yield this.getPermissions(siteId);
+            let permissions = permissionsObject.value;
+            if (options.appId || options.appDisplayName) {
+                permissions = this.getFilteredPermissions(options, permissionsObject.value);
             }
-            return Promise.resolve(permissions.map(x => x.id));
+            return permissions.map(x => x.id);
         });
     }
-    removePermissions(permissionId) {
+    removePermissions(siteId, permissionId) {
         const spRequestOptions = {
-            url: `${this.resource}/v1.0/sites/${this.siteId}/permissions/${permissionId}`,
+            url: `${this.resource}/v1.0/sites/${siteId}/permissions/${permissionId}`,
             headers: {
                 'accept': 'application/json;odata.metadata=none'
             },
@@ -84,23 +82,8 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeSiteAppPermission = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    this.siteId = yield spo_1.spo.getSpoGraphSiteId(args.options.siteUrl);
-                    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);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeSiteAppPermission();
+                yield this.removeSiteAppPermission(logger, args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -110,11 +93,28 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand_1.default {
                     message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?`
                 });
                 if (result.continue) {
-                    yield removeSiteAppPermission();
+                    yield this.removeSiteAppPermission(logger, args.options);
                 }
             }
         });
     }
+    removeSiteAppPermission(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const siteId = yield spo_1.spo.getSpoGraphSiteId(options.siteUrl);
+                const permissionIdsToRemove = yield this.getPermissionIds(siteId, options);
+                const tasks = [];
+                for (const permissionId of permissionIdsToRemove) {
+                    tasks.push(this.removePermissions(siteId, permissionId));
+                }
+                const response = yield Promise.all(tasks);
+                logger.log(response);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoSiteAppPermissionRemoveCommand_instances = new WeakSet(), _SpoSiteAppPermissionRemoveCommand_initTelemetry = function _SpoSiteAppPermissionRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -47,27 +47,26 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand_1.default {
         return permissions.filter((p) => p.grantedToIdentities.some(({ application }) => application[filterProperty] === filterValue));
     }
     getPermission(args) {
-        if (args.options.id) {
-            return Promise.resolve(args.options.id);
-        }
-        const permissionRequestOptions = {
-            url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
-            headers: {
-                accept: 'application/json;odata.metadata=none'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(permissionRequestOptions)
-            .then(response => {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.id) {
+                return args.options.id;
+            }
+            const permissionRequestOptions = {
+                url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(permissionRequestOptions);
             const sitePermissionItems = this.getFilteredPermissions(args, response.value);
             if (sitePermissionItems.length === 0) {
-                return Promise.reject('The specified app permission does not exist');
+                throw 'The specified app permission does not exist';
             }
             if (sitePermissionItems.length > 1) {
-                return Promise.reject(`Multiple app permissions with displayName ${args.options.appDisplayName} found: ${response.value.map(x => x.grantedToIdentities.map(y => y.application.id))}`);
+                throw `Multiple app permissions with displayName ${args.options.appDisplayName} found: ${response.value.map(x => x.grantedToIdentities.map(y => y.application.id))}`;
             }
-            return Promise.resolve(sitePermissionItems[0].id);
+            return sitePermissionItems[0].id;
         });
     }
     commandAction(logger, args) {