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

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

@@ -12,11 +12,12 @@ import { formatting } from '../../../../utils/formatting.js';
 import { spo } from '../../../../utils/spo.js';
 import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
-import aadO365GroupSetCommand from '../../../aad/commands/o365group/o365group-set.js';
+import aadM365GroupSetCommand from '../../../aad/commands/m365group/m365group-set.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
 import { SharingCapabilities } from '../site/SharingCapabilities.js';
 import spoSiteDesignApplyCommand from '../sitedesign/sitedesign-apply.js';
+import { FlowsPolicy } from './FlowsPolicy.js';
 class SpoSiteSetCommand extends SpoCommand {
     get name() {
         return commands.SITE_SET;
@@ -83,89 +84,69 @@ class SpoSiteSetCommand extends SpoCommand {
             await logger.logToStderr('Site is not group connected');
         }
         if (typeof args.options.isPublic !== 'undefined') {
-            return Promise.reject(`The isPublic option can't be set on a site that is not groupified`);
+            throw `The isPublic option can't be set on a site that is not groupified`;
         }
-        return this.updateSiteDescription(logger, args)
-            .then(_ => this.updateSiteOwners(logger, args));
+        await this.updateSiteDescription(logger, args);
+        await this.updateSiteOwners(logger, args);
     }
-    waitForSiteUpdateCompletion(logger, args, res) {
-        return new Promise((resolve, reject) => {
-            if (!res) {
-                resolve();
-                return;
-            }
-            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,
-                        debug: this.debug,
-                        verbose: this.verbose
-                    });
-                }, operation.PollingInterval);
-            }
+    async waitForSiteUpdateCompletion(logger, args, response) {
+        if (!response) {
+            return;
+        }
+        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) => {
+            setTimeout(() => {
+                spo.waitUntilFinished({
+                    operationId: JSON.stringify(operation._ObjectIdentity_),
+                    siteUrl: this.spoAdminUrl,
+                    resolve,
+                    reject,
+                    logger,
+                    currentContext: this.context,
+                    debug: this.debug,
+                    verbose: this.verbose
+                });
+            }, operation.PollingInterval);
         });
     }
     async updateSiteOwners(logger, args) {
         if (!args.options.owners) {
-            return Promise.resolve();
+            return;
         }
-        return new Promise(async (resolve, reject) => {
-            if (this.verbose) {
-                await logger.logToStderr(`Updating site owners ${args.options.url}...`);
-            }
-            Promise.all(args.options.owners.split(',').map(o => {
-                return this.setAdmin(args.options.url, o.trim());
-            }))
-                .then(() => {
-                resolve();
-            }, (err) => {
-                reject(err);
-            });
-        });
+        if (this.verbose) {
+            await logger.logToStderr(`Updating site owners ${args.options.url}...`);
+        }
+        await Promise.all(args.options.owners.split(',').map(o => {
+            return this.setAdmin(args.options.url, o.trim());
+        }));
     }
-    setAdmin(siteUrl, principal) {
-        return new Promise((resolve, reject) => {
-            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="48" ObjectPathId="47" /></Actions><ObjectPaths><Method Id="47" ParentId="34" Name="SetSiteAdmin"><Parameters><Parameter Type="String">${formatting.escapeXml(siteUrl)}</Parameter><Parameter Type="String">${formatting.escapeXml(principal)}</Parameter><Parameter Type="Boolean">true</Parameter></Parameters></Method><Constructor Id="34" 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 {
-                    resolve();
-                }
-            }, (err) => {
-                reject(err);
-            });
-        });
+    async setAdmin(siteUrl, principal) {
+        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="48" ObjectPathId="47" /></Actions><ObjectPaths><Method Id="47" ParentId="34" Name="SetSiteAdmin"><Parameters><Parameter Type="String">${formatting.escapeXml(siteUrl)}</Parameter><Parameter Type="String">${formatting.escapeXml(principal)}</Parameter><Parameter Type="Boolean">true</Parameter></Parameters></Method><Constructor Id="34" 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;
+        }
     }
     async updateSiteDescription(logger, args) {
         if (!args.options.description) {
-            return Promise.resolve(undefined);
+            return;
         }
         if (this.verbose) {
             await logger.logToStderr(`Setting site description ${args.options.url}...`);
@@ -184,11 +165,11 @@ class SpoSiteSetCommand extends SpoCommand {
             },
             json: true
         };
-        return request.post(requestOptions);
+        await request.post(requestOptions);
     }
     async updateSiteLockState(logger, args) {
         if (!args.options.lockState) {
-            return Promise.resolve(undefined);
+            return;
         }
         if (this.verbose) {
             await logger.logToStderr(`Setting site lock state ${args.options.url}...`);
@@ -206,52 +187,44 @@ class SpoSiteSetCommand extends SpoCommand {
         if (this.debug) {
             await logger.logToStderr(`Site attached to group ${this.groupId}`);
         }
-        return new Promise((resolve, reject) => {
-            if (typeof args.options.title === 'undefined' &&
-                typeof args.options.description === 'undefined' &&
-                typeof args.options.isPublic === 'undefined' &&
-                typeof args.options.owners === 'undefined') {
-                return resolve();
-            }
-            const promises = [];
-            if (typeof args.options.title !== 'undefined') {
-                const requestOptions = {
-                    url: `${this.spoAdminUrl}/_api/SPOGroup/UpdateGroupPropertiesBySiteId`,
-                    headers: {
-                        accept: 'application/json;odata=nometadata',
-                        'content-type': 'application/json;charset=utf-8',
-                        'X-RequestDigest': this.context.FormDigestValue
-                    },
-                    data: {
-                        groupId: this.groupId,
-                        siteId: this.siteId,
-                        displayName: args.options.title
-                    },
-                    responseType: 'json'
-                };
-                promises.push(request.post(requestOptions));
-            }
-            if (typeof args.options.isPublic !== 'undefined') {
-                const commandOptions = {
-                    id: this.groupId,
-                    isPrivate: (args.options.isPublic === false),
-                    debug: this.debug,
-                    verbose: this.verbose
-                };
-                promises.push(Cli.executeCommand(aadO365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
-            }
-            if (args.options.description) {
-                promises.push(this.setGroupifiedSiteDescription(args.options.description));
-            }
-            promises.push(this.setGroupifiedSiteOwners(logger, args));
-            Promise
-                .all(promises)
-                .then(() => {
-                resolve();
-            }, (error) => {
-                reject(error);
-            });
-        });
+        if (typeof args.options.title === 'undefined' &&
+            typeof args.options.description === 'undefined' &&
+            typeof args.options.isPublic === 'undefined' &&
+            typeof args.options.owners === 'undefined') {
+            return;
+        }
+        const promises = [];
+        if (typeof args.options.title !== 'undefined') {
+            const requestOptions = {
+                url: `${this.spoAdminUrl}/_api/SPOGroup/UpdateGroupPropertiesBySiteId`,
+                headers: {
+                    accept: 'application/json;odata=nometadata',
+                    'content-type': 'application/json;charset=utf-8',
+                    'X-RequestDigest': this.context.FormDigestValue
+                },
+                data: {
+                    groupId: this.groupId,
+                    siteId: this.siteId,
+                    displayName: args.options.title
+                },
+                responseType: 'json'
+            };
+            promises.push(request.post(requestOptions));
+        }
+        if (typeof args.options.isPublic !== 'undefined') {
+            const commandOptions = {
+                id: this.groupId,
+                isPrivate: (args.options.isPublic === false),
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            promises.push(Cli.executeCommand(aadM365GroupSetCommand, { options: { ...commandOptions, _: [] } }));
+        }
+        if (args.options.description) {
+            promises.push(this.setGroupifiedSiteDescription(args.options.description));
+        }
+        promises.push(this.setGroupifiedSiteOwners(logger, args));
+        await Promise.all(promises);
     }
     setGroupifiedSiteDescription(description) {
         const requestOptions = {
@@ -267,7 +240,7 @@ class SpoSiteSetCommand extends SpoCommand {
     }
     async setGroupifiedSiteOwners(logger, args) {
         if (typeof args.options.owners === 'undefined') {
-            return Promise.resolve();
+            return;
         }
         const owners = args.options.owners.split(',').map(o => o.trim());
         if (this.verbose) {
@@ -280,28 +253,25 @@ class SpoSiteSetCommand extends SpoCommand {
             },
             responseType: 'json'
         };
-        return request.get(requestOptions)
-            .then((res) => {
-            if (res.value.length === 0) {
-                return Promise.resolve();
-            }
-            return Promise.all(res.value.map(user => {
-                const requestOptions = {
-                    url: `${this.spoAdminUrl}/_api/SP.Directory.DirectorySession/Group('${this.groupId}')/Owners/Add(objectId='${user.id}', principalName='')`,
-                    headers: {
-                        'content-type': 'application/json;odata=verbose'
-                    }
-                };
-                return request.post(requestOptions);
-            }));
-        });
+        const response = await request.get(requestOptions);
+        if (response.value.length === 0) {
+            return;
+        }
+        await Promise.all(response.value.map(user => {
+            const requestOptions = {
+                url: `${this.spoAdminUrl}/_api/SP.Directory.DirectorySession/Group('${this.groupId}')/Owners/Add(objectId='${user.id}', principalName='')`,
+                headers: {
+                    'content-type': 'application/json;odata=verbose'
+                }
+            };
+            return request.post(requestOptions);
+        }));
     }
-    updateSiteProperties(logger, args) {
+    async updateSiteProperties(logger, args) {
         const isGroupConnectedSite = this.isGroupConnectedSite();
         const sharedProperties = ['classification', 'disableFlows', 'socialBarOnSitePagesDisabled', 'shareByEmailEnabled', 'sharingCapability', 'noScriptSite'];
         const siteProperties = ['title', 'resourceQuota', 'resourceQuotaWarningLevel', 'storageQuota', 'storageQuotaWarningLevel', 'allowSelfServiceUpgrade'];
         let properties = sharedProperties;
-        properties = properties;
         if (!isGroupConnectedSite) {
             properties = properties.concat(siteProperties);
         }
@@ -313,71 +283,84 @@ class SpoSiteSetCommand extends SpoCommand {
             }
         }
         if (!updatedProperties) {
-            return Promise.resolve(undefined);
-        }
-        return spo
-            .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
-            .then(async (res) => {
-            this.context = res;
-            if (this.verbose) {
-                await logger.logToStderr(`Updating site ${args.options.url} properties...`);
-            }
-            let propertyId = 27;
-            const payload = [];
-            if (!isGroupConnectedSite) {
-                if (args.options.title) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Title"><Parameter Type="String">${formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
-                }
-                if (args.options.resourceQuota) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="UserCodeMaximumLevel"><Parameter Type="Double">${args.options.resourceQuota}</Parameter></SetProperty>`);
-                }
-                if (args.options.resourceQuotaWarningLevel) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="UserCodeWarningLevel"><Parameter Type="Double">${args.options.resourceQuotaWarningLevel}</Parameter></SetProperty>`);
-                }
-                if (args.options.storageQuota) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageMaximumLevel"><Parameter Type="Int64">${args.options.storageQuota}</Parameter></SetProperty>`);
-                }
-                if (args.options.storageQuotaWarningLevel) {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageWarningLevel"><Parameter Type="Int64">${args.options.storageQuotaWarningLevel}</Parameter></SetProperty>`);
-                }
-                if (typeof args.options.allowSelfServiceUpgrade !== 'undefined') {
-                    payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="AllowSelfServiceUpgrade"><Parameter Type="Boolean">${args.options.allowSelfServiceUpgrade}</Parameter></SetProperty>`);
-                }
-            }
-            if (typeof args.options.classification === 'string') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${formatting.escapeXml(args.options.classification)}</Parameter></SetProperty>`);
+            return;
+        }
+        this.context = await spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+        if (this.verbose) {
+            await logger.logToStderr(`Updating site ${args.options.url} properties...`);
+        }
+        let propertyId = 27;
+        const payload = [];
+        const sitePropertiesPayload = [];
+        if (!isGroupConnectedSite) {
+            if (args.options.title) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Title"><Parameter Type="String">${formatting.escapeXml(args.options.title)}</Parameter></SetProperty>`);
             }
-            if (typeof args.options.disableFlows !== 'undefined') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Boolean">${args.options.disableFlows}</Parameter></SetProperty>`);
+            if (args.options.resourceQuota) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="UserCodeMaximumLevel"><Parameter Type="Double">${args.options.resourceQuota}</Parameter></SetProperty>`);
             }
-            if (typeof args.options.socialBarOnSitePagesDisabled !== 'undefined') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SocialBarOnSitePagesDisabled"><Parameter Type="Boolean">${args.options.socialBarOnSitePagesDisabled}</Parameter></SetProperty>`);
+            if (args.options.resourceQuotaWarningLevel) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="UserCodeWarningLevel"><Parameter Type="Double">${args.options.resourceQuotaWarningLevel}</Parameter></SetProperty>`);
             }
-            if (typeof args.options.shareByEmailEnabled !== 'undefined') {
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="ShareByEmailEnabled"><Parameter Type="Boolean">${args.options.shareByEmailEnabled}</Parameter></SetProperty>`);
+            if (args.options.storageQuota) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageMaximumLevel"><Parameter Type="Int64">${args.options.storageQuota}</Parameter></SetProperty>`);
             }
-            if (args.options.sharingCapability) {
-                const sharingCapability = SharingCapabilities[args.options.sharingCapability];
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SharingCapability"><Parameter Type="Enum">${sharingCapability}</Parameter></SetProperty>`);
+            if (args.options.storageQuotaWarningLevel) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="StorageWarningLevel"><Parameter Type="Int64">${args.options.storageQuotaWarningLevel}</Parameter></SetProperty>`);
             }
-            if (typeof args.options.noScriptSite !== 'undefined') {
-                const noScriptSite = args.options.noScriptSite ? 2 : 1;
-                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DenyAddAndCustomizePages"><Parameter Type="Enum">${noScriptSite}</Parameter></SetProperty>`);
+            if (args.options.allowSelfServiceUpgrade !== undefined) {
+                payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="AllowSelfServiceUpgrade"><Parameter Type="Boolean">${args.options.allowSelfServiceUpgrade}</Parameter></SetProperty>`);
             }
+        }
+        if (typeof args.options.classification === 'string') {
+            sitePropertiesPayload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="Classification"><Parameter Type="String">${formatting.escapeXml(args.options.classification)}</Parameter></SetProperty>`);
+        }
+        if (args.options.disableFlows !== undefined) {
+            const flowsPolicy = args.options.disableFlows ? FlowsPolicy.Disabled : FlowsPolicy.Enabled;
+            payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DisableFlows"><Parameter Type="Enum">${flowsPolicy}</Parameter></SetProperty>`);
+        }
+        if (typeof args.options.socialBarOnSitePagesDisabled !== 'undefined') {
+            payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SocialBarOnSitePagesDisabled"><Parameter Type="Boolean">${args.options.socialBarOnSitePagesDisabled}</Parameter></SetProperty>`);
+        }
+        if (args.options.shareByEmailEnabled !== undefined) {
+            sitePropertiesPayload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="ShareByEmailEnabled"><Parameter Type="Boolean">${args.options.shareByEmailEnabled}</Parameter></SetProperty>`);
+        }
+        if (args.options.sharingCapability) {
+            const sharingCapability = SharingCapabilities[args.options.sharingCapability];
+            payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="SharingCapability"><Parameter Type="Enum">${sharingCapability}</Parameter></SetProperty>`);
+        }
+        if (args.options.noScriptSite !== undefined) {
+            const noScriptSite = args.options.noScriptSite ? 2 : 1;
+            payload.push(`<SetProperty Id="${propertyId++}" ObjectPathId="5" Name="DenyAddAndCustomizePages"><Parameter Type="Enum">${noScriptSite}</Parameter></SetProperty>`);
+        }
+        let response;
+        let sitePropertiesResponse;
+        if (sitePropertiesPayload.length > 0) {
+            const requestOptions = {
+                url: `${args.options.url}/_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>${sitePropertiesPayload.join('')}</Actions><ObjectPaths><StaticProperty Id="1" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /><Property Id="5" ParentId="1" Name="Site" /></ObjectPaths></Request>`
+            };
+            sitePropertiesResponse = await request.post(requestOptions);
+        }
+        if (payload.length > 0) {
             const pos = this.tenantId.indexOf('|') + 1;
             const requestOptions = {
                 url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
-                    'X-RequestDigest': res.FormDigestValue
+                    '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>${payload.join('')}<ObjectPath Id="14" ObjectPathId="13" /><ObjectIdentityQuery Id="15" ObjectPathId="5" /><Query Id="16" ObjectPathId="13"><Query SelectAllProperties="false"><Properties><Property Name="IsComplete" ScalarProperty="true" /><Property Name="PollingInterval" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="53d8499e-d0d2-5000-cb83-9ade5be42ca4|${this.tenantId.substr(pos, this.tenantId.indexOf('&') - pos)}&#xA;SiteProperties&#xA;${formatting.encodeQueryParameter(args.options.url)}" /><Method Id="13" ParentId="5" Name="Update" /></ObjectPaths></Request>`
             };
-            return request.post(requestOptions);
-        });
+            response = await request.post(requestOptions);
+        }
+        return response || sitePropertiesResponse;
     }
-    applySiteDesign(logger, args) {
+    async applySiteDesign(logger, args) {
         if (typeof args.options.siteDesignId === 'undefined') {
-            return Promise.resolve();
+            return;
         }
         const options = {
             webUrl: args.options.url,
@@ -399,16 +382,12 @@ class SpoSiteSetCommand extends SpoCommand {
             },
             responseType: 'json'
         };
-        return request
-            .get(requestOptions)
-            .then(async (siteInfo) => {
-            this.groupId = siteInfo.GroupId;
-            this.siteId = siteInfo.Id;
-            if (this.debug) {
-                await logger.logToStderr(`Retrieved site IDs. siteId: ${this.siteId}, groupId: ${this.groupId}`);
-            }
-            return Promise.resolve();
-        });
+        const siteInfo = await request.get(requestOptions);
+        this.groupId = siteInfo.GroupId;
+        this.siteId = siteInfo.Id;
+        if (this.debug) {
+            await logger.logToStderr(`Retrieved site IDs. siteId: ${this.siteId}, groupId: ${this.groupId}`);
+        }
     }
     isGroupConnectedSite() {
         return this.groupId !== '00000000-0000-0000-0000-000000000000';

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

@@ -75,7 +75,7 @@ class SpoTenantAppCatalogAddCommand extends SpoCommand {
                 url: url,
                 skipRecycleBin: true,
                 wait: true,
-                confirm: true,
+                force: true,
                 verbose: this.verbose,
                 debug: this.debug
             };

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-get.js

@@ -11,6 +11,7 @@ import { urlUtil } from '../../../../utils/urlUtil.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
+import { Cli } from '../../../../cli/Cli.js';
 class SpoTenantApplicationCustomizerGetCommand extends SpoCommand {
     get name() {
         return commands.TENANT_APPLICATIONCUSTOMIZER_GET;
@@ -37,7 +38,7 @@ class SpoTenantApplicationCustomizerGetCommand extends SpoCommand {
                 filter = `Title eq '${args.options.title}'`;
             }
             else if (args.options.id) {
-                filter = `GUID eq '${args.options.id}'`;
+                filter = `Id eq '${args.options.id}'`;
             }
             else {
                 filter = `TenantWideExtensionComponentId eq '${args.options.clientSideComponentId}'`;
@@ -48,11 +49,15 @@ class SpoTenantApplicationCustomizerGetCommand extends SpoCommand {
                 if (listItemInstances.length === 0) {
                     throw 'The specified application customizer was not found';
                 }
+                listItemInstances.forEach(v => delete v['ID']);
                 if (listItemInstances.length > 1) {
-                    throw `Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.map(item => item.GUID).join(', ')}`;
+                    const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
+                    const result = await Cli.handleMultipleResultsFound(`Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
+                    await logger.log(result);
+                }
+                else {
+                    await logger.log(listItemInstances[0]);
                 }
-                listItemInstances.forEach(v => delete v['ID']);
-                await logger.log(listItemInstances[0]);
             }
             else {
                 throw 'The specified application customizer was not found';
@@ -77,12 +82,12 @@ _SpoTenantApplicationCustomizerGetCommand_instances = new WeakSet(), _SpoTenantA
     }, {
         option: '-i, --id [id]'
     }, {
-        option: '-c, --clientSideComponentId  [clientSideComponentId]'
+        option: '-c, --clientSideComponentId [clientSideComponentId]'
     });
 }, _SpoTenantApplicationCustomizerGetCommand_initValidators = function _SpoTenantApplicationCustomizerGetCommand_initValidators() {
     this.validators.push(async (args) => {
-        if (args.options.id && !validation.isValidGuid(args.options.id)) {
-            return `${args.options.id} is not a valid GUID`;
+        if (args.options.id && isNaN(parseInt(args.options.id))) {
+            return `${args.options.id} is not a number`;
         }
         if (args.options.clientSideComponentId && !validation.isValidGuid(args.options.clientSideComponentId)) {
             return `${args.options.clientSideComponentId} is not a valid GUID`;

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-list.js

@@ -22,8 +22,9 @@ class SpoTenantApplicationCustomizerListCommand extends SpoCommand {
         }
         const listServerRelativeUrl = urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
         try {
-            const response = await odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=TenantWideExtensionLocation eq 'ClientSideExtension.ApplicationCustomizer'`);
-            await logger.log(response);
+            const listItems = await odata.getAllItems(`${appCatalogUrl}/_api/web/GetList('${formatting.encodeQueryParameter(listServerRelativeUrl)}')/items?$filter=TenantWideExtensionLocation eq 'ClientSideExtension.ApplicationCustomizer'`);
+            listItems.forEach(i => delete i.ID);
+            await logger.log(listItems);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-remove.js

@@ -66,7 +66,8 @@ class SpoTenantApplicationCustomizerRemoveCommand extends SpoCommand {
             throw 'The specified application customizer was not found';
         }
         if (listItemInstances.length > 1) {
-            throw `Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.map(item => item.Id).join(', ')}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
+            listItemInstances[0] = await Cli.handleMultipleResultsFound(`Multiple application customizers with ${args.options.title || args.options.clientSideComponentId} were found.`, resultAsKeyValuePair);
         }
         return listItemInstances[0].Id;
     }

package/dist/m365/spo/commands/tenant/tenant-applicationcustomizer-set.js

@@ -4,7 +4,6 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
     return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
 };
 var _SpoTenantApplicationCustomizerSetCommand_instances, _SpoTenantApplicationCustomizerSetCommand_initTelemetry, _SpoTenantApplicationCustomizerSetCommand_initOptions, _SpoTenantApplicationCustomizerSetCommand_initValidators, _SpoTenantApplicationCustomizerSetCommand_initOptionSets;
-import os from 'os';
 import { Cli } from '../../../../cli/Cli.js';
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
@@ -69,7 +68,9 @@ class SpoTenantApplicationCustomizerSetCommand extends SpoCommand {
             throw 'The specified application customizer was not found';
         }
         if (listItemInstances.length > 1) {
-            throw `Multiple application customizers with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found. Please disambiguate using IDs: ${os.EOL}${listItemInstances.map(item => `- ${item.Id}`).join(os.EOL)}`;
+            const resultAsKeyValuePair = formatting.convertArrayToHashTable('Id', listItemInstances);
+            const result = await Cli.handleMultipleResultsFound(`Multiple application customizers with ${title ? `title '${title}'` : `ClientSideComponentId '${clientSideComponentId}'`} found.`, resultAsKeyValuePair);
+            return result.Id;
         }
         return listItemInstances[0].Id;
     }