forked from sh-edraft.de/sh_discord_bot
Merge pull request '0.3 - Admins können keine anderen Benutzer zu Admin machen (#88)' (#112) from #88 into 0.3
Reviewed-on: sh-edraft.de/kd_discord_bot#112 Reviewed-by: Ebola-Chan <nick.jungmann@gmail.com> Closes #88
This commit is contained in:
commit
d2968e0652
@ -1,3 +1,4 @@
|
||||
import enum
|
||||
from inspect import signature, Parameter
|
||||
|
||||
from cpl_core.utils import String
|
||||
@ -28,6 +29,9 @@ class JSONProcessor:
|
||||
if isinstance(value, dict):
|
||||
value = JSONProcessor.process(parameter.annotation, value)
|
||||
|
||||
if issubclass(parameter.annotation, enum.Enum):
|
||||
value = parameter.annotation(value)
|
||||
|
||||
args.append(value)
|
||||
|
||||
elif parameter.default != Parameter.empty:
|
||||
|
@ -85,7 +85,7 @@ class AuthUserDTO(DtoABC):
|
||||
self._email = values['email']
|
||||
self._password = values['password']
|
||||
self._is_confirmed = values['isConfirmed']
|
||||
self._auth_role = values['authRole']
|
||||
self._auth_role = AuthRoleEnum(values['authRole'])
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
return {
|
||||
|
@ -33,8 +33,8 @@ class UpdateAuthUserDTO(DtoABC):
|
||||
return self._change_password
|
||||
|
||||
def from_dict(self, values: dict):
|
||||
self._auth_user = values['authUser']
|
||||
self._new_auth_user = values['newAuthUser']
|
||||
self._auth_user = AuthUserDTO().from_dict(values['authUser'])
|
||||
self._new_auth_user = AuthUserDTO().from_dict(values['newAuthUser'])
|
||||
self._change_password = False if 'changePassword' not in values else bool(values['changePassword'])
|
||||
|
||||
def to_dict(self) -> dict:
|
||||
|
Loading…
Reference in New Issue
Block a user