@pnp/cli-microsoft365 6.8.0-beta.f473be5 → 6.9.0-beta.1cd2525

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

@@ -0,0 +1,152 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _SpoTenantCommandSetRemoveCommand_instances, _SpoTenantCommandSetRemoveCommand_initTelemetry, _SpoTenantCommandSetRemoveCommand_initOptions, _SpoTenantCommandSetRemoveCommand_initValidators, _SpoTenantCommandSetRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const odata_1 = require("../../../../utils/odata");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoTenantCommandSetRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.TENANT_COMMANDSET_REMOVE;
+    }
+    get description() {
+        return 'Removes a ListView Command Set that is installed tenant wide.';
+    }
+    constructor() {
+        super();
+        _SpoTenantCommandSetRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetRemoveCommand_instances, "m", _SpoTenantCommandSetRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetRemoveCommand_instances, "m", _SpoTenantCommandSetRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetRemoveCommand_instances, "m", _SpoTenantCommandSetRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetRemoveCommand_instances, "m", _SpoTenantCommandSetRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (args.options.confirm) {
+                    return yield this.removeTenantCommandSet(logger, args);
+                }
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove the tenant commandset ${args.options.id || args.options.title || args.options.clientSideComponentId}?`
+                });
+                if (result.continue) {
+                    yield this.removeTenantCommandSet(logger, args);
+                }
+            }
+            catch (err) {
+                logger.log(err);
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    removeTenantCommandSet(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const appCatalogUrl = yield spo_1.spo.getTenantAppCatalogUrl(logger, this.debug);
+            if (!appCatalogUrl) {
+                throw 'No app catalog URL found';
+            }
+            const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
+            const requestUrl = `${appCatalogUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            const id = yield this.getTenantCommandSetId(logger, args, requestUrl);
+            if (this.verbose) {
+                logger.logToStderr(`Removing tenant command set ${args.options.id || args.options.title || args.options.clientSideComponentId}`);
+            }
+            const requestOptions = {
+                url: `${requestUrl}/items(${id})`,
+                method: 'POST',
+                headers: {
+                    'X-HTTP-Method': 'DELETE',
+                    'If-Match': '*',
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+    getTenantCommandSetId(logger, args, requestUrl) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Getting the tenant command set ${args.options.id || args.options.title || args.options.clientSideComponentId}`);
+            }
+            let filter = '';
+            if (args.options.title) {
+                filter = `Title eq '${args.options.title}'`;
+            }
+            else if (args.options.id) {
+                filter = `Id eq ${args.options.id}`;
+            }
+            else {
+                filter = `TenantWideExtensionComponentId eq '${args.options.clientSideComponentId}'`;
+            }
+            const listItemInstances = yield odata_1.odata.getAllItems(`${requestUrl}/items?$filter=startswith(TenantWideExtensionLocation,'ClientSideExtension.ListViewCommandSet') and ${filter}`);
+            if (listItemInstances.length === 0) {
+                throw 'The specified command set was not found';
+            }
+            if (listItemInstances.length > 1) {
+                throw `Multiple command sets with ${args.options.title || args.options.clientSideComponentId} were found. Please disambiguate (IDs): ${listItemInstances.map(item => item.Id).join(', ')}`;
+            }
+            return listItemInstances[0].Id;
+        });
+    }
+}
+_SpoTenantCommandSetRemoveCommand_instances = new WeakSet(), _SpoTenantCommandSetRemoveCommand_initTelemetry = function _SpoTenantCommandSetRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            title: typeof args.options.title !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoTenantCommandSetRemoveCommand_initOptions = function _SpoTenantCommandSetRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-t, --title [title]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-c, --clientSideComponentId  [clientSideComponentId]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoTenantCommandSetRemoveCommand_initValidators = function _SpoTenantCommandSetRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id) {
+            const id = parseInt(args.options.id);
+            if (isNaN(id)) {
+                return `${args.options.id} is not a valid list item ID`;
+            }
+        }
+        if (args.options.clientSideComponentId &&
+            !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
+            return `${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        return true;
+    }));
+}, _SpoTenantCommandSetRemoveCommand_initOptionSets = function _SpoTenantCommandSetRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['title', 'id', 'clientSideComponentId'] });
+};
+module.exports = new SpoTenantCommandSetRemoveCommand();
+//# sourceMappingURL=tenant-commandset-remove.js.map

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

@@ -0,0 +1,203 @@
+"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());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    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 _SpoTenantCommandSetSetCommand_instances, _SpoTenantCommandSetSetCommand_initTelemetry, _SpoTenantCommandSetSetCommand_initOptions, _SpoTenantCommandSetSetCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+class SpoTenantCommandSetSetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.TENANT_COMMANDSET_SET;
+    }
+    get description() {
+        return 'Updates a ListView Command Set that is installed tenant wide.';
+    }
+    constructor() {
+        super();
+        _SpoTenantCommandSetSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTenantCommandSetSetCommand_instances, "m", _SpoTenantCommandSetSetCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const appCatalogUrl = yield spo_1.spo.getTenantAppCatalogUrl(logger, this.debug);
+                if (!appCatalogUrl) {
+                    throw 'No app catalog URL found';
+                }
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(appCatalogUrl, '/lists/TenantWideExtensions');
+                const listItem = yield this.getListItemById(logger, appCatalogUrl, listServerRelativeUrl, args.options.id);
+                if (listItem.TenantWideExtensionLocation.indexOf("ClientSideExtension.ListViewCommandSet") === -1) {
+                    throw 'The item is not a ListViewCommandSet';
+                }
+                yield this.updateTenantWideExtension(appCatalogUrl, args.options, listServerRelativeUrl, logger);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getListItemById(logger, webUrl, listServerRelativeUrl, id) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Getting the list item by id ${id}`);
+            }
+            const reqOptions = {
+                url: `${webUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Items(${id})`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            return yield request_1.default.get(reqOptions);
+        });
+    }
+    updateTenantWideExtension(appCatalogUrl, options, listServerRelativeUrl, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr('Updating tenant wide extension to the TenantWideExtensions list');
+            }
+            const formValues = [];
+            if (options.newTitle !== undefined) {
+                formValues.push({
+                    FieldName: 'Title',
+                    FieldValue: options.newTitle
+                });
+            }
+            if (options.clientSideComponentId !== undefined) {
+                formValues.push({
+                    FieldName: 'TenantWideExtensionComponentId',
+                    FieldValue: options.clientSideComponentId
+                });
+            }
+            if (options.location !== undefined) {
+                formValues.push({
+                    FieldName: 'TenantWideExtensionLocation',
+                    FieldValue: this.getLocation(options.location)
+                });
+            }
+            if (options.listType !== undefined) {
+                formValues.push({
+                    FieldName: 'TenantWideExtensionListTemplate',
+                    FieldValue: this.getListTemplate(options.listType)
+                });
+            }
+            if (options.clientSideComponentProperties !== undefined) {
+                formValues.push({
+                    FieldName: 'TenantWideExtensionComponentProperties',
+                    FieldValue: options.clientSideComponentProperties
+                });
+            }
+            if (options.webTemplate !== undefined) {
+                formValues.push({
+                    FieldName: 'TenantWideExtensionWebTemplate',
+                    FieldValue: options.webTemplate
+                });
+            }
+            const requestOptions = {
+                url: `${appCatalogUrl}/_api/web/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Items(${options.id})/ValidateUpdateListItem()`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: {
+                    formValues: formValues
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+    getLocation(location) {
+        switch (location) {
+            case 'Both':
+                return 'ClientSideExtension.ListViewCommandSet';
+            case 'ContextMenu':
+                return 'ClientSideExtension.ListViewCommandSet.ContextMenu';
+            default:
+                return 'ClientSideExtension.ListViewCommandSet.CommandBar';
+        }
+    }
+    getListTemplate(listTemplate) {
+        switch (listTemplate) {
+            case 'SitePages':
+                return '119';
+            case 'Library':
+                return '101';
+            default:
+                return '100';
+        }
+    }
+}
+_SpoTenantCommandSetSetCommand_instances = new WeakSet(), _SpoTenantCommandSetSetCommand_initTelemetry = function _SpoTenantCommandSetSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            newTitle: typeof args.options.newTitle !== 'undefined',
+            listType: args.options.listType,
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
+            webTemplate: typeof args.options.webTemplate !== 'undefined',
+            location: args.options.location
+        });
+    });
+}, _SpoTenantCommandSetSetCommand_initOptions = function _SpoTenantCommandSetSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '-t, --newTitle [newTitle]'
+    }, {
+        option: '-l, --listType [listType]',
+        autocomplete: SpoTenantCommandSetSetCommand.listTypes
+    }, {
+        option: '-c, --clientSideComponentId [clientSideComponentId]'
+    }, {
+        option: '-p, --clientSideComponentProperties [clientSideComponentProperties]'
+    }, {
+        option: '-w, --webTemplate [webTemplate]'
+    }, {
+        option: '--location [location]',
+        autocomplete: SpoTenantCommandSetSetCommand.locations
+    });
+}, _SpoTenantCommandSetSetCommand_initValidators = function _SpoTenantCommandSetSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (!args.options.newTitle &&
+            !args.options.listType &&
+            !args.options.clientSideComponentId &&
+            !args.options.clientSideComponentProperties &&
+            !args.options.webTemplate &&
+            !args.options.location) {
+            return 'Specify at least one property to update';
+        }
+        if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
+            return `${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        if (args.options.listType && SpoTenantCommandSetSetCommand.listTypes.indexOf(args.options.listType) < 0) {
+            return `${args.options.listType} is not a valid list type. Allowed values are ${SpoTenantCommandSetSetCommand.listTypes.join(', ')}`;
+        }
+        if (args.options.location && SpoTenantCommandSetSetCommand.locations.indexOf(args.options.location) < 0) {
+            return `${args.options.location} is not a valid location. Allowed values are ${SpoTenantCommandSetSetCommand.locations.join(', ')}`;
+        }
+        return true;
+    }));
+};
+SpoTenantCommandSetSetCommand.listTypes = ['List', 'Library', 'SitePages'];
+SpoTenantCommandSetSetCommand.locations = ['ContextMenu', 'CommandBar', 'Both'];
+module.exports = new SpoTenantCommandSetSetCommand();
+//# sourceMappingURL=tenant-commandset-set.js.map

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

@@ -43,8 +43,8 @@ class SpoTermAddCommand extends SpoCommand_1.default {
             let term;
             let formDigest;
             try {
-                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                const spoWebUrl = args.options.webUrl ? args.options.webUrl : yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoWebUrl);
                 formDigest = res.FormDigestValue;
                 if (this.verbose) {
                     logger.logToStderr(`Adding taxonomy term...`);
@@ -58,7 +58,7 @@ class SpoTermAddCommand extends SpoCommand_1.default {
                 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">${formatting_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`,
+                    url: `${spoWebUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
@@ -108,7 +108,7 @@ class SpoTermAddCommand extends SpoCommand_1.default {
                         break;
                     }
                     const requestOptions = {
-                        url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                        url: `${spoWebUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
                             'X-RequestDigest': formDigest
                         },
@@ -139,6 +139,7 @@ class SpoTermAddCommand extends SpoCommand_1.default {
 _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry = function _SpoTermAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            webUrl: typeof args.options.webUrl !== 'undefined',
             customProperties: typeof args.options.customProperties !== 'undefined',
             description: typeof args.options.description !== 'undefined',
             id: typeof args.options.id !== 'undefined',
@@ -153,6 +154,8 @@ _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry =
 }, _SpoTermAddCommand_initOptions = function _SpoTermAddCommand_initOptions() {
     this.options.unshift({
         option: '-n, --name <name>'
+    }, {
+        option: '-u, --webUrl [webUrl]'
     }, {
         option: '--termSetId [termSetId]'
     }, {
@@ -174,6 +177,12 @@ _SpoTermAddCommand_instances = new WeakSet(), _SpoTermAddCommand_initTelemetry =
     });
 }, _SpoTermAddCommand_initValidators = function _SpoTermAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.webUrl) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
+        }
         if (args.options.id) {
             if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;

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

@@ -41,8 +41,8 @@ class SpoTermGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         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 spoWebUrl = args.options.webUrl ? args.options.webUrl : yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoWebUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving taxonomy term...`);
                 }
@@ -54,7 +54,7 @@ class SpoTermGetCommand extends SpoCommand_1.default {
                     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="2" ObjectPathId="1" /><ObjectIdentityQuery Id="3" ObjectPathId="1" /><ObjectPath Id="5" ObjectPathId="4" /><ObjectIdentityQuery Id="6" ObjectPathId="4" /><ObjectPath Id="8" ObjectPathId="7" /><ObjectPath Id="10" ObjectPathId="9" /><ObjectIdentityQuery Id="11" ObjectPathId="9" /><ObjectPath Id="13" ObjectPathId="12" /><ObjectPath Id="15" ObjectPathId="14" /><ObjectIdentityQuery Id="16" ObjectPathId="14" /><ObjectPath Id="18" ObjectPathId="17" /><SetProperty Id="19" ObjectPathId="17" Name="TrimUnavailable"><Parameter Type="Boolean">true</Parameter></SetProperty><SetProperty Id="20" ObjectPathId="17" Name="TermLabel"><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name)}</Parameter></SetProperty><ObjectPath Id="22" ObjectPathId="21" /><Query Id="23" ObjectPathId="21"><Query SelectAllProperties="true"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties /></ChildItemQuery></Query></Actions><ObjectPaths><StaticMethod Id="1" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="4" ParentId="1" Name="GetDefaultSiteCollectionTermStore" /><Property Id="7" ParentId="4" Name="Groups" /><Method Id="9" ParentId="7" Name="${args.options.termGroupName === undefined ? "GetById" : "GetByName"}"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termGroupName) || args.options.termGroupId}</Parameter></Parameters></Method><Property Id="12" ParentId="9" Name="TermSets" /><Method Id="14" ParentId="12" Name="${args.options.termSetName === undefined ? "GetById" : "GetByName"}"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termSetName) || args.options.termSetId}</Parameter></Parameters></Method><Constructor Id="17" TypeId="{61a1d689-2744-4ea3-a88b-c95bee9803aa}" /><Method Id="21" ParentId="14" Name="GetTerms"><Parameters><Parameter ObjectPathId="17" /></Parameters></Method></ObjectPaths></Request>`;
                 }
                 let term;
-                const csomResponse = yield this.executeCsomCall(data, spoAdminUrl, res);
+                const csomResponse = yield this.executeCsomCall(data, spoWebUrl, res);
                 if (csomResponse === null) {
                     throw `Term with id '${args.options.id}' could not be found.`;
                 }
@@ -86,10 +86,10 @@ class SpoTermGetCommand extends SpoCommand_1.default {
             }
         });
     }
-    executeCsomCall(data, spoAdminUrl, res) {
+    executeCsomCall(data, spoWebUrl, res) {
         return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                url: `${spoWebUrl}/_vti_bin/client.svc/ProcessQuery`,
                 headers: {
                     'X-RequestDigest': res.FormDigestValue
                 },
@@ -115,6 +115,7 @@ class SpoTermGetCommand extends SpoCommand_1.default {
 _SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry = function _SpoTermGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            webUrl: typeof args.options.webUrl !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined',
             termGroupId: typeof args.options.termGroupId !== 'undefined',
@@ -125,6 +126,8 @@ _SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry =
     });
 }, _SpoTermGetCommand_initOptions = function _SpoTermGetCommand_initOptions() {
     this.options.unshift({
+        option: '-u, --webUrl [webUrl]'
+    }, {
         option: '-i, --id [id]'
     }, {
         option: '-n, --name [name]'
@@ -139,6 +142,12 @@ _SpoTermGetCommand_instances = new WeakSet(), _SpoTermGetCommand_initTelemetry =
     });
 }, _SpoTermGetCommand_initValidators = function _SpoTermGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.webUrl) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
+        }
         if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }

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

@@ -42,14 +42,14 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
             let formDigest = '';
             let termGroup;
             try {
-                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
-                const res = yield spo_1.spo.getRequestDigest(spoAdminUrl);
+                const webUrl = args.options.webUrl || (yield spo_1.spo.getSpoAdminUrl(logger, this.debug));
+                const res = yield spo_1.spo.getRequestDigest(webUrl);
                 formDigest = res.FormDigestValue;
                 if (this.verbose) {
                     logger.logToStderr(`Getting taxonomy term store...`);
                 }
                 const requestOptionsPost = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
@@ -67,7 +67,7 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Adding taxonomy term group...`);
                 }
                 const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': formDigest
                     },
@@ -86,7 +86,7 @@ class SpoTermGroupAddCommand extends SpoCommand_1.default {
                         logger.logToStderr(`Setting taxonomy term group description...`);
                     }
                     const requestOptionsQuery = {
-                        url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                        url: `${webUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
                             'X-RequestDigest': formDigest
                         },
@@ -117,7 +117,8 @@ _SpoTermGroupAddCommand_instances = new WeakSet(), _SpoTermGroupAddCommand_initT
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             description: typeof args.options.id !== 'undefined',
-            id: typeof args.options.id !== 'undefined'
+            id: typeof args.options.id !== 'undefined',
+            webUrl: typeof args.options.webUrl !== 'undefined'
         });
     });
 }, _SpoTermGroupAddCommand_initOptions = function _SpoTermGroupAddCommand_initOptions() {
@@ -127,13 +128,16 @@ _SpoTermGroupAddCommand_instances = new WeakSet(), _SpoTermGroupAddCommand_initT
         option: '-i, --id [id]'
     }, {
         option: '-d, --description [description]'
+    }, {
+        option: '-u, --webUrl [webUrl]'
     });
 }, _SpoTermGroupAddCommand_initValidators = function _SpoTermGroupAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id) {
-            if (!validation_1.validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
-            }
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.webUrl) {
+            return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         }
         return true;
     }));

package/dist/m365/spo/commands/term/term-group-get.js

@@ -40,14 +40,14 @@ class SpoTermGroupGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         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 spoWebUrl = args.options.webUrl ? args.options.webUrl : yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const res = yield spo_1.spo.getRequestDigest(spoWebUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving taxonomy term groups...`);
                 }
                 const query = args.options.id ? `<Method Id="32" ParentId="30" Name="GetById"><Parameters><Parameter Type="Guid">{${formatting_1.formatting.escapeXml(args.options.id)}}</Parameter></Parameters></Method>` : `<Method Id="32" ParentId="30" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.name)}</Parameter></Parameters></Method>`;
                 const requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${spoWebUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
@@ -76,18 +76,27 @@ class SpoTermGroupGetCommand extends SpoCommand_1.default {
 _SpoTermGroupGetCommand_instances = new WeakSet(), _SpoTermGroupGetCommand_initTelemetry = function _SpoTermGroupGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            webUrl: typeof args.options.webUrl !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             name: typeof args.options.name !== 'undefined'
         });
     });
 }, _SpoTermGroupGetCommand_initOptions = function _SpoTermGroupGetCommand_initOptions() {
     this.options.unshift({
+        option: '-u, --webUrl [webUrl]'
+    }, {
         option: '-i, --id [id]'
     }, {
         option: '-n, --name [name]'
     });
 }, _SpoTermGroupGetCommand_initValidators = function _SpoTermGroupGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.webUrl) {
+            const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+            if (isValidSharePointUrl !== true) {
+                return isValidSharePointUrl;
+            }
+        }
         if (args.options.id) {
             if (!validation_1.validation.isValidGuid(args.options.id)) {
                 return `${args.options.id} is not a valid GUID`;