@pnp/cli-microsoft365 6.0.0-beta.42305df → 6.0.0-beta.49b3c0a

package/dist/m365/spo/commands/list/list-contenttype-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");
@@ -41,18 +42,22 @@ class SpoListContentTypeRemoveCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const removeContentTypeFromList = () => __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.listTitle ? args.options.listTitle : args.options.listUrl);
                     logger.logToStderr(`Removing content type ${args.options.id} from 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)}')/ContentTypes('${encodeURIComponent(args.options.id)}')`;
+                    requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
                 }
-                else {
-                    requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/ContentTypes('${encodeURIComponent(args.options.id)}')`;
+                else if (args.options.listTitle) {
+                    requestUrl += `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);
+                    requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
                 }
                 const requestOptions = {
-                    url: requestUrl,
+                    url: `${requestUrl}/ContentTypes('${encodeURIComponent(args.options.id)}')`,
                     headers: {
                         'X-HTTP-Method': 'DELETE',
                         'If-Match': '*',
@@ -75,7 +80,7 @@ class SpoListContentTypeRemoveCommand extends SpoCommand_1.default {
                     type: 'confirm',
                     name: 'continue',
                     default: false,
-                    message: `Are you sure you want to remove the content type ${args.options.id} from the list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}?`
+                    message: `Are you sure you want to remove the content type ${args.options.id} from the list ${args.options.listId ? args.options.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl} in site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
                     yield removeContentTypeFromList();
@@ -89,6 +94,7 @@ _SpoListContentTypeRemoveCommand_instances = new WeakSet(), _SpoListContentTypeR
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -99,6 +105,8 @@ _SpoListContentTypeRemoveCommand_instances = new WeakSet(), _SpoListContentTypeR
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id <id>'
     }, {
@@ -120,7 +128,7 @@ _SpoListContentTypeRemoveCommand_instances = new WeakSet(), _SpoListContentTypeR
 }, _SpoListContentTypeRemoveCommand_initTypes = function _SpoListContentTypeRemoveCommand_initTypes() {
     this.types.string.push('id', 'i');
 }, _SpoListContentTypeRemoveCommand_initOptionSets = function _SpoListContentTypeRemoveCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListContentTypeRemoveCommand();
 //# sourceMappingURL=list-contenttype-remove.js.map

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

@@ -56,17 +56,17 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
                     const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                     requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                 }
-                args.options.roleDefinitionId = yield this.GetRoleDefinitionId(args.options);
+                args.options.roleDefinitionId = yield this.getRoleDefinitionId(args.options);
                 if (args.options.upn) {
-                    args.options.principalId = yield this.GetUserPrincipalId(args.options);
-                    yield this.AddRoleAssignment(requestUrl, logger, args.options);
+                    args.options.principalId = yield this.getUserPrincipalId(args.options);
+                    yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else if (args.options.groupName) {
-                    args.options.principalId = yield this.GetGroupPrincipalId(args.options);
-                    this.AddRoleAssignment(requestUrl, logger, args.options);
+                    args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                    yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else {
-                    yield this.AddRoleAssignment(requestUrl, logger, args.options);
+                    yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
             }
             catch (err) {
@@ -74,7 +74,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             }
         });
     }
-    AddRoleAssignment(requestUrl, logger, options) {
+    addRoleAssignment(requestUrl, logger, options) {
         const requestOptions = {
             url: `${requestUrl}roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
             method: 'POST',
@@ -89,7 +89,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             .then(_ => Promise.resolve())
             .catch((err) => Promise.reject(err));
     }
-    GetRoleDefinitionId(options) {
+    getRoleDefinitionId(options) {
         if (!options.roleDefinitionName) {
             return Promise.resolve(options.roleDefinitionId);
         }
@@ -108,7 +108,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             return Promise.reject(err);
         });
     }
-    GetGroupPrincipalId(options) {
+    getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -124,7 +124,7 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
             return Promise.reject(err);
         });
     }
-    GetUserPrincipalId(options) {
+    getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,

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

@@ -57,15 +57,15 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                         requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                     }
                     if (args.options.upn) {
-                        args.options.principalId = yield this.GetUserPrincipalId(args.options);
-                        yield this.RemoveRoleAssignment(requestUrl, logger, args.options);
+                        args.options.principalId = yield this.getUserPrincipalId(args.options);
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
                     }
                     else if (args.options.groupName) {
-                        args.options.principalId = yield this.GetGroupPrincipalId(args.options);
-                        yield this.RemoveRoleAssignment(requestUrl, logger, args.options);
+                        args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
                     }
                     else {
-                        yield this.RemoveRoleAssignment(requestUrl, logger, args.options);
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
                     }
                 }
                 catch (err) {
@@ -88,7 +88,7 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             }
         });
     }
-    RemoveRoleAssignment(requestUrl, logger, options) {
+    removeRoleAssignment(requestUrl, logger, options) {
         const requestOptions = {
             url: `${requestUrl}roleassignments/removeroleassignment(principalid='${options.principalId}')`,
             method: 'POST',
@@ -103,7 +103,7 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             .then(_ => Promise.resolve())
             .catch((err) => Promise.reject(err));
     }
-    GetGroupPrincipalId(options) {
+    getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -119,7 +119,7 @@ class SpoListRoleAssignmentRemoveCommand extends SpoCommand_1.default {
             return Promise.reject(err);
         });
     }
-    GetUserPrincipalId(options) {
+    getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,

package/dist/m365/spo/commands/list/list-roleinheritance-break.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");
@@ -44,19 +45,23 @@ class SpoListRoleInheritanceBreakCommand extends SpoCommand_1.default {
             }
             const breakListRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    let requestUrl = `${args.options.webUrl}/_api/web/lists`;
+                    let requestUrl = `${args.options.webUrl}/_api/web/`;
                     if (args.options.listId) {
-                        requestUrl += `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                        requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
                     }
-                    else {
-                        requestUrl += `/getbytitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    else if (args.options.listTitle) {
+                        requestUrl += `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);
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                     }
                     let keepExistingPermissions = true;
                     if (args.options.clearExistingPermissions) {
                         keepExistingPermissions = !args.options.clearExistingPermissions;
                     }
                     const requestOptions = {
-                        url: `${requestUrl}/breakroleinheritance(${keepExistingPermissions})`,
+                        url: `${requestUrl}breakroleinheritance(${keepExistingPermissions})`,
                         method: 'POST',
                         headers: {
                             'accept': 'application/json;odata=nometadata',
@@ -92,6 +97,7 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             clearExistingPermissions: args.options.clearExistingPermissions === true,
             confirm: (!(!args.options.confirm)).toString()
         });
@@ -103,6 +109,8 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
         option: '-i, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-c, --clearExistingPermissions'
     }, {
@@ -120,7 +128,7 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
         return true;
     }));
 }, _SpoListRoleInheritanceBreakCommand_initOptionSets = function _SpoListRoleInheritanceBreakCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListRoleInheritanceBreakCommand();
 //# sourceMappingURL=list-roleinheritance-break.js.map

package/dist/m365/spo/commands/list/list-roleinheritance-reset.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");
@@ -44,15 +45,19 @@ class SpoListRoleInheritanceResetCommand extends SpoCommand_1.default {
             }
             const resetListRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
                 try {
-                    let requestUrl = `${args.options.webUrl}/_api/web/lists`;
+                    let requestUrl = `${args.options.webUrl}/_api/web/`;
                     if (args.options.listId) {
-                        requestUrl += `(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                        requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
                     }
-                    else {
-                        requestUrl += `/getbytitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                    else if (args.options.listTitle) {
+                        requestUrl += `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);
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                     }
                     const requestOptions = {
-                        url: `${requestUrl}/resetroleinheritance`,
+                        url: `${requestUrl}resetroleinheritance`,
                         method: 'POST',
                         headers: {
                             'accept': 'application/json;odata=nometadata',
@@ -88,6 +93,7 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             confirm: (!(!args.options.confirm)).toString()
         });
     });
@@ -98,6 +104,8 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
         option: '-i, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '--confirm'
     });
@@ -113,7 +121,7 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
         return true;
     }));
 }, _SpoListRoleInheritanceResetCommand_initOptionSets = function _SpoListRoleInheritanceResetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListRoleInheritanceResetCommand();
 //# sourceMappingURL=list-roleinheritance-reset.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