Token refresh
This commit is contained in:
+24
-2
@@ -13,7 +13,7 @@ from backend.app.services.auth_service import authenticate_user, find_user
|
||||
from backend.app.services.email_service import send_password_reset_email, smtp_configured
|
||||
from backend.app.services.email_verification import verify_email
|
||||
from backend.app.services.password_reset import create_reset_token, reset_password
|
||||
from backend.app.services.token_service import issue_token, revoke_token, validate_token
|
||||
from backend.app.services.token_service import issue_token, revoke_token, rotate_refresh_token, validate_token
|
||||
from backend.app.services.otp_service import verify_code
|
||||
from backend.app.services.secret_store import decrypt_secret
|
||||
from backend.app.services.email_addresses import verify_user_email_address
|
||||
@@ -28,6 +28,12 @@ class LoginRequest(BaseModel):
|
||||
email: str
|
||||
password: str
|
||||
otp: str | None = None
|
||||
device_id: str | None = None
|
||||
|
||||
|
||||
class RefreshTokenRequest(BaseModel):
|
||||
refresh_token: str
|
||||
device_id: str | None = None
|
||||
|
||||
|
||||
class PasswordResetRequest(BaseModel):
|
||||
@@ -62,16 +68,32 @@ def login(payload: LoginRequest, request: Request):
|
||||
raise HTTPException(status_code=401, detail='One-time password required or invalid')
|
||||
|
||||
clear_login_failures(ip_address, email)
|
||||
token_data = issue_token(user['id'], user['username'])
|
||||
token_data = issue_token(user['id'], user['username'], payload.device_id)
|
||||
return {
|
||||
'access_token': token_data['access_token'],
|
||||
'token_type': 'bearer',
|
||||
'expires_at': token_data['expires_at'],
|
||||
'refresh_token': token_data['refresh_token'],
|
||||
'device_id': token_data['device_id'],
|
||||
'user': {'id': user['id'], 'username': user['username'], 'email': user['email'], 'otp_enabled': bool(user['otp_enabled'])}
|
||||
}
|
||||
|
||||
|
||||
@router.post('/refresh')
|
||||
def refresh_token_endpoint(payload: RefreshTokenRequest):
|
||||
rotated = rotate_refresh_token(payload.refresh_token, payload.device_id)
|
||||
if rotated is None:
|
||||
raise HTTPException(status_code=401, detail='Refresh token is invalid, expired, or bound to another device')
|
||||
return {
|
||||
'access_token': rotated['access_token'],
|
||||
'token_type': 'bearer',
|
||||
'expires_at': rotated['expires_at'],
|
||||
'refresh_token': rotated['refresh_token'],
|
||||
'device_id': rotated['device_id'],
|
||||
'user': {'id': rotated['user_id'], 'username': rotated['username']},
|
||||
}
|
||||
|
||||
|
||||
@router.get('/verify-email')
|
||||
def verify_email_address(token: str):
|
||||
if not verify_email(token):
|
||||
|
||||
Reference in New Issue
Block a user