@pnp/cli-microsoft365 6.8.0-beta.2463cfa → 6.8.0-beta.74dea8a

package/dist/m365/spo/commands/serviceprincipal/serviceprincipal-permissionrequest-list.js

@@ -46,8 +46,21 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand_1.defau
                     throw response.ErrorInfo.ErrorMessage;
                 }
                 else {
+                    let spoWebAppServicePrincipalPermissionRequestResult = [];
                     const result = json[json.length - 1]._Child_Items_;
-                    logger.log(result.map(r => {
+                    if (result.length > 0) {
+                        const spoClientExtensibilityWebApplicationPrincipalId = yield this.getSPOClientExtensibilityWebApplicationPrincipalId();
+                        if (spoClientExtensibilityWebApplicationPrincipalId !== null) {
+                            const oAuth2PermissionGrants = yield this.getOAuth2PermissionGrants(spoClientExtensibilityWebApplicationPrincipalId);
+                            if (oAuth2PermissionGrants) {
+                                spoWebAppServicePrincipalPermissionRequestResult = result.filter(x => oAuth2PermissionGrants.indexOf(x.Scope) === -1);
+                            }
+                        }
+                    }
+                    if (spoWebAppServicePrincipalPermissionRequestResult.length === 0) {
+                        spoWebAppServicePrincipalPermissionRequestResult = result;
+                    }
+                    logger.log(spoWebAppServicePrincipalPermissionRequestResult.map(r => {
                         return {
                             Id: r.Id.replace('/Guid(', '').replace(')/', ''),
                             Resource: r.Resource,
@@ -62,6 +75,38 @@ class SpoServicePrincipalPermissionRequestListCommand extends SpoCommand_1.defau
             }
         });
     }
+    getOAuth2PermissionGrants(spoClientExtensibilityWebApplicationPrincipalId) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `https://graph.microsoft.com/v1.0/oAuth2Permissiongrants/?$filter=clientId eq '${spoClientExtensibilityWebApplicationPrincipalId}' and consentType eq 'AllPrincipals'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            if (response.value && response.value.length > 0) {
+                return response.value[0].scope.split(' ');
+            }
+            return null;
+        });
+    }
+    getSPOClientExtensibilityWebApplicationPrincipalId() {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `https://graph.microsoft.com/v1.0/servicePrincipals/?$filter=displayName eq 'SharePoint Online Client Extensibility Web Application Principal'`,
+                headers: {
+                    accept: 'application/json;odata.metadata=none'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            if (response.value && response.value.length > 0) {
+                return response.value[0].id;
+            }
+            return null;
+        });
+    }
 }
 module.exports = new SpoServicePrincipalPermissionRequestListCommand();
 //# sourceMappingURL=serviceprincipal-permissionrequest-list.js.map

package/dist/m365/spo/commands/site/site-recyclebinitem-move.js

@@ -0,0 +1,119 @@
+"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 _SpoSiteRecycleBinItemMoveCommand_instances, _SpoSiteRecycleBinItemMoveCommand_initTelemetry, _SpoSiteRecycleBinItemMoveCommand_initOptions, _SpoSiteRecycleBinItemMoveCommand_initOptionSets, _SpoSiteRecycleBinItemMoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoSiteRecycleBinItemMoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.SITE_RECYCLEBINITEM_MOVE;
+    }
+    get description() {
+        return 'Moves items from the first-stage recycle bin to the second-stage recycle bin';
+    }
+    constructor() {
+        super();
+        _SpoSiteRecycleBinItemMoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemMoveCommand_instances, "m", _SpoSiteRecycleBinItemMoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemMoveCommand_instances, "m", _SpoSiteRecycleBinItemMoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemMoveCommand_instances, "m", _SpoSiteRecycleBinItemMoveCommand_initOptionSets).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemMoveCommand_instances, "m", _SpoSiteRecycleBinItemMoveCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.moveRecycleBinItem(args, logger);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: 'Are you sure you want to move these items to the second-stage recycle bin?'
+                });
+                if (result.continue) {
+                    yield this.moveRecycleBinItem(args, logger);
+                }
+            }
+        });
+    }
+    moveRecycleBinItem(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${args.options.siteUrl}/_api/web/recycleBin/MoveAllToSecondStage`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                if (args.options.ids !== undefined) {
+                    const ids = args.options.ids.split(',');
+                    if (this.verbose) {
+                        logger.logToStderr(`Moving ${ids.length} items to the second-stage recycle bin.`);
+                    }
+                    requestOptions.data = {
+                        ids: ids
+                    };
+                }
+                else if (this.verbose) {
+                    logger.logToStderr('Moving all items to the second-stage recycle bin.');
+                }
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoSiteRecycleBinItemMoveCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemMoveCommand_initTelemetry = function _SpoSiteRecycleBinItemMoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            ids: typeof args.options.ids !== 'undefined',
+            all: !!args.options.all,
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoSiteRecycleBinItemMoveCommand_initOptions = function _SpoSiteRecycleBinItemMoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-i, --ids [ids]'
+    }, {
+        option: '--all'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoSiteRecycleBinItemMoveCommand_initOptionSets = function _SpoSiteRecycleBinItemMoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['ids', 'all'] });
+}, _SpoSiteRecycleBinItemMoveCommand_initValidators = function _SpoSiteRecycleBinItemMoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (args.options.ids && !validation_1.validation.isValidGuidArray(args.options.ids.split(','))) {
+            return 'The option ids contains one or more invalid GUIDs';
+        }
+        return true;
+    }));
+};
+module.exports = new SpoSiteRecycleBinItemMoveCommand();
+//# sourceMappingURL=site-recyclebinitem-move.js.map

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

@@ -0,0 +1,106 @@
+"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 _SpoSiteRecycleBinItemRemoveCommand_instances, _SpoSiteRecycleBinItemRemoveCommand_initTelemetry, _SpoSiteRecycleBinItemRemoveCommand_initOptions, _SpoSiteRecycleBinItemRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+class SpoSiteRecycleBinItemRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.SITE_RECYCLEBINITEM_REMOVE;
+    }
+    get description() {
+        return 'Permanently deletes specific items from the site recycle bin';
+    }
+    constructor() {
+        super();
+        _SpoSiteRecycleBinItemRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemRemoveCommand_instances, "m", _SpoSiteRecycleBinItemRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemRemoveCommand_instances, "m", _SpoSiteRecycleBinItemRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoSiteRecycleBinItemRemoveCommand_instances, "m", _SpoSiteRecycleBinItemRemoveCommand_initValidators).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.removeRecycleBinItem(args, logger);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to permanently delete ${args.options.ids.split(',').length} item(s) from the site recycle bin?`
+                });
+                if (result.continue) {
+                    yield this.removeRecycleBinItem(args, logger);
+                }
+            }
+        });
+    }
+    removeRecycleBinItem(args, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Permanently deleting items from the site recycle bin at site ${args.options.siteUrl}...`);
+            }
+            try {
+                const requestOptions = {
+                    url: `${args.options.siteUrl}/_api/site/RecycleBin/DeleteByIds`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json',
+                    data: {
+                        ids: args.options.ids.split(',')
+                    }
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoSiteRecycleBinItemRemoveCommand_instances = new WeakSet(), _SpoSiteRecycleBinItemRemoveCommand_initTelemetry = function _SpoSiteRecycleBinItemRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoSiteRecycleBinItemRemoveCommand_initOptions = function _SpoSiteRecycleBinItemRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --siteUrl <siteUrl>'
+    }, {
+        option: '-i, --ids <ids>'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoSiteRecycleBinItemRemoveCommand_initValidators = function _SpoSiteRecycleBinItemRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        if (!validation_1.validation.isValidGuidArray(args.options.ids.split(','))) {
+            return 'The option ids contains one or more invalid GUIDs.';
+        }
+        return true;
+    }));
+};
+module.exports = new SpoSiteRecycleBinItemRemoveCommand();
+//# sourceMappingURL=site-recyclebinitem-remove.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-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`;

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

@@ -8,10 +8,17 @@ var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, ge
         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 _SpoTermGroupListCommand_instances, _SpoTermGroupListCommand_initTelemetry, _SpoTermGroupListCommand_initOptions, _SpoTermGroupListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoTermGroupListCommand extends SpoCommand_1.default {
@@ -24,16 +31,23 @@ class SpoTermGroupListCommand extends SpoCommand_1.default {
     defaultProperties() {
         return ['Id', 'Name'];
     }
-    commandAction(logger) {
+    constructor() {
+        super();
+        _SpoTermGroupListCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoTermGroupListCommand_instances, "m", _SpoTermGroupListCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoTermGroupListCommand_instances, "m", _SpoTermGroupListCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoTermGroupListCommand_instances, "m", _SpoTermGroupListCommand_initValidators).call(this);
+    }
+    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 requestOptions = {
-                    url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
+                    url: `${spoWebUrl}/_vti_bin/client.svc/ProcessQuery`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue
                     },
@@ -61,5 +75,26 @@ class SpoTermGroupListCommand extends SpoCommand_1.default {
         });
     }
 }
+_SpoTermGroupListCommand_instances = new WeakSet(), _SpoTermGroupListCommand_initTelemetry = function _SpoTermGroupListCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            webUrl: typeof args.options.webUrl !== 'undefined'
+        });
+    });
+}, _SpoTermGroupListCommand_initOptions = function _SpoTermGroupListCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl [webUrl]'
+    });
+}, _SpoTermGroupListCommand_initValidators = function _SpoTermGroupListCommand_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;
+            }
+        }
+        return true;
+    }));
+};
 module.exports = new SpoTermGroupListCommand();
 //# sourceMappingURL=term-group-list.js.map

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

@@ -44,22 +44,22 @@ class SpoTermListCommand 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 sets...`);
                 }
                 const termGroupQuery = args.options.termGroupId ? `<Method Id="77" ParentId="75" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termGroupId}}</Parameter></Parameters></Method>` : `<Method Id="77" ParentId="75" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termGroupName)}</Parameter></Parameters></Method>`;
                 const termSetQuery = args.options.termSetId ? `<Method Id="82" ParentId="80" Name="GetById"><Parameters><Parameter Type="Guid">{${args.options.termSetId}}</Parameter></Parameters></Method>` : `<Method Id="82" ParentId="80" Name="GetByName"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.termSetName)}</Parameter></Parameters></Method>`;
                 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="70" ObjectPathId="69" /><ObjectIdentityQuery Id="71" ObjectPathId="69" /><ObjectPath Id="73" ObjectPathId="72" /><ObjectIdentityQuery Id="74" ObjectPathId="72" /><ObjectPath Id="76" ObjectPathId="75" /><ObjectPath Id="78" ObjectPathId="77" /><ObjectIdentityQuery Id="79" ObjectPathId="77" /><ObjectPath Id="81" ObjectPathId="80" /><ObjectPath Id="83" ObjectPathId="82" /><ObjectIdentityQuery Id="84" ObjectPathId="82" /><ObjectPath Id="86" ObjectPathId="85" /><Query Id="87" ObjectPathId="85"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties><Property Name="Name" ScalarProperty="true" /><Property Name="Id" ScalarProperty="true" /></Properties></ChildItemQuery></Query></Actions><ObjectPaths><StaticMethod Id="69" Name="GetTaxonomySession" TypeId="{981cbc68-9edc-4f8d-872f-71146fcbb84f}" /><Method Id="72" ParentId="69" Name="GetDefaultSiteCollectionTermStore" /><Property Id="75" ParentId="72" Name="Groups" />${termGroupQuery}<Property Id="80" ParentId="77" Name="TermSets" />${termSetQuery}<Property Id="85" ParentId="82" Name="Terms" /></ObjectPaths></Request>`;
-                const result = yield this.executeCsomCall(data, spoAdminUrl, res);
+                const result = yield this.executeCsomCall(data, spoWebUrl, res);
                 const terms = [];
                 if (result._Child_Items_ && result._Child_Items_.length > 0) {
                     for (const term of result._Child_Items_) {
                         this.setTermDetails(term);
                         terms.push(term);
                         if (args.options.includeChildTerms && term.TermsCount > 0) {
-                            yield this.getChildTerms(spoAdminUrl, res, term);
+                            yield this.getChildTerms(spoWebUrl, res, term);
                         }
                     }
                 }
@@ -108,17 +108,17 @@ class SpoTermListCommand extends SpoCommand_1.default {
             }
         });
     }
-    getChildTerms(spoAdminUrl, res, parentTerm) {
+    getChildTerms(spoWebUrl, res, parentTerm) {
         return __awaiter(this, void 0, void 0, function* () {
             parentTerm.Children = [];
             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="20" ObjectPathId="19" /><Query Id="21" ObjectPathId="19"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="true"><Properties><Property Name="CustomSortOrder" ScalarProperty="true" /><Property Name="CustomProperties" ScalarProperty="true" /><Property Name="LocalCustomProperties" ScalarProperty="true" /></Properties></ChildItemQuery></Query></Actions><ObjectPaths><Property Id="19" ParentId="16" Name="Terms" /><Identity Id="16" Name="${parentTerm._ObjectIdentity_}" /></ObjectPaths></Request>`;
-            const result = yield this.executeCsomCall(data, spoAdminUrl, res);
+            const result = yield this.executeCsomCall(data, spoWebUrl, res);
             if (result._Child_Items_ && result._Child_Items_.length > 0) {
                 for (const term of result._Child_Items_) {
                     this.setTermDetails(term);
                     parentTerm.Children.push(term);
                     if (term.TermsCount > 0) {
-                        yield this.getChildTerms(spoAdminUrl, res, term);
+                        yield this.getChildTerms(spoWebUrl, res, term);
                     }
                 }
             }
@@ -132,10 +132,10 @@ class SpoTermListCommand extends SpoCommand_1.default {
     parseTermDateToIsoString(dateAsString) {
         return new Date(Number(dateAsString.replace('/Date(', '').replace(')/', ''))).toISOString();
     }
-    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
                 },
@@ -154,6 +154,7 @@ class SpoTermListCommand extends SpoCommand_1.default {
 _SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry = function _SpoTermListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            webUrl: typeof args.options.webUrl !== 'undefined',
             termGroupId: typeof args.options.termGroupId !== 'undefined',
             termGroupName: typeof args.options.termGroupName !== 'undefined',
             termSetId: typeof args.options.termSetId !== 'undefined',
@@ -163,6 +164,8 @@ _SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry
     });
 }, _SpoTermListCommand_initOptions = function _SpoTermListCommand_initOptions() {
     this.options.unshift({
+        option: '-u, --webUrl [webUrl]'
+    }, {
         option: '--termGroupId [termGroupId]'
     }, {
         option: '--termGroupName [termGroupName]'
@@ -175,6 +178,12 @@ _SpoTermListCommand_instances = new WeakSet(), _SpoTermListCommand_initTelemetry
     });
 }, _SpoTermListCommand_initValidators = function _SpoTermListCommand_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.termGroupId && !validation_1.validation.isValidGuid(args.options.termGroupId)) {
             return `${args.options.termGroupId} is not a valid GUID`;
         }