@pnp/cli-microsoft365 6.0.0-beta.78fdd2c → 6.0.0-beta.7920dfd

package/dist/m365/spo/commands/list/list-roleinheritance-break.js

@@ -15,8 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleInheritanceBreakCommand_instances, _SpoListRoleInheritanceBreakCommand_initTelemetry, _SpoListRoleInheritanceBreakCommand_initOptions, _SpoListRoleInheritanceBreakCommand_initValidators, _SpoListRoleInheritanceBreakCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+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 SpoListRoleInheritanceBreakCommand extends SpoCommand_1.default {
@@ -34,33 +37,59 @@ class SpoListRoleInheritanceBreakCommand extends SpoCommand_1.default {
     get description() {
         return 'Breaks role inheritance on list or library';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Breaking role inheritance of list in site at ${args.options.webUrl}...`);
-        }
-        let requestUrl = `${args.options.webUrl}/_api/web/lists`;
-        if (args.options.listId) {
-            requestUrl += `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
-        }
-        else {
-            requestUrl += `/getbytitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-        }
-        let keepExistingPermissions = true;
-        if (args.options.clearExistingPermissions) {
-            keepExistingPermissions = !args.options.clearExistingPermissions;
-        }
-        const requestOptions = {
-            url: `${requestUrl}/breakroleinheritance(${keepExistingPermissions})`,
-            method: 'POST',
-            headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Breaking role inheritance of list in site at ${args.options.webUrl}...`);
+            }
+            const breakListRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    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 keepExistingPermissions = true;
+                    if (args.options.clearExistingPermissions) {
+                        keepExistingPermissions = !args.options.clearExistingPermissions;
+                    }
+                    const requestOptions = {
+                        url: `${requestUrl}breakroleinheritance(${keepExistingPermissions})`,
+                        method: 'POST',
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield breakListRoleInheritance();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to break the role inheritance of ${(_a = args.options.listId) !== null && _a !== void 0 ? _a : args.options.listTitle}?`
+                });
+                if (result.continue) {
+                    yield breakListRoleInheritance();
+                }
+            }
+        });
     }
 }
 _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInheritanceBreakCommand_initTelemetry = function _SpoListRoleInheritanceBreakCommand_initTelemetry() {
@@ -68,7 +97,9 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
-            clearExistingPermissions: args.options.clearExistingPermissions === true
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            clearExistingPermissions: args.options.clearExistingPermissions === true,
+            confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _SpoListRoleInheritanceBreakCommand_initOptions = function _SpoListRoleInheritanceBreakCommand_initOptions() {
@@ -78,22 +109,26 @@ _SpoListRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoListRoleInher
         option: '-i, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-c, --clearExistingPermissions'
+    }, {
+        option: '--confirm'
     });
 }, _SpoListRoleInheritanceBreakCommand_initValidators = function _SpoListRoleInheritanceBreakCommand_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)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoListRoleInheritanceBreakCommand_initOptionSets = function _SpoListRoleInheritanceBreakCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListRoleInheritanceBreakCommand();
 //# sourceMappingURL=list-roleinheritance-break.js.map

package/dist/m365/spo/commands/list/list-roleinheritance-reset.js

@@ -15,8 +15,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleInheritanceResetCommand_instances, _SpoListRoleInheritanceResetCommand_initTelemetry, _SpoListRoleInheritanceResetCommand_initOptions, _SpoListRoleInheritanceResetCommand_initValidators, _SpoListRoleInheritanceResetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
+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 SpoListRoleInheritanceResetCommand extends SpoCommand_1.default {
@@ -34,36 +37,64 @@ class SpoListRoleInheritanceResetCommand extends SpoCommand_1.default {
     get description() {
         return 'Restores role inheritance on list or library';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Restore role inheritance of list in site at ${args.options.webUrl}...`);
-        }
-        let requestUrl = `${args.options.webUrl}/_api/web/lists`;
-        if (args.options.listId) {
-            requestUrl += `(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')`;
-        }
-        else {
-            requestUrl += `/getbytitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
-        }
-        const requestOptions = {
-            url: `${requestUrl}/resetroleinheritance`,
-            method: 'POST',
-            headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(_ => cb(), (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        var _a;
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Restore role inheritance of list in site at ${args.options.webUrl}...`);
+            }
+            const resetListRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                try {
+                    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 requestOptions = {
+                        url: `${requestUrl}resetroleinheritance`,
+                        method: 'POST',
+                        headers: {
+                            'accept': 'application/json;odata=nometadata',
+                            'content-type': 'application/json'
+                        },
+                        responseType: 'json'
+                    };
+                    yield request_1.default.post(requestOptions);
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield resetListRoleInheritance();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to reset the role inheritance of ${(_a = args.options.listId) !== null && _a !== void 0 ? _a : args.options.listTitle}?`
+                });
+                if (result.continue) {
+                    yield resetListRoleInheritance();
+                }
+            }
+        });
     }
 }
 _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInheritanceResetCommand_initTelemetry = function _SpoListRoleInheritanceResetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
-            listTitle: typeof args.options.listTitle !== 'undefined'
+            listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
         });
     });
 }, _SpoListRoleInheritanceResetCommand_initOptions = function _SpoListRoleInheritanceResetCommand_initOptions() {
@@ -73,20 +104,24 @@ _SpoListRoleInheritanceResetCommand_instances = new WeakSet(), _SpoListRoleInher
         option: '-i, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
+    }, {
+        option: '--confirm'
     });
 }, _SpoListRoleInheritanceResetCommand_initValidators = function _SpoListRoleInheritanceResetCommand_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)) {
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
             return `${args.options.listId} is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoListRoleInheritanceResetCommand_initOptionSets = function _SpoListRoleInheritanceResetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListRoleInheritanceResetCommand();
 //# sourceMappingURL=list-roleinheritance-reset.js.map

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

@@ -13,10 +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 _SpoListSetCommand_instances, _SpoListSetCommand_initTelemetry, _SpoListSetCommand_initOptions, _SpoListSetCommand_initValidators, _SpoListSetCommand_initTypes;
+var _SpoListSetCommand_instances, _SpoListSetCommand_initTelemetry, _SpoListSetCommand_initOptions, _SpoListSetCommand_initValidators, _SpoListSetCommand_initTypes, _SpoListSetCommand_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");
 const DraftVisibilityType_1 = require("./DraftVisibilityType");
@@ -29,6 +31,7 @@ class SpoListSetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListSetCommand_instances, "m", _SpoListSetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListSetCommand_instances, "m", _SpoListSetCommand_initValidators).call(this);
         __classPrivateFieldGet(this, _SpoListSetCommand_instances, "m", _SpoListSetCommand_initTypes).call(this);
+        __classPrivateFieldGet(this, _SpoListSetCommand_instances, "m", _SpoListSetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_SET;
@@ -62,33 +65,47 @@ class SpoListSetCommand extends SpoCommand_1.default {
         }
         return result;
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            logger.logToStderr(`Updating list in site at ${args.options.webUrl}...`);
-        }
-        const requestBody = this.mapRequestBody(args.options);
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/lists(guid'${encodeURIComponent(args.options.id)}')`,
-            method: 'POST',
-            headers: {
-                'X-HTTP-Method': 'MERGE',
-                'If-Match': '*',
-                'accept': 'application/json;odata=nometadata'
-            },
-            data: requestBody,
-            responseType: 'json'
-        };
-        request_1.default
-            .post(requestOptions)
-            .then(() => {
-            // REST post call doesn't return anything
-            cb();
-        }, (err) => this.handleRejectedODataJsonPromise(err, logger, cb));
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Updating list in site at ${args.options.webUrl}...`);
+            }
+            const requestBody = this.mapRequestBody(args.options);
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.id) {
+                requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.id)}')/`;
+            }
+            else if (args.options.title) {
+                requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.title)}')/`;
+            }
+            else if (args.options.url) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
+                requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                method: 'POST',
+                headers: {
+                    'X-HTTP-Method': 'MERGE',
+                    'If-Match': '*',
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: requestBody,
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+                // REST post call doesn't return anything
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
     }
     mapRequestBody(options) {
         const requestBody = {};
-        if (options.title) {
-            requestBody.Title = options.title;
+        if (options.newTitle) {
+            requestBody.Title = options.newTitle;
         }
         if (options.description) {
             requestBody.Description = options.description;
@@ -278,7 +295,10 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
         const telemetryProps = {};
         // add properties with identifiable data
         [
+            'id',
             'title',
+            'url',
+            'newTitle',
             'description',
             'templateFeatureId',
             'schemaXml',
@@ -322,11 +342,15 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
     });
 }, _SpoListSetCommand_initOptions = function _SpoListSetCommand_initOptions() {
     this.options.unshift({
-        option: '-i, --id <id>'
-    }, {
         option: '-u, --webUrl <webUrl>'
     }, {
-        option: '-t, --title [title]'
+        option: '--id [id]'
+    }, {
+        option: '--url [url]'
+    }, {
+        option: '--title [title]'
+    }, {
+        option: '--newTitle [newTitle]'
     }, {
         option: '--allowDeletion [allowDeletion]',
         autocomplete: ['true', 'false']
@@ -497,26 +521,26 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
     });
 }, _SpoListSetCommand_initValidators = function _SpoListSetCommand_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 (!utils_1.validation.isValidGuid(args.options.id)) {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
             return `${args.options.id} is not a valid GUID`;
         }
         for (let i = 0; i < SpoListSetCommand.booleanOptions.length; i++) {
             const option = SpoListSetCommand.booleanOptions[i];
             const value = args.options[option];
-            if (value && !utils_1.validation.isValidBoolean(value)) {
+            if (value && !validation_1.validation.isValidBoolean(value)) {
                 return `${value} in option ${option} is not a valid boolean value`;
             }
         }
         if (args.options.templateFeatureId &&
-            !utils_1.validation.isValidGuid(args.options.templateFeatureId)) {
+            !validation_1.validation.isValidGuid(args.options.templateFeatureId)) {
             return `${args.options.templateFeatureId} in option templateFeatureId is not a valid GUID`;
         }
         if (args.options.defaultContentApprovalWorkflowId &&
-            !utils_1.validation.isValidGuid(args.options.defaultContentApprovalWorkflowId)) {
+            !validation_1.validation.isValidGuid(args.options.defaultContentApprovalWorkflowId)) {
             return `${args.options.defaultContentApprovalWorkflowId} in option defaultContentApprovalWorkflowId is not a valid GUID`;
         }
         if (args.options.direction &&
@@ -567,6 +591,8 @@ _SpoListSetCommand_instances = new WeakSet(), _SpoListSetCommand_initTelemetry =
         'draftVersionVisibility',
         'listExperienceOptions'
     ]));
+}, _SpoListSetCommand_initOptionSets = function _SpoListSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title', 'url'] });
 };
 SpoListSetCommand.booleanOptions = [
     'allowDeletion',

package/dist/m365/spo/commands/list/list-sitescript-get.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 _SpoListSiteScriptGetCommand_instances, _SpoListSiteScriptGetCommand_initTelemetry, _SpoListSiteScriptGetCommand_initOptions, _SpoListSiteScriptGetCommand_initValidators;
+var _SpoListSiteScriptGetCommand_instances, _SpoListSiteScriptGetCommand_initTelemetry, _SpoListSiteScriptGetCommand_initOptions, _SpoListSiteScriptGetCommand_initValidators, _SpoListSiteScriptGetCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Command_1 = require("../../../../Command");
 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 SpoListSiteScriptGetCommand extends SpoCommand_1.default {
@@ -27,6 +28,7 @@ class SpoListSiteScriptGetCommand extends SpoCommand_1.default {
         __classPrivateFieldGet(this, _SpoListSiteScriptGetCommand_instances, "m", _SpoListSiteScriptGetCommand_initTelemetry).call(this);
         __classPrivateFieldGet(this, _SpoListSiteScriptGetCommand_instances, "m", _SpoListSiteScriptGetCommand_initOptions).call(this);
         __classPrivateFieldGet(this, _SpoListSiteScriptGetCommand_instances, "m", _SpoListSiteScriptGetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoListSiteScriptGetCommand_instances, "m", _SpoListSiteScriptGetCommand_initOptionSets).call(this);
     }
     get name() {
         return commands_1.default.LIST_SITESCRIPT_GET;
@@ -34,59 +36,65 @@ class SpoListSiteScriptGetCommand extends SpoCommand_1.default {
     get description() {
         return 'Extracts a site script from a SharePoint list';
     }
-    commandAction(logger, args, cb) {
-        if (this.verbose) {
-            const list = (args.options.listId ? args.options.listId : args.options.listTitle);
-            logger.logToStderr(`Extracting Site Script from list ${list} in site at ${args.options.webUrl}...`);
-        }
-        let requestUrl = '';
-        if (args.options.listId) {
-            if (this.debug) {
-                logger.logToStderr(`Retrieving List Url from Id '${args.options.listId}'...`);
-            }
-            requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${utils_1.formatting.encodeQueryParameter(args.options.listId)}')?$expand=RootFolder`;
-        }
-        else {
-            if (this.debug) {
-                logger.logToStderr(`Retrieving List Url from Title '${args.options.listTitle}'...`);
-            }
-            requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${utils_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$expand=RootFolder`;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        request_1.default
-            .get(requestOptions)
-            .then((listInstance) => {
-            const listAbsoluteUrl = utils_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listInstance.RootFolder.ServerRelativeUrl);
-            const requestUrl = `${args.options.webUrl}/_api/Microsoft_SharePoint_Utilities_WebTemplateExtensions_SiteScriptUtility_GetSiteScriptFromList`;
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json;odata=nometadata'
-                },
-                responseType: 'json',
-                data: {
-                    listUrl: listAbsoluteUrl
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                if (this.verbose) {
+                    logger.logToStderr(`Extracting Site Script from list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site at ${args.options.webUrl}...`);
+                }
+                let listServerRelativeUrl = '';
+                if (args.options.listUrl) {
+                    if (this.debug) {
+                        logger.logToStderr(`Retrieving List from URL '${args.options.listUrl}'...`);
+                    }
+                    listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                 }
-            };
-            return request_1.default.post(requestOptions);
-        })
-            .then((res) => {
-            const siteScript = res.value;
-            if (!siteScript) {
-                cb(new Command_1.CommandError(`An error has occurred, the site script could not be extracted from list '${args.options.listId || args.options.listTitle}'`));
-                return;
+                else {
+                    let requestUrl = `${args.options.webUrl}/_api/web/`;
+                    if (args.options.listId) {
+                        if (this.debug) {
+                            logger.logToStderr(`Retrieving List from Id '${args.options.listId}'...`);
+                        }
+                        requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')?$expand=RootFolder`;
+                    }
+                    else if (args.options.listTitle) {
+                        if (this.debug) {
+                            logger.logToStderr(`Retrieving List from Title '${args.options.listTitle}'...`);
+                        }
+                        requestUrl += `lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')?$expand=RootFolder`;
+                    }
+                    const requestOptions = {
+                        url: requestUrl,
+                        headers: {
+                            'accept': 'application/json;odata=nometadata'
+                        },
+                        responseType: 'json'
+                    };
+                    const listInstance = yield request_1.default.get(requestOptions);
+                    listServerRelativeUrl = listInstance.RootFolder.ServerRelativeUrl;
+                }
+                const listAbsoluteUrl = urlUtil_1.urlUtil.getAbsoluteUrl(args.options.webUrl, listServerRelativeUrl);
+                const reqOptions = {
+                    url: `${args.options.webUrl}/_api/Microsoft_SharePoint_Utilities_WebTemplateExtensions_SiteScriptUtility_GetSiteScriptFromList`,
+                    headers: {
+                        'accept': 'application/json;odata=nometadata',
+                        'content-type': 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json',
+                    data: {
+                        listUrl: listAbsoluteUrl
+                    }
+                };
+                const res = yield request_1.default.post(reqOptions);
+                const siteScript = res.value;
+                if (!siteScript) {
+                    throw `An error has occurred, the site script could not be extracted from list '${args.options.listId || args.options.listTitle}'`;
+                }
+                logger.log(siteScript);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
             }
-            logger.log(siteScript);
-            cb();
-        }, (err) => {
-            this.handleRejectedODataJsonPromise(err, logger, cb);
         });
     }
 }
@@ -94,7 +102,8 @@ _SpoListSiteScriptGetCommand_instances = new WeakSet(), _SpoListSiteScriptGetCom
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
             listId: (!(!args.options.listId)).toString(),
-            listTitle: (!(!args.options.listTitle)).toString()
+            listTitle: (!(!args.options.listTitle)).toString(),
+            listUrl: (!(!args.options.listUrl)).toString()
         });
     });
 }, _SpoListSiteScriptGetCommand_initOptions = function _SpoListSiteScriptGetCommand_initOptions() {
@@ -104,26 +113,24 @@ _SpoListSiteScriptGetCommand_instances = new WeakSet(), _SpoListSiteScriptGetCom
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     });
 }, _SpoListSiteScriptGetCommand_initValidators = function _SpoListSiteScriptGetCommand_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) {
-            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.listId && args.options.listTitle) {
-            return 'Specify listId or listTitle, but not both';
-        }
-        if (!args.options.listId && !args.options.listTitle) {
-            return 'Specify listId or listTitle, one is required';
-        }
         return true;
     }));
+}, _SpoListSiteScriptGetCommand_initOptionSets = function _SpoListSiteScriptGetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['listId', 'listTitle', 'listUrl'] });
 };
 module.exports = new SpoListSiteScriptGetCommand();
 //# sourceMappingURL=list-sitescript-get.js.map