@pnp/cli-microsoft365 6.0.0-beta.62647c9 → 6.0.0-beta.636d726

package/dist/m365/aad/commands/user/user-guest-add.js

@@ -0,0 +1,103 @@
+"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 _AadUserGuestAddCommand_instances, _AadUserGuestAddCommand_initTelemetry, _AadUserGuestAddCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class AadUserGuestAddCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _AadUserGuestAddCommand_instances.add(this);
+        __classPrivateFieldGet(this, _AadUserGuestAddCommand_instances, "m", _AadUserGuestAddCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _AadUserGuestAddCommand_instances, "m", _AadUserGuestAddCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands_1.default.USER_GUEST_ADD;
+    }
+    get description() {
+        return 'Invite an external user to the organization';
+    }
+    defaultProperties() {
+        return ['id', 'inviteRedeemUrl', 'invitedUserDisplayName', 'invitedUserEmailAddress', 'invitedUserType', 'resetRedemption', 'sendInvitationMessage', 'status'];
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/invitations`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json',
+                    data: {
+                        invitedUserEmailAddress: args.options.emailAddress,
+                        inviteRedirectUrl: args.options.inviteRedirectUrl || 'https://myapplications.microsoft.com',
+                        invitedUserDisplayName: args.options.displayName,
+                        sendInvitationMessage: args.options.sendInvitationMessage,
+                        invitedUserMessageInfo: {
+                            customizedMessageBody: args.options.welcomeMessage,
+                            messageLanguage: args.options.messageLanguage || 'en-US',
+                            ccRecipients: args.options.ccRecipients ? this.mapEmailsToRecipients([args.options.ccRecipients]) : undefined
+                        }
+                    }
+                };
+                const result = yield request_1.default.post(requestOptions);
+                logger.log(result);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    mapEmailsToRecipients(emails) {
+        return emails.map(mail => ({
+            emailAddress: {
+                address: mail.trim()
+            }
+        }));
+    }
+}
+_AadUserGuestAddCommand_instances = new WeakSet(), _AadUserGuestAddCommand_initTelemetry = function _AadUserGuestAddCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            displayName: typeof args.options.displayName !== 'undefined',
+            inviteRedirectUrl: typeof args.options.inviteRedirectUrl !== 'undefined',
+            welcomeMessage: typeof args.options.welcomeMessage !== 'undefined',
+            messageLanguage: typeof args.options.messageLanguage !== 'undefined',
+            ccRecipients: typeof args.options.ccRecipients !== 'undefined',
+            sendInvitationMessage: !!args.options.sendInvitationMessage
+        });
+    });
+}, _AadUserGuestAddCommand_initOptions = function _AadUserGuestAddCommand_initOptions() {
+    this.options.unshift({
+        option: '--emailAddress <emailAddress>'
+    }, {
+        option: '--displayName [displayName]'
+    }, {
+        option: '--inviteRedirectUrl [inviteRedirectUrl]'
+    }, {
+        option: '--welcomeMessage [welcomeMessage]'
+    }, {
+        option: '--messageLanguage [messageLanguage]'
+    }, {
+        option: '--ccRecipients [ccRecipients]'
+    }, {
+        option: '--sendInvitationMessage'
+    });
+};
+module.exports = new AadUserGuestAddCommand();
+//# sourceMappingURL=user-guest-add.js.map

package/dist/m365/aad/commands.js

@@ -54,6 +54,7 @@ exports.default = {
     SP_ADD: `${prefix} sp add`,
     SP_GET: `${prefix} sp get`,
     USER_GET: `${prefix} user get`,
+    USER_GUEST_ADD: `${prefix} user guest add`,
     USER_HIBP: `${prefix} user hibp`,
     USER_LIST: `${prefix} user list`,
     USER_PASSWORD_VALIDATE: `${prefix} user password validate`,

package/dist/m365/outlook/commands/message/message-get.js

@@ -0,0 +1,97 @@
+"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 _OutlookMessageGetCommand_instances, _OutlookMessageGetCommand_initTelemetry, _OutlookMessageGetCommand_initOptions;
+Object.defineProperty(exports, "__esModule", { value: true });
+const Auth_1 = require("../../../../Auth");
+const request_1 = require("../../../../request");
+const GraphCommand_1 = require("../../../base/GraphCommand");
+const commands_1 = require("../../commands");
+class OutlookMessageGetCommand extends GraphCommand_1.default {
+    constructor() {
+        super();
+        _OutlookMessageGetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _OutlookMessageGetCommand_instances, "m", _OutlookMessageGetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _OutlookMessageGetCommand_instances, "m", _OutlookMessageGetCommand_initOptions).call(this);
+    }
+    get name() {
+        return commands_1.default.MESSAGE_GET;
+    }
+    get description() {
+        return 'Retrieves specified message';
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            try {
+                const isAppOnlyAuth = Auth_1.Auth.isAppOnlyAuth(Auth_1.default.service.accessTokens[this.resource].accessToken);
+                if (this.verbose) {
+                    logger.logToStderr(`Retrieving message with id ${args.options.id} using ${isAppOnlyAuth ? 'app only permissions' : 'delegated permissions'}`);
+                }
+                let requestUrl = '';
+                if (isAppOnlyAuth) {
+                    if (!args.options.userId && !args.options.userPrincipalName) {
+                        throw `The option 'userId' or 'userPrincipalName' is required when retrieving an email using app only credentials`;
+                    }
+                    if (args.options.userId && args.options.userPrincipalName) {
+                        throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using app only credentials`;
+                    }
+                    requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                }
+                else {
+                    if (args.options.userId && args.options.userPrincipalName) {
+                        throw `Both options 'userId' and 'userPrincipalName' cannot be set when retrieving an email using delegated credentials`;
+                    }
+                    if (args.options.userId || args.options.userPrincipalName) {
+                        requestUrl += `users/${args.options.userId ? args.options.userId : args.options.userPrincipalName}`;
+                    }
+                    else {
+                        requestUrl += 'me';
+                    }
+                }
+                requestUrl += `/messages/${args.options.id}`;
+                const requestOptions = {
+                    url: `${this.resource}/v1.0/${requestUrl}`,
+                    headers: {
+                        accept: 'application/json;odata.metadata=none'
+                    },
+                    responseType: 'json'
+                };
+                const res = yield request_1.default.get(requestOptions);
+                logger.log(res);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_OutlookMessageGetCommand_instances = new WeakSet(), _OutlookMessageGetCommand_initTelemetry = function _OutlookMessageGetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            userId: typeof args.options.userId !== 'undefined',
+            userPrincipalName: typeof args.options.userPrincipalName !== 'undefined'
+        });
+    });
+}, _OutlookMessageGetCommand_initOptions = function _OutlookMessageGetCommand_initOptions() {
+    this.options.unshift({
+        option: '-i, --id <id>'
+    }, {
+        option: '--userId [userId]'
+    }, {
+        option: '--userPrincipalName [userPrincipalName]'
+    });
+};
+module.exports = new OutlookMessageGetCommand();
+//# sourceMappingURL=message-get.js.map

package/dist/m365/outlook/commands.js

@@ -3,6 +3,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const prefix = 'outlook';
 exports.default = {
     MAIL_SEND: `${prefix} mail send`,
+    MESSAGE_GET: `${prefix} message get`,
     MESSAGE_LIST: `${prefix} message list`,
     MESSAGE_MOVE: `${prefix} message move`,
     REPORT_MAILACTIVITYCOUNTS: `${prefix} report mailactivitycounts`,

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

@@ -18,6 +18,7 @@ Object.defineProperty(exports, "__esModule", { value: true });
 const request_1 = require("../../../../request");
 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");
@@ -38,9 +39,20 @@ class SpoFieldAddCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __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 reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/${(args.options.listTitle ? `lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')/` : '')}fields/CreateFieldAsXml`,
+                    url: `${requestUrl}/fields/CreateFieldAsXml`,
                     headers: {
                         'X-RequestDigest': reqDigest.FormDigestValue,
                         accept: 'application/json;odata=nometadata'
@@ -99,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'
         });
     });
@@ -107,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>'
     }, {
@@ -118,6 +136,13 @@ _SpoFieldAddCommand_instances = new WeakSet(), _SpoFieldAddCommand_initTelemetry
         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'];

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

@@ -19,6 +19,7 @@ const config_1 = require("../../../../config");
 const request_1 = require("../../../../request");
 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");
@@ -45,23 +46,27 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
             try {
                 const reqDigest = yield spo_1.spo.getRequestDigest(args.options.webUrl);
                 const requestDigest = reqDigest.FormDigestValue;
-                let list = undefined;
-                if (args.options.listId || args.options.listTitle) {
-                    const listQuery = args.options.listId ?
-                        `<Method Id="663" ParentId="7" Name="GetById"><Parameters><Parameter Type="Guid">${formatting_1.formatting.escapeXml(args.options.listId)}</Parameter></Parameters></Method>` :
-                        `<Method Id="663" ParentId="7" Name="GetByTitle"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.listTitle)}</Parameter></Parameters></Method>`;
+                let fieldsParentIdentity = '<Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" />';
+                if (args.options.listId || args.options.listTitle || args.options.listUrl) {
+                    let requestData = '';
+                    if (args.options.listId) {
+                        requestData = `<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="664" ObjectPathId="663" /><Query Id="665" ObjectPathId="663"><Query SelectAllProperties="false"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="663" ParentId="7" Name="GetById"><Parameters><Parameter Type="Guid">${formatting_1.formatting.escapeXml(args.options.listId)}</Parameter></Parameters></Method><Property Id="7" ParentId="5" Name="Lists" /><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`;
+                    }
+                    else if (args.options.listTitle) {
+                        requestData = `<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="664" ObjectPathId="663" /><Query Id="665" ObjectPathId="663"><Query SelectAllProperties="false"><Properties /></Query></Query></Actions><ObjectPaths><Method Id="663" ParentId="7" Name="GetByTitle"><Parameters><Parameter Type="String">${formatting_1.formatting.escapeXml(args.options.listTitle)}</Parameter></Parameters></Method><Property Id="7" ParentId="5" Name="Lists" /><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`;
+                    }
+                    else if (args.options.listUrl) {
+                        const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                        requestData = `<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="2" ObjectPathId="1" /><ObjectPath Id="4" ObjectPathId="3" /><ObjectPath Id="6" ObjectPathId="5" /><Query Id="7" ObjectPathId="5"><Query SelectAllProperties="true"><Properties /></Query></Query></Actions><ObjectPaths><StaticProperty Id="1" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /><Property Id="3" ParentId="1" Name="Web" /><Method Id="5" ParentId="3" Name="GetList"><Parameters><Parameter Type="String">${listServerRelativeUrl}</Parameter></Parameters></Method></ObjectPaths></Request>`;
+                    }
                     const requestOptions = {
                         url: `${args.options.webUrl}/_vti_bin/client.svc/ProcessQuery`,
                         headers: {
                             'X-RequestDigest': requestDigest
                         },
-                        data: `<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="664" ObjectPathId="663" /><Query Id="665" ObjectPathId="663"><Query SelectAllProperties="false"><Properties /></Query></Query></Actions><ObjectPaths>${listQuery}<Property Id="7" ParentId="5" Name="Lists" /><Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" /></ObjectPaths></Request>`
+                        data: requestData
                     };
-                    list = yield request_1.default.post(requestOptions);
-                }
-                // by default retrieve the column from the site
-                let fieldsParentIdentity = '<Property Id="5" ParentId="3" Name="Web" /><StaticProperty Id="3" TypeId="{3747adcd-a3c3-41b9-bfab-4a64dd2f1e0a}" Name="Current" />';
-                if (list) {
+                    const list = yield request_1.default.post(requestOptions);
                     const json = JSON.parse(list);
                     const response = json[0];
                     if (response.ErrorInfo) {
@@ -113,6 +118,7 @@ class SpoFieldSetCommand extends SpoCommand_1.default {
             'webUrl',
             'listId',
             'listTitle',
+            'listUrl',
             'id',
             'title',
             'updateExistingLists',
@@ -134,6 +140,7 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
             title: typeof args.options.title !== 'undefined',
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             updateExistingLists: !!args.options.updateExistingLists
         });
     });
@@ -144,6 +151,8 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-i, --id [id]'
     }, {
@@ -157,8 +166,9 @@ _SpoFieldSetCommand_instances = new WeakSet(), _SpoFieldSetCommand_initTelemetry
         if (isValidSharePointUrl !== true) {
             return isValidSharePointUrl;
         }
-        if (args.options.listId && args.options.listTitle) {
-            return `Specify listId or listTitle but not both`;
+        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)) {

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

@@ -20,6 +20,7 @@ const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const commands_1 = require("../../commands");
 class SpoFolderRoleInheritanceBreakCommand extends SpoCommand_1.default {
     constructor() {
@@ -38,10 +39,19 @@ class SpoFolderRoleInheritanceBreakCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const keepExistingPermissions = !args.options.clearExistingPermissions;
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+            const roleFolderUrl = urlUtil_1.urlUtil.getWebRelativePath(args.options.webUrl, args.options.folderUrl);
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
             const breakFolderRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
                 try {
+                    if (roleFolderUrl.split('/').length === 2) {
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                    }
+                    else {
+                        requestUrl += `GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')/ListItemAllFields`;
+                    }
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(args.options.folderUrl)}')/ListItemAllFields/breakroleinheritance(${keepExistingPermissions})`,
+                        url: `${requestUrl}/breakroleinheritance(${keepExistingPermissions})`,
                         headers: {
                             accept: 'application/json'
                         },

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

@@ -16,9 +16,11 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 var _SpoFolderRoleInheritanceResetCommand_instances, _SpoFolderRoleInheritanceResetCommand_initTelemetry, _SpoFolderRoleInheritanceResetCommand_initOptions, _SpoFolderRoleInheritanceResetCommand_initValidators;
 Object.defineProperty(exports, "__esModule", { value: true });
 const Cli_1 = require("../../../../cli/Cli");
+const formatting_1 = require("../../../../utils/formatting");
 const request_1 = require("../../../../request");
 const validation_1 = require("../../../../utils/validation");
 const SpoCommand_1 = require("../../../base/SpoCommand");
+const urlUtil_1 = require("../../../../utils/urlUtil");
 const commands_1 = require("../../commands");
 class SpoFolderRoleInheritanceResetCommand extends SpoCommand_1.default {
     constructor() {
@@ -36,10 +38,19 @@ class SpoFolderRoleInheritanceResetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.folderUrl);
+            const roleFolderUrl = urlUtil_1.urlUtil.getWebRelativePath(args.options.webUrl, args.options.folderUrl);
+            let requestUrl = `${args.options.webUrl}/_api/web/`;
             const resetFolderRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
                 try {
+                    if (roleFolderUrl.split('/').length === 2) {
+                        requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+                    }
+                    else {
+                        requestUrl += `GetFolderByServerRelativeUrl('${encodeURIComponent(serverRelativeUrl)}')/ListItemAllFields`;
+                    }
                     const requestOptions = {
-                        url: `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${args.options.folderUrl}')/ListItemAllFields/resetroleinheritance`,
+                        url: `${requestUrl}/resetroleinheritance`,
                         headers: {
                             accept: 'application/json;odata=nometadata'
                         },

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

@@ -44,18 +44,24 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             try {
-                const listIdArgument = args.options.listId || '';
-                const listTitleArgument = args.options.listTitle || '';
-                const listRestUrl = (args.options.listId ?
-                    `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(listIdArgument)}')`
-                    : `${args.options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
+                let requestUrl = `${args.options.webUrl}/_api/web`;
+                if (args.options.listId) {
+                    requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+                }
+                else if (args.options.listTitle) {
+                    requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+                }
+                else if (args.options.listUrl) {
+                    const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                    requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+                }
                 let contentTypeName = '';
                 let targetFolderServerRelativeUrl = '';
                 if (this.verbose) {
-                    logger.logToStderr(`Getting content types for list...`);
+                    logger.logToStderr(`Getting content types for list ${args.options.listId || args.options.listTitle || args.options.listUrl}...`);
                 }
                 let requestOptions = {
-                    url: `${listRestUrl}/contenttypes?$select=Name,Id`,
+                    url: `${requestUrl}/contenttypes?$select=Name,Id`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -90,7 +96,7 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
                         logger.logToStderr('setting up folder lookup response ...');
                     }
                     requestOptions = {
-                        url: `${listRestUrl}/rootFolder`,
+                        url: `${requestUrl}/rootFolder`,
                         headers: {
                             'accept': 'application/json;odata=nometadata'
                         },
@@ -101,7 +107,7 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
                     yield spo_1.spo.ensureFolder(args.options.webUrl, targetFolderServerRelativeUrl, logger, this.debug);
                 }
                 if (this.verbose) {
-                    logger.logToStderr(`Creating item in list ${args.options.listId || args.options.listTitle} in site ${args.options.webUrl}...`);
+                    logger.logToStderr(`Creating item in list ${args.options.listId || args.options.listTitle || args.options.listUrl} in site ${args.options.webUrl}...`);
                 }
                 const requestBody = {
                     formValues: this.mapRequestBody(args.options)
@@ -123,7 +129,7 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
                     });
                 }
                 requestOptions = {
-                    url: `${listRestUrl}/AddValidateUpdateItemUsingPath()`,
+                    url: `${requestUrl}/AddValidateUpdateItemUsingPath()`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -142,10 +148,10 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
                     logger.logToStderr(`Id returned by AddValidateUpdateItemUsingPath: ${idField}`);
                 }
                 if (idField.length === 0) {
-                    return Promise.reject(`Item didn't add successfully`);
+                    throw `Item didn't add successfully`;
                 }
                 requestOptions = {
-                    url: `${listRestUrl}/items(${idField[0].FieldValue})`,
+                    url: `${requestUrl}/items(${idField[0].FieldValue})`,
                     headers: {
                         'accept': 'application/json;odata=nometadata'
                     },
@@ -164,6 +170,7 @@ class SpoListItemAddCommand extends SpoCommand_1.default {
         const excludeOptions = [
             'listTitle',
             'listId',
+            'listUrl',
             'webUrl',
             'contentType',
             'folder',
@@ -184,6 +191,7 @@ _SpoListItemAddCommand_instances = new WeakSet(), _SpoListItemAddCommand_initTel
         Object.assign(this.telemetryProperties, {
             listId: typeof args.options.listId !== 'undefined',
             listTitle: typeof args.options.listTitle !== 'undefined',
+            listUrl: typeof args.options.listUrl !== 'undefined',
             contentType: typeof args.options.contentType !== 'undefined',
             folder: typeof args.options.folder !== 'undefined'
         });
@@ -195,6 +203,8 @@ _SpoListItemAddCommand_instances = new WeakSet(), _SpoListItemAddCommand_initTel
         option: '-l, --listId [listId]'
     }, {
         option: '-t, --listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     }, {
         option: '-c, --contentType [contentType]'
     }, {
@@ -213,9 +223,9 @@ _SpoListItemAddCommand_instances = new WeakSet(), _SpoListItemAddCommand_initTel
         return true;
     }));
 }, _SpoListItemAddCommand_initTypes = function _SpoListItemAddCommand_initTypes() {
-    this.types.string.push('webUrl', 'listId', 'listTitle', 'contentType', 'folder');
+    this.types.string.push('webUrl', 'listId', 'listTitle', 'listUrl', 'contentType', 'folder');
 }, _SpoListItemAddCommand_initOptionSets = function _SpoListItemAddCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListItemAddCommand();
 //# sourceMappingURL=listitem-add.js.map

package/dist/m365/spo/commands/listitem/listitem-attachment-list.js

@@ -17,6 +17,7 @@ var _SpoListItemAttachmentListCommand_instances, _SpoListItemAttachmentListComma
 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");
@@ -40,13 +41,19 @@ class SpoListItemAttachmentListCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const listIdArgument = args.options.listId || '';
-            const listTitleArgument = args.options.listTitle || '';
-            const listRestUrl = (args.options.listId ?
-                `${args.options.webUrl}/_api/web/lists(guid'${formatting_1.formatting.encodeQueryParameter(listIdArgument)}')`
-                : `${args.options.webUrl}/_api/web/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(listTitleArgument)}')`);
+            let requestUrl = `${args.options.webUrl}/_api/web`;
+            if (args.options.listId) {
+                requestUrl += `/lists(guid'${formatting_1.formatting.encodeQueryParameter(args.options.listId)}')`;
+            }
+            else if (args.options.listTitle) {
+                requestUrl += `/lists/getByTitle('${formatting_1.formatting.encodeQueryParameter(args.options.listTitle)}')`;
+            }
+            else if (args.options.listUrl) {
+                const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
+                requestUrl += `/GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')`;
+            }
             const requestOptions = {
-                url: `${listRestUrl}/items(${args.options.itemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
+                url: `${requestUrl}/items(${args.options.itemId})?$select=AttachmentFiles&$expand=AttachmentFiles`,
                 method: 'GET',
                 headers: {
                     'accept': 'application/json;odata=nometadata'
@@ -74,7 +81,8 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
     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'
         });
     });
 }, _SpoListItemAttachmentListCommand_initOptions = function _SpoListItemAttachmentListCommand_initOptions() {
@@ -86,6 +94,8 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
         option: '--listId [listId]'
     }, {
         option: '--listTitle [listTitle]'
+    }, {
+        option: '--listUrl [listUrl]'
     });
 }, _SpoListItemAttachmentListCommand_initValidators = function _SpoListItemAttachmentListCommand_initValidators() {
     this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
@@ -102,7 +112,7 @@ _SpoListItemAttachmentListCommand_instances = new WeakSet(), _SpoListItemAttachm
         return true;
     }));
 }, _SpoListItemAttachmentListCommand_initOptionSets = function _SpoListItemAttachmentListCommand_initOptionSets() {
-    this.optionSets.push(['listId', 'listTitle']);
+    this.optionSets.push(['listId', 'listTitle', 'listUrl']);
 };
 module.exports = new SpoListItemAttachmentListCommand();
 //# sourceMappingURL=listitem-attachment-list.js.map