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

package/dist/m365/spo/commands/customaction/customaction-remove.js

@@ -15,9 +15,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoCustomActionRemoveCommand_instances, _SpoCustomActionRemoveCommand_initTelemetry, _SpoCustomActionRemoveCommand_initOptions, _SpoCustomActionRemoveCommand_initValidators, _SpoCustomActionRemoveCommand_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 validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
@@ -60,7 +61,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
                 yield removeCustomAction();
             }
             else {
-                const result = yield cli_1.Cli.prompt({
+                const result = yield Cli_1.Cli.prompt({
                     type: 'confirm',
                     name: 'continue',
                     default: false,
@@ -77,7 +78,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
             return Promise.resolve(options.id);
         }
         const customActionRequestOptions = {
-            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions?$filter=Title eq '${encodeURIComponent(options.title)}'`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions?$filter=Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`,
             headers: {
                 accept: 'application/json;odata=nometadata'
             },
@@ -100,7 +101,7 @@ class SpoCustomActionRemoveCommand extends SpoCommand_1.default {
             .getCustomActionId(options)
             .then((customActionId) => {
             const requestOptions = {
-                url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${encodeURIComponent(customActionId)}')')`,
+                url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(customActionId)}')')`,
                 headers: {
                     accept: 'application/json;odata=nometadata',
                     'X-HTTP-Method': 'DELETE'
@@ -160,10 +161,10 @@ _SpoCustomActionRemoveCommand_instances = new WeakSet(), _SpoCustomActionRemoveC
     });
 }, _SpoCustomActionRemoveCommand_initValidators = function _SpoCustomActionRemoveCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (args.options.id && utils_1.validation.isValidGuid(args.options.id) === false) {
+        if (args.options.id && validation_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action Id (GUID) expected.`;
         }
-        const isValidUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (typeof isValidUrl === 'string') {
             return isValidUrl;
         }

package/dist/m365/spo/commands/customaction/customaction-set.js

@@ -16,7 +16,8 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoCustomActionSetCommand_instances, _SpoCustomActionSetCommand_initTelemetry, _SpoCustomActionSetCommand_initOptions, _SpoCustomActionSetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const base_permissions_1 = require("../../base-permissions");
 const commands_1 = require("../../commands");
@@ -74,7 +75,7 @@ class SpoCustomActionSetCommand extends SpoCommand_1.default {
     updateCustomAction(options) {
         const requestBody = this.mapRequestBody(options);
         const requestOptions = {
-            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${encodeURIComponent(options.id)}')`,
+            url: `${options.webUrl}/_api/${options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(options.id)}')`,
             headers: {
                 accept: 'application/json;odata=nometadata',
                 'X-HTTP-Method': 'MERGE'
@@ -251,10 +252,10 @@ _SpoCustomActionSetCommand_instances = new WeakSet(), _SpoCustomActionSetCommand
     });
 }, _SpoCustomActionSetCommand_initValidators = function _SpoCustomActionSetCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
-        if (utils_1.validation.isValidGuid(args.options.id) === false) {
+        if (validation_1.validation.isValidGuid(args.options.id) === false) {
             return `${args.options.id} is not valid. Custom action id (Guid) expected`;
         }
-        const isValidSharePointUrl = utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
@@ -272,7 +273,7 @@ _SpoCustomActionSetCommand_instances = new WeakSet(), _SpoCustomActionSetCommand
         if (args.options.sequence && (args.options.sequence < 0 || args.options.sequence > 65536)) {
             return 'Invalid option sequence. Expected value in range from 0 to 65536';
         }
-        if (args.options.clientSideComponentId && utils_1.validation.isValidGuid(args.options.clientSideComponentId) === false) {
+        if (args.options.clientSideComponentId && validation_1.validation.isValidGuid(args.options.clientSideComponentId) === false) {
             return `ClientSideComponentId ${args.options.clientSideComponentId} is not a valid GUID`;
         }
         if (args.options.scope &&

package/dist/m365/spo/commands/eventreceiver/EventReceiver.js

@@ -0,0 +1,3 @@
+"use strict";
+Object.defineProperty(exports, "__esModule", { value: true });
+//# sourceMappingURL=EventReceiver.js.map

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoEventreceiverGetCommand_instances, _SpoEventreceiverGetCommand_initTelemetry, _SpoEventreceiverGetCommand_initOptions, _SpoEventreceiverGetCommand_initValidators, _SpoEventreceiverGetCommand_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 SpoEventreceiverGetCommand extends SpoCommand_1.default {
@@ -36,44 +38,60 @@ class SpoEventreceiverGetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            let requestUrl = `${args.options.webUrl}/_api/`;
-            let listUrl = '';
-            let filter = '?$filter=';
-            if (args.options.listId) {
-                listUrl = `lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
-            }
-            else if (args.options.listTitle) {
-                listUrl = `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
-            }
-            else if (args.options.listUrl) {
-                const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                listUrl = `GetList('${utils_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
-            }
-            if (!args.options.scope || args.options.scope === 'web') {
-                requestUrl += `web/${listUrl}eventreceivers`;
-            }
-            else {
-                requestUrl += 'site/eventreceivers';
-            }
-            if (args.options.id) {
-                filter += `receiverid eq (guid'${args.options.id}')`;
+            try {
+                const eventReceiver = yield this.getEventReceiver(args);
+                logger.log(eventReceiver);
             }
-            else {
-                filter += `receivername eq '${args.options.name}'`;
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
+        });
+    }
+    getEventReceiver(args) {
+        return __awaiter(this, void 0, void 0, function* () {
             const requestOptions = {
-                url: requestUrl + filter,
+                url: `${args.options.webUrl}/_api`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
                 responseType: 'json'
             };
-            try {
+            if (!args.options.scope || args.options.scope === 'web') {
+                requestOptions.url += `/web`;
+            }
+            else {
+                requestOptions.url += '/site';
+            }
+            if (args.options.listId) {
+                requestOptions.url += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                requestOptions.url += `/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);
+                requestOptions.url += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
+            requestOptions.url += '/eventreceivers';
+            if (args.options.id) {
+                requestOptions.url += `(guid'${args.options.id}')`;
                 const res = yield request_1.default.get(requestOptions);
-                logger.log(res.value);
+                // Instead of failing, the request will return an 'odata.null' object if the event receiver doesn't exist.
+                if (res && res['odata.null']) {
+                    throw `The specified event receiver '${args.options.id}' does not exist.`;
+                }
+                return res;
             }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
+            else {
+                requestOptions.url += `?$filter=receivername eq '${args.options.name}'`;
+                const res = yield request_1.default.get(requestOptions);
+                if (res.value.length === 0) {
+                    throw `The specified event receiver '${args.options.name}' does not exist.`;
+                }
+                if (res.value && res.value.length > 1) {
+                    throw `Multiple event receivers with name '${args.options.name}' found: ${res.value.map(x => x.ReceiverId)}`;
+                }
+                return res.value[0];
             }
         });
     }
@@ -108,7 +126,7 @@ _SpoEventreceiverGetCommand_instances = new WeakSet(), _SpoEventreceiverGetComma
     });
 }, _SpoEventreceiverGetCommand_initValidators = function _SpoEventreceiverGetCommand_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;
         }
@@ -116,7 +134,7 @@ _SpoEventreceiverGetCommand_instances = new WeakSet(), _SpoEventreceiverGetComma
         if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
             return `Specify either list id or title or list url`;
         }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         if (args.options.scope && ['web', 'site'].indexOf(args.options.scope) === -1) {

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

@@ -16,7 +16,9 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoEventreceiverListCommand_instances, _SpoEventreceiverListCommand_initTelemetry, _SpoEventreceiverListCommand_initOptions, _SpoEventreceiverListCommand_initValidators;
 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 SpoEventreceiverListCommand extends SpoCommand_1.default {
@@ -41,14 +43,14 @@ class SpoEventreceiverListCommand extends SpoCommand_1.default {
             let requestUrl = `${args.options.webUrl}/_api/`;
             let listUrl = '';
             if (args.options.listId) {
-                listUrl = `lists(guid'${encodeURIComponent(args.options.listId)}')/`;
+                listUrl = `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/`;
             }
             else if (args.options.listTitle) {
-                listUrl = `lists/getByTitle('${encodeURIComponent(args.options.listTitle)}')/`;
+                listUrl = `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/`;
             }
             else if (args.options.listUrl) {
-                const listServerRelativeUrl = utils_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
-                listUrl = `GetList('${encodeURIComponent(listServerRelativeUrl)}')/`;
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                listUrl = `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
             }
             if (!args.options.scope || args.options.scope === 'web') {
                 requestUrl += `web/${listUrl}eventreceivers`;
@@ -97,7 +99,7 @@ _SpoEventreceiverListCommand_instances = new WeakSet(), _SpoEventreceiverListCom
     });
 }, _SpoEventreceiverListCommand_initValidators = function _SpoEventreceiverListCommand_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;
         }
@@ -105,7 +107,7 @@ _SpoEventreceiverListCommand_instances = new WeakSet(), _SpoEventreceiverListCom
         if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
             return `Specify either list id or title or list url`;
         }
-        if (args.options.listId && !utils_1.validation.isValidGuid(args.options.listId)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         if (args.options.scope && ['web', 'site'].indexOf(args.options.scope) === -1) {

package/dist/m365/spo/commands/eventreceiver/eventreceiver-remove.js

@@ -0,0 +1,167 @@
+"use strict";
+var __awaiter = (this && this.__awaiter) || function (thisArg, _arguments, P, generator) {
+    function adopt(value) { return value instanceof P ? value : new P(function (resolve) { resolve(value); }); }
+    return new (P || (P = Promise))(function (resolve, reject) {
+        function fulfilled(value) { try { step(generator.next(value)); } catch (e) { reject(e); } }
+        function rejected(value) { try { step(generator["throw"](value)); } catch (e) { reject(e); } }
+        function step(result) { result.done ? resolve(result.value) : adopt(result.value).then(fulfilled, rejected); }
+        step((generator = generator.apply(thisArg, _arguments || [])).next());
+    });
+};
+var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (receiver, state, kind, f) {
+    if (kind === "a" && !f) throw new TypeError("Private accessor was defined without a getter");
+    if (typeof state === "function" ? receiver !== state || !f : !state.has(receiver)) throw new TypeError("Cannot read private member from an object whose class did not declare it");
+    return kind === "m" ? f : kind === "a" ? f.call(receiver) : f ? f.value : state.get(receiver);
+};
+var _SpoEventreceiverRemoveCommand_instances, _SpoEventreceiverRemoveCommand_initTelemetry, _SpoEventreceiverRemoveCommand_initOptions, _SpoEventreceiverRemoveCommand_initValidators, _SpoEventreceiverRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+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");
+const request_1 = require("../../../../request");
+const getCommand = require('./eventreceiver-get');
+class SpoEventreceiverRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoEventreceiverRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoEventreceiverRemoveCommand_instances, "m", _SpoEventreceiverRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoEventreceiverRemoveCommand_instances, "m", _SpoEventreceiverRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoEventreceiverRemoveCommand_instances, "m", _SpoEventreceiverRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoEventreceiverRemoveCommand_instances, "m", _SpoEventreceiverRemoveCommand_initOptionSets).call(this);
+    }
+    get name() {
+        return commands_1.default.EVENTRECEIVER_REMOVE;
+    }
+    get description() {
+        return 'Removes event receivers for the specified web, site, or list.';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (args.options.confirm) {
+                yield this.removeEventReceiver(args.options);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove event receiver with ${args.options.id ? `id ${args.options.id}` : `name ${args.options.name}`}?`
+                });
+                if (result.continue) {
+                    yield this.removeEventReceiver(args.options);
+                }
+            }
+        });
+    }
+    removeEventReceiver(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                let requestUrl = `${options.webUrl}/_api/${options.scope || 'web'}`;
+                if (options.listId) {
+                    requestUrl += `/lists('${options.listId}')`;
+                }
+                else if (options.listTitle) {
+                    requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(options.listTitle)}')`;
+                }
+                else if (options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.listUrl);
+                    requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                }
+                const rerId = yield this.getEventReceiverId(options);
+                requestUrl += `/eventreceivers('${rerId}')`;
+                const requestOptions = {
+                    url: requestUrl,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getEventReceiverId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.id) {
+                return options.id;
+            }
+            const getOptions = {
+                webUrl: options.webUrl,
+                listId: options.listId,
+                listTitle: options.listTitle,
+                listUrl: options.listUrl,
+                scope: options.scope,
+                id: options.id,
+                name: options.name,
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const commandOutput = yield Cli_1.Cli.executeCommandWithOutput(getCommand, { options: Object.assign(Object.assign({}, getOptions), { _: [] }) });
+            const eventReceiver = JSON.parse(commandOutput.stdout);
+            return eventReceiver.ReceiverId;
+        });
+    }
+}
+_SpoEventreceiverRemoveCommand_instances = new WeakSet(), _SpoEventreceiverRemoveCommand_initTelemetry = function _SpoEventreceiverRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            listId: typeof args.options.listId !== 'undefined',
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            scope: args.options.scope || 'web',
+            id: typeof args.options.id !== 'undefined',
+            name: typeof args.options.name !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoEventreceiverRemoveCommand_initOptions = function _SpoEventreceiverRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '--listTitle [listTitle]'
+    }, {
+        option: '--listId  [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '-n, --name [name]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-s, --scope [scope]',
+        autocomplete: ['web', 'site']
+    }, {
+        option: '--confirm'
+    });
+}, _SpoEventreceiverRemoveCommand_initValidators = function _SpoEventreceiverRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        const isValidSharePointUrl = validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+        if (isValidSharePointUrl !== true) {
+            return isValidSharePointUrl;
+        }
+        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
+        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either list id or title or list url`;
+        }
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
+        }
+        if (args.options.scope && ['web', 'site'].indexOf(args.options.scope) === -1) {
+            return `${args.options.scope} is not a valid type value. Allowed values web|site.`;
+        }
+        if (args.options.scope && args.options.scope === 'site' && (args.options.listId || args.options.listUrl || args.options.listTitle)) {
+            return 'Scope cannot be set to site when retrieving list event receivers.';
+        }
+        return true;
+    }));
+}, _SpoEventreceiverRemoveCommand_initOptionSets = function _SpoEventreceiverRemoveCommand_initOptionSets() {
+    this.optionSets.push(['name', 'id']);
+};
+module.exports = new SpoEventreceiverRemoveCommand();
+//# sourceMappingURL=eventreceiver-remove.js.map

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

@@ -17,7 +17,9 @@ var _SpoExternalUserListCommand_instances, _SpoExternalUserListCommand_initTelem
 Object.defineProperty(exports, "__esModule", { value: true });
 const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoExternalUserListCommand extends SpoCommand_1.default {
@@ -37,8 +39,8 @@ class SpoExternalUserListCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const spoAdminUrl = yield utils_1.spo.getSpoAdminUrl(logger, this.debug);
-                const reqDigest = yield utils_1.spo.getRequestDigest(spoAdminUrl);
+                const spoAdminUrl = yield spo_1.spo.getSpoAdminUrl(logger, this.debug);
+                const reqDigest = yield spo_1.spo.getRequestDigest(spoAdminUrl);
                 if (this.verbose) {
                     logger.logToStderr(`Retrieving information about external users...`);
                 }
@@ -47,10 +49,10 @@ class SpoExternalUserListCommand extends SpoCommand_1.default {
                 const sortOrder = args.options.sortOrder === 'desc' ? 1 : 0;
                 let payload = '';
                 if (args.options.siteUrl) {
-                    payload = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="135" ObjectPathId="134" /><Query Id="136" ObjectPathId="134"><Query SelectAllProperties="false"><Properties><Property Name="TotalUserCount" ScalarProperty="true" /><Property Name="UserCollectionPosition" ScalarProperty="true" /><Property Name="ExternalUserCollection"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="false"><Properties><Property Name="DisplayName" ScalarProperty="true" /><Property Name="InvitedAs" ScalarProperty="true" /><Property Name="UniqueId" ScalarProperty="true" /><Property Name="AcceptedAs" ScalarProperty="true" /><Property Name="WhenCreated" ScalarProperty="true" /><Property Name="InvitedBy" ScalarProperty="true" /></Properties></ChildItemQuery></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="134" ParentId="131" Name="GetExternalUsersForSite"><Parameters><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.siteUrl)}</Parameter><Parameter Type="Int32">${position}</Parameter><Parameter Type="Int32">${pageSize}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.filter || '')}</Parameter><Parameter Type="Enum">${sortOrder}</Parameter></Parameters></Method><Constructor Id="131" TypeId="{e45fd516-a408-4ca4-b6dc-268e2f1f0f83}" /></ObjectPaths></Request>`;
+                    payload = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="135" ObjectPathId="134" /><Query Id="136" ObjectPathId="134"><Query SelectAllProperties="false"><Properties><Property Name="TotalUserCount" ScalarProperty="true" /><Property Name="UserCollectionPosition" ScalarProperty="true" /><Property Name="ExternalUserCollection"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="false"><Properties><Property Name="DisplayName" ScalarProperty="true" /><Property Name="InvitedAs" ScalarProperty="true" /><Property Name="UniqueId" ScalarProperty="true" /><Property Name="AcceptedAs" ScalarProperty="true" /><Property Name="WhenCreated" ScalarProperty="true" /><Property Name="InvitedBy" ScalarProperty="true" /></Properties></ChildItemQuery></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="134" ParentId="131" Name="GetExternalUsersForSite"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.siteUrl)}</Parameter><Parameter Type="Int32">${position}</Parameter><Parameter Type="Int32">${pageSize}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.filter || '')}</Parameter><Parameter Type="Enum">${sortOrder}</Parameter></Parameters></Method><Constructor Id="131" TypeId="{e45fd516-a408-4ca4-b6dc-268e2f1f0f83}" /></ObjectPaths></Request>`;
                 }
                 else {
-                    payload = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="109" ObjectPathId="108" /><Query Id="110" ObjectPathId="108"><Query SelectAllProperties="false"><Properties><Property Name="TotalUserCount" ScalarProperty="true" /><Property Name="UserCollectionPosition" ScalarProperty="true" /><Property Name="ExternalUserCollection"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="false"><Properties><Property Name="DisplayName" ScalarProperty="true" /><Property Name="InvitedAs" ScalarProperty="true" /><Property Name="UniqueId" ScalarProperty="true" /><Property Name="AcceptedAs" ScalarProperty="true" /><Property Name="WhenCreated" ScalarProperty="true" /><Property Name="InvitedBy" ScalarProperty="true" /></Properties></ChildItemQuery></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="108" ParentId="105" Name="GetExternalUsers"><Parameters><Parameter Type="Int32">${position}</Parameter><Parameter Type="Int32">${pageSize}</Parameter><Parameter Type="String">${utils_1.formatting.escapeXml(args.options.filter || '')}</Parameter><Parameter Type="Enum">${sortOrder}</Parameter></Parameters></Method><Constructor Id="105" TypeId="{e45fd516-a408-4ca4-b6dc-268e2f1f0f83}" /></ObjectPaths></Request>`;
+                    payload = `<Request AddExpandoFieldTypeSuffix="true" SchemaVersion="15.0.0.0" LibraryVersion="16.0.0.0" ApplicationName="${config_1.default.applicationName}" xmlns="http://schemas.microsoft.com/sharepoint/clientquery/2009"><Actions><ObjectPath Id="109" ObjectPathId="108" /><Query Id="110" ObjectPathId="108"><Query SelectAllProperties="false"><Properties><Property Name="TotalUserCount" ScalarProperty="true" /><Property Name="UserCollectionPosition" ScalarProperty="true" /><Property Name="ExternalUserCollection"><Query SelectAllProperties="false"><Properties /></Query><ChildItemQuery SelectAllProperties="false"><Properties><Property Name="DisplayName" ScalarProperty="true" /><Property Name="InvitedAs" ScalarProperty="true" /><Property Name="UniqueId" ScalarProperty="true" /><Property Name="AcceptedAs" ScalarProperty="true" /><Property Name="WhenCreated" ScalarProperty="true" /><Property Name="InvitedBy" ScalarProperty="true" /></Properties></ChildItemQuery></Property></Properties></Query></Query></Actions><ObjectPaths><Method Id="108" ParentId="105" Name="GetExternalUsers"><Parameters><Parameter Type="Int32">${position}</Parameter><Parameter Type="Int32">${pageSize}</Parameter><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.filter || '')}</Parameter><Parameter Type="Enum">${sortOrder}</Parameter></Parameters></Method><Constructor Id="105" TypeId="{e45fd516-a408-4ca4-b6dc-268e2f1f0f83}" /></ObjectPaths></Request>`;
                 }
                 const requestOptions = {
                     url: `${spoAdminUrl}/_vti_bin/client.svc/ProcessQuery`,
@@ -138,7 +140,7 @@ _SpoExternalUserListCommand_instances = new WeakSet(), _SpoExternalUserListComma
             return `${args.options.sortOrder} is not a valid sortOrder value. Allowed values asc|desc`;
         }
         if (args.options.siteUrl) {
-            return utils_1.validation.isValidSharePointUrl(args.options.siteUrl);
+            return validation_1.validation.isValidSharePointUrl(args.options.siteUrl);
         }
         return true;
     }));

package/dist/m365/spo/commands/feature/feature-enable.js

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFeatureEnableCommand_instances, _SpoFeatureEnableCommand_initTelemetry, _SpoFeatureEnableCommand_initOptions, _SpoFeatureEnableCommand_initValidators, _SpoFeatureEnableCommand_initTypes;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFeatureEnableCommand extends SpoCommand_1.default {
@@ -88,7 +88,7 @@ _SpoFeatureEnableCommand_instances = new WeakSet(), _SpoFeatureEnableCommand_ini
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 }, _SpoFeatureEnableCommand_initTypes = function _SpoFeatureEnableCommand_initTypes() {
     this.types.string.push('scope', 's');

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

@@ -16,7 +16,7 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFeatureListCommand_instances, _SpoFeatureListCommand_initTelemetry, _SpoFeatureListCommand_initOptions, _SpoFeatureListCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
-const utils_1 = require("../../../../utils");
+const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
 class SpoFeatureListCommand extends SpoCommand_1.default {
@@ -81,7 +81,7 @@ _SpoFeatureListCommand_instances = new WeakSet(), _SpoFeatureListCommand_initTel
                 return `${args.options.scope} is not a valid Feature scope. Allowed values are Site|Web`;
             }
         }
-        return utils_1.validation.isValidSharePointUrl(args.options.webUrl);
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
     }));
 };
 module.exports = new SpoFeatureListCommand();

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

@@ -16,7 +16,10 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFieldAddCommand_instances, _SpoFieldAddCommand_initTelemetry, _SpoFieldAddCommand_initOptions, _SpoFieldAddCommand_initValidators;
 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 SpoFieldAddCommand extends SpoCommand_1.default {
@@ -36,9 +39,20 @@ class SpoFieldAddCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const reqDigest = yield utils_1.spo.getRequestDigest(args.options.webUrl);
+                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)}')`;
+                }
+                const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/${(args.options.listTitle ? `lists/getByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')/` : '')}fields/CreateFieldAsXml`,
+                    url: `${requestUrl}/fields/CreateFieldAsXml`,
                     headers: {
                         'X-RequestDigest': reqDigest.FormDigestValue,
                         accept: 'application/json;odata=nometadata'
@@ -97,6 +111,8 @@ _SpoFieldAddCommand_instances = new WeakSet(), _SpoFieldAddCommand_initTelemetry
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listId: typeof args.options.listId !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             options: typeof args.options.options !== 'undefined'
         });
     });
@@ -105,6 +121,10 @@ _SpoFieldAddCommand_instances = new WeakSet(), _SpoFieldAddCommand_initTelemetry
         option: '-u, --webUrl <webUrl>'
     }, {
         option: '-l, --listTitle [listTitle]'
+    }, {
+        option: '--listId [listId]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-x, --xml <xml>'
     }, {
@@ -112,10 +132,17 @@ _SpoFieldAddCommand_instances = new WeakSet(), _SpoFieldAddCommand_initTelemetry
     });
 }, _SpoFieldAddCommand_initValidators = function _SpoFieldAddCommand_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;
         }
+        const listOptions = [args.options.listId, args.options.listTitle, args.options.listUrl];
+        if (listOptions.some(item => item !== undefined) && listOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either list id or title or list url, but not multiple`;
+        }
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} in option listId is not a valid GUID`;
+        }
         if (args.options.options) {
             let optionsError = true;
             const options = ['DefaultValue', 'AddToDefaultContentType', 'AddToNoContentType', 'AddToAllContentTypes', 'AddFieldInternalNameHint', 'AddFieldToDefaultView', 'AddFieldCheckDisplayName'];