@pnp/cli-microsoft365 5.9.0-beta.c3fe008 → 5.9.0-beta.db8b86a

package/.eslintrc.js

@@ -185,7 +185,8 @@ module.exports = {
           "camelCase"
         ]
       }
-    ]
+    ],
+    "@typescript-eslint/explicit-function-return-type": ["error", { "allowExpressions": true }]
   },
   "overrides": [
     {
@@ -196,7 +197,8 @@ module.exports = {
         "no-console": "error",
         "@typescript-eslint/no-empty-function": "off",
         "cli-microsoft365/correct-command-class-name": "off",
-        "cli-microsoft365/correct-command-name": "off"
+        "cli-microsoft365/correct-command-name": "off",
+        "@typescript-eslint/explicit-function-return-type": "off"
       }
     },
     {

package/dist/m365/outlook/commands/mail/mail-send.js

@@ -132,7 +132,7 @@ _OutlookMailSendCommand_instances = new WeakSet(), _OutlookMailSendCommand_initT
         if (args.options.bodyContentType &&
             args.options.bodyContentType !== 'Text' &&
             args.options.bodyContentType !== 'HTML') {
-            return `${args.options.bodyContents} is not a valid value for the bodyContents option. Allowed values are Text|HTML`;
+            return `${args.options.bodyContentType} is not a valid value for the bodyContentType option. Allowed values are Text|HTML`;
         }
         if (args.options.saveToSentItems &&
             args.options.saveToSentItems !== 'true' &&

package/dist/m365/planner/commands/bucket/bucket-get.js

@@ -100,7 +100,7 @@ class PlannerBucketGetCommand extends GraphCommand_1.default {
             const requestOptions = {
                 url: `${this.resource}/v1.0/planner/buckets/${id}`,
                 headers: {
-                    accept: 'application/json'
+                    accept: 'application/json;odata.metadata=none'
                 },
                 responseType: 'json'
             };

package/dist/m365/pp/commands/Environment.js

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

package/dist/m365/pp/commands/environment/environment-get.js

@@ -0,0 +1,75 @@
+"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 _PpEnvironmentGetCommand_instances, _PpEnvironmentGetCommand_initTelemetry, _PpEnvironmentGetCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const PowerPlatformCommand_1 = require("../../../base/PowerPlatformCommand");
+const commands_1 = require("../../commands");
+class PpEnvironmentGetCommand extends PowerPlatformCommand_1.default {
+    constructor() {
+        super();
+        _PpEnvironmentGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _PpEnvironmentGetCommand_instances, "m", _PpEnvironmentGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _PpEnvironmentGetCommand_instances, "m", _PpEnvironmentGetCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands_1.default.ENVIRONMENT_GET;
+    }
+    get description() {
+        return 'Gets information about the specified Power Platform environment';
+    }
+    defaultProperties() {
+        return ['name', 'id'];
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            let url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/environments`;
+            if (args.options.asAdmin) {
+                url = `${this.resource}/providers/Microsoft.BusinessAppPlatform/scopes/admin/environments`;
+            }
+            const requestOptions = {
+                url: `${url}?api-version=2020-10-01`,
+                headers: {
+                    accept: 'application/json'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            const environmentItem = res.value.filter((env) => {
+                return env.name === args.options.name;
+            })[0];
+            if (!environmentItem) {
+                throw `The specified Power Platform environment does not exist`;
+            }
+            logger.log(environmentItem);
+        });
+    }
+}
+_PpEnvironmentGetCommand_instances = new WeakSet(), _PpEnvironmentGetCommand_initTelemetry = function _PpEnvironmentGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            asAdmin: !!args.options.asAdmin
+        });
+    });
+}, _PpEnvironmentGetCommand_initOptions = function _PpEnvironmentGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-n, --name <name>'
+    }, {
+        option: '-a, --asAdmin'
+    });
+};
+module.exports = new PpEnvironmentGetCommand();
+//# sourceMappingURL=environment-get.js.map

package/dist/m365/pp/commands.js

@@ -4,6 +4,7 @@ const prefix = 'pp';
 exports.default = {
     CARD_LIST: `${prefix} card list`,
     DATAVERSE_TABLE_LIST: `${prefix} dataverse table list`,
+    ENVIRONMENT_GET: `${prefix} environment get`,
     ENVIRONMENT_LIST: `${prefix} environment list`,
     GATEWAY_LIST: `${prefix} gateway list`,
     MANAGEMENTAPP_ADD: `${prefix} managementapp add`,

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

@@ -0,0 +1,168 @@
+"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 _SpoFolderRoleAssignmentRemoveCommand_instances, _SpoFolderRoleAssignmentRemoveCommand_initTelemetry, _SpoFolderRoleAssignmentRemoveCommand_initOptions, _SpoFolderRoleAssignmentRemoveCommand_initValidators;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Cli_1 = require("../../../../cli/Cli");
+const request_1 = require("../../../../request");
+const urlUtil_1 = require("../../../../utils/urlUtil");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const commands_1 = require("../../commands");
+const SpoUserGetCommand = require("../user/user-get");
+const SpoGroupGetCommand = require("../group/group-get");
+class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand_1.default {
+    constructor() {
+        super();
+        _SpoFolderRoleAssignmentRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleAssignmentRemoveCommand_instances, "m", _SpoFolderRoleAssignmentRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleAssignmentRemoveCommand_instances, "m", _SpoFolderRoleAssignmentRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoFolderRoleAssignmentRemoveCommand_instances, "m", _SpoFolderRoleAssignmentRemoveCommand_initValidators).call(this);
+    }
+    get name() {
+        return commands_1.default.FOLDER_ROLEASSIGNMENT_REMOVE;
+    }
+    get description() {
+        return 'Removes a role assignment from the specified folder';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const removeRoleAssignment = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Removing role assignment from folder in site at ${args.options.webUrl}...`);
+                }
+                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+                const requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')/ListItemAllFields`;
+                try {
+                    if (args.options.upn) {
+                        args.options.principalId = yield this.getUserPrincipalId(args.options);
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
+                    }
+                    else if (args.options.groupName) {
+                        args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
+                    }
+                    else {
+                        yield this.removeRoleAssignment(requestUrl, logger, args.options);
+                    }
+                }
+                catch (err) {
+                    this.handleRejectedODataJsonPromise(err);
+                }
+            });
+            if (args.options.confirm) {
+                yield removeRoleAssignment();
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove a role assignment from the folder with url '${args.options.folderUrl}'?`
+                });
+                if (result.continue) {
+                    yield removeRoleAssignment();
+                }
+            }
+        });
+    }
+    removeRoleAssignment(requestUrl, logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${requestUrl}/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
+                method: 'POST',
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
+    }
+    getGroupPrincipalId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const groupGetCommandOptions = {
+                webUrl: options.webUrl,
+                name: options.groupName,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) });
+            const getGroupOutput = JSON.parse(output.stdout);
+            return getGroupOutput.Id;
+        });
+    }
+    getUserPrincipalId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const userGetCommandOptions = {
+                webUrl: options.webUrl,
+                email: options.upn,
+                id: undefined,
+                output: 'json',
+                debug: this.debug,
+                verbose: this.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) });
+            const getUserOutput = JSON.parse(output.stdout);
+            return getUserOutput.Id;
+        });
+    }
+}
+_SpoFolderRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoFolderRoleAssignmentRemoveCommand_initTelemetry = function _SpoFolderRoleAssignmentRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            principalId: typeof args.options.principalId !== 'undefined',
+            upn: typeof args.options.upn !== 'undefined',
+            groupName: typeof args.options.groupName !== 'undefined',
+            confirm: (!(!args.options.confirm)).toString()
+        });
+    });
+}, _SpoFolderRoleAssignmentRemoveCommand_initOptions = function _SpoFolderRoleAssignmentRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-f, --folderUrl <folderUrl>'
+    }, {
+        option: '--principalId [principalId]'
+    }, {
+        option: '--upn [upn]'
+    }, {
+        option: '--groupName [groupName]'
+    }, {
+        option: '--confirm'
+    });
+}, _SpoFolderRoleAssignmentRemoveCommand_initValidators = function _SpoFolderRoleAssignmentRemoveCommand_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;
+        }
+        if (args.options.principalId && isNaN(args.options.principalId)) {
+            return `Specified principalId ${args.options.principalId} is not a number`;
+        }
+        const principalOptions = [args.options.principalId, args.options.upn, args.options.groupName];
+        if (principalOptions.some(item => item !== undefined) && principalOptions.filter(item => item !== undefined).length > 1) {
+            return `Specify either principalId id, upn or groupName`;
+        }
+        if (principalOptions.filter(item => item !== undefined).length === 0) {
+            return `Specify at least principalId id, upn or groupName`;
+        }
+        return true;
+    }));
+};
+module.exports = new SpoFolderRoleAssignmentRemoveCommand();
+//# sourceMappingURL=folder-roleassignment-remove.js.map

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

@@ -17,6 +17,7 @@ var _SpoListContentTypeAddCommand_instances, _SpoListContentTypeAddCommand_initT
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -39,19 +40,25 @@ class SpoListContentTypeAddCommand 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.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl);
                 logger.logToStderr(`Adding content type ${args.options.contentTypeId} to list ${list} in site at ${args.options.webUrl}...`);
             }
-            let requestUrl = '';
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/ContentTypes/AddAvailableContentType`;
+                requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
             }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/ContentTypes/AddAvailableContentType`;
+            else if (args.options.listTitle) {
+                requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
             }
-            const requestBody = this.mapRequestBody(args.options);
+            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 requestBody = {
+                contentTypeId: args.options.contentTypeId
+            };
             const requestOptions = {
-                url: requestUrl,
+                url: `${requestUrl}/ContentTypes/AddAvailableContentType`,
                 headers: {
                     'accept': 'application/json;odata=nometadata'
                 },
@@ -67,17 +74,13 @@ class SpoListContentTypeAddCommand extends SpoCommand_1.default {
             }
         });
     }
-    mapRequestBody(options) {
-        return {
-            contentTypeId: options.contentTypeId
-        };
-    }
 }
 _SpoListContentTypeAddCommand_instances = new WeakSet(), _SpoListContentTypeAddCommand_initTelemetry = function _SpoListContentTypeAddCommand_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'
         });
     });
 }, _SpoListContentTypeAddCommand_initOptions = function _SpoListContentTypeAddCommand_initOptions() {
@@ -87,6 +90,8 @@ _SpoListContentTypeAddCommand_instances = new WeakSet(), _SpoListContentTypeAddC
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-c, --contentTypeId <contentTypeId>'
     });
@@ -96,17 +101,15 @@ _SpoListContentTypeAddCommand_instances = new WeakSet(), _SpoListContentTypeAddC
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.listId) {
-            if (!validation_1.validation.isValidGuid(args.options.listId)) {
-                return `${args.options.listId} is not a valid GUID`;
-            }
+        if (args.options.listId && !validation_1.validation.isValidGuid(args.options.listId)) {
+            return `${args.options.listId} is not a valid GUID`;
         }
         return true;
     }));
 }, _SpoListContentTypeAddCommand_initTypes = function _SpoListContentTypeAddCommand_initTypes() {
     this.types.string.push('contentTypeId', 'c');
 }, _SpoListContentTypeAddCommand_initOptionSets = function _SpoListContentTypeAddCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListContentTypeAddCommand();
 //# sourceMappingURL=list-contenttype-add.js.map

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

@@ -17,6 +17,7 @@ var _SpoListContentTypeDefaultSetCommand_instances, _SpoListContentTypeDefaultSe
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -38,9 +39,17 @@ class SpoListContentTypeDefaultSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const baseUrl = args.options.listId ?
-                `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')` :
-                `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            let baseUrl = `${args.options.webUrl}/_api/web/`;
+            if (args.options.listId) {
+                baseUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                baseUrl += `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);
+                baseUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
             if (this.verbose) {
                 logger.logToStderr('Retrieving content type order...');
             }
@@ -49,7 +58,6 @@ class SpoListContentTypeDefaultSetCommand extends SpoCommand_1.default {
                 // see if the specified content type is among the registered content types
                 // if it is, it means it's visible
                 const contentTypeIndex = contentTypeOrder.findIndex(ct => ct.StringValue.toUpperCase() === args.options.contentTypeId.toUpperCase());
-                let res;
                 if (contentTypeIndex > -1) {
                     if (this.debug) {
                         logger.logToStderr(`Content type ${args.options.contentTypeId} is visible in the list`);
@@ -70,7 +78,7 @@ class SpoListContentTypeDefaultSetCommand extends SpoCommand_1.default {
                         contentTypeOrder.unshift({
                             StringValue: args.options.contentTypeId
                         });
-                        res = yield this.updateContentTypeOrder(baseUrl, contentTypeOrder);
+                        yield this.updateContentTypeOrder(baseUrl, contentTypeOrder);
                     }
                 }
                 else {
@@ -90,9 +98,8 @@ class SpoListContentTypeDefaultSetCommand extends SpoCommand_1.default {
                     contentTypeOrder.unshift({
                         StringValue: args.options.contentTypeId
                     });
-                    res = yield this.updateContentTypeOrder(baseUrl, contentTypeOrder);
+                    yield this.updateContentTypeOrder(baseUrl, contentTypeOrder);
                 }
-                logger.log(res);
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -100,64 +107,67 @@ class SpoListContentTypeDefaultSetCommand extends SpoCommand_1.default {
         });
     }
     getContentTypeOrder(baseUrl, logger) {
-        const requestOptions = {
-            url: `${baseUrl}/RootFolder?$select=ContentTypeOrder,UniqueContentTypeOrder`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(contentTypeOrder => {
-            let uniqueContentTypeOrder = contentTypeOrder.ContentTypeOrder;
-            if (contentTypeOrder.UniqueContentTypeOrder !== null) {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${baseUrl}/RootFolder?$select=ContentTypeOrder,UniqueContentTypeOrder`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            let uniqueContentTypeOrder = response.ContentTypeOrder;
+            if (response.UniqueContentTypeOrder !== null) {
                 if (this.debug) {
                     logger.logToStderr('Using unique content type order');
                 }
-                uniqueContentTypeOrder = contentTypeOrder.UniqueContentTypeOrder;
+                uniqueContentTypeOrder = response.UniqueContentTypeOrder;
             }
             else {
                 if (this.debug) {
                     logger.logToStderr('Unique content type order not defined. Using content type order');
                 }
             }
-            return Promise.resolve(uniqueContentTypeOrder);
-        }, err => Promise.reject(err));
+            return uniqueContentTypeOrder;
+        });
     }
     updateContentTypeOrder(baseUrl, contentTypeOrder) {
-        const requestOptions = {
-            url: `${baseUrl}/RootFolder`,
-            headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json;odata=nometadata',
-                'x-http-method': 'MERGE'
-            },
-            data: {
-                UniqueContentTypeOrder: contentTypeOrder
-            },
-            responseType: 'json'
-        };
-        return request_1.default.post(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${baseUrl}/RootFolder`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json;odata=nometadata',
+                    'x-http-method': 'MERGE'
+                },
+                data: {
+                    UniqueContentTypeOrder: contentTypeOrder
+                },
+                responseType: 'json'
+            };
+            yield request_1.default.post(requestOptions);
+        });
     }
     getListContentTypes(baseUrl) {
-        const requestOptions = {
-            url: `${baseUrl}/ContentTypes?$select=Id`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(contentTypes => contentTypes.value.map(ct => ct.Id.StringValue), err => Promise.reject(err));
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${baseUrl}/ContentTypes?$select=Id`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            return response.value.map(ct => ct.Id.StringValue);
+        });
     }
 }
 _SpoListContentTypeDefaultSetCommand_instances = new WeakSet(), _SpoListContentTypeDefaultSetCommand_initTelemetry = function _SpoListContentTypeDefaultSetCommand_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'
         });
     });
 }, _SpoListContentTypeDefaultSetCommand_initOptions = function _SpoListContentTypeDefaultSetCommand_initOptions() {
@@ -167,6 +177,8 @@ _SpoListContentTypeDefaultSetCommand_instances = new WeakSet(), _SpoListContentT
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-c, --contentTypeId <contentTypeId>'
     });
@@ -186,7 +198,7 @@ _SpoListContentTypeDefaultSetCommand_instances = new WeakSet(), _SpoListContentT
 }, _SpoListContentTypeDefaultSetCommand_initTypes = function _SpoListContentTypeDefaultSetCommand_initTypes() {
     this.types.string.push('contentTypeId', 'c');
 }, _SpoListContentTypeDefaultSetCommand_initOptionSets = function _SpoListContentTypeDefaultSetCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListContentTypeDefaultSetCommand();
 //# sourceMappingURL=list-contenttype-default-set.js.map

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

@@ -17,6 +17,7 @@ var _SpoListContentTypeListCommand_instances, _SpoListContentTypeListCommand_ini
 Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
@@ -41,18 +42,22 @@ class SpoListContentTypeListCommand 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.listId : args.options.listTitle ? args.options.listTitle : args.options.listUrl);
                 logger.logToStderr(`Retrieving content types information for list ${list} in site at ${args.options.webUrl}...`);
             }
-            let requestUrl = '';
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
             if (args.options.listId) {
-                requestUrl = `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')/ContentTypes`;
+                requestUrl += `lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
             }
-            else {
-                requestUrl = `${args.options.webUrl}/_api/web/lists/GetByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/ContentTypes`;
+            else if (args.options.listTitle) {
+                requestUrl += `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
             }
             const requestOptions = {
-                url: requestUrl,
+                url: `${requestUrl}/ContentTypes`,
                 method: 'GET',
                 headers: {
                     'accept': 'application/json;odata=nometadata'
@@ -73,7 +78,8 @@ _SpoListContentTypeListCommand_instances = new WeakSet(), _SpoListContentTypeLis
     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'
         });
     });
 }, _SpoListContentTypeListCommand_initOptions = function _SpoListContentTypeListCommand_initOptions() {
@@ -83,6 +89,8 @@ _SpoListContentTypeListCommand_instances = new WeakSet(), _SpoListContentTypeLis
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     });
 }, _SpoListContentTypeListCommand_initValidators = function _SpoListContentTypeListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -98,7 +106,7 @@ _SpoListContentTypeListCommand_instances = new WeakSet(), _SpoListContentTypeLis
         return true;
     }));
 }, _SpoListContentTypeListCommand_initOptionSets = function _SpoListContentTypeListCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListContentTypeListCommand();
 //# sourceMappingURL=list-contenttype-list.js.map