Skip to content

Commit 592a3ef

Browse files
Refactor code for improved readability and consistency
Clean up whitespace and formatting across multiple files. This includes adjustments in the health check test, settings, and authentication utilities to enhance code clarity and maintainability.
1 parent ec94e86 commit 592a3ef

File tree

5 files changed

+88
-152
lines changed

5 files changed

+88
-152
lines changed

api/auth/utils.py

+13-28
Original file line numberDiff line numberDiff line change
@@ -57,82 +57,67 @@ def authenticate_user(db: Session, username: str, password: str) -> Union[User,
5757
def create_token(data: Dict[str, Any], expires_delta: Optional[timedelta] = None) -> str:
5858
"""Create a JWT token"""
5959
to_encode = data.copy()
60-
60+
6161
if expires_delta:
6262
expire = datetime.now(timezone.utc) + expires_delta
6363
else:
6464
expire = datetime.now(timezone.utc) + timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
65-
65+
6666
to_encode.update({"exp": expire})
6767
encoded_jwt = jwt.encode(to_encode, SECRET_KEY, algorithm=ALGORITHM)
6868
return encoded_jwt
6969

7070

7171
def create_access_token(data: Dict[str, Any]) -> str:
7272
"""Create an access token"""
73-
return create_token(
74-
data,
75-
expires_delta=timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES)
76-
)
73+
return create_token(data, expires_delta=timedelta(minutes=ACCESS_TOKEN_EXPIRE_MINUTES))
7774

7875

7976
def create_refresh_token(data: Dict[str, Any]) -> str:
8077
"""Create a refresh token"""
81-
return create_token(
82-
data,
83-
expires_delta=timedelta(days=REFRESH_TOKEN_EXPIRE_DAYS)
84-
)
78+
return create_token(data, expires_delta=timedelta(days=REFRESH_TOKEN_EXPIRE_DAYS))
8579

8680

8781
async def get_current_user(
88-
token: str = Depends(oauth2_scheme),
89-
db: Session = Depends(get_db)
82+
token: str = Depends(oauth2_scheme), db: Session = Depends(get_db)
9083
) -> User:
9184
"""Get the current authenticated user from the token"""
9285
credentials_exception = HTTPException(
9386
status_code=status.HTTP_401_UNAUTHORIZED,
9487
detail="Could not validate credentials",
9588
headers={"WWW-Authenticate": "Bearer"},
9689
)
97-
90+
9891
try:
9992
payload = jwt.decode(token, SECRET_KEY, algorithms=[ALGORITHM])
10093
username: str = payload.get("sub")
10194
if username is None:
10295
raise credentials_exception
10396
except JWTError:
10497
raise credentials_exception
105-
98+
10699
user = get_user(db, username=username)
107100
if user is None:
108101
raise credentials_exception
109-
102+
110103
# Update last login time
111104
user.last_login = datetime.now(timezone.utc)
112105
db.commit()
113-
106+
114107
return user
115108

116109

117-
async def get_current_active_user(
118-
current_user: User = Depends(get_current_user)
119-
) -> User:
110+
async def get_current_active_user(current_user: User = Depends(get_current_user)) -> User:
120111
"""Get the current active user"""
121112
if not current_user.is_active:
122-
raise HTTPException(
123-
status_code=status.HTTP_403_FORBIDDEN,
124-
detail="Inactive user"
125-
)
113+
raise HTTPException(status_code=status.HTTP_403_FORBIDDEN, detail="Inactive user")
126114
return current_user
127115

128116

129-
async def get_admin_user(
130-
current_user: User = Depends(get_current_active_user)
131-
) -> User:
117+
async def get_admin_user(current_user: User = Depends(get_current_active_user)) -> User:
132118
"""Check if the current user is an admin"""
133119
if not current_user.is_admin:
134120
raise HTTPException(
135-
status_code=status.HTTP_403_FORBIDDEN,
136-
detail="Admin privileges required"
121+
status_code=status.HTTP_403_FORBIDDEN, detail="Admin privileges required"
137122
)
138123
return current_user

api/main.py

+12-12
Original file line numberDiff line numberDiff line change
@@ -66,26 +66,26 @@ async def health_check(request: Request):
6666

6767
app.include_router(auth_routes.authRouter, prefix=settings.API_PREFIX, tags=["auth"])
6868
app.include_router(
69-
block_routes.blockRouter,
70-
prefix=settings.API_PREFIX,
69+
block_routes.blockRouter,
70+
prefix=settings.API_PREFIX,
7171
tags=["blocks"],
72-
dependencies=[Depends(get_current_active_user)]
72+
dependencies=[Depends(get_current_active_user)],
7373
)
7474
app.include_router(
75-
mining_routes.miningRouter,
76-
prefix=settings.API_PREFIX,
75+
mining_routes.miningRouter,
76+
prefix=settings.API_PREFIX,
7777
tags=["mining"],
78-
dependencies=[Depends(get_current_active_user)]
78+
dependencies=[Depends(get_current_active_user)],
7979
)
8080
app.include_router(
81-
transaction_routes.transactionRouter,
82-
prefix=settings.API_PREFIX,
81+
transaction_routes.transactionRouter,
82+
prefix=settings.API_PREFIX,
8383
tags=["transactions"],
84-
dependencies=[Depends(get_current_active_user)]
84+
dependencies=[Depends(get_current_active_user)],
8585
)
8686
app.include_router(
87-
wallet_routes.walletRouter,
88-
prefix=settings.API_PREFIX,
87+
wallet_routes.walletRouter,
88+
prefix=settings.API_PREFIX,
8989
tags=["wallets"],
90-
dependencies=[Depends(get_current_active_user)]
90+
dependencies=[Depends(get_current_active_user)],
9191
)

0 commit comments

Comments
 (0)