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

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

@@ -16,14 +16,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoSiteEnsureCommand_instances, _SpoSiteEnsureCommand_initOptions, _SpoSiteEnsureCommand_initTypes, _SpoSiteEnsureCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
-const Cli_1 = require("../../../../cli/Cli");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
-const spoWebGetCommand = require("../web/web-get");
 const SharingCapabilities_1 = require("./SharingCapabilities");
-const spoSiteAddCommand = require("./site-add");
-const spoSiteSetCommand = require("./site-set");
+const spo_1 = require("../../../../utils/spo");
 class SpoSiteEnsureCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.SITE_ENSURE;
@@ -42,10 +39,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             try {
                 const res = yield this.ensureSite(logger, args);
-                if (this.debug) {
-                    logger.logToStderr(res.stderr);
-                }
-                logger.log(res.stdout);
+                logger.log(res);
                 if (this.verbose) {
                     logger.logToStderr(chalk.green('DONE'));
                 }
@@ -63,9 +57,9 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             }
             catch (err) {
                 if (this.debug) {
-                    logger.logToStderr(err.stderr);
+                    logger.logToStderr(err);
                 }
-                if (err.error.message !== '404 FILE NOT FOUND') {
+                if (err.error !== '404 FILE NOT FOUND') {
                     throw err;
                 }
                 if (this.verbose) {
@@ -74,12 +68,15 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                 return this.createSite(args, logger);
             }
             if (this.debug) {
-                logger.logToStderr(getWebOutput.stderr);
+                logger.logToStderr(getWebOutput);
             }
             if (this.verbose) {
                 logger.logToStderr(`Site found at ${args.options.url}. Checking if site matches conditions...`);
             }
-            const web = JSON.parse(getWebOutput.stdout);
+            const web = {
+                Configuration: getWebOutput.Configuration,
+                WebTemplate: getWebOutput.WebTemplate
+            };
             if (args.options.type) {
                 // type was specified so we need to check if the existing site matches
                 // it. If not, we throw an error and stop
@@ -93,7 +90,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
                         expectedWebTemplate = 'SITEPAGEPUBLISHING#0';
                         break;
                     case 'ClassicSite':
-                        expectedWebTemplate = args.options.webTemplate;
+                        expectedWebTemplate = args.options.webTemplate || 'STS#0';
                         break;
                     default:
                         throw `${args.options.type} is not a valid site type. Allowed types are TeamSite,CommunicationSite,ClassicSite`;
@@ -112,51 +109,20 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
         });
     }
     getWeb(args, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Checking if site ${args.options.url} exists...`);
-        }
-        const options = {
-            url: args.options.url,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(spoWebGetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Checking if site ${args.options.url} exists...`);
+            }
+            return yield spo_1.spo.getWeb(args.options.url, logger, this.verbose);
+        });
     }
     createSite(args, logger) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
                 logger.logToStderr(`Creating site...`);
             }
-            const options = {
-                type: args.options.type,
-                title: args.options.title,
-                alias: args.options.alias,
-                description: args.options.description,
-                classification: args.options.classification,
-                isPublic: args.options.isPublic,
-                lcid: args.options.lcid,
-                url: typeof args.options.type === 'undefined' || args.options.type === 'TeamSite' ? undefined : args.options.url,
-                owners: args.options.owners,
-                shareByEmailEnabled: args.options.shareByEmailEnabled,
-                siteDesign: args.options.siteDesign,
-                siteDesignId: args.options.siteDesignId,
-                timeZone: args.options.timeZone,
-                webTemplate: args.options.webTemplate,
-                resourceQuota: args.options.resourceQuota,
-                resourceQuotaWarningLevel: args.options.resourceQuotaWarningLevel,
-                storageQuota: args.options.storageQuota,
-                storageQuotaWarningLevel: args.options.storageQuotaWarningLevel,
-                removeDeletedSite: args.options.removeDeletedSite,
-                wait: args.options.wait,
-                verbose: this.verbose,
-                debug: this.debug
-            };
-            const validationResult = yield spoSiteAddCommand.validate({ options: options }, Cli_1.Cli.getCommandInfo(spoSiteAddCommand));
-            if (validationResult !== true) {
-                return Promise.reject(validationResult);
-            }
-            return Cli_1.Cli.executeCommandWithOutput(spoSiteAddCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            const url = typeof args.options.type === 'undefined' || args.options.type === 'TeamSite' ? undefined : args.options.url;
+            return yield spo_1.spo.addSite(args.options.title, logger, this.verbose, args.options.wait, args.options.type, args.options.alias, args.options.description, args.options.owners, args.options.shareByEmailEnabled, args.options.removeDeletedSite, args.options.classification, args.options.isPublic, args.options.lcid, url, args.options.siteDesign, args.options.siteDesignId, args.options.timeZone, args.options.webTemplate, args.options.resourceQuota, args.options.resourceQuotaWarningLevel, args.options.storageQuota, args.options.storageQuotaWarningLevel);
         });
     }
     updateSite(args, logger) {
@@ -164,24 +130,7 @@ class SpoSiteEnsureCommand extends SpoCommand_1.default {
             if (this.verbose) {
                 logger.logToStderr(`Updating site...`);
             }
-            const options = {
-                classification: args.options.classification,
-                disableFlows: args.options.disableFlows,
-                isPublic: args.options.isPublic,
-                owners: args.options.owners,
-                shareByEmailEnabled: args.options.shareByEmailEnabled,
-                siteDesignId: args.options.siteDesignId,
-                title: args.options.title,
-                url: args.options.url,
-                sharingCapability: args.options.sharingCapability,
-                verbose: this.verbose,
-                debug: this.debug
-            };
-            const validationResult = yield spoSiteSetCommand.validate({ options: options }, Cli_1.Cli.getCommandInfo(spoSiteSetCommand));
-            if (validationResult !== true) {
-                return Promise.reject(validationResult);
-            }
-            return Cli_1.Cli.executeCommandWithOutput(spoSiteSetCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+            return yield spo_1.spo.updateSite(args.options.url, logger, this.verbose, args.options.title, args.options.classification, args.options.disableFlows, args.options.isPublic, args.options.owners, args.options.shareByEmailEnabled, args.options.siteDesignId, args.options.sharingCapability);
         });
     }
     /**

package/dist/m365/spo/commands/site/site-hubsite-disconnect.js

@@ -37,28 +37,8 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const disconnectHubSite = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
-                    if (this.verbose) {
-                        logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hubsite...`);
-                    }
-                    const requestOptions = {
-                        url: `${args.options.siteUrl}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
-                        headers: {
-                            'X-RequestDigest': res.FormDigestValue,
-                            accept: 'application/json;odata=nometadata'
-                        },
-                        responseType: 'json'
-                    };
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield disconnectHubSite();
+                yield this.disconnectHubSite(logger, args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -68,8 +48,30 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?`
                 });
                 if (result.continue) {
-                    yield disconnectHubSite();
+                    yield this.disconnectHubSite(logger, args);
+                }
+            }
+        });
+    }
+    disconnectHubSite(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const res = yield spo_1.spo.getRequestDigest(args.options.siteUrl);
+                if (this.verbose) {
+                    logger.logToStderr(`Disconnecting site collection ${args.options.siteUrl} from its hubsite...`);
                 }
+                const requestOptions = {
+                    url: `${args.options.siteUrl}/_api/site/JoinHubSite('00000000-0000-0000-0000-000000000000')`,
+                    headers: {
+                        'X-RequestDigest': res.FormDigestValue,
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
         });
     }

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

@@ -58,43 +58,35 @@ class SpoSiteListCommand extends SpoCommand_1.default {
         });
     }
     getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, deleted, logger) {
-        return new Promise((resolve, reject) => {
-            spo_1.spo
-                .ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug)
-                .then((res) => {
-                let requestBody = `<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="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="Filter" Type="String">${filter}</Property><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">${personalSite}</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">${webTemplate}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`;
-                if (deleted) {
-                    requestBody = `<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="5"><Query SelectAllProperties="true"><Properties><Property Name="NextStartIndexFromSharePoint" ScalarProperty="true" /></Properties></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="GetDeletedSitePropertiesFromSharePoint"><Parameters><Parameter Type="String">${startIndex}</Parameter></Parameters></Method></ObjectPaths></Request>`;
-                }
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': res.FormDigestValue
-                    },
-                    data: requestBody
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    reject(response.ErrorInfo.ErrorMessage);
-                    return;
-                }
-                else {
-                    const sites = json[json.length - 1];
-                    this.allSites.push(...sites._Child_Items_);
-                    if (sites.NextStartIndexFromSharePoint) {
-                        this
-                            .getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, personalSite, webTemplate, formDigest, deleted, logger)
-                            .then(_ => resolve(), err => reject(err));
-                    }
-                    else {
-                        resolve();
-                    }
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield spo_1.spo.ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug);
+            let requestBody = `<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="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="3" ParentId="1" Name="GetSitePropertiesFromSharePointByFilters"><Parameters><Parameter TypeId="{b92aeee2-c92c-4b67-abcc-024e471bc140}"><Property Name="Filter" Type="String">${filter}</Property><Property Name="IncludeDetail" Type="Boolean">false</Property><Property Name="IncludePersonalSite" Type="Enum">${personalSite}</Property><Property Name="StartIndex" Type="String">${startIndex}</Property><Property Name="Template" Type="String">${webTemplate}</Property></Parameter></Parameters></Method></ObjectPaths></Request>`;
+            if (deleted) {
+                requestBody = `<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="5"><Query SelectAllProperties="true"><Properties><Property Name="NextStartIndexFromSharePoint" ScalarProperty="true" /></Properties></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /><Method Id="5" ParentId="3" Name="GetDeletedSitePropertiesFromSharePoint"><Parameters><Parameter Type="String">${startIndex}</Parameter></Parameters></Method></ObjectPaths></Request>`;
+            }
+            const requestOptions = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': res.FormDigestValue
+                },
+                data: requestBody
+            };
+            const res1 = yield request_1.default.post(requestOptions);
+            const json = JSON.parse(res1);
+            const response = json[0];
+            logger.log(response);
+            if (response.ErrorInfo) {
+                throw response.ErrorInfo.ErrorMessage;
+            }
+            else {
+                const sites = json[json.length - 1];
+                logger.log(sites);
+                this.allSites.push(...sites._Child_Items_);
+                if (sites.NextStartIndexFromSharePoint) {
+                    yield this.getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, personalSite, webTemplate, formDigest, deleted, logger);
                 }
-            }, err => reject(err));
+                return;
+            }
         });
     }
     getWebTemplateId(options) {