Commit
·
05c4835
1
Parent(s):
d237d49
Refactor user register (#1962)
Browse files### What problem does this PR solve?
Refactor code, improve performance
### Type of change
- [x] Refactoring
Signed-off-by: Jin Hai <[email protected]>
- api/apps/user_app.py +14 -6
api/apps/user_app.py
CHANGED
@@ -332,16 +332,24 @@ def user_register(user_id, user):
|
|
332 |
@validate_request("nickname", "email", "password")
|
333 |
def user_add():
|
334 |
req = request.json
|
335 |
-
|
336 |
-
|
337 |
-
|
338 |
-
if not re.match(r"^[\w\._-]+@([\w_-]+\.)+[\w-]{2,4}$",
|
339 |
-
return get_json_result(data=False,
|
|
|
340 |
retcode=RetCode.OPERATING_ERROR)
|
341 |
|
|
|
|
|
|
|
|
|
|
|
|
|
|
|
342 |
user_dict = {
|
343 |
"access_token": get_uuid(),
|
344 |
-
"email":
|
345 |
"nickname": req["nickname"],
|
346 |
"password": decrypt(req["password"]),
|
347 |
"login_channel": "password",
|
|
|
332 |
@validate_request("nickname", "email", "password")
|
333 |
def user_add():
|
334 |
req = request.json
|
335 |
+
email_address = req["email"]
|
336 |
+
|
337 |
+
# Validate the email address
|
338 |
+
if not re.match(r"^[\w\._-]+@([\w_-]+\.)+[\w-]{2,4}$", email_address):
|
339 |
+
return get_json_result(data=False,
|
340 |
+
retmsg=f'Invalid Email address: {email_address}!',
|
341 |
retcode=RetCode.OPERATING_ERROR)
|
342 |
|
343 |
+
# Check if the email address is already used
|
344 |
+
if UserService.query(email=email_address):
|
345 |
+
return get_json_result(
|
346 |
+
data=False,
|
347 |
+
retmsg=f'Email: {email_address} has already registered!',
|
348 |
+
retcode=RetCode.OPERATING_ERROR)
|
349 |
+
|
350 |
user_dict = {
|
351 |
"access_token": get_uuid(),
|
352 |
+
"email": email_address,
|
353 |
"nickname": req["nickname"],
|
354 |
"password": decrypt(req["password"]),
|
355 |
"login_channel": "password",
|