Add user agreement
This commit is contained in:
@@ -1,9 +1,8 @@
|
||||
import traceback
|
||||
|
||||
import account.models
|
||||
from .api_utils import *
|
||||
from .models import *
|
||||
from django.core.exceptions import ValidationError
|
||||
from django.core.exceptions import *
|
||||
|
||||
|
||||
def _reqire_access_token(params):
|
||||
@@ -11,17 +10,13 @@ def _reqire_access_token(params):
|
||||
return UserToken.get_user_by_token(token)
|
||||
|
||||
|
||||
def make_response(response):
|
||||
return {"response": response}
|
||||
|
||||
|
||||
def account_auth(params):
|
||||
login = api_get_param_str(params, "login")
|
||||
password = api_get_param_str(params, "password")
|
||||
user = UserToken.auth(login, password)
|
||||
token = UserToken.create_token(user)
|
||||
|
||||
return make_response({"access_token": token.access_token})
|
||||
return api_make_response({"access_token": token.access_token})
|
||||
|
||||
|
||||
def account_register(params):
|
||||
@@ -45,7 +40,7 @@ def account_register(params):
|
||||
|
||||
try:
|
||||
token = UserToken.create_token(user)
|
||||
return make_response({"access_token": token.access_token})
|
||||
return api_make_response({"access_token": token.access_token})
|
||||
|
||||
except Exception as ex:
|
||||
# если вдруг токен нельзя создать
|
||||
@@ -54,12 +49,12 @@ def account_register(params):
|
||||
|
||||
except ValidationError as e:
|
||||
traceback.print_exc()
|
||||
raise Exception(API_ERROR_USER_REGISTER, e.messages)
|
||||
raise Exception(API_ERROR_USER_REGISTER, e.message_dict)
|
||||
|
||||
|
||||
def account_get(params):
|
||||
user = _reqire_access_token(params)
|
||||
return make_response({"name": user.name, "surname": user.surname, "email": user.email, "phone": user.phone})
|
||||
return api_make_response({"name": user.name, "surname": user.surname, "email": user.email, "phone": user.phone})
|
||||
|
||||
|
||||
def __make_argument_doc(name, arg_type, description, required=True):
|
||||
|
@@ -6,6 +6,10 @@ def __make_invalid_argument_type_error(name, value, except_type):
|
||||
raise Exception(API_ERROR_INVALID_ARGUMENT_TYPE, related)
|
||||
|
||||
|
||||
def api_make_response(response):
|
||||
return {"response": response}
|
||||
|
||||
|
||||
def api_get_param_int(params: dict, name: str, required=True, default=0):
|
||||
if name in params:
|
||||
try:
|
||||
|
Reference in New Issue
Block a user