From 02efc30dcfb3c102b980de6db1f34de6141183fe Mon Sep 17 00:00:00 2001
From: Lan Hui <1348141770@qq.com>
Date: Thu, 10 Nov 2022 18:58:06 +0800
Subject: [PATCH] Move all username validation logic to class UserName

---
 app/Login.py           | 11 ++++-------
 app/account_service.py |  2 +-
 2 files changed, 5 insertions(+), 8 deletions(-)

diff --git a/app/Login.py b/app/Login.py
index 66a6634..1301c1c 100644
--- a/app/Login.py
+++ b/app/Login.py
@@ -98,6 +98,9 @@ class UserName:
         for c in self.username: # a user name not include special characters
             if c in string.punctuation and c is not '.' and c is not '_':
                 return f'{c} is not allowed in the user name.'
+        if self.username in ['signup', 'login', 'logout', 'reset', 'mark', 'back', 'unfamiliar', 'familiar', 'del']:
+            return 'You used a restricted word as your user name.  Please come up with a better one.'
+
         return 'OK'
 
 
@@ -106,11 +109,5 @@ class WarningMessage:
         self.s = s
 
     def __str__(self):
-        result = UserName(self.s).validate()
-        if result != 'OK':
-            return result
+        return UserName(self.s).validate()
 
-        if self.s in ['signup', 'login', 'logout', 'reset', 'mark', 'back', 'unfamiliar', 'familiar', 'del']:
-            return 'You used a restricted word as the username.  Please come up with a better one.'
-
-        return 'OK'
diff --git a/app/account_service.py b/app/account_service.py
index 2307686..b50478b 100644
--- a/app/account_service.py
+++ b/app/account_service.py
@@ -1,5 +1,5 @@
 from flask import *
-from Login import check_username_availability, verify_user, add_user, get_expiry_date, change_password, UserName, WarningMessage
+from Login import check_username_availability, verify_user, add_user, get_expiry_date, change_password, WarningMessage
 import re
 
 # 初始化蓝图