rename parameter for user in credentials

This commit is contained in:
Florian Förster 2025-03-20 08:23:48 +01:00
parent d93cc830e7
commit f8a727b7ef
6 changed files with 16 additions and 16 deletions

View File

@ -48,6 +48,6 @@ def status_err() -> str:
def api_credentials() -> str:
model = ApiCredentials(
user_name="user", password="pass", database="test1", mandant="mandant1"
username="user", password="pass", database="test1", mandant="mandant1"
)
return model.model_dump_json()

View File

@ -39,13 +39,13 @@ class Session:
def set_credentials(
self,
user_name: str,
username: str,
password: str,
database: str,
mandant: str,
) -> None:
self._creds = validate_credentials(
user_name=user_name,
username=username,
password=password,
database=database,
mandant=mandant,
@ -99,7 +99,7 @@ class Session:
URL: Final = combine_route(self.base_url, ROUTE)
login_req = LoginRequest(
userName=self.creds.user_name,
userName=self.creds.username,
password=self.creds.password,
databaseName=self.creds.database,
mandantName=self.creds.mandant,
@ -182,13 +182,13 @@ class Session:
def validate_credentials(
user_name: str,
username: str,
password: str,
database: str,
mandant: str,
) -> ApiCredentials:
return ApiCredentials(
user_name=user_name,
username=username,
password=password,
database=database,
mandant=mandant,

View File

@ -12,13 +12,13 @@ SESSION: Final[Session] = Session(HTTP_BASE_CONTENT_HEADERS)
def set_credentials(
user_name: str,
username: str,
password: str,
database: str,
mandant: str,
) -> None: # pragma: no cover
SESSION.set_credentials(
user_name=user_name,
username=username,
password=password,
database=database,
mandant=mandant,

View File

@ -84,7 +84,7 @@ JsonStatus = t.NewType("JsonStatus", str)
class ApiCredentials(BaseModel):
model_config: ConfigDict = ConfigDict(str_strip_whitespace=True)
user_name: str
username: str
password: str
database: str
mandant: str

View File

@ -11,7 +11,7 @@ def session(credentials, api_base_url) -> common.Session:
session = common.Session(HTTP_BASE_CONTENT_HEADERS)
session.set_base_url(api_base_url)
session.set_credentials(
user_name=credentials["user"],
username=credentials["user"],
password=credentials["pwd"],
database=credentials["db"],
mandant=credentials["mandant"],

View File

@ -11,30 +11,30 @@ from delta_barth.types import HttpRequestTypes
def test_validate_creds(credentials):
creds = common.validate_credentials(
user_name=credentials["user"],
username=credentials["user"],
password=credentials["pwd"],
database=credentials["db"],
mandant=credentials["mandant"],
)
assert creds.user_name == credentials["user"]
assert creds.username == credentials["user"]
assert creds.password == credentials["pwd"]
assert creds.database == credentials["db"]
assert creds.mandant == credentials["mandant"]
# with whitespaces
user = " " + credentials["user"] + " "
creds = common.validate_credentials(
user_name=user,
username=user,
password=credentials["pwd"],
database=credentials["db"],
mandant=credentials["mandant"],
)
assert user != credentials["user"]
assert creds.user_name == credentials["user"]
assert creds.username == credentials["user"]
# invalid type
user = 123
with pytest.raises(ValidationError):
creds = common.validate_credentials(
user_name=user, # type: ignore
username=user, # type: ignore
password=credentials["pwd"],
database=credentials["db"],
mandant=credentials["mandant"],
@ -64,7 +64,7 @@ def test_session(credentials, api_base_url):
session.set_base_url(api_base_url)
assert session._base_url is not None
session.set_credentials(
user_name=credentials["user"],
username=credentials["user"],
password=credentials["pwd"],
database=credentials["db"],
mandant=credentials["mandant"],