@pnp/cli-microsoft365 7.0.0-beta.f1037e1 → 7.0.0

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

@@ -127,18 +127,16 @@ class SpoSiteAddCommand extends SpoCommand {
                     requestOptions.data.request.Owner = args.options.owners;
                 }
             }
-            const res = await request.post(requestOptions);
+            const response = await request.post(requestOptions);
             if (isTeamSite) {
-                if (res.ErrorMessage !== null) {
-                    throw res.ErrorMessage;
-                }
-                else {
-                    await logger.log(res.SiteUrl);
+                if (response.ErrorMessage !== null) {
+                    throw response.ErrorMessage;
                 }
+                await logger.log(response.SiteUrl);
             }
             else {
-                if (res.SiteStatus === 2) {
-                    await logger.log(res.SiteUrl);
+                if (response.SiteStatus === 2) {
+                    await logger.log(response.SiteUrl);
                 }
                 else {
                     throw 'An error has occurred while creating the site';
@@ -155,7 +153,7 @@ class SpoSiteAddCommand extends SpoCommand {
             this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
             let exists;
             if (args.options.removeDeletedSite) {
-                exists = await this.siteExistsInTheRecycleBin(args.options.url, logger);
+                exists = await this.siteExists(args.options.url, logger);
             }
             else {
                 // assume site doesn't exist
@@ -189,166 +187,121 @@ class SpoSiteAddCommand extends SpoCommand {
                 },
                 data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.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.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.escapeXml(webTemplate)}</Property><Property Name="TimeZoneId" Type="Int32">${args.options.timeZone}</Property><Property Name="Title" Type="String">${formatting.escapeXml(args.options.title)}</Property><Property Name="Url" Type="String">${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 = await request.post(requestOptions);
+            const response = await request.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 (!args.options.wait || isComplete) {
+                return;
+            }
             await 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.waitUntilFinished({
-                            operationId: JSON.stringify(operation._ObjectIdentity_),
-                            siteUrl: this.spoAdminUrl,
-                            resolve,
-                            reject,
-                            logger,
-                            currentContext: this.context,
-                            verbose: this.verbose,
-                            debug: this.debug
-                        });
-                    }, operation.PollingInterval);
-                }
+                setTimeout(() => {
+                    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
-                .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
-                .then(async (res) => {
-                this.context = res;
-                if (this.verbose) {
-                    await 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.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.escapeXml(url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method></ObjectPaths></Request>`
-                };
-                return request.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(async () => {
-                if (this.verbose) {
-                    await 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.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.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                };
-                return request.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);
-                    }
-                }
-                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);
-                }
-            });
-        });
+    async siteExists(url, logger) {
+        this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+        if (this.verbose) {
+            await 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.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.escapeXml(url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method></ObjectPaths></Request>`
+        };
+        const response = await request.post(requestOptions);
+        const json = JSON.parse(response);
+        const responseContent = json[0];
+        if (responseContent.ErrorInfo) {
+            if (responseContent.ErrorInfo.ErrorTypeName === 'Microsoft.Online.SharePoint.Common.SpoNoSiteException') {
+                return await this.siteExistsInTheRecycleBin(url, logger);
+            }
+            throw responseContent.ErrorInfo.ErrorMessage;
+        }
+        else {
+            const site = json[json.length - 1];
+            return site.Status === 'Recycled';
+        }
     }
-    deleteSiteFromTheRecycleBin(url, wait, logger) {
-        return new Promise((resolve, reject) => {
-            spo
-                .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
-                .then(async (res) => {
-                this.context = res;
-                if (this.verbose) {
-                    await 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.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.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                };
-                return request.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;
-                    }
-                    setTimeout(() => {
-                        spo.waitUntilFinished({
-                            operationId: JSON.stringify(operation._ObjectIdentity_),
-                            siteUrl: this.spoAdminUrl,
-                            resolve,
-                            reject,
-                            logger,
-                            currentContext: this.context,
-                            verbose: this.verbose,
-                            debug: this.debug
-                        });
-                    }, operation.PollingInterval);
-                }
-            });
+    async siteExistsInTheRecycleBin(url, logger) {
+        if (this.verbose) {
+            await 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.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.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+        };
+        const res = await request.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';
+    }
+    async deleteSiteFromTheRecycleBin(url, wait, logger) {
+        this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+        if (this.verbose) {
+            await 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.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.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+        };
+        const response = await request.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;
+        }
+        await new Promise((resolve, reject) => {
+            setTimeout(() => {
+                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

@@ -27,12 +27,12 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand {
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoSiteAppPermissionAddCommand_instances, "m", _SpoSiteAppPermissionAddCommand_initOptionSets).call(this);
     }
-    getAppInfo(args) {
+    async getAppInfo(args) {
         if (args.options.appId && args.options.appDisplayName) {
-            return Promise.resolve({
+            return {
                 appId: args.options.appId,
                 displayName: args.options.appDisplayName
-            });
+            };
         }
         let endpoint = "";
         if (args.options.appId) {
@@ -48,21 +48,18 @@ class SpoSiteAppPermissionAddCommand extends GraphCommand {
             },
             responseType: 'json'
         };
-        return request
-            .get(appRequestOptions)
-            .then(response => {
-            const appItem = response.value[0];
-            if (!appItem) {
-                return Promise.reject("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)}`);
-            }
-            return Promise.resolve({
-                appId: appItem.appId,
-                displayName: appItem.displayName
-            });
-        });
+        const response = await request.get(appRequestOptions);
+        const appItem = response.value[0];
+        if (!appItem) {
+            throw "The specified Azure AD app does not exist";
+        }
+        if (response.value.length > 1) {
+            throw `Multiple Azure AD app with displayName ${args.options.appDisplayName} found: ${response.value.map(x => x.appId)}`;
+        }
+        return {
+            appId: appItem.appId,
+            displayName: appItem.displayName
+        };
     }
     /**
      * Checks if the requested permission needs elevation after the initial creation.

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

@@ -20,15 +20,14 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
     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'
             },
@@ -36,34 +35,31 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
         };
         return request.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]);
+    async getPermissionIds(siteId, options) {
+        if (options.id) {
+            return Promise.resolve([options.id]);
         }
-        return this
-            .getPermissions()
-            .then((res) => {
-            let permissions = res.value;
-            if (args.options.appId || args.options.appDisplayName) {
-                permissions = this.getFilteredPermissions(args, res.value);
-            }
-            return Promise.resolve(permissions.map(x => x.id));
-        });
+        const permissionsObject = await this.getPermissions(siteId);
+        let permissions = permissionsObject.value;
+        if (options.appId || options.appDisplayName) {
+            permissions = this.getFilteredPermissions(options, permissionsObject.value);
+        }
+        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'
             },
@@ -72,23 +68,8 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
         return request.delete(spRequestOptions);
     }
     async commandAction(logger, args) {
-        const removeSiteAppPermission = async () => {
-            try {
-                this.siteId = await spo.getSpoGraphSiteId(args.options.siteUrl);
-                const permissionIdsToRemove = await this.getPermissionIds(args);
-                const tasks = [];
-                for (const permissionId of permissionIdsToRemove) {
-                    tasks.push(this.removePermissions(permissionId));
-                }
-                const res = await Promise.all(tasks);
-                await logger.log(res);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeSiteAppPermission();
+            await this.removeSiteAppPermission(logger, args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -98,10 +79,25 @@ class SpoSiteAppPermissionRemoveCommand extends GraphCommand {
                 message: `Are you sure you want to remove the specified application permission from site ${args.options.siteUrl}?`
             });
             if (result.continue) {
-                await removeSiteAppPermission();
+                await this.removeSiteAppPermission(logger, args.options);
             }
         }
     }
+    async removeSiteAppPermission(logger, options) {
+        try {
+            const siteId = await spo.getSpoGraphSiteId(options.siteUrl);
+            const permissionIdsToRemove = await this.getPermissionIds(siteId, options);
+            const tasks = [];
+            for (const permissionId of permissionIdsToRemove) {
+                tasks.push(this.removePermissions(siteId, permissionId));
+            }
+            const response = await Promise.all(tasks);
+            await 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

@@ -35,9 +35,9 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand {
         }
         return permissions.filter((p) => p.grantedToIdentities.some(({ application }) => application[filterProperty] === filterValue));
     }
-    getPermission(args) {
+    async getPermission(args) {
         if (args.options.id) {
-            return Promise.resolve(args.options.id);
+            return args.options.id;
         }
         const permissionRequestOptions = {
             url: `${this.resource}/v1.0/sites/${this.siteId}/permissions`,
@@ -46,18 +46,15 @@ class SpoSiteAppPermissionSetCommand extends GraphCommand {
             },
             responseType: 'json'
         };
-        return request
-            .get(permissionRequestOptions)
-            .then(response => {
-            const sitePermissionItems = this.getFilteredPermissions(args, response.value);
-            if (sitePermissionItems.length === 0) {
-                return Promise.reject('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))}`);
-            }
-            return Promise.resolve(sitePermissionItems[0].id);
-        });
+        const response = await request.get(permissionRequestOptions);
+        const sitePermissionItems = this.getFilteredPermissions(args, response.value);
+        if (sitePermissionItems.length === 0) {
+            throw 'The specified app permission does not exist';
+        }
+        if (sitePermissionItems.length > 1) {
+            throw `Multiple app permissions with displayName ${args.options.appDisplayName} found: ${response.value.map(x => x.grantedToIdentities.map(y => y.application.id))}`;
+        }
+        return sitePermissionItems[0].id;
     }
     async commandAction(logger, args) {
         try {

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

@@ -3,7 +3,7 @@ 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 _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initValidators;
+var _SpoSiteCommSiteEnableCommand_instances, _SpoSiteCommSiteEnableCommand_initTelemetry, _SpoSiteCommSiteEnableCommand_initOptions, _SpoSiteCommSiteEnableCommand_initOptionSets, _SpoSiteCommSiteEnableCommand_initValidators;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -21,11 +21,12 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoSiteCommSiteEnableCommand_instances, "m", _SpoSiteCommSiteEnableCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const designPackageId = args.options.designPackageId || '96c933ac-3698-44c7-9f4a-5fd17d71af9e';
+        const designPackageId = this.getDesignPackageId(args.options);
         if (this.verbose) {
-            logger.logToStderr(`Enabling communication site at ${args.options.url}...`);
+            logger.logToStderr(`Enabling communication site with design package '${designPackageId}' at '${args.options.url}'...`);
         }
         try {
             const requestOptions = {
@@ -42,11 +43,26 @@ class SpoSiteCommSiteEnableCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
+    getDesignPackageId(options) {
+        if (options.designPackageId) {
+            return options.designPackageId;
+        }
+        switch (options.designPackage) {
+            case 'Blank':
+                return 'f6cc5403-0d63-442e-96c0-285923709ffc';
+            case 'Showcase':
+                return '6142d2a0-63a5-4ba0-aede-d9fefca2c767';
+            case 'Topic':
+            default:
+                return '96c933ac-3698-44c7-9f4a-5fd17d71af9e';
+        }
+    }
 }
 _SpoSiteCommSiteEnableCommand_instances = new WeakSet(), _SpoSiteCommSiteEnableCommand_initTelemetry = function _SpoSiteCommSiteEnableCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            designPackageId: typeof args.options.designPackageId !== 'undefined'
+            designPackageId: typeof args.options.designPackageId !== 'undefined',
+            designPackage: typeof args.options.designPackage !== 'undefined'
         });
     });
 }, _SpoSiteCommSiteEnableCommand_initOptions = function _SpoSiteCommSiteEnableCommand_initOptions() {
@@ -54,12 +70,25 @@ _SpoSiteCommSiteEnableCommand_instances = new WeakSet(), _SpoSiteCommSiteEnableC
         option: '-u, --url <url>'
     }, {
         option: '-i, --designPackageId [designPackageId]'
+    }, {
+        option: '-p, --designPackage [designPackage]',
+        autocomplete: ["Topic", "Showcase", "Blank"]
+    });
+}, _SpoSiteCommSiteEnableCommand_initOptionSets = function _SpoSiteCommSiteEnableCommand_initOptionSets() {
+    this.optionSets.push({
+        options: ['designPackageId', 'designPackage'],
+        runsWhen: (args) => args.options.designPackageId || args.options.designPackage
     });
 }, _SpoSiteCommSiteEnableCommand_initValidators = function _SpoSiteCommSiteEnableCommand_initValidators() {
     this.validators.push(async (args) => {
         if (args.options.designPackageId &&
             !validation.isValidGuid(args.options.designPackageId)) {
-            return `${args.options.designPackageId} is not a valid GUID`;
+            return `${args.options.designPackageId} is not a valid GUID.`;
+        }
+        if (args.options.designPackage) {
+            if (['Topic', 'Showcase', 'Blank'].indexOf(args.options.designPackage) === -1) {
+                return `${args.options.designPackage} is not a valid designPackage. Allowed values are Topic|Showcase|Blank`;
+            }
         }
         return validation.isValidSharePointUrl(args.options.url);
     });