@pnp/cli-microsoft365 6.0.0-beta.550f33a → 6.0.0-beta.55cbe4a

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-remove.js

@@ -15,10 +15,12 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoTenantRecycleBinItemRemoveCommand_instances, _SpoTenantRecycleBinItemRemoveCommand_initTelemetry, _SpoTenantRecycleBinItemRemoveCommand_initOptions, _SpoTenantRecycleBinItemRemoveCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
@@ -35,78 +37,70 @@ class SpoTenantRecycleBinItemRemoveCommand extends SpoCommand_1.default {
     get description() {
         return 'Removes the specified deleted site collection from tenant recycle bin';
     }
-    commandAction(logger, args, cb) {
-        const removeDeletedSite = () => {
-            utils_1.spo
-                .getSpoAdminUrl(logger, this.debug)
-                .then((adminUrl) => {
-                this.spoAdminUrl = adminUrl;
-                return utils_1.spo.ensureFormDigest(this.spoAdminUrl, logger, this.context, this.debug);
-            })
-                .then((res) => {
-                this.context = res;
-                if (this.verbose) {
-                    logger.logToStderr(`Removing deleted site collection ${args.options.siteUrl}...`);
-                }
-                const requestOptions = {
-                    url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                    headers: {
-                        'X-RequestDigest': this.context.FormDigestValue
-                    },
-                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-                };
-                return request_1.default.post(requestOptions);
-            })
-                .then((res) => {
-                return new Promise((resolve, reject) => {
-                    const json = JSON.parse(res);
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeDeletedSite = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    const adminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                    const res = yield spo_1.spo.ensureFormDigest(adminUrl, logger, this.context, this.debug);
+                    if (this.verbose) {
+                        logger.logToStderr(`Removing deleted site collection ${args.options.siteUrl}...`);
+                    }
+                    const requestOptions = {
+                        url: `${this.spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                        headers: {
+                            'X-RequestDigest': res.FormDigestValue
+                        },
+                        data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="16" ObjectPathId="15" /><Query Id="17" ObjectPathId="15"><Query SelectAllProperties="false"><Properties><Property Name="PollingInterval" ScalarProperty="true" /><Property Name="IsComplete" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Method Id="15" ParentId="1" Name="RemoveDeletedSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.siteUrl)}</Parameter></Parameters></Method><Constructor Id="1" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                    };
+                    const processQuery = yield request_1.default.post(requestOptions);
+                    const json = JSON.parse(processQuery);
                     const response = json[0];
                     if (response.ErrorInfo) {
-                        reject(response.ErrorInfo.ErrorMessage);
+                        throw response.ErrorInfo.ErrorMessage;
                     }
                     else {
                         const operation = json[json.length - 1];
                         const isComplete = operation.IsComplete;
                         if (!args.options.wait || isComplete) {
-                            resolve();
                             return;
                         }
-                        setTimeout(() => {
-                            utils_1.spo.waitUntilFinished({
-                                operationId: JSON.stringify(operation._ObjectIdentity_),
-                                siteUrl: this.spoAdminUrl,
-                                resolve,
-                                reject,
-                                logger,
-                                currentContext: this.context,
-                                dots: this.dots,
-                                debug: this.debug,
-                                verbose: this.verbose
-                            });
-                        }, operation.PollingInterval);
+                        yield new Promise((resolve, reject) => {
+                            setTimeout(() => {
+                                spo_1.spo.waitUntilFinished({
+                                    operationId: JSON.stringify(operation._ObjectIdentity_),
+                                    siteUrl: this.spoAdminUrl,
+                                    resolve,
+                                    reject,
+                                    logger,
+                                    currentContext: this.context,
+                                    dots: this.dots,
+                                    debug: this.debug,
+                                    verbose: this.verbose
+                                });
+                            }, operation.PollingInterval);
+                        });
                     }
-                });
-            })
-                .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
-        };
-        if (args.options.confirm) {
-            removeDeletedSite();
-        }
-        else {
-            cli_1.Cli.prompt({
-                type: 'confirm',
-                name: 'continue',
-                default: false,
-                message: `Are you sure you want to remove the deleted site collection ${args.options.siteUrl} from tenant recycle bin?`
-            }, (result) => {
-                if (!result.continue) {
-                    cb();
                 }
-                else {
-                    removeDeletedSite();
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
-        }
+            if (args.options.confirm) {
+                yield removeDeletedSite();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the deleted site collection ${args.options.siteUrl} from tenant recycle bin?`
+                });
+                if (result.continue) {
+                    yield removeDeletedSite();
+                }
+            }
+        });
     }
 }
 _SpoTenantRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRemoveCommand_initTelemetry = function _SpoTenantRecycleBinItemRemoveCommand_initTelemetry() {
@@ -125,7 +119,7 @@ _SpoTenantRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoTenantRecyc
         option: '--confirm'
     });
 }, _SpoTenantRecycleBinItemRemoveCommand_initValidators = function _SpoTenantRecycleBinItemRemoveCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoTenantRecycleBinItemRemoveCommand();
 //# sourceMappingURL=tenant-recyclebinitem-remove.js.map

package/dist/m365/spo/commands/tenant/tenant-recyclebinitem-restore.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoTenantRecycleBinItemRestoreCommand_instances, _SpoTenantRecycleBinItemRestoreCommand_initTelemetry, _SpoTenantRecycleBinItemRestoreCommand_initOptions, _SpoTenantRecycleBinItemRestoreCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand_1.default {
@@ -33,26 +34,27 @@ class SpoTenantRecycleBinItemRestoreCommand extends SpoCommand_1.default {
     get description() {
         return 'Restores the specified deleted site collection from tenant recycle bin';
     }
-    commandAction(logger, args, cb) {
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((adminUrl) => {
-            const requestOptions = {
-                url: `${adminUrl}/_api/SPOInternalUseOnly.Tenant/RestoreDeletedSite`,
-                headers: {
-                    accept: 'application/json;odata=nometadata',
-                    'content-type': 'application/json;charset=utf-8'
-                },
-                data: {
-                    siteUrl: args.options.siteUrl
-                }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then(res => {
-            logger.log(JSON.parse(res));
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const adminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const requestOptions = {
+                    url: `${adminUrl}/_api/SPOInternalUseOnly.Tenant/RestoreDeletedSite`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata',
+                        'content-type': 'application/json;charset=utf-8'
+                    },
+                    data: {
+                        siteUrl: args.options.siteUrl
+                    }
+                };
+                const res = yield request_1.default.post(requestOptions);
+                logger.log(JSON.parse(res));
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 _SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecycleBinItemRestoreCommand_initTelemetry = function _SpoTenantRecycleBinItemRestoreCommand_initTelemetry() {
@@ -68,7 +70,7 @@ _SpoTenantRecycleBinItemRestoreCommand_instances = new WeakSet(), _SpoTenantRecy
         option: '--wait'
     });
 }, _SpoTenantRecycleBinItemRestoreCommand_initValidators = function _SpoTenantRecycleBinItemRestoreCommand_initValidators() {
-    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return utils_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () { return validation_1.validation.isValidSharePointUrl(args.options.siteUrl); }));
 };
 module.exports = new SpoTenantRecycleBinItemRestoreCommand();
 //# sourceMappingURL=tenant-recyclebinitem-restore.js.map

package/dist/m365/spo/commands/tenant/tenant-settings-list.js

@@ -1,9 +1,17 @@
 "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 });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoTenantSettingsListCommand extends SpoCommand_1.default {
@@ -13,58 +21,54 @@ class SpoTenantSettingsListCommand extends SpoCommand_1.default {
     get description() {
         return 'Lists the global tenant settings';
     }
-    commandAction(logger, args, cb) {
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue
-                },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties><Property Name="HideDefaultThemes" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
+    commandAction(logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': res.FormDigestValue
+                    },
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="4" ObjectPathId="3" /><Query Id="5" ObjectPathId="3"><Query SelectAllProperties="true"><Properties><Property Name="HideDefaultThemes" ScalarProperty="true" /></Properties></Query></Query></Actions><ObjectPaths><Constructor Id="3" TypeId="{268004ae-ef6b-4e9b-8425-127220d84719}" /></ObjectPaths></Request>`
+                };
+                const processQuery = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(processQuery);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                const result = json[4];
+                delete result['_ObjectIdentity_'];
+                delete result['_ObjectType_'];
+                // map integers to their enums
+                const sharingLinkType = ['None', 'Direct', 'Internal', 'AnonymousAccess'];
+                const sharingCapabilities = ['Disabled', 'ExternalUserSharingOnly', 'ExternalUserAndGuestSharing', 'ExistingExternalUserSharingOnly'];
+                const sharingDomainRestrictionModes = ['None', 'AllowList', 'BlockList'];
+                const sharingState = ['Unspecified', 'On', 'Off'];
+                const anonymousLinkType = ['None', 'View', 'Edit'];
+                const sharingPermissionType = ['None', 'View', 'Edit'];
+                const sPOConditionalAccessPolicyType = ['AllowFullAccess', 'AllowLimitedAccess', 'BlockAccess'];
+                const specialCharactersState = ['NoPreference', 'Allowed', 'Disallowed'];
+                const sPOLimitedAccessFileType = ['OfficeOnlineFilesOnly', 'WebPreviewableFiles', 'OtherFiles'];
+                result['SharingCapability'] = sharingCapabilities[result['SharingCapability']];
+                result['SharingDomainRestrictionMode'] = sharingDomainRestrictionModes[result['SharingDomainRestrictionMode']];
+                result['ODBMembersCanShare'] = sharingState[result['ODBMembersCanShare']];
+                result['ODBAccessRequests'] = sharingState[result['ODBAccessRequests']];
+                result['DefaultSharingLinkType'] = sharingLinkType[result['DefaultSharingLinkType']];
+                result['FileAnonymousLinkType'] = anonymousLinkType[result['FileAnonymousLinkType']];
+                result['FolderAnonymousLinkType'] = anonymousLinkType[result['FolderAnonymousLinkType']];
+                result['DefaultLinkPermission'] = sharingPermissionType[result['DefaultLinkPermission']];
+                result['ConditionalAccessPolicy'] = sPOConditionalAccessPolicyType[result['ConditionalAccessPolicy']];
+                result['SpecialCharactersStateInFileFolderNames'] = specialCharactersState[result['SpecialCharactersStateInFileFolderNames']];
+                result['LimitedAccessFileType'] = sPOLimitedAccessFileType[result['LimitedAccessFileType']];
+                logger.log(result);
             }
-            const result = json[4];
-            delete result['_ObjectIdentity_'];
-            delete result['_ObjectType_'];
-            // map integers to their enums
-            const sharingLinkType = ['None', 'Direct', 'Internal', 'AnonymousAccess'];
-            const sharingCapabilities = ['Disabled', 'ExternalUserSharingOnly', 'ExternalUserAndGuestSharing', 'ExistingExternalUserSharingOnly'];
-            const sharingDomainRestrictionModes = ['None', 'AllowList', 'BlockList'];
-            const sharingState = ['Unspecified', 'On', 'Off'];
-            const anonymousLinkType = ['None', 'View', 'Edit'];
-            const sharingPermissionType = ['None', 'View', 'Edit'];
-            const sPOConditionalAccessPolicyType = ['AllowFullAccess', 'AllowLimitedAccess', 'BlockAccess'];
-            const specialCharactersState = ['NoPreference', 'Allowed', 'Disallowed'];
-            const sPOLimitedAccessFileType = ['OfficeOnlineFilesOnly', 'WebPreviewableFiles', 'OtherFiles'];
-            result['SharingCapability'] = sharingCapabilities[result['SharingCapability']];
-            result['SharingDomainRestrictionMode'] = sharingDomainRestrictionModes[result['SharingDomainRestrictionMode']];
-            result['ODBMembersCanShare'] = sharingState[result['ODBMembersCanShare']];
-            result['ODBAccessRequests'] = sharingState[result['ODBAccessRequests']];
-            result['DefaultSharingLinkType'] = sharingLinkType[result['DefaultSharingLinkType']];
-            result['FileAnonymousLinkType'] = anonymousLinkType[result['FileAnonymousLinkType']];
-            result['FolderAnonymousLinkType'] = anonymousLinkType[result['FolderAnonymousLinkType']];
-            result['DefaultLinkPermission'] = sharingPermissionType[result['DefaultLinkPermission']];
-            result['ConditionalAccessPolicy'] = sPOConditionalAccessPolicyType[result['ConditionalAccessPolicy']];
-            result['SpecialCharactersStateInFileFolderNames'] = specialCharactersState[result['SpecialCharactersStateInFileFolderNames']];
-            result['LimitedAccessFileType'] = sPOLimitedAccessFileType[result['LimitedAccessFileType']];
-            logger.log(result);
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
 }
 module.exports = new SpoTenantSettingsListCommand();

package/dist/m365/spo/commands/tenant/tenant-settings-set.js

@@ -15,10 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoTenantSettingsSetCommand_instances, _SpoTenantSettingsSetCommand_initTelemetry, _SpoTenantSettingsSetCommand_initOptions, _SpoTenantSettingsSetCommand_initValidators, _SpoTenantSettingsSetCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoTenantSettingsSetCommand extends SpoCommand_1.default {
@@ -49,75 +49,65 @@ class SpoTenantSettingsSetCommand extends SpoCommand_1.default {
     getSPOConditionalAccessPolicyType() { return ['AllowFullAccess', 'AllowLimitedAccess', 'BlockAccess']; }
     getSpecialCharactersState() { return ['NoPreference', 'Allowed', 'Disallowed']; }
     getSPOLimitedAccessFileType() { return ['OfficeOnlineFilesOnly', 'WebPreviewableFiles', 'OtherFiles']; }
-    commandAction(logger, args, cb) {
-        let formDigestValue = '';
-        let spoAdminUrl = '';
-        let tenantId = '';
-        utils_1.spo
-            .getTenantId(logger, this.debug)
-            .then((_tenantId) => {
-            tenantId = _tenantId;
-            return utils_1.spo.getSpoAdminUrl(logger, this.debug);
-        })
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            formDigestValue = res.FormDigestValue;
-            // map the args.options to XML Properties
-            let propsXml = '';
-            let id = 42; // geek's humor
-            for (const optionKey of Object.keys(args.options)) {
-                if (this.isExcludedOption(optionKey)) {
-                    continue;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const tenantId = yield spo_1.spo.getTenantId(logger, this.debug);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const formDigestValue = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                // map the args.options to XML Properties
+                let propsXml = '';
+                let id = 42; // geek's humor
+                for (const optionKey of Object.keys(args.options)) {
+                    if (this.isExcludedOption(optionKey)) {
+                        continue;
+                    }
+                    let optionValue = args.options[optionKey];
+                    if (this.getAllEnumOptions().indexOf(optionKey) > -1) {
+                        // map enum values to int
+                        optionValue = this.mapEnumToInt(optionKey, args.options[optionKey]);
+                    }
+                    if (['AllowedDomainListForSyncClient', 'DisabledWebPartIds'].indexOf(optionKey) > -1) {
+                        // the XML has to be represented as array of guids
+                        let valuesXml = '';
+                        optionValue.split(',').forEach((value) => {
+                            valuesXml += `<Object Type="Guid">{${formatting_1.formatting.escapeXml(value)}}</Object>`;
+                        });
+                        propsXml += `<SetProperty Id="${id++}" ObjectPathId="7" Name="${optionKey}"><Parameter Type="Array">${valuesXml}</Parameter></SetProperty><Method Name="Update" Id="${id++}" ObjectPathId="7" />`;
+                    }
+                    else if (['ExcludedFileExtensionsForSyncClient'].indexOf(optionKey) > -1) {
+                        // the XML has to be represented as array of strings
+                        let valuesXml = '';
+                        optionValue.split(',').forEach((value) => {
+                            valuesXml += `<Object Type="String">${value}</Object>`;
+                        });
+                        propsXml += `<SetProperty Id="${id++}" ObjectPathId="7" Name="${optionKey}"><Parameter Type="Array">${valuesXml}</Parameter></SetProperty><Method Name="Update" Id="${id++}" ObjectPathId="7" />`;
+                    }
+                    else {
+                        propsXml += `<SetProperty Id="${id++}" ObjectPathId="7" Name="${optionKey}"><Parameter Type="String">${optionValue}</Parameter></SetProperty>`;
+                    }
                 }
-                let optionValue = args.options[optionKey];
-                if (this.getAllEnumOptions().indexOf(optionKey) > -1) {
-                    // map enum values to int
-                    optionValue = this.mapEnumToInt(optionKey, args.options[optionKey]);
+                const requestOptions = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': formDigestValue
+                    },
+                    data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${propsXml}</Actions><ObjectPaths><Identity Id="7" Name="${tenantId}" /></ObjectPaths></Request>`
+                };
+                const res = yield request_1.default.post(requestOptions);
+                const json = JSON.parse(res);
+                const response = json[0];
+                if (response.ErrorInfo) {
+                    throw response.ErrorInfo.ErrorMessage;
                 }
-                if (['AllowedDomainListForSyncClient', 'DisabledWebPartIds'].indexOf(optionKey) > -1) {
-                    // the XML has to be represented as array of guids
-                    let valuesXml = '';
-                    optionValue.split(',').forEach((value) => {
-                        valuesXml += `<Object Type="Guid">{${utils_1.formatting.escapeXml(value)}}</Object>`;
-                    });
-                    propsXml += `<SetProperty Id="${id++}" ObjectPathId="7" Name="${optionKey}"><Parameter Type="Array">${valuesXml}</Parameter></SetProperty><Method Name="Update" Id="${id++}" ObjectPathId="7" />`;
-                }
-                else if (['ExcludedFileExtensionsForSyncClient'].indexOf(optionKey) > -1) {
-                    // the XML has to be represented as array of strings
-                    let valuesXml = '';
-                    optionValue.split(',').forEach((value) => {
-                        valuesXml += `<Object Type="String">${value}</Object>`;
-                    });
-                    propsXml += `<SetProperty Id="${id++}" ObjectPathId="7" Name="${optionKey}"><Parameter Type="Array">${valuesXml}</Parameter></SetProperty><Method Name="Update" Id="${id++}" ObjectPathId="7" />`;
-                }
-                else {
-                    propsXml += `<SetProperty Id="${id++}" ObjectPathId="7" Name="${optionKey}"><Parameter Type="String">${optionValue}</Parameter></SetProperty>`;
+                if (args.options.EnableAzureADB2BIntegration === true) {
+                    this.warn(logger, 'WARNING: Make sure to also enable the Azure AD one-time passcode authentication preview. If it is not enabled then SharePoint will not use Azure AD B2B even if EnableAzureADB2BIntegration is set to true. Learn more at http://aka.ms/spo-b2b-integration.');
                 }
             }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': formDigestValue
-                },
-                data: `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions>${propsXml}</Actions><ObjectPaths><Identity Id="7" Name="${tenantId}" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                return;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            if (args.options.EnableAzureADB2BIntegration === true) {
-                this.warn(logger, 'WARNING: Make sure to also enable the Azure AD one-time passcode authentication preview. If it is not enabled then SharePoint will not use Azure AD B2B even if EnableAzureADB2BIntegration is set to true. Learn more at http://aka.ms/spo-b2b-integration.');
-            }
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
     isExcludedOption(optionKey) {
         // it is not possible to dynamically get the GlobalOptions