@pnp/cli-microsoft365 6.3.0 → 6.4.0-beta.140530d

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

@@ -0,0 +1,146 @@
+"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 _SpoCommandSetRemoveCommand_instances, _SpoCommandSetRemoveCommand_initTelemetry, _SpoCommandSetRemoveCommand_initOptions, _SpoCommandSetRemoveCommand_initValidators, _SpoCommandSetRemoveCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const commands_1 = require("../../commands");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+const Cli_1 = require("../../../../cli/Cli");
+class SpoCommandSetRemoveCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.COMMANDSET_REMOVE;
+    }
+    get description() {
+        return 'Remove a ListView Command Set that is added to a site.';
+    }
+    constructor() {
+        super();
+        _SpoCommandSetRemoveCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoCommandSetRemoveCommand_instances, "m", _SpoCommandSetRemoveCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoCommandSetRemoveCommand_instances, "m", _SpoCommandSetRemoveCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoCommandSetRemoveCommand_instances, "m", _SpoCommandSetRemoveCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoCommandSetRemoveCommand_instances, "m", _SpoCommandSetRemoveCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing ListView Command Set ${args.options.clientSideComponentId || args.options.title || args.options.id} to site '${args.options.webUrl}'...`);
+            }
+            if (args.options.confirm) {
+                yield this.deleteCommandset(args);
+            }
+            else {
+                const result = yield Cli_1.Cli.prompt({
+                    type: 'confirm',
+                    name: 'continue',
+                    default: false,
+                    message: `Are you sure you want to remove command set '${args.options.clientSideComponentId || args.options.title || args.options.id}'?`
+                });
+                if (result.continue) {
+                    yield this.deleteCommandset(args);
+                }
+            }
+        });
+    }
+    getCommandSetId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.id) {
+                return options.id;
+            }
+            let commandSets = [];
+            if (options.title) {
+                commandSets = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `(Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}') and (startswith(Location,'ClientSideExtension.ListViewCommandSet'))`);
+            }
+            else {
+                commandSets = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `(ClientSideComponentId eq guid'${options.clientSideComponentId}') and (startswith(Location,'ClientSideExtension.ListViewCommandSet'))`);
+            }
+            if (commandSets.length === 0) {
+                throw `No user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found`;
+            }
+            if (commandSets.length > 1) {
+                throw `Multiple user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found. Please disambiguate using IDs: ${commandSets.map((commandSet) => commandSet.Id).join(', ')}`;
+            }
+            return commandSets[0].Id;
+        });
+    }
+    deleteCommandset(args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!args.options.scope) {
+                args.options.scope = 'Site';
+            }
+            try {
+                const id = yield this.getCommandSetId(args.options);
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/${args.options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(id)}')`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata'
+                    },
+                    responseType: 'json'
+                };
+                yield request_1.default.delete(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+}
+_SpoCommandSetRemoveCommand_instances = new WeakSet(), _SpoCommandSetRemoveCommand_initTelemetry = function _SpoCommandSetRemoveCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            title: typeof args.options.title !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined',
+            confirm: !!args.options.confirm
+        });
+    });
+}, _SpoCommandSetRemoveCommand_initOptions = function _SpoCommandSetRemoveCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-c, --clientSideComponentId  [clientSideComponentId]'
+    }, {
+        option: '-s, --scope [scope]', autocomplete: SpoCommandSetRemoveCommand.scopes
+    }, {
+        option: '--confirm'
+    });
+}, _SpoCommandSetRemoveCommand_initValidators = function _SpoCommandSetRemoveCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
+            return `${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        if (args.options.scope && SpoCommandSetRemoveCommand.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${SpoCommandSetRemoveCommand.scopes.join(', ')}`;
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+}, _SpoCommandSetRemoveCommand_initOptionSets = function _SpoCommandSetRemoveCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title', 'clientSideComponentId'] });
+};
+SpoCommandSetRemoveCommand.scopes = ['All', 'Site', 'Web'];
+module.exports = new SpoCommandSetRemoveCommand();
+//# sourceMappingURL=commandset-remove.js.map

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

@@ -0,0 +1,182 @@
+"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 _SpoCommandSetSetCommand_instances, _SpoCommandSetSetCommand_initTelemetry, _SpoCommandSetSetCommand_initOptions, _SpoCommandSetSetCommand_initValidators, _SpoCommandSetSetCommand_initOptionSets;
+Object.defineProperty(exports, "__esModule", { value: true });
+const commands_1 = require("../../commands");
+const validation_1 = require("../../../../utils/validation");
+const SpoCommand_1 = require("../../../base/SpoCommand");
+const request_1 = require("../../../../request");
+const formatting_1 = require("../../../../utils/formatting");
+const spo_1 = require("../../../../utils/spo");
+class SpoCommandSetSetCommand extends SpoCommand_1.default {
+    get name() {
+        return commands_1.default.COMMANDSET_SET;
+    }
+    get description() {
+        return 'Updates a ListView Command Set on a site.';
+    }
+    constructor() {
+        super();
+        _SpoCommandSetSetCommand_instances.add(this);
+        __classPrivateFieldGet(this, _SpoCommandSetSetCommand_instances, "m", _SpoCommandSetSetCommand_initTelemetry).call(this);
+        __classPrivateFieldGet(this, _SpoCommandSetSetCommand_instances, "m", _SpoCommandSetSetCommand_initOptions).call(this);
+        __classPrivateFieldGet(this, _SpoCommandSetSetCommand_instances, "m", _SpoCommandSetSetCommand_initValidators).call(this);
+        __classPrivateFieldGet(this, _SpoCommandSetSetCommand_instances, "m", _SpoCommandSetSetCommand_initOptionSets).call(this);
+    }
+    commandAction(logger, args) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Updating ListView Command Set ${args.options.clientSideComponentId} to site '${args.options.webUrl}'...`);
+            }
+            if (!args.options.scope) {
+                args.options.scope = 'Site';
+            }
+            const location = this.getLocation(args.options.location ? args.options.location : '');
+            try {
+                const requestBody = {};
+                if (args.options.newTitle) {
+                    requestBody.Title = args.options.newTitle;
+                }
+                if (args.options.location) {
+                    requestBody.Location = location;
+                }
+                if (args.options.listType) {
+                    requestBody.RegistrationId = this.getListTemplate(args.options.listType);
+                }
+                if (args.options.clientSideComponentProperties) {
+                    requestBody.ClientSideComponentProperties = args.options.clientSideComponentProperties;
+                }
+                const id = yield this.getCommandSetId(args.options);
+                const requestOptions = {
+                    url: `${args.options.webUrl}/_api/${args.options.scope}/UserCustomActions('${formatting_1.formatting.encodeQueryParameter(id)}')`,
+                    headers: {
+                        accept: 'application/json;odata=nometadata',
+                        'X-HTTP-Method': 'MERGE'
+                    },
+                    data: requestBody,
+                    responseType: 'json'
+                };
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
+    getCommandSetId(options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (options.id) {
+                return options.id;
+            }
+            let commandSets = [];
+            if (options.title) {
+                commandSets = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `(Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}') and (startswith(Location,'ClientSideExtension.ListViewCommandSet'))`);
+            }
+            else {
+                commandSets = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `(ClientSideComponentId eq guid'${options.clientSideComponentId}') and (startswith(Location,'ClientSideExtension.ListViewCommandSet'))`);
+            }
+            if (commandSets.length === 0) {
+                throw `No user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found`;
+            }
+            if (commandSets.length > 1) {
+                throw `Multiple user commandsets with ${options.title ? `title '${options.title}'` : `ClientSideComponentId '${options.clientSideComponentId}'`} found. Please disambiguate using IDs: ${commandSets.map((commandSet) => commandSet.Id).join(', ')}`;
+            }
+            return commandSets[0].Id;
+        });
+    }
+    getLocation(location) {
+        switch (location) {
+            case 'Both':
+                return 'ClientSideExtension.ListViewCommandSet';
+            case 'ContextMenu':
+                return 'ClientSideExtension.ListViewCommandSet.ContextMenu';
+            default:
+                return 'ClientSideExtension.ListViewCommandSet.CommandBar';
+        }
+    }
+    getListTemplate(listTemplate) {
+        switch (listTemplate) {
+            case 'SitePages':
+                return '119';
+            case 'Library':
+                return '101';
+            default:
+                return '100';
+        }
+    }
+}
+_SpoCommandSetSetCommand_instances = new WeakSet(), _SpoCommandSetSetCommand_initTelemetry = function _SpoCommandSetSetCommand_initTelemetry() {
+    this.telemetry.push((args) => {
+        Object.assign(this.telemetryProperties, {
+            title: typeof args.options.title !== 'undefined',
+            id: typeof args.options.id !== 'undefined',
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
+            listType: typeof args.options.listType !== 'undefined',
+            clientSideComponentProperties: typeof args.options.clientSideComponentProperties !== 'undefined',
+            scope: typeof args.options.scope !== 'undefined',
+            location: typeof args.options.location !== 'undefined'
+        });
+    });
+}, _SpoCommandSetSetCommand_initOptions = function _SpoCommandSetSetCommand_initOptions() {
+    this.options.unshift({
+        option: '-u, --webUrl <webUrl>'
+    }, {
+        option: '-t, --title [title]'
+    }, {
+        option: '-i, --id [id]'
+    }, {
+        option: '-c, --clientSideComponentId  [clientSideComponentId]'
+    }, {
+        option: '--newTitle [newTitle]'
+    }, {
+        option: '-l, --listType [listType]', autocomplete: SpoCommandSetSetCommand.listTypes
+    }, {
+        option: '--clientSideComponentProperties  [clientSideComponentProperties]'
+    }, {
+        option: '-s, --scope [scope]', autocomplete: SpoCommandSetSetCommand.scopes
+    }, {
+        option: '--location [location]', autocomplete: SpoCommandSetSetCommand.locations
+    });
+}, _SpoCommandSetSetCommand_initValidators = function _SpoCommandSetSetCommand_initValidators() {
+    this.validators.push((args) => __awaiter(this, void 0, void 0, function* () {
+        if (args.options.id && !validation_1.validation.isValidGuid(args.options.id)) {
+            return `${args.options.id} is not a valid GUID`;
+        }
+        if (args.options.clientSideComponentId && !validation_1.validation.isValidGuid(args.options.clientSideComponentId)) {
+            return `${args.options.clientSideComponentId} is not a valid GUID`;
+        }
+        if (args.options.listType && SpoCommandSetSetCommand.listTypes.indexOf(args.options.listType) < 0) {
+            return `${args.options.listType} is not a valid list type. Allowed values are ${SpoCommandSetSetCommand.listTypes.join(', ')}`;
+        }
+        if (args.options.scope && SpoCommandSetSetCommand.scopes.indexOf(args.options.scope) < 0) {
+            return `${args.options.scope} is not a valid scope. Allowed values are ${SpoCommandSetSetCommand.scopes.join(', ')}`;
+        }
+        if (args.options.location && SpoCommandSetSetCommand.locations.indexOf(args.options.location) < 0) {
+            return `${args.options.location} is not a valid location. Allowed values are ${SpoCommandSetSetCommand.locations.join(', ')}`;
+        }
+        if (!args.options.newTitle && !args.options.listType && !args.options.clientSideComponentProperties && !args.options.location) {
+            return `Please specify option to be updated`;
+        }
+        return validation_1.validation.isValidSharePointUrl(args.options.webUrl);
+    }));
+}, _SpoCommandSetSetCommand_initOptionSets = function _SpoCommandSetSetCommand_initOptionSets() {
+    this.optionSets.push({ options: ['id', 'title', 'clientSideComponentId'] });
+};
+SpoCommandSetSetCommand.listTypes = ['List', 'Library', 'SitePages'];
+SpoCommandSetSetCommand.scopes = ['All', 'Site', 'Web'];
+SpoCommandSetSetCommand.locations = ['ContextMenu', 'CommandBar', 'Both'];
+module.exports = new SpoCommandSetSetCommand();
+//# sourceMappingURL=commandset-set.js.map

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

@@ -77,14 +77,26 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
                 }
                 return customAction;
             }
-            const customActions = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`);
-            if (customActions.length === 1) {
-                return customActions[0];
+            else if (options.title) {
+                const customActions = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `Title eq '${formatting_1.formatting.encodeQueryParameter(options.title)}'`);
+                if (customActions.length === 1) {
+                    return customActions[0];
+                }
+                if (customActions.length === 0) {
+                    throw `No user custom action with title '${options.title}' found`;
+                }
+                throw `Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${customActions.map(a => a.Id).join(', ')}`;
             }
-            if (customActions.length === 0) {
-                throw `No user custom action with title '${options.title}' found`;
+            else {
+                const customActions = yield spo_1.spo.getCustomActions(options.webUrl, options.scope, `ClientSideComponentId eq guid'${options.clientSideComponentId}'`);
+                if (customActions.length === 0) {
+                    throw `No user custom action with ClientSideComponentId '${options.clientSideComponentId}' found`;
+                }
+                if (customActions.length > 1) {
+                    throw `Multiple user custom actions with ClientSideComponentId '${options.clientSideComponentId}' found. Please disambiguate using IDs: ${customActions.map((customAction) => customAction.Id).join(', ')}`;
+                }
+                return customActions[0];
             }
-            throw `Multiple user custom actions with title '${options.title}' found. Please disambiguate using IDs: ${customActions.map(a => a.Id).join(', ')}`;
         });
     }
     humanizeScope(scope) {
@@ -100,6 +112,9 @@ class SpoCustomActionGetCommand extends SpoCommand_1.default {
 _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand_initTelemetry = function _SpoCustomActionGetCommand_initTelemetry() {
     this.telemetry.push((args) => {
         Object.assign(this.telemetryProperties, {
+            id: typeof args.options.id !== 'undefined',
+            title: typeof args.options.title !== 'undefined',
+            clientSideComponentId: typeof args.options.clientSideComponentId !== 'undefined',
             scope: args.options.scope || 'All'
         });
     });
@@ -108,6 +123,8 @@ _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand
         option: '-i, --id [id]'
     }, {
         option: '-t, --title [title]'
+    }, {
+        option: '-c, --clientSideComponentId [clientSideComponentId]'
     }, {
         option: '-u, --webUrl <webUrl>'
     }, {
@@ -130,10 +147,13 @@ _SpoCustomActionGetCommand_instances = new WeakSet(), _SpoCustomActionGetCommand
                 return `${args.options.scope} is not a valid custom action scope. Allowed values are Site|Web|All`;
             }
         }
+        if (args.options.clientSideComponentId && validation_1.validation.isValidGuid(args.options.clientSideComponentId) === false) {
+            return `${args.options.clientSideComponentId} is not a valid GUID.`;
+        }
         return true;
     }));
 }, _SpoCustomActionGetCommand_initOptionSets = function _SpoCustomActionGetCommand_initOptionSets() {
-    this.optionSets.push({ options: ['id', 'title'] });
+    this.optionSets.push({ options: ['id', 'title', 'clientSideComponentId'] });
 };
 module.exports = new SpoCustomActionGetCommand();
 //# sourceMappingURL=customaction-get.js.map

package/dist/m365/spo/commands/file/file-move.js

@@ -55,7 +55,7 @@ class SpoFileMoveCommand extends SpoCommand_1.default {
                 // A user might enter folder instead of file as source url by mistake
                 // then there are edge cases when deleteIfAlreadyExists flag is set
                 // the user can receive misleading error message.
-                this.fileExists(tenantUrl, webUrl, args.options.sourceUrl);
+                yield this.fileExists(tenantUrl, webUrl, args.options.sourceUrl);
                 if (args.options.deleteIfAlreadyExists) {
                     // try delete target file, if deleteIfAlreadyExists flag is set
                     const filename = args.options.sourceUrl.replace(/^.*[\\\/]/, '');

package/dist/m365/spo/commands/group/group-member-add.js

@@ -15,15 +15,14 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoGroupMemberAddCommand_instances, _SpoGroupMemberAddCommand_initTelemetry, _SpoGroupMemberAddCommand_initOptions, _SpoGroupMemberAddCommand_initValidators, _SpoGroupMemberAddCommand_initOptionSets;
 Object.defineProperty(exports, "__esModule", { value: true });
-const Cli_1 = require("../../../../cli/Cli");
 const request_1 = require("../../../../request");
 const formatting_1 = require("../../../../utils/formatting");
 const validation_1 = require("../../../../utils/validation");
-const AadUserGetCommand = require("../../../aad/commands/user/user-get");
-const AadGroupGetCommand = require("../../../aad/commands/group/group-get");
-const SpoUserGetCommand = require("../user/user-get");
 const SpoCommand_1 = require("../../../base/SpoCommand");
 const commands_1 = require("../../commands");
+const aadUser_1 = require("../../../../utils/aadUser");
+const aadGroup_1 = require("../../../../utils/aadGroup");
+const spo_1 = require("../../../../utils/spo");
 class SpoGroupMemberAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.GROUP_MEMBER_ADD;
@@ -48,21 +47,20 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
                 const groupId = yield this.getGroupId(args, logger);
                 const resolvedUsernameList = yield this.getValidUsers(args, logger);
                 if (this.verbose) {
-                    logger.logToStderr(`Adding user(s) to SharePoint Group ${args.options.groupId || args.options.groupName}`);
+                    logger.logToStderr(`Adding resource(s) to SharePoint Group ${args.options.groupId || args.options.groupName}`);
                 }
-                const data = {
-                    url: args.options.webUrl,
-                    peoplePickerInput: this.getFormattedUserList(resolvedUsernameList),
-                    roleValue: `group:${groupId}`
-                };
                 const requestOptions = {
                     url: `${args.options.webUrl}/_api/SP.Web.ShareObject`,
                     headers: {
-                        'Accept': 'application/json;odata=nometadata',
-                        'Content-type': 'application/json;odata=verbose'
+                        accept: 'application/json;odata=nometadata',
+                        'content-type': 'application/json;odata=nometadata'
                     },
-                    data: data,
-                    responseType: 'json'
+                    responseType: 'json',
+                    data: {
+                        url: args.options.webUrl,
+                        peoplePickerInput: this.getFormattedUserList(resolvedUsernameList),
+                        roleValue: `group:${groupId}`
+                    }
                 };
                 const sharingResult = yield request_1.default.post(requestOptions);
                 if (sharingResult.ErrorMessage !== null) {
@@ -83,7 +81,7 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
             `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')` :
             `GetById('${args.options.groupId}')`;
         const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/sitegroups/${getGroupMethod}`,
+            url: `${args.options.webUrl}/_api/web/sitegroups/${getGroupMethod}?$select=Id`,
             headers: {
                 'accept': 'application/json;odata=nometadata'
             },
@@ -91,91 +89,52 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
         };
         return request_1.default
             .get(requestOptions)
-            .then(response => {
-            const groupId = response.Id;
-            if (!groupId) {
-                return Promise.reject(`The specified group does not exist in the SharePoint site`);
-            }
-            return groupId;
-        });
+            .then(response => response.Id);
     }
     getValidUsers(args, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Checking if the specified users exist`);
-        }
-        const validUserNames = [];
-        const invalidUserNames = [];
-        const userIdentifiers = args.options.userName || args.options.email || args.options.aadGroupId || args.options.aadGroupName || args.options.userId.toString();
-        return Promise
-            .all(userIdentifiers.split(',').map((userIdentifier) => __awaiter(this, void 0, void 0, function* () {
-            const user = userIdentifier.trim();
-            try {
-                if (args.options.userId) {
-                    yield this.spoUserGet(args.options, user, logger, validUserNames);
-                }
-                else if (args.options.aadGroupId || args.options.aadGroupName) {
-                    yield this.aadGroupGet(args.options, user, logger, validUserNames);
-                }
-                else {
-                    yield this.aadUserGet(args.options, user, logger, validUserNames);
-                }
-            }
-            catch (err) {
-                logger.logToStderr(err.stderr);
-                invalidUserNames.push(userIdentifier);
-                return err;
-            }
-        })))
-            .then(() => {
-            if (invalidUserNames.length > 0) {
-                return Promise.reject(`Users not added to the group because the following users don't exist: ${invalidUserNames.join(', ')}`);
-            }
-            return Promise.resolve(validUserNames);
-        });
-    }
-    aadUserGet(options, userIdentifier, logger, validUserNames) {
+        var _a, _b, _c, _d;
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Get UPN from Azure AD for user ${userIdentifier}`);
+                logger.logToStderr('Checking if the specified users and groups exist');
             }
-            const aadUserGetCommandoptions = Object.assign(Object.assign(Object.assign({}, (options.userName && { userName: userIdentifier })), (options.email && { email: userIdentifier })), { output: 'json', debug: options.debug, verbose: options.verbose });
-            const aadUserGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, aadUserGetCommandoptions), { _: [] }) });
-            if (this.debug) {
-                logger.logToStderr(aadUserGetOutput.stderr);
-            }
-            validUserNames.push(JSON.parse(aadUserGetOutput.stdout).userPrincipalName);
-        });
-    }
-    aadGroupGet(options, userIdentifier, logger, validUserNames) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.verbose) {
-                logger.logToStderr(`Get UPN from Azure AD for group ${userIdentifier}`);
-            }
-            const aadUserGetCommandoptions = Object.assign(Object.assign(Object.assign({}, (options.aadGroupId && { id: userIdentifier })), (options.aadGroupName && { title: userIdentifier })), { output: 'json', debug: options.debug, verbose: options.verbose });
-            const aadGroupGetOutput = yield Cli_1.Cli.executeCommandWithOutput(AadGroupGetCommand, { options: Object.assign(Object.assign({}, aadUserGetCommandoptions), { _: [] }) });
-            if (this.debug) {
-                logger.logToStderr(aadGroupGetOutput.stderr);
-            }
-            validUserNames.push(JSON.parse(aadGroupGetOutput.stdout).mail);
-        });
-    }
-    spoUserGet(options, userIdentifier, logger, validUserNames) {
-        return __awaiter(this, void 0, void 0, function* () {
-            if (this.verbose) {
-                logger.logToStderr(`Get UPN from SharePoint for user ${userIdentifier}`);
-            }
-            const spoUserGetCommandoptions = {
-                id: userIdentifier,
-                webUrl: options.webUrl,
-                output: 'json',
-                debug: options.debug,
-                verbose: options.verbose
-            };
-            const spoUserGetOutput = yield Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, spoUserGetCommandoptions), { _: [] }) });
-            if (this.debug) {
-                logger.logToStderr(spoUserGetOutput.stderr);
-            }
-            validUserNames.push(JSON.parse(spoUserGetOutput.stdout).UserPrincipalName);
+            const validUserNames = [];
+            const identifiers = (_d = (_c = (_b = (_a = args.options.userName) !== null && _a !== void 0 ? _a : args.options.email) !== null && _b !== void 0 ? _b : args.options.aadGroupId) !== null && _c !== void 0 ? _c : args.options.aadGroupName) !== null && _d !== void 0 ? _d : args.options.userId.toString();
+            yield Promise.all(identifiers.split(',').map((identifier) => __awaiter(this, void 0, void 0, function* () {
+                const trimmedIdentifier = identifier.trim();
+                try {
+                    if (args.options.userId) {
+                        if (this.verbose) {
+                            logger.logToStderr(`Getting AAD ID of user with ID ${trimmedIdentifier}`);
+                        }
+                        const spoUserAzureId = yield spo_1.spo.getUserAzureIdBySpoId(args.options.webUrl, trimmedIdentifier);
+                        validUserNames.push(spoUserAzureId);
+                    }
+                    else if (args.options.userName) {
+                        validUserNames.push(trimmedIdentifier);
+                    }
+                    else if (args.options.aadGroupId) {
+                        validUserNames.push(trimmedIdentifier);
+                    }
+                    else if (args.options.aadGroupName) {
+                        if (this.verbose) {
+                            logger.logToStderr(`Getting ID of Azure AD group ${trimmedIdentifier}`);
+                        }
+                        const groupId = yield aadGroup_1.aadGroup.getGroupIdByDisplayName(trimmedIdentifier);
+                        validUserNames.push(groupId);
+                    }
+                    else {
+                        if (this.verbose) {
+                            logger.logToStderr(`Getting Azure AD ID for user ${trimmedIdentifier}`);
+                        }
+                        const upn = yield aadUser_1.aadUser.getUserIdByEmail(trimmedIdentifier);
+                        validUserNames.push(upn);
+                    }
+                }
+                catch (err) {
+                    throw `Resource '${trimmedIdentifier}' does not exist.`;
+                }
+            })));
+            return validUserNames;
         });
     }
     getFormattedUserList(activeUserList) {