[server] Don't give blocked users admin rights

geropl · csweichel · commit da088db09627 · 2021-04-30T12:43:40.000+02:00
diff --git a/components/server/src/user/user-service.ts b/components/server/src/user/user-service.ts
@@ -145,7 +145,7 @@ export class UserService {
 
             newUser.blocked = !canPass;
         }
-        if (isFirstUser || this.env.makeNewUsersAdmin) {
+        if (!newUser.blocked && (isFirstUser || this.env.makeNewUsersAdmin)) {
             newUser.rolesOrPermissions = ['admin'];
         }
     }

Original file line number	Diff line number	Diff line change
`@@ -145,7 +145,7 @@ export class UserService {`
`145`	`145`
`146`	`146`	`newUser.blocked = !canPass;`
`147`	`147`	`}`
`148`		`- if (isFirstUser \|\| this.env.makeNewUsersAdmin) {`
	`148`	`+ if (!newUser.blocked && (isFirstUser \|\| this.env.makeNewUsersAdmin)) {`
`149`	`149`	`newUser.rolesOrPermissions = ['admin'];`
`150`	`150`	`}`
`151`	`151`	`}`