Skip to content

Commit cce3da4

Browse files
committed
ENH: Use obfuscate method from fmu-settings
1 parent 43250bf commit cce3da4

File tree

2 files changed

+3
-20
lines changed

2 files changed

+3
-20
lines changed

src/fmu_settings_api/v1/main.py

Lines changed: 2 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,6 @@
66

77
from fastapi import APIRouter, Cookie, Depends, HTTPException, Response
88
from fmu.settings import find_nearest_fmu_directory
9-
from fmu.settings.models.user_config import UserConfig
109

1110
from fmu_settings_api.config import settings
1211
from fmu_settings_api.deps import (
@@ -59,17 +58,9 @@ async def create_session(
5958
secure=False,
6059
samesite="lax",
6160
)
62-
config_dict = user_fmu_dir.config.load().model_dump()
61+
obfuscated_user_config = user_fmu_dir.config.load().obfuscate_secrets()
6362

64-
# Overwrite secret keys with obfuscated keys
65-
for k, v in config_dict["user_api_keys"].items():
66-
if v is not None:
67-
# Convert SecretStr("*********") to "*********"
68-
config_dict["user_api_keys"][k] = str(v)
69-
70-
user_config = UserConfig.model_validate(config_dict)
71-
72-
session_response = SessionResponse(user_config=user_config)
63+
session_response = SessionResponse(user_config=obfuscated_user_config)
7364

7465
with contextlib.suppress(FileNotFoundError):
7566
path = Path.cwd()

src/fmu_settings_api/v1/routes/user.py

Lines changed: 1 addition & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -14,15 +14,7 @@ async def get_fmu_directory_config(session: SessionDep) -> UserConfig:
1414
"""Returns the user configuration of the current session."""
1515
try:
1616
config = session.user_fmu_directory.config
17-
config_dict = config.load().model_dump()
18-
19-
# Overwrite secret keys with obfuscated keys
20-
for k, v in config_dict["user_api_keys"].items():
21-
if v is not None:
22-
# Convert SecretStr("*********") to "*********"
23-
config_dict["user_api_keys"][k] = str(v)
24-
25-
return UserConfig.model_validate(config_dict)
17+
return config.load().obfuscate_secrets()
2618
except PermissionError as e:
2719
raise HTTPException(
2820
status_code=403,

0 commit comments

Comments
 (0)