lone connection

api/main.py

@@ -218,7 +218,7 @@ async def login_for_access_token(request: Request, form_data: OAuth2PasswordRequ
     Authorize.set_access_cookies(access_token)
     Authorize.set_refresh_cookies(refresh_token)
     #return templates.TemplateResponse("index.html", {"request": request, "msg": 'Login'})
-    if util.user.email_veri_pass(form_data.username,db):
+    if util.user.email_veri_pass(form_data.username):
         return {"access_token": access_token, "token_type": "bearer",'veri':'ok'}
     else:
         return {"access_token": access_token, "token_type": "bearer",'veri':'fail'}
@@ -286,8 +286,8 @@ def logout(request: Request, Authorize: AuthJWT = Depends()):
 @app.post('/get_role')
 async def get_role(token: str = Depends(oauth2_scheme)):
      
-    user_id = util.user.get_user_id(token,db)
-    roles = util.user.get_user_role(user_id,db)
+    user_id = util.user.get_user_id(token)
+    roles = util.user.get_user_role(user_id)
     return roles
 
 @app.post('/create_role')
@@ -300,8 +300,8 @@ async def get_role(token: str = Depends(oauth2_scheme)):
 @app.post('/get_avatar_by_role')
 async def get_role(token: str = Depends(oauth2_scheme)):
      
-    user_id = util.user.get_user_id(token,db)
-    roles = util.user.get_user_role(user_id,db)
+    user_id = util.user.get_user_id(token)
+    roles = util.user.get_user_role(user_id)
     
     return user_id
 
@@ -336,7 +336,7 @@ async def send_reset_pwd(user_id,email):
         print(user_id)
         user_dict = next(iter(db.query('SELECT * FROM users where id ="'+str(user_id)+'"')))
     else:
-        user_id = util.user.get_id_by_email(email,db)
+        user_id = util.user.get_id_by_email(email)
         print(user_id)
         user_dict = next(iter(db.query('SELECT * FROM users where id ="'+str(user_id)+'"')))
     mailer.send(msg, user_dict['email'])
@@ -348,7 +348,7 @@ async def reset_password(req :util.models.reset_pwd):
     print(req.code)
     veri_obj = next(iter(db.query('SELECT * FROM reset_pw_code where code ="'+str(req.code)+'"')))
     print(veri_obj['user_id'])
-    user_id = util.user.get_id_by_email(veri_obj['email'],db)
+    user_id = util.user.get_id_by_email(veri_obj['email'])
     print(user_id)
     db.query('UPDATE users SET password = '+'"'+get_password_hash(req.password)+'" where id ='+str(user_id))
     

api/util/user.py

@@ -11,8 +11,8 @@ SECRET_KEY = "df2f77bd544240801a048bd4293afd8eeb7fff3cb7050e42c791db4b83ebadcd"
 ALGORITHM = "HS256"
 ACCESS_TOKEN_EXPIRE_DAYS = 5
 pwd_context = CryptContext(schemes=["bcrypt"], deprecated="auto")
- 
-def get_user_id(token,db):
+def get_user_id(token):
+    db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     credentials_exception = HTTPException(
         status_code=status.HTTP_401_UNAUTHORIZED,
         detail="Could not validate credentials",
@@ -32,15 +32,15 @@ def get_user_id(token,db):
     user_id = first(db.query('SELECT * FROM users where username="' + user.username+'"'))['id']
     return user_id
 
-def check_user_exists( username,db):
-     
+def check_user_exists( username):
+    db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     if int(next(iter(db.query('SELECT COUNT(*) FROM AI_anchor.users WHERE username = "'+username+'"')))['COUNT(*)']) > 0:
         return True
     else:
         return False
 
-def get_user( username: str,db):
-     
+def get_user( username: str):
+    db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     if not check_user_exists(username):  # if user don't exist
         return False
     user_dict = next(
@@ -48,8 +48,8 @@ def get_user( username: str,db):
     user = util.models.User(**user_dict)
     return user
     
-def user_register( user,db):
-     
+def user_register( user):
+    db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     table = db['users']
     user.password = get_password_hash(user.password)
     table.insert(dict(user))
@@ -60,8 +60,8 @@ def get_password_hash( password):
 def verify_password( plain_password, hashed_password):
     return pwd_context.verify(plain_password, hashed_password)
 
-def authenticate_user( username: str, password: str,db):
-     
+def authenticate_user( username: str, password: str):
+    db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     if not check_user_exists(username):  # if user don't exist
         return False
     user_dict = next(iter(db.query('SELECT * FROM AI_anchor.users where username ="'+username+'"')))
@@ -70,8 +70,8 @@ def authenticate_user( username: str, password: str,db):
         return False
     return user
 
-def get_user_role(id,db):
-     
+def get_user_role(id):
+    db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     state = 'SELECT * FROM user_role '\
     'INNER JOIN users on user_role.user_id= users.id '\
     'INNER JOIN role on user_role.role_id = role.id '\
@@ -81,8 +81,8 @@ def get_user_role(id,db):
         role_list.append({'id':row['role_id'],'name':row['name']})
     return role_list
 
-def get_avatar_by_role(id,db):
-     
+def get_avatar_by_role(id):
+    db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     state = 'SELECT * FROM ('\
 'SELECT role_id FROM AI_anchor.user_role '\
 'INNER JOIN users on user_role.user_id= users.id '\
@@ -95,12 +95,12 @@ def get_avatar_by_role(id,db):
         role_list.append({'id':row['role_id'],'name':row['name']})
     return role_list
 #def add_role( username,role_id):
-    # 
+    #db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     #user_role_table = db['user_role']
     #user_role_table.insert({'user_id':,'role_id':role_id})
 
-def get_user_id(token,db):
-     
+def get_user_id(token):
+    db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     credentials_exception = HTTPException(
         status_code=status.HTTP_401_UNAUTHORIZED,
         detail="Could not validate credentials",
@@ -120,13 +120,13 @@ def get_user_id(token,db):
     user_id = first(db.query('SELECT * FROM users where username="' + user.username+'"'))['id']
     return user_id
     
-def get_id_by_email(email,db):
-     
+def get_id_by_email(email):
+    db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     user_dict = next(iter(db.query('SELECT * FROM users where email ="'+email+'"')))
     return user_dict['id']
 
-def email_veri_pass(name,db):
-     
+def email_veri_pass(name):
+    db = dataset.connect('mysql://choozmo:pAssw0rd@db.ptt.cx:3306/AI_anchor?charset=utf8mb4')
     user_dict = next(iter(db.query('SELECT * FROM users where username ="'+name+'"')))
     user_obj = first(db.query('SELECT * FROM register_veri_code where user_id ="'+str(user_dict['id'])+'"'))
     if user_obj == None: