@pnp/cli-microsoft365 6.11.0-beta.69fd6f4 → 6.11.0-beta.79a1133

package/dist/m365/spo/commands/folder/folder-retentionlabel-ensure.js

@@ -89,7 +89,7 @@ class SpoFolderRetentionLabelEnsureCommand extends SpoCommand_1.default {
             }
             else {
                 const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
-                requestUrl += `GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
             }
             const requestOptions = {
                 url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,

package/dist/m365/spo/commands/folder/folder-retentionlabel-remove.js

@@ -107,7 +107,7 @@ class SpoFolderRetentionLabelRemoveCommand extends SpoCommand_1.default {
             }
             else {
                 const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
-                requestUrl += `GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
             }
             const requestOptions = {
                 url: `${requestUrl}?$expand=ListItemAllFields,ListItemAllFields/ParentList&$select=ServerRelativeUrl,ListItemAllFields/ParentList/Id,ListItemAllFields/Id`,

package/dist/m365/spo/commands/folder/folder-roleassignment-add.js

@@ -53,7 +53,7 @@ class SpoFolderRoleAssignmentAddCommand extends SpoCommand_1.default {
                     requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
                 }
                 else {
-                    requestUrl += `GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
+                    requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
                 }
                 const roleDefinitionId = yield this.getRoleDefinitionId(args.options);
                 if (args.options.upn) {

package/dist/m365/spo/commands/folder/folder-roleassignment-remove.js

@@ -45,7 +45,7 @@ class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Removing role assignment from folder in site at ${args.options.webUrl}...`);
                 }
                 const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
-                const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
+                const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
                 try {
                     if (args.options.upn) {
                         args.options.principalId = yield this.getUserPrincipalId(args.options);

package/dist/m365/spo/commands/folder/folder-roleinheritance-break.js

@@ -48,7 +48,7 @@ class SpoFolderRoleInheritanceBreakCommand extends SpoCommand_1.default {
                         requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
                     }
                     else {
-                        requestUrl += `GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
+                        requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
                     }
                     const requestOptions = {
                         url: `${requestUrl}/breakroleinheritance(${keepExistingPermissions})`,

package/dist/m365/spo/commands/folder/folder-roleinheritance-reset.js

@@ -47,7 +47,7 @@ class SpoFolderRoleInheritanceResetCommand extends SpoCommand_1.default {
                         requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
                     }
                     else {
-                        requestUrl += `GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
+                        requestUrl += `GetFolderByServerRelativePath(DecodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')/ListItemAllFields`;
                     }
                     const requestOptions = {
                         url: `${requestUrl}/resetroleinheritance`,

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

@@ -73,7 +73,6 @@ class SpoGroupListCommand extends SpoCommand_1.default {
                 responseType: 'json'
             };
             const groupProperties = yield request_1.default.get(requestOptions);
-            logger.log(groupProperties);
             if (!options.output || !Cli_1.Cli.shouldTrimOutput(options.output)) {
                 logger.log(groupProperties);
             }

package/dist/m365/spo/commands/navigation/navigation-node-set.js

@@ -132,8 +132,8 @@ _SpoNavigationNodeSetCommand_instances = new WeakSet(), _SpoNavigationNodeSetCom
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.audienceIds === undefined && !args.options.url && args.options.isExternal === undefined && !args.options.title && args.options.openInNewWindow === undefined) {
-            return `Please specify atleast one property to update.`;
+        if (args.options.audienceIds === undefined && args.options.url === undefined && args.options.isExternal === undefined && !args.options.title && args.options.openInNewWindow === undefined) {
+            return `Please specify at least one property to update.`;
         }
         if (args.options.audienceIds) {
             const audienceIdsSplitted = args.options.audienceIds.split(',');

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

@@ -21,6 +21,12 @@ const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+var OrgAssetType;
+(function (OrgAssetType) {
+    OrgAssetType[OrgAssetType["ImageDocumentLibrary"] = 1] = "ImageDocumentLibrary";
+    OrgAssetType[OrgAssetType["OfficeTemplateLibrary"] = 2] = "OfficeTemplateLibrary";
+    OrgAssetType[OrgAssetType["OfficeFontLibrary"] = 4] = "OfficeFontLibrary";
+})(OrgAssetType || (OrgAssetType = {}));
 class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.ORGASSETSLIBRARY_ADD;
@@ -42,6 +48,7 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
             const cdnType = cdnTypeString === 'Private' ? 1 : 0;
             const thumbnailSchema = typeof args.options.thumbnailUrl === 'undefined' ? `<Parameter Type="Null" />` : `<Parameter Type="String">${args.options.thumbnailUrl}</Parameter>`;
             try {
+                const orgAssetType = this.getOrgAssetType(args.options.orgAssetType);
                 spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
                 const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 const requestOptions = {
@@ -49,7 +56,7 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
                     headers: {
                         'X-RequestDigest': reqDigest.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><Method Name="AddToOrgAssetsLibAndCdnWithType" Id="11" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${args.options.libraryUrl}</Parameter>${thumbnailSchema}<Parameter Type="Enum">1</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" 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><Method Name="AddToOrgAssetsLibAndCdnWithType" Id="11" ObjectPathId="8"><Parameters><Parameter Type="Enum">${cdnType}</Parameter><Parameter Type="String">${args.options.libraryUrl}</Parameter>${thumbnailSchema}<Parameter Type="Enum">${orgAssetType}</Parameter></Parameters></Method></Actions><ObjectPaths><Constructor Id="8" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
                 };
                 const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
@@ -63,12 +70,23 @@ class SpoOrgAssetsLibraryAddCommand extends SpoCommand_1.default {
             }
         });
     }
+    getOrgAssetType(orgAssetType) {
+        switch (orgAssetType) {
+            case 'OfficeTemplateLibrary':
+                return OrgAssetType.OfficeTemplateLibrary;
+            case 'OfficeFontLibrary':
+                return OrgAssetType.OfficeFontLibrary;
+            default:
+                return OrgAssetType.ImageDocumentLibrary;
+        }
+    }
 }
 _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAddCommand_initTelemetry = function _SpoOrgAssetsLibraryAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             cdnType: args.options.cdnType || 'Private',
-            thumbnailUrl: typeof args.options.thumbnailUrl !== 'undefined'
+            thumbnailUrl: typeof args.options.thumbnailUrl !== 'undefined',
+            orgAssetType: args.options.orgAssetType
         });
     });
 }, _SpoOrgAssetsLibraryAddCommand_initOptions = function _SpoOrgAssetsLibraryAddCommand_initOptions() {
@@ -78,7 +96,10 @@ _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAd
         option: '--thumbnailUrl [thumbnailUrl]'
     }, {
         option: '--cdnType [cdnType]',
-        autocomplete: ['Public', 'Private']
+        autocomplete: SpoOrgAssetsLibraryAddCommand.cdnTypes
+    }, {
+        option: '--orgAssetType [orgAssetType]',
+        autocomplete: SpoOrgAssetsLibraryAddCommand.orgAssetTypes
     });
 }, _SpoOrgAssetsLibraryAddCommand_initValidators = function _SpoOrgAssetsLibraryAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -86,8 +107,16 @@ _SpoOrgAssetsLibraryAddCommand_instances = new WeakSet(), _SpoOrgAssetsLibraryAd
         if (typeof args.options.thumbnailUrl !== 'undefined' && isValidThumbnailUrl !== true) {
             return isValidThumbnailUrl;
         }
+        if (args.options.cdnType && SpoOrgAssetsLibraryAddCommand.cdnTypes.indexOf(args.options.cdnType) < 0) {
+            return `${args.options.cdnType} is not a valid value for cdnType. Valid values are ${SpoOrgAssetsLibraryAddCommand.cdnTypes.join(', ')}`;
+        }
+        if (args.options.orgAssetType && SpoOrgAssetsLibraryAddCommand.orgAssetTypes.indexOf(args.options.orgAssetType) < 0) {
+            return `${args.options.orgAssetType} is not a valid value for orgAssetType. Valid values are ${SpoOrgAssetsLibraryAddCommand.orgAssetTypes.join(', ')}`;
+        }
         return validation_1.validation.isValidSharePointUrl(args.options.libraryUrl);
     }));
 };
+SpoOrgAssetsLibraryAddCommand.orgAssetTypes = ['ImageDocumentLibrary', 'OfficeTemplateLibrary', 'OfficeFontLibrary'];
+SpoOrgAssetsLibraryAddCommand.cdnTypes = ['Public', 'Private'];
 module.exports = new SpoOrgAssetsLibraryAddCommand();
 //# sourceMappingURL=orgassetslibrary-add.js.map

package/dist/m365/spo/commands/page/Page.js

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.Page = exports.supportedPromoteAs = exports.supportedPageLayouts = void 0;
 const request_1 = require("../../../../request");
@@ -10,7 +19,7 @@ exports.supportedPageLayouts = ['Article', 'Home', 'SingleWebPartAppPage', 'Repo
 exports.supportedPromoteAs = ['HomePage', 'NewsPage', 'Template'];
 class Page {
     static getPage(name, webUrl, logger, debug, verbose) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (verbose) {
                 logger.logToStderr(`Retrieving information about the page...`);
             }
@@ -23,26 +32,15 @@ class Page {
                 },
                 responseType: 'json'
             };
-            request_1.default
-                .get(requestOptions)
-                .then((res) => {
-                if (res.ListItemAllFields.ClientSideApplicationId !== 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec') {
-                    reject(`Page ${name} is not a modern page.`);
-                    return;
-                }
-                try {
-                    resolve(clientsidepages_1.ClientSidePage.fromHtml(res.ListItemAllFields.CanvasContent1));
-                }
-                catch (e) {
-                    reject(e);
-                }
-            }, (error) => {
-                reject(error);
-            });
+            const res = yield request_1.default.get(requestOptions);
+            if (res.ListItemAllFields.ClientSideApplicationId !== 'b6917cb1-93a0-4b97-a84d-7cf49975d4ec') {
+                throw `Page ${name} is not a modern page.`;
+            }
+            return clientsidepages_1.ClientSidePage.fromHtml(res.ListItemAllFields.CanvasContent1);
         });
     }
     static checkout(name, webUrl, logger, debug, verbose) {
-        return new Promise((resolve, reject) => {
+        return __awaiter(this, void 0, void 0, function* () {
             if (verbose) {
                 logger.log(`Checking out ${name} page...`);
             }
@@ -54,20 +52,14 @@ class Page {
                 },
                 responseType: 'json'
             };
-            request_1.default
-                .post(requestOptions)
-                .then((pageData) => {
-                if (!pageData) {
-                    reject(`Page ${name} information not retrieved with the checkout`);
-                    return;
-                }
-                if (verbose) {
-                    logger.log(`Page ${name} is now checked out`);
-                }
-                resolve(pageData);
-            }, (error) => {
-                reject(error);
-            });
+            const pageData = yield request_1.default.post(requestOptions);
+            if (!pageData) {
+                throw `Page ${name} information not retrieved with the checkout`;
+            }
+            if (verbose) {
+                logger.log(`Page ${name} is now checked out`);
+            }
+            return pageData;
         });
     }
     static getControlsInformation(control, isJSONOutput) {

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

@@ -1,4 +1,13 @@
 "use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
 Object.defineProperty(exports, "__esModule", { value: true });
 exports.SpoPropertyBagBaseCommand = void 0;
 const config_1 = require("../../../../config");
@@ -17,35 +26,37 @@ class SpoPropertyBagBaseCommand extends SpoCommand_1.default {
      * This method is executed when folder option is specified. PnP PowerShell behaves the same way.
      */
     getFolderPropertyBag(identityResp, webUrl, folder, logger) {
-        let serverRelativeUrl = folder;
-        if (identityResp.serverRelativeUrl !== '/') {
-            serverRelativeUrl = `${identityResp.serverRelativeUrl}${serverRelativeUrl}`;
-        }
-        const requestOptions = {
-            url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
-            headers: {
-                'X-RequestDigest': this.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="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_1.default
-                .post(requestOptions)
-                .then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            let serverRelativeUrl = folder;
+            if (identityResp.serverRelativeUrl !== '/') {
+                serverRelativeUrl = `${identityResp.serverRelativeUrl}${serverRelativeUrl}`;
+            }
+            const requestOptions = {
+                url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.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="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>`
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
                 if (this.debug) {
                     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');
+                    throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
                 }
                 const propertiesObj = json.find(x => { return x['Properties']; });
                 if (propertiesObj) {
-                    return resolve(propertiesObj['Properties']);
+                    return propertiesObj['Properties'];
                 }
-                reject('Cannot proceed. Properties not found'); // this is not suppose to happen
-            }, (err) => { reject(err); });
+                throw 'Cannot proceed. Properties not found'; // this is not suppose to happen
+            }
+            catch (err) {
+                throw err;
+            }
         });
     }
     /**
@@ -53,29 +64,33 @@ class SpoPropertyBagBaseCommand extends SpoCommand_1.default {
      * This method is executed when no folder specified. PnP PowerShell behaves the same way.
      */
     getWebPropertyBag(identityResp, webUrl, logger) {
-        const requestOptions = {
-            url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
-            headers: {
-                'X-RequestDigest': this.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><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_1.default.post(requestOptions).then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.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><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>`
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
                 if (this.debug) {
                     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');
+                    throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
                 }
                 const allPropertiesObj = json.find(x => { return x['AllProperties']; });
                 if (allPropertiesObj) {
-                    return resolve(allPropertiesObj['AllProperties']);
+                    return allPropertiesObj['AllProperties'];
                 }
-                reject('Cannot proceed. AllProperties not found'); // this is not supposed to happen
-            }, (err) => { reject(err); });
+                throw 'Cannot proceed. AllProperties not found'; // this is not supposed to happen
+            }
+            catch (err) {
+                throw err;
+            }
         });
     }
     /**
@@ -112,28 +127,32 @@ class SpoPropertyBagBaseCommand extends SpoCommand_1.default {
         return { key: objKey, value: objValue };
     }
     static setProperty(name, value, webUrl, formDigest, identityResp, logger, debug, folder) {
-        let objectType = 'AllProperties';
-        if (folder) {
-            objectType = 'Properties';
-        }
-        const requestOptions = {
-            url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
-            headers: {
-                'X-RequestDigest': formDigest
-            },
-            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><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(name)}</Parameter><Parameter Type="String">${formatting_1.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_1.default.post(requestOptions).then((res) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            let objectType = 'AllProperties';
+            if (folder) {
+                objectType = 'Properties';
+            }
+            const requestOptions = {
+                url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': formDigest
+                },
+                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><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(name)}</Parameter><Parameter Type="String">${formatting_1.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>`
+            };
+            try {
+                const res = yield request_1.default.post(requestOptions);
                 const json = JSON.parse(res);
                 const contents = json.find(x => { return x['ErrorInfo']; });
                 if (contents && contents.ErrorInfo) {
-                    reject(contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error');
+                    throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
                 }
                 else {
-                    resolve(res);
+                    return res;
                 }
-            }, (err) => { reject(err); });
+            }
+            catch (err) {
+                throw err;
+            }
         });
     }
     /**
@@ -145,12 +164,14 @@ class SpoPropertyBagBaseCommand extends SpoCommand_1.default {
      * @param cmd command instance
      */
     static isNoScriptSite(webUrl, formDigest, webIdentityResp, logger, debug) {
-        return new Promise((resolve, reject) => {
-            spo_1.spo.getEffectiveBasePermissions(webIdentityResp.objectIdentity, webUrl, formDigest, logger, debug)
-                .then((basePermissionsResp) => {
-                resolve(basePermissionsResp.has(base_permissions_1.PermissionKind.AddAndCustomizePages) === false);
-            })
-                .catch(err => reject(err));
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const basePermissionsResp = yield spo_1.spo.getEffectiveBasePermissions(webIdentityResp.objectIdentity, webUrl, formDigest, logger, debug);
+                return basePermissionsResp.has(base_permissions_1.PermissionKind.AddAndCustomizePages) === false;
+            }
+            catch (err) {
+                throw err;
+            }
         });
     }
 }

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

@@ -39,24 +39,8 @@ class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseC
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeProperty = () => __awaiter(this, void 0, void 0, function* () {
-                try {
-                    const contextResponse = yield spo_1.spo.getRequestDigest(args.options.webUrl);
-                    this.formDigestValue = contextResponse.FormDigestValue;
-                    let identityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
-                    const opts = args.options;
-                    if (opts.folder) {
-                        // get the folder guid instead of the web guid
-                        identityResp = yield spo_1.spo.getFolderIdentity(identityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
-                    }
-                    yield this.removeProperty(identityResp, args.options);
-                }
-                catch (err) {
-                    this.handleRejectedPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeProperty();
+                yield this.removeProperty(args);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -66,34 +50,51 @@ class SpoPropertyBagRemoveCommand extends propertybag_base_1.SpoPropertyBagBaseC
                     message: `Are you sure you want to remove the ${args.options.key} property?`
                 });
                 if (result.continue) {
-                    yield removeProperty();
+                    yield this.removeProperty(args);
                 }
             }
         });
     }
-    removeProperty(identityResp, options) {
-        let objectType = 'AllProperties';
-        if (options.folder) {
-            objectType = 'Properties';
-        }
-        const requestOptions = {
-            url: `${options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
-            headers: {
-                'X-RequestDigest': this.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><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${formatting_1.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_1.default.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);
+    removeProperty(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const contextResponse = yield spo_1.spo.getRequestDigest(args.options.webUrl);
+                this.formDigestValue = contextResponse.FormDigestValue;
+                let identityResp = yield spo_1.spo.getCurrentWebIdentity(args.options.webUrl, this.formDigestValue);
+                const opts = args.options;
+                if (opts.folder) {
+                    // get the folder guid instead of the web guid
+                    identityResp = yield spo_1.spo.getFolderIdentity(identityResp.objectIdentity, opts.webUrl, opts.folder, this.formDigestValue);
                 }
-            }, (err) => { reject(err); });
+                yield this.removePropertyWithIdentityResp(identityResp, args.options);
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
+            }
+        });
+    }
+    removePropertyWithIdentityResp(identityResp, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let objectType = 'AllProperties';
+            if (options.folder) {
+                objectType = 'Properties';
+            }
+            const requestOptions = {
+                url: `${options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
+                headers: {
+                    'X-RequestDigest': this.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><Method Name="SetFieldValue" Id="206" ObjectPathId="205"><Parameters><Parameter Type="String">${formatting_1.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>`
+            };
+            const res = yield request_1.default.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;
+            }
         });
     }
 }