@pnp/cli-microsoft365 7.0.0-beta.99e75a7 → 7.0.0-beta.b2eab57

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

@@ -23,30 +23,8 @@ class SpoThemeRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoThemeRemoveCommand_instances, "m", _SpoThemeRemoveCommand_initOptions).call(this);
     }
     async commandAction(logger, args) {
-        const removeTheme = async () => {
-            try {
-                const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
-                if (this.verbose) {
-                    await logger.logToStderr(`Removing theme from tenant...`);
-                }
-                const requestOptions = {
-                    url: `${spoAdminUrl}/_api/thememanager/DeleteTenantTheme`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    data: {
-                        name: args.options.name
-                    },
-                    responseType: 'json'
-                };
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeTheme();
+            await this.removeTheme(logger, args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -56,8 +34,30 @@ class SpoThemeRemoveCommand extends SpoCommand {
                 message: `Are you sure you want to remove the theme`
             });
             if (result.continue) {
-                await removeTheme();
+                await this.removeTheme(logger, args.options);
+            }
+        }
+    }
+    async removeTheme(logger, options) {
+        try {
+            const spoAdminUrl = await spo.getSpoAdminUrl(logger, this.debug);
+            if (this.verbose) {
+                await logger.logToStderr(`Removing theme from tenant...`);
             }
+            const requestOptions = {
+                url: `${spoAdminUrl}/_api/thememanager/DeleteTenantTheme`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                data: {
+                    name: options.name
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
         }
     }
 }

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

@@ -49,7 +49,6 @@ class SpoThemeSetCommand extends SpoCommand {
             if (contents && contents.ErrorInfo) {
                 throw contents.ErrorInfo.ErrorMessage || 'ClientSvc unknown error';
             }
-            return Promise.resolve();
         }
         catch (err) {
             this.handleRejectedPromise(err);

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

@@ -26,33 +26,8 @@ class SpoUserRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoUserRemoveCommand_instances, "m", _SpoUserRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const removeUser = async () => {
-            if (this.verbose) {
-                await logger.logToStderr(`Removing user from  subsite ${args.options.webUrl} ...`);
-            }
-            let requestUrl = '';
-            if (args.options.id) {
-                requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removebyid(${args.options.id})`;
-            }
-            if (args.options.loginName) {
-                requestUrl = `${encodeURI(args.options.webUrl)}/_api/web/siteusers/removeByLoginName('${formatting.encodeQueryParameter(args.options.loginName)}')`;
-            }
-            const requestOptions = {
-                url: requestUrl,
-                headers: {
-                    accept: 'application/json;odata=nometadata'
-                },
-                responseType: 'json'
-            };
-            try {
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeUser();
+            await this.removeUser(logger, args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -62,10 +37,35 @@ class SpoUserRemoveCommand extends SpoCommand {
                 message: `Are you sure you want to remove specified user from the site ${args.options.webUrl}`
             });
             if (result.continue) {
-                await removeUser();
+                await this.removeUser(logger, args.options);
             }
         }
     }
+    async removeUser(logger, options) {
+        if (this.verbose) {
+            await logger.logToStderr(`Removing user from  subsite ${options.webUrl} ...`);
+        }
+        let requestUrl = `${encodeURI(options.webUrl)}/_api/web/siteusers/`;
+        if (options.id) {
+            requestUrl += `removebyid(${options.id})`;
+        }
+        else if (options.loginName) {
+            requestUrl += `removeByLoginName('${formatting.encodeQueryParameter(options.loginName)}')`;
+        }
+        const requestOptions = {
+            url: requestUrl,
+            headers: {
+                accept: 'application/json;odata=nometadata'
+            },
+            responseType: 'json'
+        };
+        try {
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _SpoUserRemoveCommand_instances = new WeakSet(), _SpoUserRemoveCommand_initTelemetry = function _SpoUserRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

package/dist/m365/spo/commands/web/web-reindex.js

@@ -66,50 +66,43 @@ class SpoWebReindexCommand extends SpoCommand {
             this.handleRejectedPromise(err);
         }
     }
-    reindexLists(webUrl, requestDigest, logger, webIdentityResp) {
-        return new Promise((resolve, reject) => {
-            (async () => {
-                if (this.debug) {
-                    await logger.logToStderr(`Retrieving information about lists...`);
-                }
-                const requestOptions = {
-                    url: `${webUrl}/_api/web/lists?$select=NoCrawl,Title,RootFolder/Properties,RootFolder/ServerRelativeUrl&$expand=RootFolder/Properties`,
-                    headers: {
-                        'accept': 'application/json;odata=nometadata'
-                    },
-                    responseType: 'json'
-                };
-                return request.get(requestOptions);
-            })()
-                .then((lists) => {
-                const promises = lists.value.map(l => this.reindexList(l, webUrl, requestDigest, webIdentityResp, logger));
-                return Promise.all(promises);
-            })
-                .then(() => {
-                resolve();
-            }, (err) => reject(err));
-        });
+    async reindexLists(webUrl, requestDigest, logger, webIdentityResp) {
+        try {
+            if (this.debug) {
+                await logger.logToStderr(`Retrieving information about lists...`);
+            }
+            const requestOptions = {
+                url: `${webUrl}/_api/web/lists?$select=NoCrawl,Title,RootFolder/Properties,RootFolder/ServerRelativeUrl&$expand=RootFolder/Properties`,
+                headers: {
+                    'accept': 'application/json;odata=nometadata'
+                },
+                responseType: 'json'
+            };
+            const lists = await request.get(requestOptions);
+            const promises = lists.value.map(l => this.reindexList(l, webUrl, requestDigest, webIdentityResp, logger));
+            await Promise.all(promises);
+        }
+        catch (err) {
+            throw err;
+        }
     }
-    reindexList(list, webUrl, requestDigest, webIdentityResp, logger) {
-        return new Promise(async (resolve, reject) => {
-            if (list.NoCrawl) {
-                if (this.debug) {
-                    await logger.logToStderr(`List ${list.Title} is excluded from crawling`);
-                }
-                resolve();
-                return;
+    async reindexList(list, webUrl, requestDigest, webIdentityResp, logger) {
+        if (list.NoCrawl) {
+            if (this.debug) {
+                await logger.logToStderr(`List ${list.Title} is excluded from crawling`);
             }
-            spo
-                .getFolderIdentity(webIdentityResp.objectIdentity, webUrl, list.RootFolder.ServerRelativeUrl, requestDigest)
-                .then((folderIdentityResp) => {
-                let searchversion = list.RootFolder.Properties.vti_x005f_searchversion || 0;
-                searchversion++;
-                return SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchversion.toString(), webUrl, requestDigest, folderIdentityResp, logger, this.debug, list.RootFolder.ServerRelativeUrl);
-            })
-                .then(() => {
-                resolve();
-            }, (err) => reject(err));
-        });
+            return;
+        }
+        try {
+            const folderIdentityResp = await spo.getFolderIdentity(webIdentityResp.objectIdentity, webUrl, list.RootFolder.ServerRelativeUrl, requestDigest);
+            let searchversion = list.RootFolder.Properties.vti_x005f_searchversion || 0;
+            searchversion++;
+            await SpoPropertyBagBaseCommand.setProperty('vti_searchversion', searchversion.toString(), webUrl, requestDigest, folderIdentityResp, logger, this.debug, list.RootFolder.ServerRelativeUrl);
+            return;
+        }
+        catch (err) {
+            throw (err);
+        }
     }
 }
 _SpoWebReindexCommand_instances = new WeakSet(), _SpoWebReindexCommand_initOptions = function _SpoWebReindexCommand_initOptions() {

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

@@ -24,27 +24,8 @@ class SpoWebRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoWebRemoveCommand_instances, "m", _SpoWebRemoveCommand_initValidators).call(this);
     }
     async commandAction(logger, args) {
-        const removeWeb = async () => {
-            const requestOptions = {
-                url: `${encodeURI(args.options.url)}/_api/web`,
-                headers: {
-                    accept: 'application/json;odata=nometadata',
-                    'X-HTTP-Method': 'DELETE'
-                },
-                responseType: 'json'
-            };
-            if (this.verbose) {
-                await logger.logToStderr(`Deleting subsite ${args.options.url} ...`);
-            }
-            try {
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeWeb();
+            await this.removeWeb(logger, args.options.url);
         }
         else {
             const result = await Cli.prompt({
@@ -54,10 +35,29 @@ class SpoWebRemoveCommand extends SpoCommand {
                 message: `Are you sure you want to remove the subsite ${args.options.url}`
             });
             if (result.continue) {
-                await removeWeb();
+                await this.removeWeb(logger, args.options.url);
             }
         }
     }
+    async removeWeb(logger, url) {
+        const requestOptions = {
+            url: `${encodeURI(url)}/_api/web`,
+            headers: {
+                accept: 'application/json;odata=nometadata',
+                'X-HTTP-Method': 'DELETE'
+            },
+            responseType: 'json'
+        };
+        if (this.verbose) {
+            await logger.logToStderr(`Deleting subsite ${url} ...`);
+        }
+        try {
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _SpoWebRemoveCommand_instances = new WeakSet(), _SpoWebRemoveCommand_initTelemetry = function _SpoWebRemoveCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -49,7 +49,7 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             this.handleRejectedODataJsonPromise(err);
         }
     }
-    addRoleAssignment(logger, options) {
+    async addRoleAssignment(logger, options) {
         const requestOptions = {
             url: `${options.webUrl}/_api/web/roleassignments/addroleassignment(principalid='${options.principalId}',roledefid='${options.roleDefinitionId}')`,
             method: 'POST',
@@ -59,14 +59,11 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             },
             responseType: 'json'
         };
-        return request
-            .post(requestOptions)
-            .then(_ => Promise.resolve())
-            .catch((err) => Promise.reject(err));
+        await request.post(requestOptions);
     }
-    getRoleDefinitionId(options) {
+    async getRoleDefinitionId(options) {
         if (!options.roleDefinitionName) {
-            return Promise.resolve(options.roleDefinitionId);
+            return options.roleDefinitionId;
         }
         const roleDefinitionListCommandOptions = {
             webUrl: options.webUrl,
@@ -74,16 +71,12 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoRoleDefinitionListCommand, { options: { ...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);
-        });
+        const output = await Cli.executeCommandWithOutput(spoRoleDefinitionListCommand, { options: { ...roleDefinitionListCommandOptions, _: [] } });
+        const getRoleDefinitionListOutput = JSON.parse(output.stdout);
+        const roleDefinitionId = getRoleDefinitionListOutput.find((role) => role.Name === options.roleDefinitionName).Id;
+        return roleDefinitionId;
     }
-    getGroupPrincipalId(options) {
+    async getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -91,15 +84,11 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } })
-            .then((output) => {
-            const getGroupOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getGroupOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
+        const getGroupOutput = JSON.parse(output.stdout);
+        return getGroupOutput.Id;
     }
-    getUserPrincipalId(options) {
+    async getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,
@@ -108,13 +97,9 @@ class SpoWebRoleAssignmentAddCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } })
-            .then((output) => {
-            const getUserOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getUserOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
+        const getUserOutput = JSON.parse(output.stdout);
+        return getUserOutput.Id;
     }
 }
 _SpoWebRoleAssignmentAddCommand_instances = new WeakSet(), _SpoWebRoleAssignmentAddCommand_initTelemetry = function _SpoWebRoleAssignmentAddCommand_initTelemetry() {

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

@@ -27,29 +27,8 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
         __classPrivateFieldGet(this, _SpoWebRoleAssignmentRemoveCommand_instances, "m", _SpoWebRoleAssignmentRemoveCommand_initOptionSets).call(this);
     }
     async commandAction(logger, args) {
-        const removeRoleAssignment = async () => {
-            if (this.verbose) {
-                await logger.logToStderr(`Removing role assignment from web ${args.options.webUrl}...`);
-            }
-            try {
-                if (args.options.upn) {
-                    args.options.principalId = await this.getUserPrincipalId(args.options);
-                    await this.removeRoleAssignment(logger, args.options);
-                }
-                else if (args.options.groupName) {
-                    args.options.principalId = await this.getGroupPrincipalId(args.options);
-                    await this.removeRoleAssignment(logger, args.options);
-                }
-                else {
-                    await this.removeRoleAssignment(logger, args.options);
-                }
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await removeRoleAssignment();
+            await this.removeRoleAssignment(logger, args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -59,11 +38,32 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
                 message: `Are you sure you want to remove role assignment from web ${args.options.webUrl}?`
             });
             if (result.continue) {
-                await removeRoleAssignment();
+                await this.removeRoleAssignment(logger, args.options);
             }
         }
     }
-    removeRoleAssignment(logger, options) {
+    async removeRoleAssignment(logger, options) {
+        if (this.verbose) {
+            await logger.logToStderr(`Removing role assignment from web ${options.webUrl}...`);
+        }
+        try {
+            if (options.upn) {
+                options.principalId = await this.getUserPrincipalId(options);
+                await this.removeRoleAssignmentWithOptions(logger, options);
+            }
+            else if (options.groupName) {
+                options.principalId = await this.getGroupPrincipalId(options);
+                await this.removeRoleAssignmentWithOptions(logger, options);
+            }
+            else {
+                await this.removeRoleAssignmentWithOptions(logger, options);
+            }
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
+    async removeRoleAssignmentWithOptions(logger, options) {
         const requestOptions = {
             url: `${options.webUrl}/_api/web/roleassignments/removeroleassignment(principalid='${options.principalId}')`,
             method: 'POST',
@@ -73,12 +73,9 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             },
             responseType: 'json'
         };
-        return request
-            .post(requestOptions)
-            .then(_ => Promise.resolve())
-            .catch((err) => Promise.reject(err));
+        await request.post(requestOptions);
     }
-    getGroupPrincipalId(options) {
+    async getGroupPrincipalId(options) {
         const groupGetCommandOptions = {
             webUrl: options.webUrl,
             name: options.groupName,
@@ -86,15 +83,11 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } })
-            .then((output) => {
-            const getGroupOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getGroupOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoGroupGetCommand, { options: { ...groupGetCommandOptions, _: [] } });
+        const getGroupOutput = JSON.parse(output.stdout);
+        return getGroupOutput.Id;
     }
-    getUserPrincipalId(options) {
+    async getUserPrincipalId(options) {
         const userGetCommandOptions = {
             webUrl: options.webUrl,
             email: options.upn,
@@ -103,13 +96,9 @@ class SpoWebRoleAssignmentRemoveCommand extends SpoCommand {
             debug: this.debug,
             verbose: this.verbose
         };
-        return Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } })
-            .then((output) => {
-            const getUserOutput = JSON.parse(output.stdout);
-            return Promise.resolve(getUserOutput.Id);
-        }, (err) => {
-            return Promise.reject(err);
-        });
+        const output = await Cli.executeCommandWithOutput(spoUserGetCommand, { options: { ...userGetCommandOptions, _: [] } });
+        const getUserOutput = JSON.parse(output.stdout);
+        return getUserOutput.Id;
     }
 }
 _SpoWebRoleAssignmentRemoveCommand_instances = new WeakSet(), _SpoWebRoleAssignmentRemoveCommand_initTelemetry = function _SpoWebRoleAssignmentRemoveCommand_initTelemetry() {

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

@@ -27,24 +27,8 @@ class SpoWebRoleInheritanceBreakCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Break role inheritance of subsite with URL ${args.options.webUrl}...`);
         }
-        const breakroleInheritance = async () => {
-            const requestOptions = {
-                url: `${args.options.webUrl}/_api/web/breakroleinheritance(${!args.options.clearExistingPermissions})`,
-                headers: {
-                    'accept': 'application/json;odata=nometadata',
-                    'content-type': 'application/json'
-                },
-                responseType: 'json'
-            };
-            try {
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await breakroleInheritance();
+            await this.breakroleInheritance(args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -54,10 +38,26 @@ class SpoWebRoleInheritanceBreakCommand extends SpoCommand {
                 message: `Are you sure you want to break the role inheritance of subsite ${args.options.webUrl}`
             });
             if (result.continue) {
-                await breakroleInheritance();
+                await this.breakroleInheritance(args.options);
             }
         }
     }
+    async breakroleInheritance(options) {
+        const requestOptions = {
+            url: `${options.webUrl}/_api/web/breakroleinheritance(${!options.clearExistingPermissions})`,
+            headers: {
+                'accept': 'application/json;odata=nometadata',
+                'content-type': 'application/json'
+            },
+            responseType: 'json'
+        };
+        try {
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _SpoWebRoleInheritanceBreakCommand_instances = new WeakSet(), _SpoWebRoleInheritanceBreakCommand_initTelemetry = function _SpoWebRoleInheritanceBreakCommand_initTelemetry() {
     this.telemetry.push((args) => {

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

@@ -27,25 +27,8 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand {
         if (this.verbose) {
             await logger.logToStderr(`Restore role inheritance of subsite at ${args.options.webUrl}...`);
         }
-        const resetWebRoleInheritance = async () => {
-            try {
-                const requestOptions = {
-                    url: `${args.options.webUrl}/_api/web/resetroleinheritance`,
-                    method: 'POST',
-                    headers: {
-                        'accept': 'application/json;odata=nometadata',
-                        'content-type': 'application/json'
-                    },
-                    responseType: 'json'
-                };
-                await request.post(requestOptions);
-            }
-            catch (err) {
-                this.handleRejectedODataJsonPromise(err);
-            }
-        };
         if (args.options.force) {
-            await resetWebRoleInheritance();
+            await this.resetWebRoleInheritance(args.options);
         }
         else {
             const result = await Cli.prompt({
@@ -55,10 +38,27 @@ class SpoWebRoleInheritanceResetCommand extends SpoCommand {
                 message: `Are you sure you want to reset the role inheritance of ${args.options.webUrl}`
             });
             if (result.continue) {
-                await resetWebRoleInheritance();
+                await this.resetWebRoleInheritance(args.options);
             }
         }
     }
+    async resetWebRoleInheritance(options) {
+        try {
+            const requestOptions = {
+                url: `${options.webUrl}/_api/web/resetroleinheritance`,
+                method: 'POST',
+                headers: {
+                    'accept': 'application/json;odata=nometadata',
+                    'content-type': 'application/json'
+                },
+                responseType: 'json'
+            };
+            await request.post(requestOptions);
+        }
+        catch (err) {
+            this.handleRejectedODataJsonPromise(err);
+        }
+    }
 }
 _SpoWebRoleInheritanceResetCommand_instances = new WeakSet(), _SpoWebRoleInheritanceResetCommand_initTelemetry = function _SpoWebRoleInheritanceResetCommand_initTelemetry() {
     this.telemetry.push((args) => {