Skip to content
Closed
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
The table of contents is too big for display.
Diff view
Diff view
  •  
  •  
  •  
4 changes: 2 additions & 2 deletions spec/auth/using_access_token_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_retrieves_general_settings_with_valid_token(
base_url,
auth_token,
)
client.settings.settings_service_get_general_settings()
client.settings.get_general_settings(body={})

def test_raises_api_exception_with_invalid_token(
self,
Expand All @@ -59,4 +59,4 @@ def test_raises_api_exception_with_invalid_token(
"invalid",
)
with pytest.raises(ZitadelError):
client.settings.settings_service_get_general_settings()
client.settings.get_general_settings(body={})
4 changes: 2 additions & 2 deletions spec/auth/using_client_credentials_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -58,7 +58,7 @@ def test_retrieves_general_settings_with_valid_client_credentials(
client_id,
client_secret,
)
client.settings.settings_service_get_general_settings()
client.settings.get_general_settings(body={})

def test_raises_api_exception_with_invalid_client_credentials(
self,
Expand All @@ -71,4 +71,4 @@ def test_raises_api_exception_with_invalid_client_credentials(
"invalid",
)
with pytest.raises(ZitadelError):
client.settings.settings_service_get_general_settings()
client.settings.get_general_settings(body={})
4 changes: 2 additions & 2 deletions spec/auth/using_private_key_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -47,7 +47,7 @@ def test_retrieves_general_settings_with_valid_private_key(
base_url,
key_file,
)
client.settings.settings_service_get_general_settings()
client.settings.get_general_settings(body={})

def test_raises_api_exception_with_invalid_private_key(
self,
Expand All @@ -59,4 +59,4 @@ def test_raises_api_exception_with_invalid_private_key(
key_file,
)
with pytest.raises(ZitadelError):
client.settings.settings_service_get_general_settings()
client.settings.get_general_settings(body={})
33 changes: 14 additions & 19 deletions spec/check_session_service_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -12,11 +12,10 @@
SessionServiceCreateSessionRequest,
SessionServiceCreateSessionResponse,
SessionServiceDeleteSessionRequest,
SessionServiceGetSessionRequest,
SessionServiceGetSessionResponse,
SessionServiceListSessionsRequest,
SessionServiceListSessionsResponse,
SessionServiceSetSessionRequest,
SessionServiceSetSessionResponse,
)


Expand Down Expand Up @@ -52,15 +51,12 @@ def session(client: zitadel.Zitadel) -> Generator[SessionServiceCreateSessionRes
checks=SessionServiceChecks(user=SessionServiceCheckUser(loginName="johndoe")),
lifetime="18000s",
)
response = client.sessions.session_service_create_session(request)
response = client.sessions.create_session(request)
yield response
# Teardown
delete_body = SessionServiceDeleteSessionRequest()
try:
client.sessions.session_service_delete_session(
response.session_id if response.session_id is not None else "",
delete_body,
)
request2 = SessionServiceDeleteSessionRequest(sessionId=response.session_id if response.session_id is not None else "")
client.sessions.delete_session(request2)
except ApiError:
pass

Expand Down Expand Up @@ -88,9 +84,8 @@ def test_retrieves_session_details_by_id(
session: SessionServiceCreateSessionResponse,
) -> None:
"""Retrieves the session details by ID."""
response: SessionServiceGetSessionResponse = client.sessions.session_service_get_session(
session.session_id if session.session_id is not None else ""
)
request = SessionServiceGetSessionRequest(sessionId=session.session_id if session.session_id is not None else "")
response: SessionServiceGetSessionResponse = client.sessions.get_session(request)
assert response.session is not None
assert response.session.id == session.session_id

Expand All @@ -101,7 +96,7 @@ def test_includes_created_session_when_listing(
) -> None:
"""Includes the created session when listing all sessions."""
request = SessionServiceListSessionsRequest(queries=[])
response: SessionServiceListSessionsResponse = client.sessions.session_service_list_sessions(request)
response = client.sessions.list_sessions(request)
assert response.sessions is not None
assert session.session_id in [session.id for session in response.sessions]

Expand All @@ -111,11 +106,10 @@ def test_updates_session_lifetime_and_returns_new_token(
session: SessionServiceCreateSessionResponse,
) -> None:
"""Updates the session lifetime and returns a new token."""
request = SessionServiceSetSessionRequest(lifetime="36000s")
response: SessionServiceSetSessionResponse = client.sessions.session_service_set_session(
session.session_id if session.session_id is not None else "",
request,
request = SessionServiceSetSessionRequest(
sessionId=session.session_id if session.session_id is not None else "", lifetime="36000s"
)
response = client.sessions.set_session(request)
assert isinstance(response.session_token, str)

def test_raises_api_exception_for_nonexistent_session(
Expand All @@ -125,7 +119,8 @@ def test_raises_api_exception_for_nonexistent_session(
) -> None:
"""Raises an ApiException when retrieving a non-existent session."""
with pytest.raises(ApiError):
client.sessions.session_service_get_session(
str(uuid.uuid4()),
session_token=session.session_token,
request = SessionServiceGetSessionRequest(
sessionId=str(uuid.uuid4()),
sessionToken=session.session_token,
)
client.sessions.get_session(request)
25 changes: 16 additions & 9 deletions spec/check_user_service_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -5,6 +5,7 @@
import pytest

import zitadel_client as zitadel
from zitadel_client import UserServiceGetUserByIDRequest
from zitadel_client.exceptions import ApiError
from zitadel_client.models import (
UserServiceAddHumanUserRequest,
Expand Down Expand Up @@ -50,10 +51,10 @@ def user(client: zitadel.Zitadel) -> Generator[UserServiceAddHumanUserResponse,
profile=UserServiceSetHumanProfile(given_name="John", family_name="Doe"), # type: ignore[call-arg]
email=UserServiceSetHumanEmail(email=f"johndoe{uuid.uuid4().hex}@example.com"),
)
response = client.users.user_service_add_human_user(request)
response = client.users.add_human_user(request)
yield response
try:
client.users.user_service_delete_user(response.user_id) # type: ignore[arg-type]
client.users.delete_user(response.user_id) # type: ignore[arg-type]
except ApiError:
pass

Expand Down Expand Up @@ -81,7 +82,10 @@ def test_retrieves_user_details_by_id(
user: UserServiceAddHumanUserResponse,
) -> None:
"""Retrieves the user details by ID."""
response: UserServiceGetUserByIDResponse = client.users.user_service_get_user_by_id(user.user_id) # type: ignore[arg-type]
request = UserServiceGetUserByIDRequest(
userId=user.user_id, # type: ignore[arg-type]
)
response: UserServiceGetUserByIDResponse = client.users.get_user_by_id(request)
assert response.user.user_id == user.user_id # type: ignore[union-attr]

def test_includes_created_user_when_listing(
Expand All @@ -91,7 +95,7 @@ def test_includes_created_user_when_listing(
) -> None:
"""Includes the created user when listing all users."""
request = UserServiceListUsersRequest(queries=[])
response = client.users.user_service_list_users(request)
response = client.users.list_users(request)
ids = [u.user_id for u in response.result] # type: ignore
assert user.user_id in ids

Expand All @@ -101,11 +105,11 @@ def test_updates_user_email_and_reflects_in_get(
user: UserServiceAddHumanUserResponse,
) -> None:
"""Updates the user's email and verifies the change."""
client.users.user_service_update_human_user(
user.user_id, # type: ignore[arg-type]
UserServiceUpdateHumanUserRequest(email=UserServiceSetHumanEmail(email=f"updated{uuid.uuid4().hex}@example.com")),
request = UserServiceUpdateHumanUserRequest(
userId=user.user_id, email=UserServiceSetHumanEmail(email=f"updated{uuid.uuid4().hex}@example.com")
)
response = client.users.user_service_get_user_by_id(user.user_id) # type: ignore[arg-type]
client.users.update_human_user(request)
response = client.users.get_user_by_id(user.user_id) # type: ignore[arg-type]
assert "updated" in response.user.human.email.email # type: ignore

def test_raises_api_exception_for_nonexistent_user(
Expand All @@ -114,4 +118,7 @@ def test_raises_api_exception_for_nonexistent_user(
) -> None:
"""Raises an ApiException when retrieving a non-existent user."""
with pytest.raises(ApiError):
client.users.user_service_get_user_by_id(str(uuid.uuid4()))
request = UserServiceGetUserByIDRequest(
userId=str(uuid.uuid4()),
)
client.users.get_user_by_id(request)
10 changes: 8 additions & 2 deletions zitadel_client/api/__init__.py
Original file line number Diff line number Diff line change
@@ -1,7 +1,14 @@
# flake8: noqa

# import apis into api package
from zitadel_client.api.action_service_api import ActionServiceApi
from zitadel_client.api.beta_action_service_api import BetaActionServiceApi
from zitadel_client.api.beta_feature_service_api import BetaFeatureServiceApi
from zitadel_client.api.beta_oidc_service_api import BetaOIDCServiceApi
from zitadel_client.api.beta_organization_service_api import BetaOrganizationServiceApi
from zitadel_client.api.beta_session_service_api import BetaSessionServiceApi
from zitadel_client.api.beta_settings_service_api import BetaSettingsServiceApi
from zitadel_client.api.beta_user_service_api import BetaUserServiceApi
from zitadel_client.api.beta_web_key_service_api import BetaWebKeyServiceApi
from zitadel_client.api.feature_service_api import FeatureServiceApi
from zitadel_client.api.identity_provider_service_api import IdentityProviderServiceApi
from zitadel_client.api.oidc_service_api import OIDCServiceApi
Expand All @@ -10,5 +17,4 @@
from zitadel_client.api.session_service_api import SessionServiceApi
from zitadel_client.api.settings_service_api import SettingsServiceApi
from zitadel_client.api.user_service_api import UserServiceApi
from zitadel_client.api.web_key_service_api import WebKeyServiceApi

Loading
Loading