@pnp/cli-microsoft365 6.0.0-beta.4e32416 → 6.0.0-beta.55cbe4a

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

@@ -16,10 +16,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteAddCommand_instances, _SpoSiteAddCommand_initTelemetry, _SpoSiteAddCommand_initOptions, _SpoSiteAddCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoSiteAddCommand extends SpoCommand_1.default {
@@ -42,222 +43,211 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Creates new SharePoint Online site';
     }
-    commandAction(logger, args, cb) {
-        const isClassicSite = args.options.type === 'ClassicSite';
-        if (isClassicSite) {
-            this.createClassicSite(logger, args, cb);
-        }
-        else {
-            this.createModernSite(logger, args, cb);
-        }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const isClassicSite = args.options.type === 'ClassicSite';
+            if (isClassicSite) {
+                yield this.createClassicSite(logger, args);
+            }
+            else {
+                yield this.createModernSite(logger, args);
+            }
+        });
     }
-    createModernSite(logger, args, cb) {
-        const isTeamSite = args.options.type !== 'CommunicationSite';
-        let spoUrl = '';
-        utils_1.spo
-            .getSpoUrl(logger, this.debug)
-            .then((_spoUrl) => {
-            spoUrl = _spoUrl;
-            if (args.options.allowFileSharingForGuestUsers && this.verbose) {
-                logger.logToStderr(chalk.yellow(`Option 'allowFileSharingForGuestUsers' is deprecated. Please use 'shareByEmailEnabled' instead`));
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Creating new site...`);
-            }
-            let requestOptions = {};
-            if (isTeamSite) {
-                requestOptions = {
-                    url: `${spoUrl}/_api/GroupSiteManager/CreateGroupEx`,
-                    headers: {
-                        'content-type': 'application/json; odata=verbose; charset=utf-8',
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json',
-                    data: {
-                        displayName: args.options.title,
-                        alias: args.options.alias,
-                        isPublic: args.options.isPublic,
-                        optionalParams: {
-                            Description: args.options.description || '',
-                            CreationOptions: {
-                                results: [],
-                                Classification: args.options.classification || ''
+    createModernSite(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const isTeamSite = args.options.type !== 'CommunicationSite';
+            try {
+                const spoUrl = yield spo_1.spo.getSpoUrl(logger, this.debug);
+                if (args.options.allowFileSharingForGuestUsers && this.verbose) {
+                    logger.logToStderr(chalk.yellow(`Option 'allowFileSharingForGuestUsers' is deprecated. Please use 'shareByEmailEnabled' instead`));
+                }
+                if (this.verbose) {
+                    logger.logToStderr(`Creating new site...`);
+                }
+                let requestOptions = {};
+                if (isTeamSite) {
+                    requestOptions = {
+                        url: `${spoUrl}/_api/GroupSiteManager/CreateGroupEx`,
+                        headers: {
+                            'content-type': 'application/json; odata=verbose; charset=utf-8',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json',
+                        data: {
+                            displayName: args.options.title,
+                            alias: args.options.alias,
+                            isPublic: args.options.isPublic,
+                            optionalParams: {
+                                Description: args.options.description || '',
+                                CreationOptions: {
+                                    results: [],
+                                    Classification: args.options.classification || ''
+                                }
                             }
                         }
-                    }
-                };
-                if (args.options.lcid) {
-                    requestOptions.data.optionalParams.CreationOptions.results.push(`SPSiteLanguage:${args.options.lcid}`);
-                }
-                if (args.options.owners) {
-                    requestOptions.data.optionalParams.Owners = {
-                        results: args.options.owners.split(',').map(o => o.trim())
                     };
-                }
-            }
-            else {
-                let siteDesignId = '';
-                if (args.options.siteDesignId) {
-                    siteDesignId = args.options.siteDesignId;
+                    if (args.options.lcid) {
+                        requestOptions.data.optionalParams.CreationOptions.results.push(`SPSiteLanguage:${args.options.lcid}`);
+                    }
+                    if (args.options.owners) {
+                        requestOptions.data.optionalParams.Owners = {
+                            results: args.options.owners.split(',').map(o => o.trim())
+                        };
+                    }
                 }
                 else {
-                    if (args.options.siteDesign) {
-                        switch (args.options.siteDesign) {
-                            case 'Topic':
-                                siteDesignId = '00000000-0000-0000-0000-000000000000';
-                                break;
-                            case 'Showcase':
-                                siteDesignId = '6142d2a0-63a5-4ba0-aede-d9fefca2c767';
-                                break;
-                            case 'Blank':
-                                siteDesignId = 'f6cc5403-0d63-442e-96c0-285923709ffc';
-                                break;
-                        }
+                    let siteDesignId = '';
+                    if (args.options.siteDesignId) {
+                        siteDesignId = args.options.siteDesignId;
                     }
                     else {
-                        siteDesignId = '00000000-0000-0000-0000-000000000000';
+                        if (args.options.siteDesign) {
+                            switch (args.options.siteDesign) {
+                                case 'Topic':
+                                    siteDesignId = '00000000-0000-0000-0000-000000000000';
+                                    break;
+                                case 'Showcase':
+                                    siteDesignId = '6142d2a0-63a5-4ba0-aede-d9fefca2c767';
+                                    break;
+                                case 'Blank':
+                                    siteDesignId = 'f6cc5403-0d63-442e-96c0-285923709ffc';
+                                    break;
+                            }
+                        }
+                        else {
+                            siteDesignId = '00000000-0000-0000-0000-000000000000';
+                        }
                     }
-                }
-                requestOptions = {
-                    url: `${spoUrl}/_api/SPSiteManager/Create`,
-                    headers: {
-                        'content-type': 'application/json;odata=nometadata',
-                        accept: 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json',
-                    data: {
-                        request: {
-                            Title: args.options.title,
-                            Url: args.options.url,
-                            ShareByEmailEnabled: args.options.shareByEmailEnabled || args.options.allowFileSharingForGuestUsers,
-                            Description: args.options.description || '',
-                            Classification: args.options.classification || '',
-                            WebTemplate: 'SITEPAGEPUBLISHING#0',
-                            SiteDesignId: siteDesignId
+                    requestOptions = {
+                        url: `${spoUrl}/_api/SPSiteManager/Create`,
+                        headers: {
+                            'content-type': 'application/json;odata=nometadata',
+                            accept: 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json',
+                        data: {
+                            request: {
+                                Title: args.options.title,
+                                Url: args.options.url,
+                                ShareByEmailEnabled: args.options.shareByEmailEnabled || args.options.allowFileSharingForGuestUsers,
+                                Description: args.options.description || '',
+                                Classification: args.options.classification || '',
+                                WebTemplate: 'SITEPAGEPUBLISHING#0',
+                                SiteDesignId: siteDesignId
+                            }
                         }
+                    };
+                    if (args.options.lcid) {
+                        requestOptions.data.request.Lcid = args.options.lcid;
+                    }
+                    if (args.options.owners) {
+                        requestOptions.data.request.Owner = args.options.owners;
                     }
-                };
-                if (args.options.lcid) {
-                    requestOptions.data.request.Lcid = args.options.lcid;
-                }
-                if (args.options.owners) {
-                    requestOptions.data.request.Owner = args.options.owners;
                 }
-            }
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            if (isTeamSite) {
-                if (res.ErrorMessage !== null) {
-                    cb(new Command_1.CommandError(res.ErrorMessage));
-                    return;
+                const res = yield request_1.default.post(requestOptions);
+                if (isTeamSite) {
+                    if (res.ErrorMessage !== null) {
+                        throw res.ErrorMessage;
+                    }
+                    else {
+                        logger.log(res.SiteUrl);
+                    }
                 }
                 else {
-                    logger.log(res.SiteUrl);
+                    if (res.SiteStatus === 2) {
+                        logger.log(res.SiteUrl);
+                    }
+                    else {
+                        throw 'An error has occurred while creating the site';
+                    }
                 }
             }
-            else {
-                if (res.SiteStatus === 2) {
-                    logger.log(res.SiteUrl);
-                }
-                else {
-                    cb(new Command_1.CommandError('An error has occurred while creating the site'));
-                    return;
-                }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            cb();
-        }, (res) => this.handleRejectedODataJsonPromise(res, logger, cb));
+        });
     }
-    createClassicSite(logger, args, cb) {
-        this.dots = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            this.spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-        })
-            .then((res) => {
-            this.context = res;
-            if (args.options.removeDeletedSite) {
-                return this.siteExistsInTheRecycleBin(args.options.url, logger);
-            }
-            else {
-                // assume site doesn't exist
-                return Promise.resolve(false);
-            }
-        })
-            .then((exists) => {
-            if (exists) {
-                if (this.verbose) {
-                    logger.logToStderr('Site exists in the recycle bin');
+    createClassicSite(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            this.dots = '';
+            try {
+                this.spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                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);
                 }
-                return this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
-            }
-            else {
-                if (this.verbose) {
-                    logger.logToStderr('Site not found');
+                else {
+                    // assume site doesn't exist
+                    exists = false;
                 }
-                return Promise.resolve();
-            }
-        })
-            .then(() => {
-            return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-        })
-            .then((res) => {
-            this.context = res;
-            if (this.verbose) {
-                logger.logToStderr(`Creating site collection ${args.options.url}...`);
-            }
-            const lcid = typeof args.options.lcid === 'number' ? args.options.lcid : 1033;
-            const storageQuota = typeof args.options.storageQuota === 'number' ? args.options.storageQuota : 100;
-            const storageQuotaWarningLevel = typeof args.options.storageQuotaWarningLevel === 'number' ? args.options.storageQuotaWarningLevel : 100;
-            const resourceQuota = typeof args.options.resourceQuota === 'number' ? args.options.resourceQuota : 0;
-            const resourceQuotaWarningLevel = typeof args.options.resourceQuotaWarningLevel === 'number' ? args.options.resourceQuotaWarningLevel : 0;
-            const webTemplate = args.options.webTemplate || 'STS#0';
-            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="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">${utils_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">${utils_1.formatting.escapeXml(webTemplate)}</Property><Property Name="TimeZoneId" Type="Int32">${args.options.timeZone}</Property><Property Name="Title" Type="String">${utils_1.formatting.escapeXml(args.options.title)}</Property><Property Name="Url" Type="String">${utils_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>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            return new Promise((resolve, reject) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
+                if (exists) {
+                    if (this.verbose) {
+                        logger.logToStderr('Site exists in the recycle bin');
+                    }
+                    yield this.deleteSiteFromTheRecycleBin(args.options.url, args.options.wait, logger);
                 }
                 else {
-                    const operation = json[json.length - 1];
-                    const isComplete = operation.IsComplete;
-                    if (!args.options.wait || isComplete) {
-                        resolve();
-                        return;
+                    if (this.verbose) {
+                        logger.logToStderr('Site not found');
                     }
-                    setTimeout(() => {
-                        utils_1.spo.waitUntilFinished({
-                            operationId: JSON.stringify(operation._ObjectIdentity_),
-                            siteUrl: this.spoAdminUrl,
-                            resolve,
-                            reject,
-                            logger,
-                            currentContext: this.context,
-                            dots: this.dots,
-                            verbose: this.verbose,
-                            debug: this.debug
-                        });
-                    }, operation.PollingInterval);
                 }
-            });
-        })
-            .then(_ => cb(), (err) => this.handleRejectedPromise(err, logger, cb));
+                this.context = yield spo_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
+                if (this.verbose) {
+                    logger.logToStderr(`Creating site collection ${args.options.url}...`);
+                }
+                const lcid = typeof args.options.lcid === 'number' ? args.options.lcid : 1033;
+                const storageQuota = typeof args.options.storageQuota === 'number' ? args.options.storageQuota : 100;
+                const storageQuotaWarningLevel = typeof args.options.storageQuotaWarningLevel === 'number' ? args.options.storageQuotaWarningLevel : 100;
+                const resourceQuota = typeof args.options.resourceQuota === 'number' ? args.options.resourceQuota : 0;
+                const resourceQuotaWarningLevel = typeof args.options.resourceQuotaWarningLevel === 'number' ? args.options.resourceQuotaWarningLevel : 0;
+                const webTemplate = args.options.webTemplate || 'STS#0';
+                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="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,
+                                dots: this.dots,
+                                verbose: this.verbose,
+                                debug: this.debug
+                            });
+                        }, operation.PollingInterval);
+                    }
+                });
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
     }
     siteExistsInTheRecycleBin(url, logger) {
         return new Promise((resolve, reject) => {
-            utils_1.spo
+            spo_1.spo
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
@@ -269,7 +259,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                     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">${utils_1.formatting.escapeXml(url)}</Parameter><Parameter Type="Boolean">false</Parameter></Parameters></Method></ObjectPaths></Request>`
+                    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);
             })
@@ -303,7 +293,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                     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">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    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);
             })
@@ -339,7 +329,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
     }
     deleteSiteFromTheRecycleBin(url, wait, logger) {
         return new Promise((resolve, reject) => {
-            utils_1.spo
+            spo_1.spo
                 .ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug)
                 .then((res) => {
                 this.context = res;
@@ -351,7 +341,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                     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">${utils_1.formatting.escapeXml(url)}</Parameter></Parameters></Method><Constructor Id="175" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    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);
             })
@@ -369,7 +359,7 @@ class SpoSiteAddCommand extends SpoCommand_1.default {
                         return;
                     }
                     setTimeout(() => {
-                        utils_1.spo.waitUntilFinished({
+                        spo_1.spo.waitUntilFinished({
                             operationId: JSON.stringify(operation._ObjectIdentity_),
                             siteUrl: this.spoAdminUrl,
                             resolve,
@@ -484,7 +474,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
             if (!args.options.url) {
                 return 'Required option url missing';
             }
-            const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
             if (isValidSharePointUrl !== true) {
                 return isValidSharePointUrl;
             }
@@ -499,7 +489,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
                 return 'The CommunicationSite supports only one owner in the owners option';
             }
             if (args.options.siteDesignId) {
-                if (!utils_1.validation.isValidGuid(args.options.siteDesignId)) {
+                if (!validation_1.validation.isValidGuid(args.options.siteDesignId)) {
                     return `${args.options.siteDesignId} is not a valid GUID`;
                 }
             }
@@ -514,7 +504,7 @@ _SpoSiteAddCommand_instances = new WeakSet(), _SpoSiteAddCommand_initTelemetry =
             if (!args.options.url) {
                 return 'Required option url missing';
             }
-            const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.url);
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.url);
             if (isValidSharePointUrl !== true) {
                 return isValidSharePointUrl;
             }

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

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