|
@@ -6,6 +6,7 @@ from sqlalchemy.orm import Session
|
|
|
from werkzeug.security import check_password_hash, generate_password_hash
|
|
|
from itsdangerous import BadSignature, SignatureExpired
|
|
|
from itsdangerous import TimedJSONWebSignatureSerializer as Serializer
|
|
|
+from app.utils.utils import decode_base64
|
|
|
from constants.constants import SECRET_KEY
|
|
|
|
|
|
|
|
@@ -40,7 +41,7 @@ def create_users(db: Session, item: schemas.UsersCreate):
|
|
|
check_2 = db.query(models.Users).filter(models.Users.username == item.username).first()
|
|
|
if check_2:
|
|
|
raise Exception('该账号已存在')
|
|
|
-
|
|
|
+ item.password = decode_base64(item.password)
|
|
|
user_code = str(uuid.uuid1()).replace('-','')
|
|
|
db_item = models.Users(**{
|
|
|
'name': item.name,
|
|
@@ -54,10 +55,11 @@ def create_users(db: Session, item: schemas.UsersCreate):
|
|
|
db.refresh(db_item)
|
|
|
return db_item
|
|
|
|
|
|
-def login(db, item: schemas.LoginBase):
|
|
|
+def login(db: Session, item: schemas.LoginBase):
|
|
|
user: models.Users = db.query(models.Users).filter(models.Users.username == item.username).first()
|
|
|
if not user:
|
|
|
raise Exception('不存在此账号')
|
|
|
+ item.password = decode_base64(item.password)
|
|
|
if not verify_password(user.password,item.password):
|
|
|
raise Exception('密码错误')
|
|
|
auth_token = generate_user_token(user)
|
|
@@ -76,7 +78,7 @@ def get_users_by_project(db: Session, project_id: int):
|
|
|
.filter(models.Users.id.in_(user_ids)).all()
|
|
|
res = []
|
|
|
for user in users:
|
|
|
- if user.id == 1 and project_id != 1: continue
|
|
|
+ if user.id == 1: continue
|
|
|
item = user.to_dict()
|
|
|
item.update({'role_name':id_role[user_role[user.id]].name})
|
|
|
res.append(item)
|