@pnp/cli-microsoft365 5.7.0 → 5.8.0-beta.03ce984

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

@@ -1,6 +1,14 @@
 "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");
@@ -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 utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield utils_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,7 +15,6 @@ 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");
@@ -49,75 +48,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 utils_1.spo.getTenantId(logger, this.debug);
+                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const formDigestValue = yield utils_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">{${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>`;
+                    }
                 }
-                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

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

@@ -13,10 +13,9 @@ 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 _SpoTermAddCommand_instances, _SpoTermAddCommand_initTelemetry, _SpoTermAddCommand_initOptions, _SpoTermAddCommand_initValidators;
+var _SpoTermAddCommand_instances, _SpoTermAddCommand_initTelemetry, _SpoTermAddCommand_initOptions, _SpoTermAddCommand_initValidators, _SpoTermAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const uuid_1 = require("uuid");
-const Command_1 = require("../../../../Command");
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const utils_1 = require("../../../../utils");
@@ -29,6 +28,7 @@ class SpoTermAddCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTermAddCommand_instances, "m", _SpoTermAddCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.TERM_ADD;
@@ -36,108 +36,102 @@ class SpoTermAddCommand extends SpoCommand_1.default {
     get description() {
         return 'Adds taxonomy term';
     }
-    commandAction(logger, args, cb) {
-        let term;
-        let formDigest;
-        let spoAdminUrl = '';
-        utils_1.spo
-            .getSpoAdminUrl(logger, this.debug)
-            .then((_spoAdminUrl) => {
-            spoAdminUrl = _spoAdminUrl;
-            return utils_1.spo.getRequestDigest(spoAdminUrl);
-        })
-            .then((res) => {
-            formDigest = res.FormDigestValue;
-            if (this.verbose) {
-                logger.logToStderr(`Adding taxonomy term...`);
-            }
-            const termGroupQuery = args.options.termGroupId ? `<Method Id="11" ParentId="9" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="11" ParentId="9" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
-            const termParentQuery = args.options.parentTermId ?
-                // get parent term by ID
-                `<Method Id="16" ParentId="6" Name="GetTerm"><Parameters><Parameter Type="Guid">{${args.options.parentTermId}}</Parameter></Parameters></Method>` :
-                // no parent term specified, add to term set
-                args.options.termSetId ? `<Method Id="16" ParentId="14" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termSetId}}</Parameter></Parameters></Method>` : `<Method Id="16" ParentId="14" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termSetName)}</Parameter></Parameters></Method>`;
-            const termId = args.options.id || (0, uuid_1.v4)();
-            const 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" /><ObjectIdentityQuery Id="5" ObjectPathId="3" /><ObjectPath Id="7" ObjectPathId="6" /><ObjectIdentityQuery Id="8" ObjectPathId="6" /><ObjectPath Id="10" ObjectPathId="9" /><ObjectPath Id="12" ObjectPathId="11" /><ObjectIdentityQuery Id="13" ObjectPathId="11" /><ObjectPath Id="15" ObjectPathId="14" /><ObjectPath Id="17" ObjectPathId="16" /><ObjectIdentityQuery Id="18" ObjectPathId="16" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectIdentityQuery Id="21" ObjectPathId="19" /><Query Id="22" ObjectPathId="19"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="3" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="6" ParentId="3" Name="GetDefaultSiteCollectionTermStore" /><Property Id="9" ParentId="6" Name="Groups" />${termGroupQuery}<Property Id="14" ParentId="11" Name="TermSets" />${termParentQuery}<Method Id="19" ParentId="16" Name="CreateTerm"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="Int32">1033</Parameter><Parameter Type="Guid">{${termId}}</Parameter></Parameters></Method></ObjectPaths></Request>`;
-            const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
-                headers: {
-                    'X-RequestDigest': res.FormDigestValue
-                },
-                data: data
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const json = JSON.parse(res);
-            const response = json[0];
-            if (response.ErrorInfo) {
-                return Promise.reject(response.ErrorInfo.ErrorMessage);
-            }
-            term = json[json.length - 1];
-            if (!args.options.description &&
-                !args.options.customProperties &&
-                !args.options.localCustomProperties) {
-                return Promise.resolve(undefined);
-            }
-            if (this.verbose) {
-                logger.logToStderr(`Setting term properties...`);
-            }
-            const properties = [];
-            let i = 127;
-            if (args.options.description) {
-                properties.push(`<Method Name="SetDescription" Id="${i++}" ObjectPathId="117"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.description)}</Parameter><Parameter Type="Int32">1033</Parameter></Parameters></Method>`);
-                term.Description = args.options.description;
-            }
-            if (args.options.customProperties) {
-                const customProperties = JSON.parse(args.options.customProperties);
-                Object.keys(customProperties).forEach(k => {
-                    properties.push(`<Method Name="SetCustomProperty" Id="${i++}" ObjectPathId="117"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(k)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(customProperties[k])}</Parameter></Parameters></Method>`);
-                });
-                term.CustomProperties = customProperties;
-            }
-            if (args.options.localCustomProperties) {
-                const localCustomProperties = JSON.parse(args.options.localCustomProperties);
-                Object.keys(localCustomProperties).forEach(k => {
-                    properties.push(`<Method Name="SetLocalCustomProperty" Id="${i++}" ObjectPathId="117"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(k)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(localCustomProperties[k])}</Parameter></Parameters></Method>`);
-                });
-                term.LocalCustomProperties = localCustomProperties;
-            }
-            let termStoreObjectIdentity = '';
-            // get term store object identity
-            for (let i = 0; i < json.length; i++) {
-                if (json[i] !== 8) {
-                    continue;
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let term;
+            let formDigest;
+            try {
+                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                formDigest = res.FormDigestValue;
+                if (this.verbose) {
+                    logger.logToStderr(`Adding taxonomy term...`);
                 }
-                termStoreObjectIdentity = json[i + 1]._ObjectIdentity_;
-                break;
-            }
-            const requestOptions = {
-                url: `${spoAdminUrl}/_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>${properties.join('')}<Method Name="CommitAll" Id="131" ObjectPathId="109" /></Actions><ObjectPaths><Identity Id="117" Name="${term._ObjectIdentity_}" /><Identity Id="109" Name="${termStoreObjectIdentity}" /></ObjectPaths></Request>`
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            if (res) {
-                const json = JSON.parse(res);
+                const termGroupQuery = args.options.termGroupId ? `<Method Id="11" ParentId="9" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="11" ParentId="9" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
+                const termParentQuery = args.options.parentTermId ?
+                    // get parent term by ID
+                    `<Method Id="16" ParentId="6" Name="GetTerm"><Parameters><Parameter Type="Guid">{${args.options.parentTermId}}</Parameter></Parameters></Method>` :
+                    // no parent term specified, add to term set
+                    args.options.termSetId ? `<Method Id="16" ParentId="14" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termSetId}}</Parameter></Parameters></Method>` : `<Method Id="16" ParentId="14" Name="GetByName"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.termSetName)}</Parameter></Parameters></Method>`;
+                const termId = args.options.id || (0, uuid_1.v4)();
+                const 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" /><ObjectIdentityQuery Id="5" ObjectPathId="3" /><ObjectPath Id="7" ObjectPathId="6" /><ObjectIdentityQuery Id="8" ObjectPathId="6" /><ObjectPath Id="10" ObjectPathId="9" /><ObjectPath Id="12" ObjectPathId="11" /><ObjectIdentityQuery Id="13" ObjectPathId="11" /><ObjectPath Id="15" ObjectPathId="14" /><ObjectPath Id="17" ObjectPathId="16" /><ObjectIdentityQuery Id="18" ObjectPathId="16" /><ObjectPath Id="20" ObjectPathId="19" /><ObjectIdentityQuery Id="21" ObjectPathId="19" /><Query Id="22" ObjectPathId="19"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticMethod Id="3" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="6" ParentId="3" Name="GetDefaultSiteCollectionTermStore" /><Property Id="9" ParentId="6" Name="Groups" />${termGroupQuery}<Property Id="14" ParentId="11" Name="TermSets" />${termParentQuery}<Method Id="19" ParentId="16" Name="CreateTerm"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.name)}</Parameter><Parameter Type="Int32">1033</Parameter><Parameter Type="Guid">{${termId}}</Parameter></Parameters></Method></ObjectPaths></Request>`;
+                const requestOptionsPost = {
+                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    headers: {
+                        'X-RequestDigest': res.FormDigestValue
+                    },
+                    data: data
+                };
+                const processQuery = yield request_1.default.post(requestOptionsPost);
+                const json = JSON.parse(processQuery);
                 const response = json[0];
                 if (response.ErrorInfo) {
-                    cb(new Command_1.CommandError(response.ErrorInfo.ErrorMessage));
-                    return;
+                    throw response.ErrorInfo.ErrorMessage;
+                }
+                term = json[json.length - 1];
+                let terms = undefined;
+                if (!(!args.options.description &&
+                    !args.options.customProperties &&
+                    !args.options.localCustomProperties)) {
+                    if (this.verbose) {
+                        logger.logToStderr(`Setting term properties...`);
+                    }
+                    const properties = [];
+                    let i = 127;
+                    if (args.options.description) {
+                        properties.push(`<Method Name="SetDescription" Id="${i++}" ObjectPathId="117"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.description)}</Parameter><Parameter Type="Int32">1033</Parameter></Parameters></Method>`);
+                        term.Description = args.options.description;
+                    }
+                    if (args.options.customProperties) {
+                        const customProperties = JSON.parse(args.options.customProperties);
+                        Object.keys(customProperties).forEach(k => {
+                            properties.push(`<Method Name="SetCustomProperty" Id="${i++}" ObjectPathId="117"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(k)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(customProperties[k])}</Parameter></Parameters></Method>`);
+                        });
+                        term.CustomProperties = customProperties;
+                    }
+                    if (args.options.localCustomProperties) {
+                        const localCustomProperties = JSON.parse(args.options.localCustomProperties);
+                        Object.keys(localCustomProperties).forEach(k => {
+                            properties.push(`<Method Name="SetLocalCustomProperty" Id="${i++}" ObjectPathId="117"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(k)}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(localCustomProperties[k])}</Parameter></Parameters></Method>`);
+                        });
+                        term.LocalCustomProperties = localCustomProperties;
+                    }
+                    let termStoreObjectIdentity = '';
+                    // get term store object identity
+                    for (let i = 0; i < json.length; i++) {
+                        if (json[i] !== 8) {
+                            continue;
+                        }
+                        termStoreObjectIdentity = json[i + 1]._ObjectIdentity_;
+                        break;
+                    }
+                    const requestOptions = {
+                        url: `${spoAdminUrl}/_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>${properties.join('')}<Method Name="CommitAll" Id="131" ObjectPathId="109" /></Actions><ObjectPaths><Identity Id="117" Name="${term._ObjectIdentity_}" /><Identity Id="109" Name="${termStoreObjectIdentity}" /></ObjectPaths></Request>`
+                    };
+                    terms = yield request_1.default.post(requestOptions);
                 }
+                if (terms) {
+                    const json = JSON.parse(terms);
+                    const response = json[0];
+                    if (response.ErrorInfo) {
+                        throw response.ErrorInfo.ErrorMessage;
+                    }
+                }
+                delete term._ObjectIdentity_;
+                delete term._ObjectType_;
+                term.CreatedDate = new Date(Number(term.CreatedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
+                term.Id = term.Id.replace('/Guid(', '').replace(')/', '');
+                term.LastModifiedDate = new Date(Number(term.LastModifiedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
+                logger.log(term);
+            }
+            catch (err) {
+                this.handleRejectedPromise(err);
             }
-            delete term._ObjectIdentity_;
-            delete term._ObjectType_;
-            term.CreatedDate = new Date(Number(term.CreatedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
-            term.Id = term.Id.replace('/Guid(', '').replace(')/', '');
-            term.LastModifiedDate = new Date(Number(term.LastModifiedDate.replace('/Date(', '').replace(')/', ''))).toISOString();
-            logger.log(term);
-            cb();
-        }, (err) => this.handleRejectedPromise(err, logger, cb));
+        });
     }
 }
 _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry = function _SpoTermAddCommand_initTelemetry() {
@@ -191,12 +185,6 @@ _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry =
                 return 'Specify either parentTermId, termSetId or termSetName but not both';
             }
         }
-        if (!args.options.termGroupId && !args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName';
-        }
-        if (args.options.termGroupId && args.options.termGroupName) {
-            return 'Specify termGroupId or termGroupName but not both';
-        }
         if (args.options.termGroupId) {
             if (!utils_1.validation.isValidGuid(args.options.termGroupId)) {
                 return `${args.options.termGroupId} is not a valid GUID`;
@@ -231,6 +219,8 @@ _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry =
         }
         return true;
     }));
+}, _SpoTermAddCommand_initOptionSets = function _SpoTermAddCommand_initOptionSets() {
+    this.optionSets.push(['termGroupId', 'termGroupName']);
 };
 module.exports = new SpoTermAddCommand();
 //# sourceMappingURL=term-add.js.map