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

package/dist/m365/spo/commands/page/page-section-add.js

@@ -3,13 +3,13 @@ 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 _SpoPageSectionAddCommand_instances, _SpoPageSectionAddCommand_initTelemetry, _SpoPageSectionAddCommand_initOptions, _SpoPageSectionAddCommand_initValidators;
+var _SpoPageSectionAddCommand_instances, _a, _SpoPageSectionAddCommand_initTelemetry, _SpoPageSectionAddCommand_initOptions, _SpoPageSectionAddCommand_initValidators;
 import request from '../../../../request.js';
 import { formatting } from '../../../../utils/formatting.js';
 import { validation } from '../../../../utils/validation.js';
 import SpoCommand from '../../../base/SpoCommand.js';
 import commands from '../../commands.js';
-import { CanvasSectionTemplate } from './clientsidepages.js';
+import { CanvasSectionTemplate, ZoneEmphasis } from './clientsidepages.js';
 class SpoPageSectionAddCommand extends SpoCommand {
     get name() {
         return commands.PAGE_SECTION_ADD;
@@ -67,7 +67,7 @@ class SpoPageSectionAddCommand extends SpoCommand {
             // zoneIndex for the new section to add
             const zoneIndex = this.getSectionIndex(zoneIndices, args.options.order);
             // get the list of columns to insert based on the selected template
-            const columnsToAdd = this.getColumns(zoneIndex, args.options.sectionTemplate);
+            const columnsToAdd = this.getColumns(zoneIndex, args.options.sectionTemplate, args.options.zoneEmphasis, args.options.isLayoutReflowOnTop);
             // insert the column in the right place in the array so that
             // it stays sorted ascending by zoneIndex
             let pos = canvasContent.findIndex(c => typeof c.controlType === 'undefined' && c.position.zoneIndex > zoneIndex);
@@ -107,39 +107,42 @@ class SpoPageSectionAddCommand extends SpoCommand {
         }
         return zoneIndices[order - 2] + ((zoneIndices[order - 1] - zoneIndices[order - 2]) / 2);
     }
-    getColumns(zoneIndex, sectionTemplate) {
+    getColumns(zoneIndex, sectionTemplate, zoneEmphasis, isLayoutReflowOnTop) {
         const columns = [];
         let sectionIndex = 1;
         switch (sectionTemplate) {
             case 'OneColumnFullWidth':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 0));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 0, zoneEmphasis));
                 break;
             case 'TwoColumn':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 6, zoneEmphasis));
                 break;
             case 'ThreeColumn':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
                 break;
             case 'TwoColumnLeft':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
                 break;
             case 'TwoColumnRight':
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4));
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 4, zoneEmphasis));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 8, zoneEmphasis));
+                break;
+            case 'Vertical':
+                columns.push(this.getVerticalColumn(zoneEmphasis, isLayoutReflowOnTop));
                 break;
             case 'OneColumn':
             default:
-                columns.push(this.getColumn(zoneIndex, sectionIndex++, 12));
+                columns.push(this.getColumn(zoneIndex, sectionIndex++, 12, zoneEmphasis));
                 break;
         }
         return columns;
     }
-    getColumn(zoneIndex, sectionIndex, sectionFactor) {
-        return {
+    getColumn(zoneIndex, sectionIndex, sectionFactor, zoneEmphasis) {
+        const columnValue = {
             displayMode: 2,
             position: {
                 zoneIndex: zoneIndex,
@@ -149,12 +152,26 @@ class SpoPageSectionAddCommand extends SpoCommand {
             },
             emphasis: {}
         };
+        if (zoneEmphasis) {
+            const zoneEmphasisValue = ZoneEmphasis[zoneEmphasis];
+            columnValue.emphasis = { zoneEmphasis: zoneEmphasisValue };
+        }
+        return columnValue;
+    }
+    getVerticalColumn(zoneEmphasis, isLayoutReflowOnTop) {
+        const columnValue = this.getColumn(1, 1, 12, zoneEmphasis);
+        columnValue.position.isLayoutReflowOnTop = isLayoutReflowOnTop !== undefined ? true : false;
+        columnValue.position.layoutIndex = 2;
+        columnValue.position.controlIndex = 1;
+        return columnValue;
     }
 }
-_SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_initTelemetry = function _SpoPageSectionAddCommand_initTelemetry() {
+_a = SpoPageSectionAddCommand, _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_initTelemetry = function _SpoPageSectionAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            order: typeof args.options.order !== 'undefined'
+            order: typeof args.options.order !== 'undefined',
+            zoneEmphasis: typeof args.options.zoneEmphasis !== 'undefined',
+            isLayoutReflowOnTop: !!args.options.isLayoutReflowOnTop
         });
     });
 }, _SpoPageSectionAddCommand_initOptions = function _SpoPageSectionAddCommand_initOptions() {
@@ -163,22 +180,40 @@ _SpoPageSectionAddCommand_instances = new WeakSet(), _SpoPageSectionAddCommand_i
     }, {
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-t, --sectionTemplate <sectionTemplate>'
+        option: '-t, --sectionTemplate <sectionTemplate>',
+        autocomplete: _a.SectionTemplate
     }, {
         option: '--order [order]'
+    }, {
+        option: '--zoneEmphasis [zoneEmphasis]',
+        autocomplete: _a.ZoneEmphasis
+    }, {
+        option: '--isLayoutReflowOnTop'
     });
 }, _SpoPageSectionAddCommand_initValidators = function _SpoPageSectionAddCommand_initValidators() {
     this.validators.push(async (args) => {
         if (!(args.options.sectionTemplate in CanvasSectionTemplate)) {
-            return `${args.options.sectionTemplate} is not a valid section template. Allowed values are OneColumn|OneColumnFullWidth|TwoColumn|ThreeColumn|TwoColumnLeft|TwoColumnRight`;
+            return `${args.options.sectionTemplate} is not a valid section template. Allowed values are OneColumn|OneColumnFullWidth|TwoColumn|ThreeColumn|TwoColumnLeft|TwoColumnRight|Vertical`;
         }
         if (typeof args.options.order !== 'undefined') {
             if (!Number.isInteger(args.options.order) || args.options.order < 1) {
                 return 'The value of parameter order must be 1 or higher';
             }
         }
+        if (typeof args.options.zoneEmphasis !== 'undefined') {
+            if (!(args.options.zoneEmphasis in ZoneEmphasis)) {
+                return 'The value of parameter zoneEmphasis must be None|Neutral|Soft|Strong';
+            }
+        }
+        if (typeof args.options.isLayoutReflowOnTop !== 'undefined') {
+            if (args.options.sectionTemplate !== 'Vertical') {
+                return 'Specify isLayoutReflowOnTop when the sectionTemplate is set to Vertical.';
+            }
+        }
         return validation.isValidSharePointUrl(args.options.webUrl);
     });
 };
+SpoPageSectionAddCommand.SectionTemplate = ['OneColumn', 'OneColumnFullWidth', 'TwoColumn', 'ThreeColumn', 'TwoColumnLeft', 'TwoColumnRight', 'Vertical'];
+SpoPageSectionAddCommand.ZoneEmphasis = ['None', 'Neutral', 'Soft', 'Strong'];
 export default new SpoPageSectionAddCommand();
 //# sourceMappingURL=page-section-add.js.map

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

@@ -58,7 +58,7 @@ class SpoPageSetCommand extends SpoCommand {
                 pageTitle = pageTitle || page.Title;
                 pageId = page.Id;
                 bannerImageUrl = page.BannerImageUrl;
-                canvasContent1 = page.CanvasContent1;
+                canvasContent1 = args.options.content || page.CanvasContent1;
                 layoutWebpartsContent = page.LayoutWebpartsContent;
                 pageDescription = pageDescription || page.Description;
                 topicHeader = page.TopicHeader;
@@ -277,7 +277,8 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
             publish: args.options.publish || false,
             publishMessage: typeof args.options.publishMessage !== 'undefined',
             description: typeof args.options.description !== 'undefined',
-            title: typeof args.options.title !== 'undefined'
+            title: typeof args.options.title !== 'undefined',
+            content: typeof args.options.content !== 'undefined'
         });
     });
 }, _SpoPageSetCommand_initOptions = function _SpoPageSetCommand_initOptions() {
@@ -305,6 +306,8 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
         option: '--description [description]'
     }, {
         option: '--title [title]'
+    }, {
+        option: '--content [content]'
     });
 }, _SpoPageSetCommand_initTypes = function _SpoPageSetCommand_initTypes() {
     this.types.boolean.push('commentsEnabled');
@@ -332,6 +335,14 @@ _SpoPageSetCommand_instances = new WeakSet(), _SpoPageSetCommand_initTelemetry =
         if (args.options.promoteAs === 'NewsPage' && args.options.layoutType && args.options.layoutType !== 'Article') {
             return 'You can only promote article pages as news article';
         }
+        if (args.options.content) {
+            try {
+                JSON.parse(args.options.content);
+            }
+            catch (e) {
+                return `Specified content is not a valid JSON string. Input: ${args.options.content}. Error: ${e}`;
+            }
+        }
         return true;
     });
 };

package/dist/m365/spo/commands/propertybag/propertybag-base.js

@@ -13,7 +13,7 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
      * Gets property bag for a folder or site rootFolder of a site where return type is "_ObjectType_\":\"SP.Folder\".
      * This method is executed when folder option is specified. PnP PowerShell behaves the same way.
      */
-    getFolderPropertyBag(identityResp, webUrl, folder, logger) {
+    async getFolderPropertyBag(identityResp, webUrl, folder, logger) {
         let serverRelativeUrl = folder;
         if (identityResp.serverRelativeUrl !== '/') {
             serverRelativeUrl = `${identityResp.serverRelativeUrl}${serverRelativeUrl}`;
@@ -25,31 +25,31 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
             },
             data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="10" ObjectPathId="9" /><ObjectIdentityQuery Id="11" ObjectPathId="9" /><Query Id="12" ObjectPathId="9"><Query SelectAllProperties="false"><Properties><Property Name="Properties" SelectAll="true"><Query SelectAllProperties="false"><Properties /></Query></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="9" ParentId="5" Name="GetFolderByServerRelativeUrl"><Parameters><Parameter Type="String">${serverRelativeUrl}</Parameter></Parameters></Method><Identity Id="5" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
-        return new Promise((resolve, reject) => {
-            return request
-                .post(requestOptions)
-                .then(async (res) => {
-                if (this.debug) {
-                    await logger.logToStderr('Attempt to get Properties key values');
-                }
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x['ErrorInfo']; });
-                if (contents && contents.ErrorInfo) {
-                    return reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                const propertiesObj = json.find(x => { return x['Properties']; });
-                if (propertiesObj) {
-                    return resolve(propertiesObj['Properties']);
-                }
-                reject('Cannot proceed. Properties not found'); // this is not suppose to happen
-            }, (err) => { reject(err); });
-        });
+        try {
+            const res = await request.post(requestOptions);
+            if (this.debug) {
+                await logger.logToStderr('Attempt to get Properties key values');
+            }
+            const json = JSON.parse(res);
+            const contents = json.find(x => { return x['ErrorInfo']; });
+            if (contents && contents.ErrorInfo) {
+                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+            }
+            const propertiesObj = json.find(x => { return x['Properties']; });
+            if (propertiesObj) {
+                return propertiesObj['Properties'];
+            }
+            throw 'Cannot proceed. Properties not found'; // this is not suppose to happen
+        }
+        catch (err) {
+            throw err;
+        }
     }
     /**
      * Gets property bag for site or sitecollection where return type is "_ObjectType_\":\"SP.Web\".
      * This method is executed when no folder specified. PnP PowerShell behaves the same way.
      */
-    getWebPropertyBag(identityResp, webUrl, logger) {
+    async getWebPropertyBag(identityResp, webUrl, logger) {
         const requestOptions = {
             url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
             headers: {
@@ -57,23 +57,25 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
             },
             data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Query Id="97" ObjectPathId="5"><Query SelectAllProperties="false"><Properties><Property Name="ServerRelativeUrl" ScalarProperty="true" /><Property Name="AllProperties" SelectAll="true"><Query SelectAllProperties="false"><Properties /></Query></Property></Properties></Query></Query></Actions><ObjectPaths><Identity Id="5" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
-        return new Promise((resolve, reject) => {
-            request.post(requestOptions).then(async (res) => {
-                if (this.debug) {
-                    await logger.logToStderr('Attempt to get AllProperties key values');
-                }
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x['ErrorInfo']; });
-                if (contents && contents.ErrorInfo) {
-                    return reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                const allPropertiesObj = json.find(x => { return x['AllProperties']; });
-                if (allPropertiesObj) {
-                    return resolve(allPropertiesObj['AllProperties']);
-                }
-                reject('Cannot proceed. AllProperties not found'); // this is not supposed to happen
-            }, (err) => { reject(err); });
-        });
+        try {
+            const res = await request.post(requestOptions);
+            if (this.debug) {
+                await logger.logToStderr('Attempt to get AllProperties key values');
+            }
+            const json = JSON.parse(res);
+            const contents = json.find(x => { return x['ErrorInfo']; });
+            if (contents && contents.ErrorInfo) {
+                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+            }
+            const allPropertiesObj = json.find(x => { return x['AllProperties']; });
+            if (allPropertiesObj) {
+                return allPropertiesObj['AllProperties'];
+            }
+            throw 'Cannot proceed. AllProperties not found'; // this is not supposed to happen
+        }
+        catch (err) {
+            throw err;
+        }
     }
     /**
      * The property bag item data returned from the client.svc/ProcessQuery response
@@ -108,7 +110,7 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
         }
         return { key: objKey, value: objValue };
     }
-    static setProperty(name, value, webUrl, formDigest, identityResp, logger, debug, folder) {
+    static async setProperty(name, value, webUrl, formDigest, identityResp, logger, debug, folder) {
         let objectType = 'AllProperties';
         if (folder) {
             objectType = 'Properties';
@@ -120,18 +122,20 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
             },
             data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${formatting.escapeXml(name)}</Parameter><Parameter Type="String">${formatting.escapeXml(value)}</Parameter></Parameters></Method><Method Name="Update" Id="207" ObjectPathId="198" /></Actions><ObjectPaths><Property Id="205" ParentId="198" Name="${objectType}" /><Identity Id="198" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
-        return new Promise((resolve, reject) => {
-            request.post(requestOptions).then((res) => {
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x['ErrorInfo']; });
-                if (contents && contents.ErrorInfo) {
-                    reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                else {
-                    resolve(res);
-                }
-            }, (err) => { reject(err); });
-        });
+        try {
+            const res = await request.post(requestOptions);
+            const json = JSON.parse(res);
+            const contents = json.find(x => { return x['ErrorInfo']; });
+            if (contents && contents.ErrorInfo) {
+                throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+            }
+            else {
+                return res;
+            }
+        }
+        catch (err) {
+            throw err;
+        }
     }
     /**
      * Detects if the site in question has no script enabled or not. Detection is done
@@ -141,14 +145,14 @@ export class SpoPropertyBagBaseCommand extends SpoCommand {
      * @param options command options
      * @param cmd command instance
      */
-    static isNoScriptSite(webUrl, formDigest, webIdentityResp, logger, debug) {
-        return new Promise((resolve, reject) => {
-            spo.getEffectiveBasePermissions(webIdentityResp.objectIdentity, webUrl, formDigest, logger, debug)
-                .then((basePermissionsResp) => {
-                resolve(basePermissionsResp.has(PermissionKind.AddAndCustomizePages) === false);
-            })
-                .catch(err => reject(err));
-        });
+    static async isNoScriptSite(webUrl, formDigest, webIdentityResp, logger, debug) {
+        try {
+            const basePermissionsResp = await spo.getEffectiveBasePermissions(webIdentityResp.objectIdentity, webUrl, formDigest, logger, debug);
+            return basePermissionsResp.has(PermissionKind.AddAndCustomizePages) === false;
+        }
+        catch (err) {
+            throw err;
+        }
     }
 }
 //# sourceMappingURL=propertybag-base.js.map

package/dist/m365/spo/commands/propertybag/propertybag-remove.js

@@ -27,24 +27,8 @@ class SpoPropertyBagRemoveCommand extends SpoPropertyBagBaseCommand {
         __classPrivateFieldGet(this, _SpoPropertyBagRemoveCommand_instances, "m", _SpoPropertyBagRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const removeProperty = async () => {
-            try {
-                const contextResponse = await spo.getRequestDigest(args.options.webUrl);
-                this.formDigestValue = contextResponse.FormDigestValue;
-                let identityResp = await spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
-                const opts = args.options;
-                if (opts.folder) {
-                    // get the folder guid instead of the web guid
-                    identityResp = await spo.getFolderIdentity(identityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
-                }
-                await this.removeProperty(identityResp, args.options);
-            }
-            catch (err) {
-                this.handleRejectedPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeProperty();
+            await this.removeProperty(args);
         }
         else {
             const result = await Cli.prompt({
@@ -54,11 +38,27 @@ class SpoPropertyBagRemoveCommand extends SpoPropertyBagBaseCommand {
                 message: `Are you sure you want to remove the ${args.options.key} property?`
             });
             if (result.continue) {
-                await removeProperty();
+                await this.removeProperty(args);
             }
         }
     }
-    removeProperty(identityResp, options) {
+    async removeProperty(args) {
+        try {
+            const contextResponse = await spo.getRequestDigest(args.options.webUrl);
+            this.formDigestValue = contextResponse.FormDigestValue;
+            let identityResp = await spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+            const opts = args.options;
+            if (opts.folder) {
+                // get the folder guid instead of the web guid
+                identityResp = await spo.getFolderIdentity(identityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
+            }
+            await this.removePropertyWithIdentityResp(identityResp, args.options);
+        }
+        catch (err) {
+            this.handleRejectedPromise(err);
+        }
+    }
+    async removePropertyWithIdentityResp(identityResp, options) {
         let objectType = 'AllProperties';
         if (options.folder) {
             objectType = 'Properties';
@@ -70,18 +70,15 @@ class SpoPropertyBagRemoveCommand extends SpoPropertyBagBaseCommand {
             },
             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><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${formatting.escapeXml(options.key)}</Parameter><Parameter Type="Null" /></Parameters></Method><Method Name="Update" Id="207" ObjectPathId="198" /></Actions><ObjectPaths><Property Id="205" ParentId="198" Name="${objectType}" /><Identity Id="198" Name="${identityResp.objectIdentity}" /></ObjectPaths></Request>`
         };
-        return new Promise((resolve, reject) => {
-            request.post(requestOptions).then((res) => {
-                const json = JSON.parse(res);
-                const contents = json.find(x => { return x['ErrorInfo']; });
-                if (contents && contents.ErrorInfo) {
-                    reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
-                }
-                else {
-                    resolve(res);
-                }
-            }, (err) => { reject(err); });
-        });
+        const res = await request.post(requestOptions);
+        const json = JSON.parse(res);
+        const contents = json.find(x => { return x['ErrorInfo']; });
+        if (contents && contents.ErrorInfo) {
+            throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
+        }
+        else {
+            return res;
+        }
     }
 }
 _SpoPropertyBagRemoveCommand_instances = new WeakSet(), _SpoPropertyBagRemoveCommand_initTelemetry = function _SpoPropertyBagRemoveCommand_initTelemetry() {

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

@@ -28,38 +28,8 @@ class SpoServicePrincipalSetCommand extends SpoCommand {
         return [commands.SP_SET];
     }
     async commandAction(logger, args) {
-        const toggleServicePrincipal = async () => {
-            try {
-                const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = await spo.getRequestDigest(spoAdminUrl);
-                if (this.verbose) {
-                    await logger.logToStderr(`${(args.options.enabled ? 'Enabling' : 'Disabling')} service principal...`);
-                }
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': reqDigest.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="28" ObjectPathId="27" /><SetProperty Id="29" ObjectPathId="27" Name="AccountEnabled"><Parameter Type="Boolean">${args.options.enabled}</Parameter></SetProperty><Method Name="Update" Id="30" ObjectPathId="27" /><Query Id="31" ObjectPathId="27"><Query SelectAllProperties="true"><Properties><Property Name="AccountEnabled" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="27" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /></ObjectPaths></Request>`
-                };
-                const res = await request.post(requestOptions);
-                const json = JSON.parse(res);
-                const response = json[0];
-                if (response.ErrorInfo) {
-                    throw response.ErrorInfo.ErrorMessage;
-                }
-                else {
-                    const output = json[json.length - 1];
-                    delete output._ObjectType_;
-                    await logger.log(output);
-                }
-            }
-            catch (err) {
-                this.handleRejectedPromise(err);
-            }
-        };
         if (args.options.force) {
-            await toggleServicePrincipal();
+            await this.toggleServicePrincipal(logger, args);
         }
         else {
             const result = await Cli.prompt({
@@ -69,10 +39,38 @@ class SpoServicePrincipalSetCommand extends SpoCommand {
                 message: `Are you sure you want to ${args.options.enabled ? 'enable' : 'disable'} the service principal?`
             });
             if (result.continue) {
-                await toggleServicePrincipal();
+                await this.toggleServicePrincipal(logger, args);
             }
         }
     }
+    async toggleServicePrincipal(logger, args) {
+        try {
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            const reqDigest = await spo.getRequestDigest(spoAdminUrl);
+            if (this.verbose) {
+                await logger.logToStderr(`${(args.options.enabled ? 'Enabling' : 'Disabling')} service principal...`);
+            }
+            const requestOptions = {
+                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': reqDigest.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="28" ObjectPathId="27" /><SetProperty Id="29" ObjectPathId="27" Name="AccountEnabled"><Parameter Type="Boolean">${args.options.enabled}</Parameter></SetProperty><Method Name="Update" Id="30" ObjectPathId="27" /><Query Id="31" ObjectPathId="27"><Query SelectAllProperties="true"><Properties><Property Name="AccountEnabled" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="27" TypeId="{104e8f06-1e00-4675-99c6-1b9b504ed8d8}" /></ObjectPaths></Request>`
+            };
+            const response = await request.post(requestOptions);
+            const json = JSON.parse(response);
+            const responseContent = json[0];
+            if (responseContent.ErrorInfo) {
+                throw responseContent.ErrorInfo.ErrorMessage;
+            }
+            const output = json[json.length - 1];
+            delete output._ObjectType_;
+            await logger.log(output);
+        }
+        catch (err) {
+            this.handleRejectedPromise(err);
+        }
+    }
 }
 _SpoServicePrincipalSetCommand_instances = new WeakSet(), _SpoServicePrincipalSetCommand_initTelemetry = function _SpoServicePrincipalSetCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/site/FlowsPolicy.js

@@ -0,0 +1,7 @@
+export var FlowsPolicy;
+(function (FlowsPolicy) {
+    FlowsPolicy[FlowsPolicy["Unknown"] = 0] = "Unknown";
+    FlowsPolicy[FlowsPolicy["Disabled"] = 1] = "Disabled";
+    FlowsPolicy[FlowsPolicy["Enabled"] = 2] = "Enabled";
+})(FlowsPolicy || (FlowsPolicy = {}));
+//# sourceMappingURL=FlowsPolicy.js.map