@pnp/cli-microsoft365 6.0.0-beta.c5b75e1 → 6.0.0-beta.c63e3b2

package/dist/m365/spo/commands/list/list-view-field-set.js

@@ -17,6 +17,7 @@ var _SpoListViewFieldSetCommand_instances, _SpoListViewFieldSetCommand_initTelem
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -37,7 +38,17 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const listSelector = args.options.listId ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            let listSelector = '';
+            if (args.options.listId) {
+                listSelector = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                listSelector = `lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                listSelector = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
             const viewSelector = args.options.viewId ? `('${formatting_1.formatting.encodeQueryParameter(args.options.viewId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.viewTitle)}')`;
             if (this.verbose) {
                 logger.logToStderr(`Getting field ${args.options.id || args.options.title}...`);
@@ -47,7 +58,7 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
                 if (this.verbose) {
                     logger.logToStderr(`Moving the field ${args.options.id || args.options.title} in view ${args.options.viewId || args.options.viewTitle} to position ${args.options.position}...`);
                 }
-                const moveRequestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}/viewfields/moveviewfieldto`;
+                const moveRequestUrl = `${args.options.webUrl}/_api/web/${listSelector}/views${viewSelector}/viewfields/moveviewfieldto`;
                 const moveRequestOptions = {
                     url: moveRequestUrl,
                     headers: {
@@ -67,8 +78,8 @@ class SpoListViewFieldSetCommand extends SpoCommand_1.default {
         });
     }
     getField(options, listSelector) {
-        const fieldSelector = options.id ? `/getbyid('${encodeURIComponent(options.id)}')` : `/getbyinternalnameortitle('${encodeURIComponent(options.title)}')`;
-        const getRequestUrl = `${options.webUrl}/_api/web/lists${listSelector}/fields${fieldSelector}`;
+        const fieldSelector = options.id ? `/getbyid('${formatting_1.formatting.encodeQueryParameter(options.id)}')` : `/getbyinternalnameortitle('${formatting_1.formatting.encodeQueryParameter(options.title)}')`;
+        const getRequestUrl = `${options.webUrl}/_api/web/${listSelector}/fields${fieldSelector}`;
         const requestOptions = {
             url: getRequestUrl,
             headers: {
@@ -84,6 +95,7 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             viewId: typeof args.options.viewId !== 'undefined',
             viewTitle: typeof args.options.viewTitle !== 'undefined',
             id: typeof args.options.id !== 'undefined',
@@ -97,6 +109,8 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '--viewId [viewId]'
     }, {
@@ -136,7 +150,7 @@ _SpoListViewFieldSetCommand_instances = new WeakSet(), _SpoListViewFieldSetComma
         return true;
     }));
 }, _SpoListViewFieldSetCommand_initOptionSets = function _SpoListViewFieldSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['viewId', 'viewTitle'], ['id', 'title']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['viewId', 'viewTitle'], ['id', 'title']);
 };
 module.exports = new SpoListViewFieldSetCommand();
 //# sourceMappingURL=list-view-field-set.js.map

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

@@ -17,6 +17,7 @@ var _SpoListViewListCommand_instances, _SpoListViewListCommand_initTelemetry, _S
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -40,16 +41,16 @@ class SpoListViewListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (this.verbose) {
-                const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-                logger.logToStderr(`Retrieving views information for list ${list} in site at ${args.options.webUrl}...`);
-            }
-            let requestUrl = '';
+            let requestUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/views`;
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/views`;
+            }
+            else if (args.options.listTitle) {
+                requestUrl += `/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/views`;
             }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/views`;
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/views`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -72,7 +73,8 @@ _SpoListViewListCommand_instances = new WeakSet(), _SpoListViewListCommand_initT
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined'
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined'
         });
     });
 }, _SpoListViewListCommand_initOptions = function _SpoListViewListCommand_initOptions() {
@@ -82,6 +84,8 @@ _SpoListViewListCommand_instances = new WeakSet(), _SpoListViewListCommand_initT
         option: '-i, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     });
 }, _SpoListViewListCommand_initValidators = function _SpoListViewListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -97,7 +101,7 @@ _SpoListViewListCommand_instances = new WeakSet(), _SpoListViewListCommand_initT
         return true;
     }));
 }, _SpoListViewListCommand_initOptionSets = function _SpoListViewListCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListViewListCommand();
 //# sourceMappingURL=list-view-list.js.map

package/dist/m365/spo/commands/list/list-view-remove.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -39,14 +40,19 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const removeViewFromList = () => __awaiter(this, void 0, void 0, function* () {
-                if (this.verbose) {
-                    const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-                    logger.logToStderr(`Removing view ${args.options.id || args.options.title} from list ${list} in site at ${args.options.webUrl}...`);
+                let listSelector = '';
+                if (args.options.listId) {
+                    listSelector = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                }
+                else if (args.options.listTitle) {
+                    listSelector = `lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                }
+                else if (args.options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    listSelector = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
                 }
-                let requestUrl = '';
-                const listSelector = args.options.listId ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
                 const viewSelector = args.options.id ? `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')` : `/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`;
-                requestUrl = `${args.options.webUrl}/_api/web/lists${listSelector}/views${viewSelector}`;
+                const requestUrl = `${args.options.webUrl}/_api/web/${listSelector}/views${viewSelector}`;
                 const requestOptions = {
                     url: requestUrl,
                     headers: {
@@ -72,7 +78,7 @@ class SpoListViewRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove the view ${args.options.id || args.options.title} from the list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
+                    message: `Are you sure you want to remove the view ${args.options.id || args.options.title} from the list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
                     yield removeViewFromList();
@@ -86,6 +92,7 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
@@ -98,6 +105,8 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '--id [id]'
     }, {
@@ -124,7 +133,7 @@ _SpoListViewRemoveCommand_instances = new WeakSet(), _SpoListViewRemoveCommand_i
         return true;
     }));
 }, _SpoListViewRemoveCommand_initOptionSets = function _SpoListViewRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['id', 'title']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['id', 'title']);
 };
 module.exports = new SpoListViewRemoveCommand();
 //# sourceMappingURL=list-view-remove.js.map

package/dist/m365/spo/commands/list/list-view-set.js

@@ -17,6 +17,7 @@ var _SpoListViewSetCommand_instances, _SpoListViewSetCommand_initTelemetry, _Spo
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const spo_1 = require("../../../../utils/spo");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
@@ -41,15 +42,22 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const baseRestUrl = `${args.options.webUrl}/_api/web/lists`;
-            const listRestUrl = args.options.listId ?
-                `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`
-                : `/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-            const viewRestUrl = `/views/${(args.options.id ? `getById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')` : `getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`)}`;
+            let listRestUrl = '';
+            if (args.options.listId) {
+                listRestUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                listRestUrl = `lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                listRestUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
+            const viewRestUrl = `/views/${(args.options.id ? `GetById('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')` : `GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')`)}`;
             try {
                 const res = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 const requestOptions = {
-                    url: `${baseRestUrl}${listRestUrl}${viewRestUrl}`,
+                    url: `${args.options.webUrl}/_api/web/${listRestUrl}${viewRestUrl}`,
                     headers: {
                         'X-RequestDigest': res.FormDigestValue,
                         'content-type': 'application/json;odata=nometadata',
@@ -71,6 +79,7 @@ class SpoListViewSetCommand extends SpoCommand_1.default {
             'webUrl',
             'listId',
             'listTitle',
+            'listUrl',
             'id',
             'title',
             'debug',
@@ -90,6 +99,7 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             id: typeof args.options.id !== 'undefined',
             title: typeof args.options.title !== 'undefined'
         });
@@ -101,6 +111,8 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '--id [id]'
     }, {
@@ -123,7 +135,7 @@ _SpoListViewSetCommand_instances = new WeakSet(), _SpoListViewSetCommand_initTel
         return true;
     }));
 }, _SpoListViewSetCommand_initOptionSets = function _SpoListViewSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle'], ['id', 'title']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl'], ['id', 'title']);
 };
 module.exports = new SpoListViewSetCommand();
 //# sourceMappingURL=list-view-set.js.map

package/dist/m365/spo/commands/list/list-webhook-add.js

@@ -17,6 +17,7 @@ var _SpoListWebhookAddCommand_instances, _SpoListWebhookAddCommand_initTelemetry
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -42,17 +43,21 @@ class SpoListWebhookAddCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Adding webhook to list ${args.options.listId ? args.options.listId : args.options.listTitle} located at site ${args.options.webUrl}...`);
+                logger.logToStderr(`Adding webhook to list ${args.options.listId || args.options.listTitle || args.options.listUrl} located at site ${args.options.webUrl}...`);
             }
-            let requestUrl = '';
+            let requestUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions')`;
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions`;
             }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions')`;
+            else if (args.options.listTitle) {
+                requestUrl += `/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Subscriptions`;
             }
             const requestBody = {};
-            requestBody.resource = args.options.listId ? args.options.listId : args.options.listTitle;
+            requestBody.resource = args.options.listId || args.options.listTitle || args.options.listUrl;
             requestBody.notificationUrl = args.options.notificationUrl;
             // If no expiration date has been provided we will default to the
             // maximum expiration date of 180 days from now 
@@ -84,10 +89,11 @@ class SpoListWebhookAddCommand extends SpoCommand_1.default {
 _SpoListWebhookAddCommand_instances = new WeakSet(), _SpoListWebhookAddCommand_initTelemetry = function _SpoListWebhookAddCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            listId: (!(!args.options.listId)).toString(),
-            listTitle: (!(!args.options.listTitle)).toString(),
-            expirationDateTime: (!(!args.options.expirationDateTime)).toString(),
-            clientState: (!(!args.options.clientState)).toString()
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            expirationDateTime: typeof args.options.expirationDateTime !== 'undefined',
+            clientState: typeof args.options.clientState !== 'undefined'
         });
     });
 }, _SpoListWebhookAddCommand_initOptions = function _SpoListWebhookAddCommand_initOptions() {
@@ -97,6 +103,8 @@ _SpoListWebhookAddCommand_instances = new WeakSet(), _SpoListWebhookAddCommand_i
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-n, --notificationUrl <notificationUrl>'
     }, {
@@ -129,7 +137,7 @@ _SpoListWebhookAddCommand_instances = new WeakSet(), _SpoListWebhookAddCommand_i
         return true;
     }));
 }, _SpoListWebhookAddCommand_initOptionSets = function _SpoListWebhookAddCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListWebhookAddCommand();
 //# sourceMappingURL=list-webhook-add.js.map

package/dist/m365/spo/commands/list/list-webhook-get.js

@@ -17,6 +17,7 @@ var _SpoListWebhookGetCommand_instances, _SpoListWebhookGetCommand_initTelemetry
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -38,15 +39,19 @@ class SpoListWebhookGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                const list = (args.options.listId ? args.options.listId : args.options.listTitle);
+                const list = (args.options.listId || args.options.listTitle || args.options.listUrl);
                 logger.logToStderr(`Retrieving information for webhook ${args.options.id} belonging to list ${list} in site at ${args.options.webUrl}...`);
             }
-            let requestUrl = '';
+            let requestUrl = `${args.options.webUrl}/_api/web`;
             if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+            else if (args.options.listTitle) {
+                requestUrl += `/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -72,9 +77,9 @@ class SpoListWebhookGetCommand extends SpoCommand_1.default {
 _SpoListWebhookGetCommand_instances = new WeakSet(), _SpoListWebhookGetCommand_initTelemetry = function _SpoListWebhookGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            listId: (!(!args.options.listId)).toString(),
-            listTitle: (!(!args.options.listTitle)).toString(),
-            id: (!(!args.options.id)).toString()
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined'
         });
     });
 }, _SpoListWebhookGetCommand_initOptions = function _SpoListWebhookGetCommand_initOptions() {
@@ -85,7 +90,9 @@ _SpoListWebhookGetCommand_instances = new WeakSet(), _SpoListWebhookGetCommand_i
     }, {
         option: '-t, --listTitle [listTitle]'
     }, {
-        option: '-i, --id [id]'
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '-i, --id <id>'
     });
 }, _SpoListWebhookGetCommand_initValidators = function _SpoListWebhookGetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -104,7 +111,7 @@ _SpoListWebhookGetCommand_instances = new WeakSet(), _SpoListWebhookGetCommand_i
         return true;
     }));
 }, _SpoListWebhookGetCommand_initOptionSets = function _SpoListWebhookGetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListWebhookGetCommand();
 //# sourceMappingURL=list-webhook-get.js.map

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

@@ -13,11 +13,11 @@ 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 _SpoListWebhookListCommand_instances, _SpoListWebhookListCommand_initTelemetry, _SpoListWebhookListCommand_initOptions, _SpoListWebhookListCommand_initValidators;
+var _SpoListWebhookListCommand_instances, _SpoListWebhookListCommand_initTelemetry, _SpoListWebhookListCommand_initOptions, _SpoListWebhookListCommand_initValidators, _SpoListWebhookListCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const chalk = require("chalk");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -28,6 +28,7 @@ class SpoListWebhookListCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListWebhookListCommand_instances, "m", _SpoListWebhookListCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListWebhookListCommand_instances, "m", _SpoListWebhookListCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListWebhookListCommand_instances, "m", _SpoListWebhookListCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListWebhookListCommand_instances, "m", _SpoListWebhookListCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_WEBHOOK_LIST;
@@ -40,28 +41,19 @@ class SpoListWebhookListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            if (args.options.title && this.verbose) {
-                logger.logToStderr(chalk.yellow(`Option 'title' is deprecated. Please use 'listTitle' instead`));
-            }
-            if (args.options.id && this.verbose) {
-                logger.logToStderr(chalk.yellow(`Option 'id' is deprecated. Please use 'listId' instead`));
-            }
             if (this.verbose) {
-                const list = args.options.id ? formatting_1.formatting.encodeQueryParameter(args.options.id) : (args.options.listId ? formatting_1.formatting.encodeQueryParameter(args.options.listId) : (args.options.title ? formatting_1.formatting.encodeQueryParameter(args.options.title) : formatting_1.formatting.encodeQueryParameter(args.options.listTitle)));
-                logger.logToStderr(`Retrieving webhook information for list ${list} in site at ${args.options.webUrl}...`);
-            }
-            let requestUrl = '';
-            if (args.options.id) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/Subscriptions`;
+                logger.logToStderr(`Retrieving webhook information for list ${args.options.listTitle || args.options.listId || args.options.listUrl} in site at ${args.options.webUrl}...`);
             }
-            else if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions`;
+            let requestUrl = `${args.options.webUrl}/_api/web`;
+            if (args.options.listId) {
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions`;
             }
             else if (args.options.listTitle) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions`;
+                requestUrl += `/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions`;
             }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')/Subscriptions`;
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Subscriptions`;
             }
             const requestOptions = {
                 url: requestUrl,
@@ -94,10 +86,9 @@ class SpoListWebhookListCommand extends SpoCommand_1.default {
 _SpoListWebhookListCommand_instances = new WeakSet(), _SpoListWebhookListCommand_initTelemetry = function _SpoListWebhookListCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            id: (!(!args.options.id)).toString(),
-            listId: (!(!args.options.listId)).toString(),
-            listTitle: (!(!args.options.listTitle)).toString(),
-            title: (!(!args.options.title)).toString()
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined'
         });
     });
 }, _SpoListWebhookListCommand_initOptions = function _SpoListWebhookListCommand_initOptions() {
@@ -108,9 +99,7 @@ _SpoListWebhookListCommand_instances = new WeakSet(), _SpoListWebhookListCommand
     }, {
         option: '-t, --listTitle [listTitle]'
     }, {
-        option: '--id [id]'
-    }, {
-        option: '--title [title]'
+        option: '--listUrl [listUrl]'
     });
 }, _SpoListWebhookListCommand_initValidators = function _SpoListWebhookListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -118,29 +107,15 @@ _SpoListWebhookListCommand_instances = new WeakSet(), _SpoListWebhookListCommand
         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`;
-            }
-        }
         if (args.options.listId) {
             if (!validation_1.validation.isValidGuid(args.options.listId)) {
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (args.options.id && args.options.title) {
-            return 'Specify id or title, but not both';
-        }
-        if (args.options.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.id && !args.options.title) {
-            if (!args.options.listId && !args.options.listTitle) {
-                return 'Specify listId or listTitle, one is required';
-            }
-        }
         return true;
     }));
+}, _SpoListWebhookListCommand_initOptionSets = function _SpoListWebhookListCommand_initOptionSets() {
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListWebhookListCommand();
 //# sourceMappingURL=list-webhook-list.js.map

package/dist/m365/spo/commands/list/list-webhook-remove.js

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -40,15 +41,19 @@ class SpoListWebhookRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeWebhook = () => __awaiter(this, void 0, void 0, function* () {
                 if (this.verbose) {
-                    const list = (args.options.listId ? args.options.listId : args.options.listTitle);
+                    const list = (args.options.listId || args.options.listId || args.options.listUrl);
                     logger.logToStderr(`Webhook ${args.options.id} is about to be removed from list ${list} located at site ${args.options.webUrl}...`);
                 }
-                let requestUrl = '';
+                let requestUrl = `${args.options.webUrl}/_api/web`;
                 if (args.options.listId) {
-                    requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+                    requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
                 }
-                else {
-                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+                else if (args.options.listTitle) {
+                    requestUrl += `/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
+                }
+                else if (args.options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/Subscriptions('${formatting_1.formatting.encodeQueryParameter(args.options.id)}')`;
                 }
                 const requestOptions = {
                     url: requestUrl,
@@ -74,7 +79,7 @@ class SpoListWebhookRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove webhook ${args.options.id} from list ${args.options.listTitle || args.options.listId} located at site ${args.options.webUrl}?`
+                    message: `Are you sure you want to remove webhook ${args.options.id} from list ${args.options.listTitle || args.options.listId || args.options.listUrl} located at site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
                     yield removeWebhook();
@@ -86,10 +91,11 @@ class SpoListWebhookRemoveCommand extends SpoCommand_1.default {
 _SpoListWebhookRemoveCommand_instances = new WeakSet(), _SpoListWebhookRemoveCommand_initTelemetry = function _SpoListWebhookRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            listId: (!(!args.options.listId)).toString(),
-            listTitle: (!(!args.options.listTitle)).toString(),
-            id: (!(!args.options.id)).toString(),
-            confirm: (!(!args.options.confirm)).toString()
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            confirm: !!args.options.confirm
         });
     });
 }, _SpoListWebhookRemoveCommand_initOptions = function _SpoListWebhookRemoveCommand_initOptions() {
@@ -99,6 +105,8 @@ _SpoListWebhookRemoveCommand_instances = new WeakSet(), _SpoListWebhookRemoveCom
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id <id>'
     }, {
@@ -121,7 +129,7 @@ _SpoListWebhookRemoveCommand_instances = new WeakSet(), _SpoListWebhookRemoveCom
         return true;
     }));
 }, _SpoListWebhookRemoveCommand_initOptionSets = function _SpoListWebhookRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListWebhookRemoveCommand();
 //# sourceMappingURL=list-webhook-remove.js.map