@pnp/cli-microsoft365 7.0.0-beta.99e75a7 → 7.0.0-beta.aa2d71e

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

@@ -5,14 +5,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoSiteEnsureCommand_instances, _SpoSiteEnsureCommand_initOptions, _SpoSiteEnsureCommand_initTypes, _SpoSiteEnsureCommand_initValidators;
 import chalk from 'chalk';
-import { Cli } from '../../../../cli/Cli.js';
+import { spo } from '../../../../utils/spo.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import spoWebGetCommand from '../web/web-get.js';
 import { SharingCapabilities } from './SharingCapabilities.js';
-import spoSiteAddCommand from './site-add.js';
-import spoSiteSetCommand from './site-set.js';
 class SpoSiteEnsureCommand extends SpoCommand {
     get name() {
         return commands.SITE_ENSURE;
@@ -30,10 +27,7 @@ class SpoSiteEnsureCommand extends SpoCommand {
     async commandAction(logger, args) {
         try {
             const res = await this.ensureSite(logger, args);
-            if (this.debug) {
-                await logger.logToStderr(res.stderr);
-            }
-            await logger.log(res.stdout);
+            await logger.log(res);
             if (this.verbose) {
                 await logger.logToStderr(chalk.green('DONE'));
             }
@@ -49,9 +43,9 @@ class SpoSiteEnsureCommand extends SpoCommand {
         }
         catch (err) {
             if (this.debug) {
-                await logger.logToStderr(err.stderr);
+                await logger.logToStderr(err);
             }
-            if (err.error.message !== '404 FILE NOT FOUND') {
+            if (err.error !== '404 FILE NOT FOUND') {
                 throw err;
             }
             if (this.verbose) {
@@ -60,12 +54,15 @@ class SpoSiteEnsureCommand extends SpoCommand {
             return this.createSite(args, logger);
         }
         if (this.debug) {
-            await logger.logToStderr(getWebOutput.stderr);
+            await logger.logToStderr(getWebOutput);
         }
         if (this.verbose) {
             await 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
@@ -79,7 +76,7 @@ class SpoSiteEnsureCommand extends SpoCommand {
                     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`;
@@ -100,70 +97,20 @@ class SpoSiteEnsureCommand extends SpoCommand {
         if (this.verbose) {
             await 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.executeCommandWithOutput(spoWebGetCommand, { options: { ...options, _: [] } });
+        return await spo.getWeb(args.options.url, logger, this.verbose);
     }
     async createSite(args, logger) {
         if (this.verbose) {
             await 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 = await spoSiteAddCommand.validate({ options: options }, Cli.getCommandInfo(spoSiteAddCommand));
-        if (validationResult !== true) {
-            return Promise.reject(validationResult);
-        }
-        return Cli.executeCommandWithOutput(spoSiteAddCommand, { options: { ...options, _: [] } });
+        const url = typeof args.options.type === 'undefined' || args.options.type === 'TeamSite' ? undefined : args.options.url;
+        return await 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);
     }
     async updateSite(args, logger) {
         if (this.verbose) {
             await 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 = await spoSiteSetCommand.validate({ options: options }, Cli.getCommandInfo(spoSiteSetCommand));
-        if (validationResult !== true) {
-            return Promise.reject(validationResult);
-        }
-        return Cli.executeCommandWithOutput(spoSiteSetCommand, { options: { ...options, _: [] } });
+        return await 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);
     }
     /**
      * Maps the base sharingCapability enum to string array so it can

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

@@ -25,28 +25,8 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoSiteHubSiteDisconnectCommand_instances, "m", _SpoSiteHubSiteDisconnectCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const disconnectHubSite = async () => {
-            try {
-                const res = await spo.getRequestDigest(args.options.siteUrl);
-                if (this.verbose) {
-                    await 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'
-                };
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await disconnectHubSite();
+            await this.disconnectHubSite(logger, args);
         }
         else {
             const result = await Cli.prompt({
@@ -56,8 +36,28 @@ class SpoSiteHubSiteDisconnectCommand extends SpoCommand {
                 message: `Are you sure you want to disconnect the site collection ${args.options.siteUrl} from its hub site?`
             });
             if (result.continue) {
-                await disconnectHubSite();
+                await this.disconnectHubSite(logger, args);
+            }
+        }
+    }
+    async disconnectHubSite(logger, args) {
+        try {
+            const res = await spo.getRequestDigest(args.options.siteUrl);
+            if (this.verbose) {
+                await 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'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

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

@@ -37,52 +37,39 @@ class SpoSiteListCommand extends SpoCommand {
                 await logger.logToStderr(`Retrieving list of site collections...`);
             }
             this.allSites = [];
-            await this.getAllSites(spoAdminUrl, formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, args.options.deleted, logger);
+            await this.getAllSites(spoAdminUrl, formatting.escapeXml(args.options.filter || ''), '0', personalSite, webTemplate, undefined, logger);
             await logger.log(this.allSites);
         }
         catch (err) {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, deleted, logger) {
-        return new Promise((resolve, reject) => {
-            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.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.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.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();
-                    }
-                }
-            }, err => reject(err));
-        });
+    async getAllSites(spoAdminUrl, filter, startIndex, personalSite, webTemplate, formDigest, logger) {
+        const res = await spo.ensureFormDigest(spoAdminUrl, logger, formDigest, this.debug);
+        const requestBody = `<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="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>`;
+        const requestOptions = {
+            url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+            headers: {
+                'X-RequestDigest': res.FormDigestValue
+            },
+            data: requestBody
+        };
+        const res1 = await request.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) {
+                await this.getAllSites(spoAdminUrl, filter, sites.NextStartIndexFromSharePoint, personalSite, webTemplate, formDigest, logger);
+            }
+            return;
+        }
     }
     getWebTemplateId(options) {
         if (options.webTemplate) {
@@ -107,7 +94,6 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
             webTemplate: args.options.webTemplate,
             type: args.options.type,
             filter: (!(!args.options.filter)).toString(),
-            deleted: args.options.deleted,
             includeOneDriveSites: typeof args.options.includeOneDriveSites !== 'undefined'
         });
     });
@@ -121,8 +107,6 @@ _SpoSiteListCommand_instances = new WeakSet(), _SpoSiteListCommand_initTelemetry
         option: '--filter [filter]'
     }, {
         option: '--includeOneDriveSites'
-    }, {
-        option: '--deleted'
     });
 }, _SpoSiteListCommand_initValidators = function _SpoSiteListCommand_initValidators() {
     this.validators.push(async (args) => {

package/dist/m365/spo/commands/site/site-recyclebinitem-list.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 _SpoSiteRecycleBinItemListCommand_instances, _SpoSiteRecycleBinItemListCommand_initTelemetry, _SpoSiteRecycleBinItemListCommand_initOptions, _SpoSiteRecycleBinItemListCommand_initValidators;
+var _SpoSiteRecycleBinItemListCommand_instances, _a, _SpoSiteRecycleBinItemListCommand_initTelemetry, _SpoSiteRecycleBinItemListCommand_initOptions, _SpoSiteRecycleBinItemListCommand_initValidators;
 import request from '../../../../request.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
@@ -32,7 +32,7 @@ class SpoSiteRecycleBinItemListCommand extends SpoCommand {
         const state = args.options.secondary ? '2' : '1';
         let requestUrl = `${args.options.siteUrl}/_api/site/RecycleBin?$filter=(ItemState eq ${state})`;
         if (typeof args.options.type !== 'undefined') {
-            const type = SpoSiteRecycleBinItemListCommand.recycleBinItemType.find(item => item.value === args.options.type);
+            const type = _a.recycleBinItemType.find(item => item.value === args.options.type);
             if (typeof type !== 'undefined') {
                 requestUrl += ` and (ItemType eq ${type.id})`;
             }
@@ -53,7 +53,7 @@ class SpoSiteRecycleBinItemListCommand extends SpoCommand {
         }
     }
 }
-_SpoSiteRecycleBinItemListCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemListCommand_initTelemetry = function _SpoSiteRecycleBinItemListCommand_initTelemetry() {
+_a = SpoSiteRecycleBinItemListCommand, _SpoSiteRecycleBinItemListCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemListCommand_initTelemetry = function _SpoSiteRecycleBinItemListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             type: args.options.type,
@@ -65,7 +65,7 @@ _SpoSiteRecycleBinItemListCommand_instances = new WeakSet(), _SpoSiteRecycleBinI
         option: '-u, --siteUrl <siteUrl>'
     }, {
         option: '-t, --type [type]',
-        autocomplete: SpoSiteRecycleBinItemListCommand.recycleBinItemType.map(item => item.value)
+        autocomplete: _a.recycleBinItemType.map(item => item.value)
     }, {
         option: '-s, --secondary'
     });
@@ -76,8 +76,8 @@ _SpoSiteRecycleBinItemListCommand_instances = new WeakSet(), _SpoSiteRecycleBinI
             return isValidSharePointUrl;
         }
         if (typeof args.options.type !== 'undefined' &&
-            !SpoSiteRecycleBinItemListCommand.recycleBinItemType.some(item => item.value === args.options.type)) {
-            return `${args.options.type} is not a valid value. Allowed values are ${SpoSiteRecycleBinItemListCommand.recycleBinItemType.map(item => item.value).join(', ')}`;
+            !_a.recycleBinItemType.some(item => item.value === args.options.type)) {
+            return `${args.options.type} is not a valid value. Allowed values are ${_a.recycleBinItemType.map(item => item.value).join(', ')}`;
         }
         return true;
     });