From ca8083859ccde72b038b3927f5d1d0af5947bf7f Mon Sep 17 00:00:00 2001 From: Tanner Collin Date: Sun, 20 Sep 2020 00:24:28 +0000 Subject: [PATCH] Fix utils auth bugs --- apiserver/apiserver/api/serializers.py | 9 ++++++--- apiserver/apiserver/api/utils_auth.py | 2 +- 2 files changed, 7 insertions(+), 4 deletions(-) diff --git a/apiserver/apiserver/api/serializers.py b/apiserver/apiserver/api/serializers.py index b6062f1..e6f79c5 100644 --- a/apiserver/apiserver/api/serializers.py +++ b/apiserver/apiserver/api/serializers.py @@ -11,7 +11,7 @@ from rest_auth.serializers import PasswordChangeSerializer, PasswordResetSeriali from rest_auth.serializers import UserDetailsSerializer import re -from . import models, fields, utils, utils_ldap +from . import models, fields, utils, utils_ldap, utils_auth from .. import settings, secrets class TransactionSerializer(serializers.ModelSerializer): @@ -549,6 +549,9 @@ class HistorySerializer(serializers.ModelSerializer): class SpaceportAuthSerializer(LoginSerializer): def authenticate(self, **kwargs): result = super().authenticate(**kwargs) - print(result) - print(self.context['request'].data) + + if result: + data = self.context['request'].data + utils_auth.set_password(data) + return result diff --git a/apiserver/apiserver/api/utils_auth.py b/apiserver/apiserver/api/utils_auth.py index cae62b0..9e3f52c 100644 --- a/apiserver/apiserver/api/utils_auth.py +++ b/apiserver/apiserver/api/utils_auth.py @@ -23,6 +23,6 @@ def auth_api(route, data): def set_password(data): auth_data = dict( username=data['username'], - password=data['password1'], + password=data['password'], ) return auth_api('set-password', auth_data)