Skip to content
Merged
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
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions spec/check_session_service_spec.py
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@
SessionServiceCheckUser,
SessionServiceCreateSessionRequest,
SessionServiceCreateSessionResponse,
SessionServiceDeleteSessionBody,
SessionServiceDeleteSessionRequest,
SessionServiceGetSessionResponse,
SessionServiceListSessionsRequest,
SessionServiceListSessionsResponse,
Expand Down Expand Up @@ -55,7 +55,7 @@ def session(client: zitadel.Zitadel) -> Generator[SessionServiceCreateSessionRes
response = client.sessions.session_service_create_session(request)
yield response
# Teardown
delete_body = SessionServiceDeleteSessionBody()
delete_body = SessionServiceDeleteSessionRequest()
try:
client.sessions.session_service_delete_session(
response.session_id if response.session_id is not None else "",
Expand Down
42 changes: 21 additions & 21 deletions zitadel_client/api/session_service_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@
from typing_extensions import Annotated
from zitadel_client.models.session_service_create_session_request import SessionServiceCreateSessionRequest
from zitadel_client.models.session_service_create_session_response import SessionServiceCreateSessionResponse
from zitadel_client.models.session_service_delete_session_body import SessionServiceDeleteSessionBody
from zitadel_client.models.session_service_delete_session_request import SessionServiceDeleteSessionRequest
from zitadel_client.models.session_service_delete_session_response import SessionServiceDeleteSessionResponse
from zitadel_client.models.session_service_get_session_response import SessionServiceGetSessionResponse
from zitadel_client.models.session_service_list_sessions_request import SessionServiceListSessionsRequest
Expand Down Expand Up @@ -101,7 +101,7 @@ def session_service_create_session(
)

_response_types_map: Dict[str, Optional[str]] = {
'201': "SessionServiceCreateSessionResponse",
'200': "SessionServiceCreateSessionResponse",
'403': "SessionServiceRpcStatus",
'404': "SessionServiceRpcStatus",
}
Expand Down Expand Up @@ -170,7 +170,7 @@ def session_service_create_session_with_http_info(
)

_response_types_map: Dict[str, Optional[str]] = {
'201': "SessionServiceCreateSessionResponse",
'200': "SessionServiceCreateSessionResponse",
'403': "SessionServiceRpcStatus",
'404': "SessionServiceRpcStatus",
}
Expand Down Expand Up @@ -239,7 +239,7 @@ def session_service_create_session_without_preload_content(
)

_response_types_map: Dict[str, Optional[str]] = {
'201': "SessionServiceCreateSessionResponse",
'200': "SessionServiceCreateSessionResponse",
'403': "SessionServiceRpcStatus",
'404': "SessionServiceRpcStatus",
}
Expand Down Expand Up @@ -331,7 +331,7 @@ def _session_service_create_session_serialize(
def session_service_delete_session(
self,
session_id: Annotated[StrictStr, Field(description="\"id of the session to terminate\"")],
session_service_delete_session_body: SessionServiceDeleteSessionBody,
session_service_delete_session_request: SessionServiceDeleteSessionRequest,
_request_timeout: Union[
None,
Annotated[StrictFloat, Field(gt=0)],
Expand All @@ -351,8 +351,8 @@ def session_service_delete_session(

:param session_id: \"id of the session to terminate\" (required)
:type session_id: str
:param session_service_delete_session_body: (required)
:type session_service_delete_session_body: SessionServiceDeleteSessionBody
:param session_service_delete_session_request: (required)
:type session_service_delete_session_request: SessionServiceDeleteSessionRequest
:param _request_timeout: timeout setting for this request. If one
number provided, it will be total request
timeout. It can also be a pair (tuple) of
Expand All @@ -377,7 +377,7 @@ def session_service_delete_session(

_param = self._session_service_delete_session_serialize(
session_id=session_id,
session_service_delete_session_body=session_service_delete_session_body,
session_service_delete_session_request=session_service_delete_session_request,
_request_auth=_request_auth,
_content_type=_content_type,
_headers=_headers,
Expand All @@ -404,7 +404,7 @@ def session_service_delete_session(
def session_service_delete_session_with_http_info(
self,
session_id: Annotated[StrictStr, Field(description="\"id of the session to terminate\"")],
session_service_delete_session_body: SessionServiceDeleteSessionBody,
session_service_delete_session_request: SessionServiceDeleteSessionRequest,
_request_timeout: Union[
None,
Annotated[StrictFloat, Field(gt=0)],
Expand All @@ -424,8 +424,8 @@ def session_service_delete_session_with_http_info(

:param session_id: \"id of the session to terminate\" (required)
:type session_id: str
:param session_service_delete_session_body: (required)
:type session_service_delete_session_body: SessionServiceDeleteSessionBody
:param session_service_delete_session_request: (required)
:type session_service_delete_session_request: SessionServiceDeleteSessionRequest
:param _request_timeout: timeout setting for this request. If one
number provided, it will be total request
timeout. It can also be a pair (tuple) of
Expand All @@ -450,7 +450,7 @@ def session_service_delete_session_with_http_info(

_param = self._session_service_delete_session_serialize(
session_id=session_id,
session_service_delete_session_body=session_service_delete_session_body,
session_service_delete_session_request=session_service_delete_session_request,
_request_auth=_request_auth,
_content_type=_content_type,
_headers=_headers,
Expand All @@ -477,7 +477,7 @@ def session_service_delete_session_with_http_info(
def session_service_delete_session_without_preload_content(
self,
session_id: Annotated[StrictStr, Field(description="\"id of the session to terminate\"")],
session_service_delete_session_body: SessionServiceDeleteSessionBody,
session_service_delete_session_request: SessionServiceDeleteSessionRequest,
_request_timeout: Union[
None,
Annotated[StrictFloat, Field(gt=0)],
Expand All @@ -497,8 +497,8 @@ def session_service_delete_session_without_preload_content(

:param session_id: \"id of the session to terminate\" (required)
:type session_id: str
:param session_service_delete_session_body: (required)
:type session_service_delete_session_body: SessionServiceDeleteSessionBody
:param session_service_delete_session_request: (required)
:type session_service_delete_session_request: SessionServiceDeleteSessionRequest
:param _request_timeout: timeout setting for this request. If one
number provided, it will be total request
timeout. It can also be a pair (tuple) of
Expand All @@ -523,7 +523,7 @@ def session_service_delete_session_without_preload_content(

_param = self._session_service_delete_session_serialize(
session_id=session_id,
session_service_delete_session_body=session_service_delete_session_body,
session_service_delete_session_request=session_service_delete_session_request,
_request_auth=_request_auth,
_content_type=_content_type,
_headers=_headers,
Expand All @@ -545,7 +545,7 @@ def session_service_delete_session_without_preload_content(
def _session_service_delete_session_serialize(
self,
session_id,
session_service_delete_session_body,
session_service_delete_session_request,
_request_auth,
_content_type,
_headers,
Expand Down Expand Up @@ -573,8 +573,8 @@ def _session_service_delete_session_serialize(
# process the header parameters
# process the form parameters
# process the body parameter
if session_service_delete_session_body is not None:
_body_params = session_service_delete_session_body
if session_service_delete_session_request is not None:
_body_params = session_service_delete_session_request


# set the HTTP header `Accept`
Expand Down Expand Up @@ -866,9 +866,9 @@ def _session_service_get_session_serialize(
_path_params['sessionId'] = session_id
# process the query parameters
if session_token is not None:

_query_params.append(('sessionToken', session_token))

# process the header parameters
# process the form parameters
# process the body parameter
Expand Down
6 changes: 3 additions & 3 deletions zitadel_client/api/user_service_api.py
Original file line number Diff line number Diff line change
Expand Up @@ -161,7 +161,7 @@ def user_service_add_human_user(
)

_response_types_map: Dict[str, Optional[str]] = {
'201': "UserServiceAddHumanUserResponse",
'200': "UserServiceAddHumanUserResponse",
'403': "UserServiceRpcStatus",
'404': "UserServiceRpcStatus",
}
Expand Down Expand Up @@ -230,7 +230,7 @@ def user_service_add_human_user_with_http_info(
)

_response_types_map: Dict[str, Optional[str]] = {
'201': "UserServiceAddHumanUserResponse",
'200': "UserServiceAddHumanUserResponse",
'403': "UserServiceRpcStatus",
'404': "UserServiceRpcStatus",
}
Expand Down Expand Up @@ -299,7 +299,7 @@ def user_service_add_human_user_without_preload_content(
)

_response_types_map: Dict[str, Optional[str]] = {
'201': "UserServiceAddHumanUserResponse",
'200': "UserServiceAddHumanUserResponse",
'403': "UserServiceRpcStatus",
'404': "UserServiceRpcStatus",
}
Expand Down
1 change: 1 addition & 0 deletions zitadel_client/auth/oauth_authenticator.py
Original file line number Diff line number Diff line change
Expand Up @@ -77,6 +77,7 @@ def refresh_token(self) -> Token:

T = TypeVar("T", bound="OAuthAuthenticatorBuilder[Any]")


# noinspection PyTypeHintsInspection
class OAuthAuthenticatorBuilder(ABC, Generic[T]):
"""
Expand Down
4 changes: 2 additions & 2 deletions zitadel_client/models/__init__.py
Original file line number Diff line number Diff line change
Expand Up @@ -131,7 +131,7 @@
from zitadel_client.models.session_service_create_session_response import SessionServiceCreateSessionResponse
from zitadel_client.models.session_service_creation_date_query import SessionServiceCreationDateQuery
from zitadel_client.models.session_service_creator_query import SessionServiceCreatorQuery
from zitadel_client.models.session_service_delete_session_body import SessionServiceDeleteSessionBody
from zitadel_client.models.session_service_delete_session_request import SessionServiceDeleteSessionRequest
from zitadel_client.models.session_service_delete_session_response import SessionServiceDeleteSessionResponse
from zitadel_client.models.session_service_details import SessionServiceDetails
from zitadel_client.models.session_service_factors import SessionServiceFactors
Expand All @@ -142,12 +142,12 @@
from zitadel_client.models.session_service_list_query import SessionServiceListQuery
from zitadel_client.models.session_service_list_sessions_request import SessionServiceListSessionsRequest
from zitadel_client.models.session_service_list_sessions_response import SessionServiceListSessionsResponse
from zitadel_client.models.session_service_otp_email_send_code import SessionServiceOTPEmailSendCode
from zitadel_client.models.session_service_otp_factor import SessionServiceOTPFactor
from zitadel_client.models.session_service_password_factor import SessionServicePasswordFactor
from zitadel_client.models.session_service_protobuf_any import SessionServiceProtobufAny
from zitadel_client.models.session_service_request_challenges import SessionServiceRequestChallenges
from zitadel_client.models.session_service_request_challenges_otp_email import SessionServiceRequestChallengesOTPEmail
from zitadel_client.models.session_service_request_challenges_otp_email_send_code import SessionServiceRequestChallengesOTPEmailSendCode
from zitadel_client.models.session_service_request_challenges_otpsms import SessionServiceRequestChallengesOTPSMS
from zitadel_client.models.session_service_request_challenges_web_auth_n import SessionServiceRequestChallengesWebAuthN
from zitadel_client.models.session_service_rpc_status import SessionServiceRpcStatus
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class IdentityProviderServiceAzureADTenant(BaseModel):
tenant_type: Optional[IdentityProviderServiceAzureADTenantType] = Field(default=IdentityProviderServiceAzureADTenantType.AZURE_AD_TENANT_TYPE_COMMON, alias="tenantType")
tenant_id: Optional[StrictStr] = Field(default=None, alias="tenantId")
additional_properties: Dict[str, Any] = {}
__properties: ClassVar[List[str]] = ["tenantType", "tenantId"]
__properties: ClassVar[List[str]] = []

model_config = ConfigDict(
populate_by_name=True,
Expand Down Expand Up @@ -90,8 +90,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
return cls.model_validate(obj)

_obj = cls.model_validate({
"tenantType": obj.get("tenantType") if obj.get("tenantType") is not None else IdentityProviderServiceAzureADTenantType.AZURE_AD_TENANT_TYPE_COMMON,
"tenantId": obj.get("tenantId")
})
# store additional fields in additional_properties
for _key in obj.keys():
Expand Down
54 changes: 1 addition & 53 deletions zitadel_client/models/identity_provider_service_idp_config.py
Original file line number Diff line number Diff line change
Expand Up @@ -53,7 +53,7 @@ class IdentityProviderServiceIDPConfig(BaseModel):
apple: Optional[IdentityProviderServiceAppleConfig] = None
saml: Optional[IdentityProviderServiceSAMLConfig] = None
additional_properties: Dict[str, Any] = {}
__properties: ClassVar[List[str]] = ["options", "ldap", "google", "oauth", "oidc", "jwt", "github", "githubEs", "gitlab", "gitlabSelfHosted", "azureAd", "apple", "saml"]
__properties: ClassVar[List[str]] = []

model_config = ConfigDict(
populate_by_name=True,
Expand Down Expand Up @@ -96,45 +96,6 @@ def to_dict(self) -> Dict[str, Any]:
exclude=excluded_fields,
exclude_none=True,
)
# override the default output from pydantic by calling `to_dict()` of options
if self.options:
_dict['options'] = self.options.to_dict()
# override the default output from pydantic by calling `to_dict()` of ldap
if self.ldap:
_dict['ldap'] = self.ldap.to_dict()
# override the default output from pydantic by calling `to_dict()` of google
if self.google:
_dict['google'] = self.google.to_dict()
# override the default output from pydantic by calling `to_dict()` of oauth
if self.oauth:
_dict['oauth'] = self.oauth.to_dict()
# override the default output from pydantic by calling `to_dict()` of oidc
if self.oidc:
_dict['oidc'] = self.oidc.to_dict()
# override the default output from pydantic by calling `to_dict()` of jwt
if self.jwt:
_dict['jwt'] = self.jwt.to_dict()
# override the default output from pydantic by calling `to_dict()` of github
if self.github:
_dict['github'] = self.github.to_dict()
# override the default output from pydantic by calling `to_dict()` of github_es
if self.github_es:
_dict['githubEs'] = self.github_es.to_dict()
# override the default output from pydantic by calling `to_dict()` of gitlab
if self.gitlab:
_dict['gitlab'] = self.gitlab.to_dict()
# override the default output from pydantic by calling `to_dict()` of gitlab_self_hosted
if self.gitlab_self_hosted:
_dict['gitlabSelfHosted'] = self.gitlab_self_hosted.to_dict()
# override the default output from pydantic by calling `to_dict()` of azure_ad
if self.azure_ad:
_dict['azureAd'] = self.azure_ad.to_dict()
# override the default output from pydantic by calling `to_dict()` of apple
if self.apple:
_dict['apple'] = self.apple.to_dict()
# override the default output from pydantic by calling `to_dict()` of saml
if self.saml:
_dict['saml'] = self.saml.to_dict()
# puts key-value pairs in additional_properties in the top level
if self.additional_properties is not None:
for _key, _value in self.additional_properties.items():
Expand All @@ -152,19 +113,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
return cls.model_validate(obj)

_obj = cls.model_validate({
"options": IdentityProviderServiceOptions.from_dict(obj["options"]) if obj.get("options") is not None else None,
"ldap": IdentityProviderServiceLDAPConfig.from_dict(obj["ldap"]) if obj.get("ldap") is not None else None,
"google": IdentityProviderServiceGoogleConfig.from_dict(obj["google"]) if obj.get("google") is not None else None,
"oauth": IdentityProviderServiceOAuthConfig.from_dict(obj["oauth"]) if obj.get("oauth") is not None else None,
"oidc": IdentityProviderServiceGenericOIDCConfig.from_dict(obj["oidc"]) if obj.get("oidc") is not None else None,
"jwt": IdentityProviderServiceJWTConfig.from_dict(obj["jwt"]) if obj.get("jwt") is not None else None,
"github": IdentityProviderServiceGitHubConfig.from_dict(obj["github"]) if obj.get("github") is not None else None,
"githubEs": IdentityProviderServiceGitHubEnterpriseServerConfig.from_dict(obj["githubEs"]) if obj.get("githubEs") is not None else None,
"gitlab": IdentityProviderServiceGitLabConfig.from_dict(obj["gitlab"]) if obj.get("gitlab") is not None else None,
"gitlabSelfHosted": IdentityProviderServiceGitLabSelfHostedConfig.from_dict(obj["gitlabSelfHosted"]) if obj.get("gitlabSelfHosted") is not None else None,
"azureAd": IdentityProviderServiceAzureADConfig.from_dict(obj["azureAd"]) if obj.get("azureAd") is not None else None,
"apple": IdentityProviderServiceAppleConfig.from_dict(obj["apple"]) if obj.get("apple") is not None else None,
"saml": IdentityProviderServiceSAMLConfig.from_dict(obj["saml"]) if obj.get("saml") is not None else None
})
# store additional fields in additional_properties
for _key in obj.keys():
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ class OIDCServiceAuthorizeOrDenyDeviceAuthorizationRequest(BaseModel):
session: Optional[OIDCServiceSession] = None
deny: Optional[Dict[str, Any]] = None
additional_properties: Dict[str, Any] = {}
__properties: ClassVar[List[str]] = ["session", "deny"]
__properties: ClassVar[List[str]] = []

model_config = ConfigDict(
populate_by_name=True,
Expand Down Expand Up @@ -73,9 +73,6 @@ def to_dict(self) -> Dict[str, Any]:
exclude=excluded_fields,
exclude_none=True,
)
# override the default output from pydantic by calling `to_dict()` of session
if self.session:
_dict['session'] = self.session.to_dict()
# puts key-value pairs in additional_properties in the top level
if self.additional_properties is not None:
for _key, _value in self.additional_properties.items():
Expand All @@ -93,8 +90,6 @@ def from_dict(cls, obj: Optional[Dict[str, Any]]) -> Optional[Self]:
return cls.model_validate(obj)

_obj = cls.model_validate({
"session": OIDCServiceSession.from_dict(obj["session"]) if obj.get("session") is not None else None,
"deny": obj.get("deny")
})
# store additional fields in additional_properties
for _key in obj.keys():
Expand Down
Loading