delta-barth/delta-barth-py
1
0
Fork 0
Code Issues 3 Pull Requests Actions Packages Projects 3 Releases 3 Wiki Activity

rename parameter for user in credentials

Browse Source
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
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/delta_barth/_csharp/json_types.py
View File

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

10
src/delta_barth/api/common.py
View File

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

4
src/delta_barth/management.py
View File

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

2
src/delta_barth/types.py
View File

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

2
tests/api/conftest.py
View File

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

12
tests/api/test_common.py
View File

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