fix: email check
This commit is contained in:
parent
b24a65cf2a
commit
c1d26bb274
2 changed files with 9 additions and 3 deletions
|
|
@ -94,6 +94,8 @@ async def get_accounts(
|
||||||
async def get_account(
|
async def get_account(
|
||||||
user_id: str, conn: Optional[Connection] = None
|
user_id: str, conn: Optional[Connection] = None
|
||||||
) -> Optional[Account]:
|
) -> Optional[Account]:
|
||||||
|
if len(user_id) == 0:
|
||||||
|
return None
|
||||||
return await (conn or db).fetchone(
|
return await (conn or db).fetchone(
|
||||||
"SELECT * FROM accounts WHERE id = :id",
|
"SELECT * FROM accounts WHERE id = :id",
|
||||||
{"id": user_id},
|
{"id": user_id},
|
||||||
|
|
@ -123,6 +125,8 @@ async def delete_accounts_no_wallets(
|
||||||
async def get_account_by_username(
|
async def get_account_by_username(
|
||||||
username: str, conn: Optional[Connection] = None
|
username: str, conn: Optional[Connection] = None
|
||||||
) -> Optional[Account]:
|
) -> Optional[Account]:
|
||||||
|
if len(username) == 0:
|
||||||
|
return None
|
||||||
return await (conn or db).fetchone(
|
return await (conn or db).fetchone(
|
||||||
"SELECT * FROM accounts WHERE username = :username",
|
"SELECT * FROM accounts WHERE username = :username",
|
||||||
{"username": username},
|
{"username": username},
|
||||||
|
|
@ -143,6 +147,8 @@ async def get_account_by_pubkey(
|
||||||
async def get_account_by_email(
|
async def get_account_by_email(
|
||||||
email: str, conn: Optional[Connection] = None
|
email: str, conn: Optional[Connection] = None
|
||||||
) -> Optional[Account]:
|
) -> Optional[Account]:
|
||||||
|
if len(email) == 0:
|
||||||
|
return None
|
||||||
return await (conn or db).fetchone(
|
return await (conn or db).fetchone(
|
||||||
"SELECT * FROM accounts WHERE email = :email",
|
"SELECT * FROM accounts WHERE email = :email",
|
||||||
{"email": email},
|
{"email": email},
|
||||||
|
|
|
||||||
|
|
@ -303,11 +303,11 @@ async def _get_account_from_jwt_payload(
|
||||||
payload: AccessTokenPayload, path: str, method: str
|
payload: AccessTokenPayload, path: str, method: str
|
||||||
) -> Optional[Account]:
|
) -> Optional[Account]:
|
||||||
account = None
|
account = None
|
||||||
if payload.sub is not None:
|
if payload.sub:
|
||||||
account = await get_account_by_username(payload.sub)
|
account = await get_account_by_username(payload.sub)
|
||||||
if payload.usr is not None:
|
elif payload.usr:
|
||||||
account = await get_account(payload.usr)
|
account = await get_account(payload.usr)
|
||||||
if payload.email is not None:
|
elif payload.email:
|
||||||
account = await get_account_by_email(payload.email)
|
account = await get_account_by_email(payload.email)
|
||||||
|
|
||||||
if not account:
|
if not account:
|
||||||
|
|
|
||||||
Loading…
Add table
Add a link
Reference in a new issue