arno/etesync-server
1
0
Fork 0
mirror of https://github.com/etesync/server synced 2024-11-22 16:58:08 +00:00
Code Issues Releases Wiki Activity

Fix user creation.

Browse Source
This commit is contained in:
Tom Hacohen 2020-12-28 17:46:20 +02:00
parent 3d438b9591
commit f7858a20b7
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
django_etebase/utils.py
View File

@ -28,7 +28,7 @@ def get_user_queryset(queryset, context: CallbackContext):
def create_user(context: CallbackContext, *args, **kwargs): def create_user(context: CallbackContext, *args, **kwargs):
custom_func = app_settings.CREATE_USER_FUNC custom_func = app_settings.CREATE_USER_FUNC
if custom_func is not None: if custom_func is not None:
return custom_func(*args, **kwargs) return custom_func(context, *args, **kwargs)
return User.objects.create_user(*args, **kwargs) return User.objects.create_user(*args, **kwargs)

4
etebase_fastapi/authentication.py
View File

@ -181,7 +181,7 @@ async def is_etebase():
@authentication_router.post("/login_challenge/", response_model=LoginChallengeOut) @authentication_router.post("/login_challenge/", response_model=LoginChallengeOut)
async def login_challenge(user: User = Depends(get_login_user)): def login_challenge(user: User = Depends(get_login_user)):
salt = bytes(user.userinfo.salt) salt = bytes(user.userinfo.salt)
enc_key = get_encryption_key(salt) enc_key = get_encryption_key(salt)
box = nacl.secret.SecretBox(enc_key) box = nacl.secret.SecretBox(enc_key)
@ -238,10 +238,10 @@ def signup_save(data: SignupIn, request: Request) -> User:
# Create the user and save the casing the user chose as the first name # Create the user and save the casing the user chose as the first name
try: try:
instance = create_user( instance = create_user(
CallbackContext(request.path_params),
**user_data.dict(), **user_data.dict(),
password=None, password=None,
first_name=user_data.username, first_name=user_data.username,
context=CallbackContext(request.path_params),
) )
instance.full_clean() instance.full_clean()
except HttpError as e: except HttpError as e: