@pnp/cli-microsoft365 6.9.0-beta.f6054b4 → 6.10.0-beta.05cab2f

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

@@ -41,6 +41,9 @@ class SpoFileRoleInheritanceResetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             const resetFileRoleInheritance = () => __awaiter(this, void 0, void 0, function* () {
+                if (this.verbose) {
+                    logger.logToStderr(`Resetting role inheritance for file ${args.options.fileId || args.options.fileUrl}`);
+                }
                 try {
                     const fileURL = yield this.getFileURL(args);
                     const requestOptions = {

package/dist/m365/spo/commands/file/file-sharinginfo-get.js

@@ -44,7 +44,7 @@ class SpoFileSharingInfoGetCommand extends SpoCommand_1.default {
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
             if (this.verbose) {
-                logger.logToStderr(`Retrieving sharing information report for the file...`);
+                logger.logToStderr(`Retrieving sharing information report for the file ${args.options.fileId || args.options.fileUrl}`);
             }
             try {
                 const fileInformation = yield this.getNeededFileInformation(args);
@@ -94,26 +94,28 @@ class SpoFileSharingInfoGetCommand extends SpoCommand_1.default {
         });
     }
     getNeededFileInformation(args) {
-        let requestUrl = '';
-        if (args.options.fileId) {
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${args.options.fileId}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
-        }
-        else {
-            const serverRelPath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
-            requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelPath)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
-        }
-        const requestOptions = {
-            url: requestUrl,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions)
-            .then((res) => Promise.resolve({
-            fileItemId: parseInt(res.ListItemAllFields.Id),
-            libraryName: res.ListItemAllFields.ParentList.Title
-        }));
+        return __awaiter(this, void 0, void 0, function* () {
+            let requestUrl = '';
+            if (args.options.fileId) {
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileById('${args.options.fileId}')/?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
+            }
+            else {
+                const serverRelPath = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.fileUrl);
+                requestUrl = `${args.options.webUrl}/_api/web/GetFileByServerRelativePath(decodedUrl='${formatting_1.formatting.encodeQueryParameter(serverRelPath)}')?$select=ListItemAllFields/Id,ListItemAllFields/ParentList/Title&$expand=ListItemAllFields/ParentList`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const res = yield request_1.default.get(requestOptions);
+            return {
+                fileItemId: parseInt(res.ListItemAllFields.Id),
+                libraryName: res.ListItemAllFields.ParentList.Title
+            };
+        });
     }
 }
 _SpoFileSharingInfoGetCommand_instances = new WeakSet(), _SpoFileSharingInfoGetCommand_initTelemetry = function _SpoFileSharingInfoGetCommand_initTelemetry() {

package/dist/m365/spo/commands/file/file-version-clear.js

@@ -80,7 +80,7 @@ class SpoFileVersionClearCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            yield request_1.default.post(requestOptions);
+            return request_1.default.post(requestOptions);
         });
     }
 }

package/dist/m365/spo/commands/file/file-version-remove.js

@@ -81,7 +81,7 @@ class SpoFileVersionRemoveCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            yield request_1.default.delete(requestOptions);
+            return request_1.default.delete(requestOptions);
         });
     }
 }

package/dist/m365/spo/commands/file/file-version-restore.js

@@ -81,7 +81,7 @@ class SpoFileVersionRestoreCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            yield request_1.default.post(requestOptions);
+            return request_1.default.post(requestOptions);
         });
     }
 }

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

@@ -38,34 +38,8 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
-            const removeFolder = () => __awaiter(this, void 0, void 0, function* () {
-                if (this.verbose) {
-                    logger.logToStderr(`Removing folder in site at ${args.options.webUrl}...`);
-                }
-                const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.url);
-                let requestUrl = `${args.options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
-                if (args.options.recycle) {
-                    requestUrl += `/recycle()`;
-                }
-                const requestOptions = {
-                    url: requestUrl,
-                    method: 'POST',
-                    headers: {
-                        'X-HTTP-Method': 'DELETE',
-                        'If-Match': '*',
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                try {
-                    yield request_1.default.post(requestOptions);
-                }
-                catch (err) {
-                    this.handleRejectedODataJsonPromise(err);
-                }
-            });
             if (args.options.confirm) {
-                yield removeFolder();
+                yield this.removeFolder(logger, args.options);
             }
             else {
                 const result = yield Cli_1.Cli.prompt({
@@ -75,11 +49,39 @@ class SpoFolderRemoveCommand extends SpoCommand_1.default {
                     message: `Are you sure you want to ${args.options.recycle ? "recycle" : "remove"} the folder ${args.options.url} located in site ${args.options.webUrl}?`
                 });
                 if (result.continue) {
-                    yield removeFolder();
+                    yield this.removeFolder(logger, args.options);
                 }
             }
         });
     }
+    removeFolder(logger, options) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Removing folder in site at ${options.webUrl}...`);
+            }
+            const serverRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(options.webUrl, options.url);
+            let requestUrl = `${options.webUrl}/_api/web/GetFolderByServerRelativeUrl('${formatting_1.formatting.encodeQueryParameter(serverRelativeUrl)}')`;
+            if (options.recycle) {
+                requestUrl += `/recycle()`;
+            }
+            const requestOptions = {
+                url: requestUrl,
+                method: 'POST',
+                headers: {
+                    'X-HTTP-Method': 'DELETE',
+                    'If-Match': '*',
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            try {
+                yield request_1.default.post(requestOptions);
+            }
+            catch (err) {
+                this.handleRejectedODataJsonPromise(err);
+            }
+        });
+    }
 }
 _SpoFolderRemoveCommand_instances = new WeakSet(), _SpoFolderRemoveCommand_initTelemetry = function _SpoFolderRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -87,7 +87,7 @@ class SpoFolderRoleAssignmentAddCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            yield request_1.default.post(requestOptions);
+            return request_1.default.post(requestOptions);
         });
     }
     addRoleAssignment(requestUrl, principalId, roleDefinitionId) {
@@ -101,13 +101,13 @@ class SpoFolderRoleAssignmentAddCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            yield request_1.default.post(requestOptions);
+            return request_1.default.post(requestOptions);
         });
     }
     getRoleDefinitionId(options) {
         return __awaiter(this, void 0, void 0, function* () {
             if (!options.roleDefinitionName) {
-                return Promise.resolve(options.roleDefinitionId);
+                return options.roleDefinitionId;
             }
             const roleDefinitionFolderCommandOptions = {
                 webUrl: options.webUrl,

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

@@ -90,7 +90,7 @@ class SpoFolderRoleAssignmentRemoveCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            yield request_1.default.post(requestOptions);
+            return request_1.default.post(requestOptions);
         });
     }
     getGroupPrincipalId(options) {

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

@@ -74,22 +74,23 @@ class SpoGroupMemberAddCommand extends SpoCommand_1.default {
         });
     }
     getGroupId(args, logger) {
-        if (this.verbose) {
-            logger.logToStderr(`Getting group Id for SharePoint Group ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
-        }
-        const getGroupMethod = args.options.groupName ?
-            `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')` :
-            `GetById('${args.options.groupId}')`;
-        const requestOptions = {
-            url: `${args.options.webUrl}/_api/web/sitegroups/${getGroupMethod}?$select=Id`,
-            headers: {
-                'accept': 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then(response => response.Id);
+        return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Getting group Id for SharePoint Group ${args.options.groupId ? args.options.groupId : args.options.groupName}`);
+            }
+            const getGroupMethod = args.options.groupName ?
+                `GetByName('${formatting_1.formatting.encodeQueryParameter(args.options.groupName)}')` :
+                `GetById('${args.options.groupId}')`;
+            const requestOptions = {
+                url: `${args.options.webUrl}/_api/web/sitegroups/${getGroupMethod}?$select=Id`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
+            return response.Id;
+        });
     }
     getValidUsers(args, logger) {
         var _a, _b, _c, _d;

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

@@ -39,6 +39,9 @@ class SpoGroupSetCommand extends SpoCommand_1.default {
     }
     commandAction(logger, args) {
         return __awaiter(this, void 0, void 0, function* () {
+            if (this.verbose) {
+                logger.logToStderr(`Setting properties for group ${args.options.id || args.options.name}`);
+            }
             const requestOptions = {
                 url: `${args.options.webUrl}/_api/web/sitegroups/${args.options.id ? `GetById(${args.options.id})` : `GetByName('${args.options.name}')`}`,
                 headers: {
@@ -58,7 +61,9 @@ class SpoGroupSetCommand extends SpoCommand_1.default {
             };
             try {
                 yield request_1.default.patch(requestOptions);
-                yield this.setGroupOwner(args.options);
+                if (args.options.ownerEmail || args.options.ownerUserName) {
+                    yield this.setGroupOwner(args.options);
+                }
             }
             catch (err) {
                 this.handleRejectedODataJsonPromise(err);
@@ -66,12 +71,8 @@ class SpoGroupSetCommand extends SpoCommand_1.default {
         });
     }
     setGroupOwner(options) {
-        if (!options.ownerEmail && !options.ownerUserName) {
-            return Promise.resolve();
-        }
-        return this
-            .getOwnerId(options)
-            .then((ownerId) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const ownerId = yield this.getOwnerId(options);
             const requestOptions = {
                 url: `${options.webUrl}/_api/web/sitegroups/${options.id ? `GetById(${options.id})` : `GetByName('${options.name}')`}/SetUserAsOwner(${ownerId})`,
                 headers: {
@@ -84,16 +85,15 @@ class SpoGroupSetCommand extends SpoCommand_1.default {
         });
     }
     getOwnerId(options) {
-        const cmdOptions = {
-            userName: options.ownerUserName,
-            email: options.ownerEmail,
-            output: 'json',
-            debug: options.debug,
-            verbose: options.verbose
-        };
-        return Cli_1.Cli
-            .executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, cmdOptions), { _: [] }) })
-            .then((output) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const cmdOptions = {
+                userName: options.ownerUserName,
+                email: options.ownerEmail,
+                output: 'json',
+                debug: options.debug,
+                verbose: options.verbose
+            };
+            const output = yield Cli_1.Cli.executeCommandWithOutput(AadUserGetCommand, { options: Object.assign(Object.assign({}, cmdOptions), { _: [] }) });
             const getUserOutput = JSON.parse(output.stdout);
             const requestOptions = {
                 url: `${options.webUrl}/_api/web/ensureUser('${getUserOutput.userPrincipalName}')?$select=Id`,
@@ -103,9 +103,9 @@ class SpoGroupSetCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            return request_1.default.post(requestOptions);
-        })
-            .then((response) => response.Id);
+            const response = yield request_1.default.post(requestOptions);
+            return response.Id;
+        });
     }
 }
 _SpoGroupSetCommand_instances = new WeakSet(), _SpoGroupSetCommand_initTelemetry = function _SpoGroupSetCommand_initTelemetry() {

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

@@ -58,7 +58,7 @@ class SpoHomeSiteRemoveCommand extends SpoCommand_1.default {
                     }
                 }
                 catch (err) {
-                    this.handleRejectedPromise(err);
+                    this.handleRejectedODataJsonPromise(err);
                 }
             });
             if (args.options.confirm) {

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

@@ -59,39 +59,41 @@ class SpoHubSiteGetCommand extends SpoCommand_1.default {
         });
     }
     getAssociatedSites(spoAdminUrl, hubSiteId, logger, args) {
-        const options = {
-            output: 'json',
-            debug: args.options.debug,
-            verbose: args.options.verbose,
-            listTitle: 'DO_NOT_DELETE_SPLIST_TENANTADMIN_AGGREGATED_SITECOLLECTIONS',
-            webUrl: spoAdminUrl,
-            filter: `HubSiteId eq '${hubSiteId}'`,
-            fields: 'Title,SiteUrl,SiteId'
-        };
-        return Cli_1.Cli
-            .executeCommandWithOutput(SpoListItemListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        return __awaiter(this, void 0, void 0, function* () {
+            const options = {
+                output: 'json',
+                debug: args.options.debug,
+                verbose: args.options.verbose,
+                listTitle: 'DO_NOT_DELETE_SPLIST_TENANTADMIN_AGGREGATED_SITECOLLECTIONS',
+                webUrl: spoAdminUrl,
+                filter: `HubSiteId eq '${hubSiteId}'`,
+                fields: 'Title,SiteUrl,SiteId'
+            };
+            return Cli_1.Cli.executeCommandWithOutput(SpoListItemListCommand, { options: Object.assign(Object.assign({}, options), { _: [] }) });
+        });
     }
     getHubSiteById(spoUrl, options) {
-        const requestOptions = {
-            url: `${spoUrl}/_api/hubsites/getbyid('${options.id}')`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default.get(requestOptions);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${spoUrl}/_api/hubsites/getbyid('${options.id}')`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.get(requestOptions);
+        });
     }
     getHubSite(spoUrl, options) {
-        const requestOptions = {
-            url: `${spoUrl}/_api/hubsites`,
-            headers: {
-                accept: 'application/json;odata=nometadata'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .get(requestOptions)
-            .then((response) => {
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${spoUrl}/_api/hubsites`,
+                headers: {
+                    accept: 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const response = yield request_1.default.get(requestOptions);
             let hubSites = response.value;
             if (options.title) {
                 hubSites = hubSites.filter(site => site.Title.toLocaleLowerCase() === options.title.toLocaleLowerCase());
@@ -100,10 +102,10 @@ class SpoHubSiteGetCommand extends SpoCommand_1.default {
                 hubSites = hubSites.filter(site => site.SiteUrl.toLocaleLowerCase() === options.url.toLocaleLowerCase());
             }
             if (hubSites.length === 0) {
-                return Promise.reject(`The specified hub site ${options.title || options.url} does not exist`);
+                throw `The specified hub site ${options.title || options.url} does not exist`;
             }
             if (hubSites.length > 1) {
-                return Promise.reject(`Multiple hub sites with ${options.title || options.url} found. Please disambiguate: ${hubSites.map(site => site.SiteUrl).join(', ')}`);
+                throw `Multiple hub sites with ${options.title || options.url} found. Please disambiguate: ${hubSites.map(site => site.SiteUrl).join(', ')}`;
             }
             return hubSites[0];
         });

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

@@ -92,38 +92,27 @@ class SpoHubSiteListCommand extends SpoCommand_1.default {
         });
     }
     getSites(reqOptions, nonPagedUrl, logger, sites = [], batchNumber = 0) {
-        return new Promise((resolve, reject) => {
-            request_1.default
-                .post(reqOptions)
-                .then((res) => {
-                batchNumber++;
-                const retrievedSites = res.Row.length > 0 ? sites.concat(res.Row) : sites;
+        return __awaiter(this, void 0, void 0, function* () {
+            const res = yield request_1.default.post(reqOptions);
+            batchNumber++;
+            const retrievedSites = res.Row.length > 0 ? sites.concat(res.Row) : sites;
+            if (this.debug) {
+                logger.logToStderr(res);
+                logger.logToStderr(`Retrieved ${res.Row.length} sites in batch ${batchNumber}`);
+            }
+            if (!!res.NextHref) {
+                reqOptions.url = nonPagedUrl + res.NextHref;
                 if (this.debug) {
-                    logger.logToStderr(res);
-                    logger.logToStderr(`Retrieved ${res.Row.length} sites in batch ${batchNumber}`);
-                }
-                if (!!res.NextHref) {
-                    reqOptions.url = nonPagedUrl + res.NextHref;
-                    if (this.debug) {
-                        logger.logToStderr(`Url for next batch of sites: ${reqOptions.url}`);
-                    }
-                    this
-                        .getSites(reqOptions, nonPagedUrl, logger, retrievedSites, batchNumber)
-                        .then((associatedSites) => {
-                        resolve(associatedSites);
-                    }, (err) => {
-                        reject(err);
-                    });
+                    logger.logToStderr(`Url for next batch of sites: ${reqOptions.url}`);
                 }
-                else {
-                    if (this.debug) {
-                        logger.logToStderr(`Retrieved ${retrievedSites.length} sites in total`);
-                    }
-                    resolve(retrievedSites);
+                return this.getSites(reqOptions, nonPagedUrl, logger, retrievedSites, batchNumber);
+            }
+            else {
+                if (this.debug) {
+                    logger.logToStderr(`Retrieved ${retrievedSites.length} sites in total`);
                 }
-            }, (err) => {
-                reject(err);
-            });
+                return retrievedSites;
+            }
         });
     }
 }

package/dist/m365/spo/commands/hubsite/hubsite-unregister.js

@@ -39,6 +39,9 @@ class SpoHubSiteUnregisterCommand extends SpoCommand_1.default {
         return __awaiter(this, void 0, void 0, function* () {
             const unregisterHubSite = () => __awaiter(this, void 0, void 0, function* () {
                 try {
+                    if (this.verbose) {
+                        logger.logToStderr(`Unregistering site collection ${args.options.url} as a hub site...`);
+                    }
                     const res = yield spo_1.spo.getRequestDigest(args.options.url);
                     const requestOptions = {
                         url: `${args.options.url}/_api/site/UnregisterHubSite`,

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

@@ -582,7 +582,7 @@ _SpoListAddCommand_instances = new WeakSet(), _SpoListAddCommand_initTelemetry =
         return true;
     }));
 }, _SpoListAddCommand_initTypes = function _SpoListAddCommand_initTypes() {
-    this.types.string.push('baseTemplate', 'webUrl', 'templateFeatureId', 'defaultContentApprovalWorkflowId', 'draftVersionVisibility', 'listExperienceOptions');
+    this.types.string.push('title', 'baseTemplate', 'webUrl', 'templateFeatureId', 'defaultContentApprovalWorkflowId', 'draftVersionVisibility', 'listExperienceOptions');
     this.types.boolean.push(...SpoListAddCommand.booleanOptions);
 };
 SpoListAddCommand.booleanOptions = [

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

@@ -145,7 +145,7 @@ class SpoListContentTypeDefaultSetCommand extends SpoCommand_1.default {
                 },
                 responseType: 'json'
             };
-            yield request_1.default.post(requestOptions);
+            return request_1.default.post(requestOptions);
         });
     }
     getListContentTypes(baseUrl) {

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

@@ -15,16 +15,13 @@ var __classPrivateFieldGet = (this && this.__classPrivateFieldGet) || function (
 };
 var _SpoListRoleAssignmentAddCommand_instances, _SpoListRoleAssignmentAddCommand_initTelemetry, _SpoListRoleAssignmentAddCommand_initOptions, _SpoListRoleAssignmentAddCommand_initValidators, _SpoListRoleAssignmentAddCommand_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 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");
-const SpoRoleDefinitionListCommand = require("../roledefinition/roledefinition-list");
+const spo_1 = require("../../../../utils/spo");
 class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
     get name() {
         return commands_1.default.LIST_ROLEASSIGNMENT_ADD;
@@ -57,13 +54,15 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
                     const listServerRelativeUrl = urlUtil_1.urlUtil.getServerRelativePath(args.options.webUrl, args.options.listUrl);
                     requestUrl += `GetList('${formatting_1.formatting.encodeQueryParameter(listServerRelativeUrl)}')/`;
                 }
-                args.options.roleDefinitionId = yield this.getRoleDefinitionId(args.options);
+                args.options.roleDefinitionId = yield this.getRoleDefinitionId(args.options, logger);
                 if (args.options.upn) {
-                    args.options.principalId = yield this.getUserPrincipalId(args.options);
+                    const user = yield spo_1.spo.getUserByEmail(args.options.webUrl, args.options.upn, logger, this.verbose);
+                    args.options.principalId = user.Id;
                     yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else if (args.options.groupName) {
-                    args.options.principalId = yield this.getGroupPrincipalId(args.options);
+                    const group = yield spo_1.spo.getGroupByName(args.options.webUrl, args.options.groupName, logger, this.verbose);
+                    args.options.principalId = group.Id;
                     yield this.addRoleAssignment(requestUrl, logger, args.options);
                 }
                 else {
@@ -76,70 +75,26 @@ class SpoListRoleAssignmentAddCommand extends SpoCommand_1.default {
         });
     }
     addRoleAssignment(requestUrl, logger, options) {
-        const requestOptions = {
-            url: `${requestUrl}roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
-            method: 'POST',
-            headers: {
-                'accept': 'application/json;odata=nometadata',
-                'content-type': 'application/json'
-            },
-            responseType: 'json'
-        };
-        return request_1.default
-            .post(requestOptions)
-            .then(_ => Promise.resolve())
-            .catch((err) => Promise.reject(err));
-    }
-    getRoleDefinitionId(options) {
-        if (!options.roleDefinitionName) {
-            return Promise.resolve(options.roleDefinitionId);
-        }
-        const roleDefinitionListCommandOptions = {
-            webUrl: options.webUrl,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(SpoRoleDefinitionListCommand, { options: Object.assign(Object.assign({}, roleDefinitionListCommandOptions), { _: [] }) })
-            .then((output) => {
-            const getRoleDefinitionListOutput = JSON.parse(output.stdout);
-            const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
-            return Promise.resolve(roleDefinitionId);
-        }, (err) => {
-            return Promise.reject(err);
-        });
-    }
-    getGroupPrincipalId(options) {
-        const groupGetCommandOptions = {
-            webUrl: options.webUrl,
-            name: options.groupName,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(SpoGroupGetCommand, { options: Object.assign(Object.assign({}, groupGetCommandOptions), { _: [] }) })
-            .then((output) => {
-            const getGroupOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getGroupOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
+        return __awaiter(this, void 0, void 0, function* () {
+            const requestOptions = {
+                url: `${requestUrl}roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
+                method: 'POST',
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            return request_1.default.post(requestOptions);
         });
     }
-    getUserPrincipalId(options) {
-        const userGetCommandOptions = {
-            webUrl: options.webUrl,
-            email: options.upn,
-            id: undefined,
-            output: 'json',
-            debug: this.debug,
-            verbose: this.verbose
-        };
-        return Cli_1.Cli.executeCommandWithOutput(SpoUserGetCommand, { options: Object.assign(Object.assign({}, userGetCommandOptions), { _: [] }) })
-            .then((output) => {
-            const getUserOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getUserOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
+    getRoleDefinitionId(options, logger) {
+        return __awaiter(this, void 0, void 0, function* () {
+            if (!options.roleDefinitionName) {
+                return options.roleDefinitionId;
+            }
+            const roleDefinition = yield spo_1.spo.getRoleDefinitionByName(options.webUrl, options.roleDefinitionName, logger, this.verbose);
+            return roleDefinition.Id;
         });
     }
 }