@pnp/cli-microsoft365 6.0.0-beta.566a6b8 → 6.0.0-beta.5ea1353

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListWebhookGetCommand_instances, _SpoListWebhookGetCommand_initTelemetry, _SpoListWebhookGetCommand_initOptions, _SpoListWebhookGetCommand_initValidators, _SpoListWebhookGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+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");
 class SpoListWebhookGetCommand extends SpoCommand_1.default {
@@ -37,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'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${utils_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('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${utils_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,
@@ -71,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() {
@@ -84,26 +90,28 @@ _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* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId) {
-            if (!utils_1.validation.isValidGuid(args.options.listId)) {
+            if (!validation_1.validation.isValidGuid(args.options.listId)) {
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
         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,12 @@ 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 utils_1 = require("../../../../utils");
+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");
 class SpoListWebhookListCommand extends SpoCommand_1.default {
@@ -27,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;
@@ -39,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 ? utils_1.formatting.encodeQueryParameter(args.options.id) : (args.options.listId ? utils_1.formatting.encodeQueryParameter(args.options.listId) : (args.options.title ? utils_1.formatting.encodeQueryParameter(args.options.title) : utils_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'${utils_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'${utils_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('${utils_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('${utils_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,
@@ -93,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() {
@@ -107,39 +99,23 @@ _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* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.id) {
-            if (!utils_1.validation.isValidGuid(args.options.id)) {
-                return `${args.options.id} is not a valid GUID`;
-            }
-        }
         if (args.options.listId) {
-            if (!utils_1.validation.isValidGuid(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

@@ -15,9 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListWebhookRemoveCommand_instances, _SpoListWebhookRemoveCommand_initTelemetry, _SpoListWebhookRemoveCommand_initOptions, _SpoListWebhookRemoveCommand_initValidators, _SpoListWebhookRemoveCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const cli_1 = require("../../../../cli");
+const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+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");
 class SpoListWebhookRemoveCommand extends SpoCommand_1.default {
@@ -39,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'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${utils_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('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${utils_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,
@@ -69,11 +75,11 @@ class SpoListWebhookRemoveCommand extends SpoCommand_1.default {
                 yield removeWebhook();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     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();
@@ -85,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() {
@@ -98,6 +105,8 @@ _SpoListWebhookRemoveCommand_instances = new WeakSet(), _SpoListWebhookRemoveCom
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id <id>'
     }, {
@@ -105,22 +114,22 @@ _SpoListWebhookRemoveCommand_instances = new WeakSet(), _SpoListWebhookRemoveCom
     });
 }, _SpoListWebhookRemoveCommand_initValidators = function _SpoListWebhookRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId) {
-            if (!utils_1.validation.isValidGuid(args.options.listId)) {
+            if (!validation_1.validation.isValidGuid(args.options.listId)) {
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
         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

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

@@ -17,7 +17,9 @@ var _SpoListWebhookSetCommand_instances, _SpoListWebhookSetCommand_initTelemetry
 Object.defineProperty(exports, "__esModule", { value: true });
 const chalk = require("chalk");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+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");
 class SpoListWebhookSetCommand extends SpoCommand_1.default {
@@ -38,25 +40,26 @@ class SpoListWebhookSetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Updating webhook ${args.options.id} belonging to list ${args.options.listId ? args.options.listId : args.options.listTitle} located at site ${args.options.webUrl}...`);
+                logger.logToStderr(`Updating webhook ${args.options.id} belonging 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'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/Subscriptions('${utils_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('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/Subscriptions('${utils_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)}')`;
             }
-            const requestBody = {};
-            if (args.options.notificationUrl) {
-                requestBody.notificationUrl = args.options.notificationUrl;
-            }
-            if (args.options.expirationDateTime) {
-                requestBody.expirationDateTime = args.options.expirationDateTime;
+            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 requestBody = {
+                notificationUrl: args.options.notificationUrl,
+                expirationDateTime: args.options.expirationDateTime,
+                clientState: args.options.clientState
+            };
             const requestOptions = {
                 url: requestUrl,
-                method: 'PATCH',
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -65,7 +68,6 @@ class SpoListWebhookSetCommand extends SpoCommand_1.default {
             };
             try {
                 yield request_1.default.patch(requestOptions);
-                // REST patch call doesn't return anything
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -76,10 +78,12 @@ class SpoListWebhookSetCommand extends SpoCommand_1.default {
 _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_initTelemetry = function _SpoListWebhookSetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
-            listId: (!(!args.options.listId)).toString(),
-            listTitle: (!(!args.options.listTitle)).toString(),
-            notificationUrl: (!(!args.options.notificationUrl)).toString(),
-            expirationDateTime: (!(!args.options.expirationDateTime)).toString()
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            notificationUrl: typeof args.options.notificationUrl !== 'undefined',
+            expirationDateTime: typeof args.options.expirationDateTime !== 'undefined',
+            clientState: typeof args.options.clientState !== 'undefined'
         });
     });
 }, _SpoListWebhookSetCommand_initOptions = function _SpoListWebhookSetCommand_initOptions() {
@@ -89,29 +93,33 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id <id>'
     }, {
         option: '-n, --notificationUrl [notificationUrl]'
     }, {
         option: '-e, --expirationDateTime [expirationDateTime]'
+    }, {
+        option: '-c, --clientState [clientState]'
     });
 }, _SpoListWebhookSetCommand_initValidators = function _SpoListWebhookSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (!validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId) {
-            if (!utils_1.validation.isValidGuid(args.options.listId)) {
+            if (!validation_1.validation.isValidGuid(args.options.listId)) {
                 return `${args.options.listId} is not a valid GUID`;
             }
         }
-        if (!args.options.notificationUrl && !args.options.expirationDateTime) {
-            return 'Specify notificationUrl, expirationDateTime or both, at least one is required';
+        if (!args.options.notificationUrl && !args.options.expirationDateTime && !args.options.clientState) {
+            return 'Specify notificationUrl, expirationDateTime, clientState or multiple, at least one is required';
         }
         const parsedDateTime = Date.parse(args.options.expirationDateTime);
         if (args.options.expirationDateTime && !(!parsedDateTime) !== true) {
@@ -124,7 +132,7 @@ _SpoListWebhookSetCommand_instances = new WeakSet(), _SpoListWebhookSetCommand_i
         return true;
     }));
 }, _SpoListWebhookSetCommand_initOptionSets = function _SpoListWebhookSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListWebhookSetCommand();
 //# sourceMappingURL=list-webhook-set.js.map

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

@@ -16,7 +16,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoListItemAddCommand_instances, _SpoListItemAddCommand_initTelemetry, _SpoListItemAddCommand_initOptions, _SpoListItemAddCommand_initValidators, _SpoListItemAddCommand_initTypes, _SpoListItemAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoListItemAddCommand extends SpoCommand_1.default {
@@ -41,18 +44,24 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const listIdArgument = args.options.listId || '';
-                const listTitleArgument = args.options.listTitle || '';
-                const listRestUrl = (args.options.listId ?
-                    `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(listIdArgument)}')`
-                    : `${args.options.webUrl}/_api/web/lists/getByTitle('${utils_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
+                let requestUrl = `${args.options.webUrl}/_api/web`;
+                if (args.options.listId) {
+                    requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                }
+                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 contentTypeName = '';
                 let targetFolderServerRelativeUrl = '';
                 if (this.verbose) {
-                    logger.logToStderr(`Getting content types for list...`);
+                    logger.logToStderr(`Getting content types for list ${args.options.listId || args.options.listTitle || args.options.listUrl}...`);
                 }
                 let requestOptions = {
-                    url: `${listRestUrl}/contenttypes?$select=Name,Id`,
+                    url: `${requestUrl}/contenttypes?$select=Name,Id`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -87,18 +96,18 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
                         logger.logToStderr('setting up folder lookup response ...');
                     }
                     requestOptions = {
-                        url: `${listRestUrl}/rootFolder`,
+                        url: `${requestUrl}/rootFolder`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
                         responseType: 'json'
                     };
                     const rootFolderResponse = yield request_1.default.get(requestOptions);
-                    targetFolderServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(rootFolderResponse["ServerRelativeUrl"], args.options.folder);
-                    yield utils_1.spo.ensureFolder(args.options.webUrl, targetFolderServerRelativeUrl, logger, this.debug);
+                    targetFolderServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(rootFolderResponse["ServerRelativeUrl"], args.options.folder);
+                    yield spo_1.spo.ensureFolder(args.options.webUrl, targetFolderServerRelativeUrl, logger, this.debug);
                 }
                 if (this.verbose) {
-                    logger.logToStderr(`Creating item in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
+                    logger.logToStderr(`Creating item in list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site ${args.options.webUrl}...`);
                 }
                 const requestBody = {
                     formValues: this.mapRequestBody(args.options)
@@ -120,7 +129,7 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
                     });
                 }
                 requestOptions = {
-                    url: `${listRestUrl}/AddValidateUpdateItemUsingPath()`,
+                    url: `${requestUrl}/AddValidateUpdateItemUsingPath()`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -139,10 +148,10 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Id returned by AddValidateUpdateItemUsingPath: ${idField}`);
                 }
                 if (idField.length === 0) {
-                    return Promise.reject(`Item didn't add successfully`);
+                    throw `Item didn't add successfully`;
                 }
                 requestOptions = {
-                    url: `${listRestUrl}/items(${idField[0].FieldValue})`,
+                    url: `${requestUrl}/items(${idField[0].FieldValue})`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -161,6 +170,7 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
         const excludeOptions = [
             'listTitle',
             'listId',
+            'listUrl',
             'webUrl',
             'contentType',
             'folder',
@@ -181,6 +191,7 @@ _SpoListItemAddCommand_instances = new WeakSet(), _SpoListItemAddCommand_initTel
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             contentType: typeof args.options.contentType !== 'undefined',
             folder: typeof args.options.folder !== 'undefined'
         });
@@ -192,6 +203,8 @@ _SpoListItemAddCommand_instances = new WeakSet(), _SpoListItemAddCommand_initTel
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-c, --contentType [contentType]'
     }, {
@@ -199,20 +212,20 @@ _SpoListItemAddCommand_instances = new WeakSet(), _SpoListItemAddCommand_initTel
     });
 }, _SpoListItemAddCommand_initValidators = function _SpoListItemAddCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
         if (args.options.listId &&
-            !utils_1.validation.isValidGuid(args.options.listId)) {
+            !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} in option listId is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoListItemAddCommand_initTypes = function _SpoListItemAddCommand_initTypes() {
-    this.types.string.push('webUrl', 'listId', 'listTitle', 'contentType', 'folder');
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'contentType', 'folder');
 }, _SpoListItemAddCommand_initOptionSets = function _SpoListItemAddCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListItemAddCommand();
 //# sourceMappingURL=listitem-add.js.map