diff --git a/flame_hub/_auth_client.py b/flame_hub/_auth_client.py index 76c4670..3b9c89d 100644 --- a/flame_hub/_auth_client.py +++ b/flame_hub/_auth_client.py @@ -3,8 +3,7 @@ import typing as t import typing_extensions as te -from pydantic import BaseModel, Field, WrapValidator, EmailStr, ConfigDict -from pydantic.alias_generators import to_camel +from pydantic import BaseModel, Field, WrapValidator, EmailStr from flame_hub._base_client import ( BaseClient, @@ -24,217 +23,208 @@ from flame_hub._defaults import DEFAULT_AUTH_BASE_URL -class AuthBaseModel(BaseModel): - model_config = ConfigDict( - alias_generator=to_camel, - validate_by_alias=True, - validate_by_name=True, - serialize_by_alias=True, - ) - - -class CreateRealm(AuthBaseModel): +class CreateRealm(BaseModel): name: str - display_name: str | None + displayName: str | None description: str | None -class UpdateRealm(AuthBaseModel): +class UpdateRealm(BaseModel): name: str | UNSET_T = UNSET - display_name: str | None | UNSET_T = UNSET + displayName: str | None | UNSET_T = UNSET description: str | None | UNSET_T = UNSET class Realm(CreateRealm): id: uuid.UUID - built_in: bool - created_at: datetime - updated_at: datetime + builtIn: bool + createdAt: datetime + updatedAt: datetime -class CreateUser(AuthBaseModel): +class CreateUser(BaseModel): name: str - display_name: str | None + displayName: str | None email: t.Annotated[EmailStr, IsOptionalField] = None active: bool - name_locked: bool - first_name: str | None - last_name: str | None + nameLocked: bool + firstName: str | None + lastName: str | None class User(CreateUser): id: uuid.UUID avatar: str | None cover: str | None - realm_id: uuid.UUID + realmId: uuid.UUID realm: t.Annotated[Realm, IsIncludable] = None - created_at: datetime - updated_at: datetime + createdAt: datetime + updatedAt: datetime -class UpdateUser(AuthBaseModel): +class UpdateUser(BaseModel): name: str | UNSET_T = UNSET - display_name: str | UNSET_T = UNSET + displayName: str | UNSET_T = UNSET email: str | None | UNSET_T = UNSET active: bool | UNSET_T = UNSET - name_locked: bool | UNSET_T = UNSET - first_name: str | None | UNSET_T = UNSET - last_name: str | None | UNSET_T = UNSET + nameLocked: bool | UNSET_T = UNSET + firstName: str | None | UNSET_T = UNSET + lastName: str | None | UNSET_T = UNSET password: str | None | UNSET_T = UNSET -class CreatePermission(AuthBaseModel): +class CreatePermission(BaseModel): name: str - display_name: str | None + displayName: str | None description: str | None - realm_id: t.Annotated[uuid.UUID | None, Field(), WrapValidator(uuid_validator)] - policy_id: t.Annotated[uuid.UUID | None, Field(), WrapValidator(uuid_validator)] + realmId: t.Annotated[uuid.UUID | None, Field(), WrapValidator(uuid_validator)] + policyId: t.Annotated[uuid.UUID | None, Field(), WrapValidator(uuid_validator)] class Permission(CreatePermission): id: uuid.UUID - built_in: bool - client_id: uuid.UUID | None - created_at: datetime - updated_at: datetime + builtIn: bool + clientId: uuid.UUID | None + createdAt: datetime + updatedAt: datetime realm: t.Annotated[Realm | None, IsIncludable] = None -class UpdatePermission(AuthBaseModel): +class UpdatePermission(BaseModel): name: str | UNSET_T = UNSET - display_name: str | None | UNSET_T = UNSET + displayName: str | None | UNSET_T = UNSET description: str | None | UNSET_T = UNSET - realm_id: t.Annotated[uuid.UUID | None | UNSET_T, Field(), WrapValidator(uuid_validator)] = UNSET - policy_id: t.Annotated[uuid.UUID | None | UNSET_T, Field(), WrapValidator(uuid_validator)] = UNSET + realmId: t.Annotated[uuid.UUID | None | UNSET_T, Field(), WrapValidator(uuid_validator)] = UNSET + policyId: t.Annotated[uuid.UUID | None | UNSET_T, Field(), WrapValidator(uuid_validator)] = UNSET -class CreateRole(AuthBaseModel): +class CreateRole(BaseModel): name: str - display_name: str | None + displayName: str | None description: str | None class Role(CreateRole): id: uuid.UUID target: str | None - realm_id: uuid.UUID | None - created_at: datetime - updated_at: datetime + realmId: uuid.UUID | None + createdAt: datetime + updatedAt: datetime realm: t.Annotated[Realm | None, IsIncludable] = None -class UpdateRole(AuthBaseModel): +class UpdateRole(BaseModel): name: str | UNSET_T = UNSET - display_name: str | None | UNSET_T = UNSET + displayName: str | None | UNSET_T = UNSET description: str | None | UNSET_T = UNSET -class CreateRolePermission(AuthBaseModel): - role_id: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] - permission_id: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] +class CreateRolePermission(BaseModel): + roleId: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] + permissionId: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] class RolePermission(CreateRolePermission): id: uuid.UUID - role_realm_id: uuid.UUID | None - permission_realm_id: uuid.UUID | None - policy_id: uuid.UUID | None - created_at: datetime - updated_at: datetime + roleRealmId: uuid.UUID | None + permissionRealmId: uuid.UUID | None + policyId: uuid.UUID | None + createdAt: datetime + updatedAt: datetime role: t.Annotated[Role, IsIncludable] = None - role_realm: t.Annotated[Realm | None, IsIncludable] = None + roleRealm: t.Annotated[Realm | None, IsIncludable] = None permission: t.Annotated[Permission, IsIncludable] = None - permission_realm: t.Annotated[Realm | None, IsIncludable] = None + permissionRealm: t.Annotated[Realm | None, IsIncludable] = None -class CreateUserPermission(AuthBaseModel): - user_id: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] - permission_id: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] +class CreateUserPermission(BaseModel): + userId: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] + permissionId: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] class UserPermission(CreateUserPermission): id: uuid.UUID - user_realm_id: uuid.UUID | None - permission_realm_id: uuid.UUID | None - policy_id: uuid.UUID | None - created_at: datetime - updated_at: datetime + userRealmId: uuid.UUID | None + permissionRealmId: uuid.UUID | None + policyId: uuid.UUID | None + createdAt: datetime + updatedAt: datetime permission: t.Annotated[Permission, IsIncludable] = None user: t.Annotated[User, IsIncludable] = None - permission_realm: t.Annotated[Realm | None, IsIncludable] = None - user_realm: t.Annotated[Realm | None, IsIncludable] = None + permissionRealm: t.Annotated[Realm | None, IsIncludable] = None + userRealm: t.Annotated[Realm | None, IsIncludable] = None -class CreateUserRole(AuthBaseModel): - user_id: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] - role_id: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] +class CreateUserRole(BaseModel): + userId: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] + roleId: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] class UserRole(CreateUserRole): id: uuid.UUID - user_realm_id: uuid.UUID | None - role_realm_id: uuid.UUID | None - created_at: datetime - updated_at: datetime + userRealmId: uuid.UUID | None + roleRealmId: uuid.UUID | None + createdAt: datetime + updatedAt: datetime user: t.Annotated[User, IsIncludable] = None role: t.Annotated[Role, IsIncludable] = None - user_realm: t.Annotated[Realm | None, IsIncludable] = None - role_realm: t.Annotated[Realm | None, IsIncludable] = None + userRealm: t.Annotated[Realm | None, IsIncludable] = None + roleRealm: t.Annotated[Realm | None, IsIncludable] = None ClientAuthMethod = t.Literal["none", "secret", "tls"] ClientTokenBindingMethod = t.Literal["none", "tls"] -class CreateClient(AuthBaseModel): +class CreateClient(BaseModel): name: str secret: str | None - display_name: str | None + displayName: str | None description: str | None - redirect_uri: str | None + redirectUri: str | None active: bool - is_confidential: bool - secret_hashed: bool - grant_types: str | None - auth_method: ClientAuthMethod - token_binding_method: ClientTokenBindingMethod - realm_id: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] + isConfidential: bool + secretHashed: bool + grantTypes: str | None + authMethod: ClientAuthMethod + tokenBindingMethod: ClientTokenBindingMethod + realmId: t.Annotated[uuid.UUID, Field(), WrapValidator(uuid_validator)] -class Client(AuthBaseModel): +class Client(BaseModel): id: uuid.UUID name: str - built_in: bool - display_name: str | None + builtIn: bool + displayName: str | None description: str | None - redirect_uri: str | None + redirectUri: str | None active: bool - secret_hashed: bool - grant_types: str | None - secret_encrypted: bool + secretHashed: bool + grantTypes: str | None + secretEncrypted: bool scope: str | None - base_url: str | None - root_url: str | None - auth_method: ClientAuthMethod - token_binding_method: ClientTokenBindingMethod - created_at: datetime - updated_at: datetime - realm_id: uuid.UUID + baseUrl: str | None + rootUrl: str | None + authMethod: ClientAuthMethod + tokenBindingMethod: ClientTokenBindingMethod + createdAt: datetime + updatedAt: datetime + realmId: uuid.UUID realm: t.Annotated[Realm, IsIncludable] = None -class UpdateClient(AuthBaseModel): +class UpdateClient(BaseModel): name: str | UNSET_T = UNSET secret: str | None | UNSET_T = UNSET - display_name: str | None | UNSET_T = UNSET + displayName: str | None | UNSET_T = UNSET description: str | None | UNSET_T = UNSET - redirect_uri: str | None | UNSET_T = UNSET + redirectUri: str | None | UNSET_T = UNSET active: bool | UNSET_T = UNSET - is_confidential: bool | UNSET_T = UNSET - secret_hashed: bool | UNSET_T = UNSET - grant_types: str | None | UNSET_T = UNSET - auth_method: ClientAuthMethod | UNSET_T = UNSET - token_binding_method: ClientTokenBindingMethod | UNSET_T = UNSET + isConfidential: bool | UNSET_T = UNSET + secretHashed: bool | UNSET_T = UNSET + grantTypes: str | None | UNSET_T = UNSET + authMethod: ClientAuthMethod | UNSET_T = UNSET + tokenBindingMethod: ClientTokenBindingMethod | UNSET_T = UNSET class AuthClient(BaseClient): @@ -265,7 +255,7 @@ def find_realms(self, **params: te.Unpack[FindAllKwargs]) -> ResourceListResult[ def create_realm( self, name: str, - display_name: str | None = None, + displayName: str | None = None, description: str | None = None, **params: te.Unpack[BaseKwargs], ) -> Realm: @@ -273,24 +263,24 @@ def create_realm( Realm, CreateRealm( name=name, - display_name=display_name, + displayName=displayName, description=description, ), "realms", **params, ) - def delete_realm(self, realm_id: Realm | uuid.UUID | str, **params: te.Unpack[BaseKwargs]): - self._delete_resource("realms", realm_id, **params) + def delete_realm(self, realmId: Realm | uuid.UUID | str, **params: te.Unpack[BaseKwargs]): + self._delete_resource("realms", realmId, **params) - def get_realm(self, realm_id: Realm | uuid.UUID | str, **params: te.Unpack[GetKwargs]) -> Realm | None: - return self._get_single_resource(Realm, "realms", realm_id, **params) + def get_realm(self, realmId: Realm | uuid.UUID | str, **params: te.Unpack[GetKwargs]) -> Realm | None: + return self._get_single_resource(Realm, "realms", realmId, **params) def update_realm( self, - realm_id: Realm | str | uuid.UUID, + realmId: Realm | str | uuid.UUID, name: str | UNSET_T = UNSET, - display_name: str | None | UNSET_T = UNSET, + displayName: str | None | UNSET_T = UNSET, description: str | None | UNSET_T = UNSET, **params: te.Unpack[BaseKwargs], ) -> Realm: @@ -298,59 +288,59 @@ def update_realm( Realm, UpdateRealm( name=name, - display_name=display_name, + displayName=displayName, description=description, ), "realms", - realm_id, + realmId, **params, ) def create_permission( self, name: str, - display_name: str | None = None, + displayName: str | None = None, description: str | None = None, - realm_id: Realm | uuid.UUID | str | None = None, + realmId: Realm | uuid.UUID | str | None = None, **params: te.Unpack[BaseKwargs], ) -> Permission: return self._create_resource( Permission, CreatePermission( name=name, - display_name=display_name, + displayName=displayName, description=description, - realm_id=realm_id, - policy_id=None, # TODO: add policies when hub implements them + realmId=realmId, + policyId=None, # TODO: add policies when hub implements them ), "permissions", **params, ) def get_permission( - self, permission_id: Permission | uuid.UUID | str, **params: te.Unpack[GetKwargs] + self, permissionId: Permission | uuid.UUID | str, **params: te.Unpack[GetKwargs] ) -> Permission | None: return self._get_single_resource( - Permission, "permissions", permission_id, include=get_includable_names(Permission), **params + Permission, "permissions", permissionId, include=get_includable_names(Permission), **params ) - def delete_permission(self, permission_id: Permission | uuid.UUID | str, **params: te.Unpack[BaseKwargs]): - self._delete_resource("permissions", permission_id, **params) + def delete_permission(self, permissionId: Permission | uuid.UUID | str, **params: te.Unpack[BaseKwargs]): + self._delete_resource("permissions", permissionId, **params) def update_permission( self, - permission_id: Permission | uuid.UUID | str, + permissionId: Permission | uuid.UUID | str, name: str | UNSET_T = UNSET, - display_name: str | None | UNSET_T = UNSET, + displayName: str | None | UNSET_T = UNSET, description: str | None | UNSET_T = UNSET, - realm_id: Realm | uuid.UUID | str | None | UNSET_T = UNSET, + realmId: Realm | uuid.UUID | str | None | UNSET_T = UNSET, **params: te.Unpack[BaseKwargs], ) -> Permission: return self._update_resource( Permission, - UpdatePermission(name=name, display_name=display_name, description=description, realm_id=realm_id), + UpdatePermission(name=name, displayName=displayName, description=description, realmId=realmId), "permissions", - permission_id, + permissionId, **params, ) @@ -363,36 +353,36 @@ def find_permissions(self, **params: te.Unpack[FindAllKwargs]) -> ResourceListRe def create_role( self, name: str, - display_name: str | None = None, + displayName: str | None = None, description: str | None = None, **params: te.Unpack[BaseKwargs], ) -> Role: return self._create_resource( Role, - CreateRole(name=name, display_name=display_name, description=description), + CreateRole(name=name, displayName=displayName, description=description), "roles", **params, ) - def get_role(self, role_id: Role | uuid.UUID | str, **params: te.Unpack[GetKwargs]) -> Role | None: - return self._get_single_resource(Role, "roles", role_id, include=get_includable_names(Role), **params) + def get_role(self, roleId: Role | uuid.UUID | str, **params: te.Unpack[GetKwargs]) -> Role | None: + return self._get_single_resource(Role, "roles", roleId, include=get_includable_names(Role), **params) - def delete_role(self, role_id: Role | uuid.UUID | str, **params: te.Unpack[BaseKwargs]): - self._delete_resource("roles", role_id, **params) + def delete_role(self, roleId: Role | uuid.UUID | str, **params: te.Unpack[BaseKwargs]): + self._delete_resource("roles", roleId, **params) def update_role( self, - role_id: Role | uuid.UUID | str, + roleId: Role | uuid.UUID | str, name: str | UNSET_T = UNSET, - display_name: str | None | UNSET_T = UNSET, + displayName: str | None | UNSET_T = UNSET, description: str | None | UNSET_T = UNSET, **params: te.Unpack[BaseKwargs], ) -> Role: return self._update_resource( Role, - UpdateRole(name=name, display_name=display_name, description=description), + UpdateRole(name=name, displayName=displayName, description=description), "roles", - role_id, + roleId, **params, ) @@ -404,34 +394,34 @@ def find_roles(self, **params: te.Unpack[FindAllKwargs]) -> ResourceListResult[R def create_role_permission( self, - role_id: Role | uuid.UUID | str, - permission_id: Permission | uuid.UUID | str, + roleId: Role | uuid.UUID | str, + permissionId: Permission | uuid.UUID | str, **params: te.Unpack[BaseKwargs], ) -> RolePermission: return self._create_resource( RolePermission, - CreateRolePermission(role_id=role_id, permission_id=permission_id), + CreateRolePermission(roleId=roleId, permissionId=permissionId), "role-permissions", **params, ) def get_role_permission( - self, role_permission_id: RolePermission | uuid.UUID | str, **params: te.Unpack[GetKwargs] + self, rolePermissionId: RolePermission | uuid.UUID | str, **params: te.Unpack[GetKwargs] ) -> RolePermission | None: return self._get_single_resource( RolePermission, "role-permissions", - role_permission_id, + rolePermissionId, include=get_includable_names(RolePermission), **params, ) def delete_role_permission( self, - role_permission_id: RolePermission | uuid.UUID | str, + rolePermissionId: RolePermission | uuid.UUID | str, **params: te.Unpack[BaseKwargs], ): - self._delete_resource("role-permissions", role_permission_id, **params) + self._delete_resource("role-permissions", rolePermissionId, **params) def get_role_permissions(self, **params: te.Unpack[GetKwargs]) -> ResourceListResult[RolePermission]: return self._get_all_resources( @@ -453,59 +443,59 @@ def create_user( self, name: str, email: str, - display_name: str | None = None, + displayName: str | None = None, active: bool = True, - name_locked: bool = False, - first_name: str | None = None, - last_name: str | None = None, + nameLocked: bool = False, + firstName: str | None = None, + lastName: str | None = None, **params: te.Unpack[BaseKwargs], ) -> User: return self._create_resource( User, CreateUser( name=name, - display_name=display_name, + displayName=displayName, email=email, active=active, - name_locked=name_locked, - first_name=first_name, - last_name=last_name, + nameLocked=nameLocked, + firstName=firstName, + lastName=lastName, ), "users", **params, ) - def get_user(self, user_id: User | uuid.UUID | str, **params: te.Unpack[GetKwargs]) -> User | None: - return self._get_single_resource(User, "users", user_id, include=get_includable_names(User), **params) + def get_user(self, userId: User | uuid.UUID | str, **params: te.Unpack[GetKwargs]) -> User | None: + return self._get_single_resource(User, "users", userId, include=get_includable_names(User), **params) - def delete_user(self, user_id: User | uuid.UUID | str, **params: te.Unpack[BaseKwargs]): - self._delete_resource("users", user_id, **params) + def delete_user(self, userId: User | uuid.UUID | str, **params: te.Unpack[BaseKwargs]): + self._delete_resource("users", userId, **params) def update_user( self, - user_id: User | uuid.UUID | str, + userId: User | uuid.UUID | str, name: str | UNSET_T = UNSET, - display_name: str | UNSET_T = UNSET, + displayName: str | UNSET_T = UNSET, email: str | None | UNSET_T = UNSET, active: bool | UNSET_T = UNSET, - name_locked: bool | UNSET_T = UNSET, - first_name: str | None | UNSET_T = UNSET, - last_name: str | None | UNSET_T = UNSET, + nameLocked: bool | UNSET_T = UNSET, + firstName: str | None | UNSET_T = UNSET, + lastName: str | None | UNSET_T = UNSET, **params: te.Unpack[BaseKwargs], ) -> User: return self._update_resource( User, UpdateUser( name=name, - display_name=display_name, + displayName=displayName, email=email, active=active, - name_locked=name_locked, - first_name=first_name, - last_name=last_name, + nameLocked=nameLocked, + firstName=firstName, + lastName=lastName, ), "users", - user_id, + userId, **params, ) @@ -517,34 +507,34 @@ def find_users(self, **params: te.Unpack[FindAllKwargs]) -> ResourceListResult[U def create_user_permission( self, - user_id: User | uuid.UUID | str, - permission_id: Permission | uuid.UUID | str, + userId: User | uuid.UUID | str, + permissionId: Permission | uuid.UUID | str, **params: te.Unpack[BaseKwargs], ) -> UserPermission: return self._create_resource( UserPermission, - CreateUserPermission(user_id=user_id, permission_id=permission_id), + CreateUserPermission(userId=userId, permissionId=permissionId), "user-permissions", **params, ) def get_user_permission( - self, user_permission_id: UserPermission | uuid.UUID | str, **params: te.Unpack[GetKwargs] + self, userPermissionId: UserPermission | uuid.UUID | str, **params: te.Unpack[GetKwargs] ) -> UserPermission | None: return self._get_single_resource( UserPermission, "user-permissions", - user_permission_id, + userPermissionId, include=get_includable_names(UserPermission), **params, ) def delete_user_permission( self, - user_permission_id: UserPermission | uuid.UUID | str, + userPermissionId: UserPermission | uuid.UUID | str, **params: te.Unpack[BaseKwargs], ): - self._delete_resource("user-permissions", user_permission_id, **params) + self._delete_resource("user-permissions", userPermissionId, **params) def get_user_permissions(self, **params: te.Unpack[GetKwargs]) -> ResourceListResult[UserPermission]: return self._get_all_resources( @@ -564,26 +554,24 @@ def find_user_permissions(self, **params: te.Unpack[FindAllKwargs]) -> ResourceL def create_user_role( self, - user_id: User | uuid.UUID | str, - role_id: Role | uuid.UUID | str, + userId: User | uuid.UUID | str, + roleId: Role | uuid.UUID | str, **params: te.Unpack[BaseKwargs], ) -> UserRole: return self._create_resource( UserRole, - CreateUserRole(user_id=user_id, role_id=role_id), + CreateUserRole(userId=userId, roleId=roleId), "user-roles", **params, ) - def get_user_role( - self, user_role_id: UserRole | uuid.UUID | str, **params: te.Unpack[GetKwargs] - ) -> UserRole | None: + def get_user_role(self, userRoleId: UserRole | uuid.UUID | str, **params: te.Unpack[GetKwargs]) -> UserRole | None: return self._get_single_resource( - UserRole, "user-roles", user_role_id, include=get_includable_names(UserRole), **params + UserRole, "user-roles", userRoleId, include=get_includable_names(UserRole), **params ) - def delete_user_role(self, user_role_id: UserRole | uuid.UUID | str, **params: te.Unpack[BaseKwargs]): - self._delete_resource("user-roles", user_role_id, **params) + def delete_user_role(self, userRoleId: UserRole | uuid.UUID | str, **params: te.Unpack[BaseKwargs]): + self._delete_resource("user-roles", userRoleId, **params) def get_user_roles(self, **params: te.Unpack[GetKwargs]) -> ResourceListResult[UserRole]: return self._get_all_resources(UserRole, "user-roles", include=get_includable_names(UserRole), **params) @@ -594,44 +582,44 @@ def find_user_roles(self, **params: te.Unpack[FindAllKwargs]) -> ResourceListRes def create_client( self, name: str, - realm_id: Realm | str | uuid.UUID, + realmId: Realm | str | uuid.UUID, secret: str | None = None, - display_name: str | None = None, + displayName: str | None = None, description: str | None = None, - redirect_uri: str | None = None, + redirectUri: str | None = None, active: bool = True, - is_confidential: bool = True, - secret_hashed: bool = False, - grant_types: str | None = None, - auth_method: ClientAuthMethod = "secret", - token_binding_method: ClientTokenBindingMethod = "none", + isConfidential: bool = True, + secretHashed: bool = False, + grantTypes: str | None = None, + authMethod: ClientAuthMethod = "secret", + tokenBindingMethod: ClientTokenBindingMethod = "none", **params: te.Unpack[BaseKwargs], ) -> Client: return self._create_resource( Client, CreateClient( name=name, - realm_id=realm_id, + realmId=realmId, secret=secret, - display_name=display_name, + displayName=displayName, description=description, - redirect_uri=redirect_uri, + redirectUri=redirectUri, active=active, - is_confidential=is_confidential, - secret_hashed=secret_hashed, - grant_types=grant_types, - auth_method=auth_method, - token_binding_method=token_binding_method, + isConfidential=isConfidential, + secretHashed=secretHashed, + grantTypes=grantTypes, + authMethod=authMethod, + tokenBindingMethod=tokenBindingMethod, ), "clients", **params, ) - def delete_client(self, client_id: Client | uuid.UUID | str, **params: te.Unpack[BaseKwargs]): - self._delete_resource("clients", client_id, **params) + def delete_client(self, clientId: Client | uuid.UUID | str, **params: te.Unpack[BaseKwargs]): + self._delete_resource("clients", clientId, **params) - def get_client(self, client_id: Client | uuid.UUID | str, **params: te.Unpack[GetKwargs]) -> Client | None: - return self._get_single_resource(Client, "clients", client_id, include=get_includable_names(Client), **params) + def get_client(self, clientId: Client | uuid.UUID | str, **params: te.Unpack[GetKwargs]) -> Client | None: + return self._get_single_resource(Client, "clients", clientId, include=get_includable_names(Client), **params) def get_clients(self, **params: te.Unpack[GetKwargs]) -> ResourceListResult[Client]: return self._get_all_resources(Client, "clients", include=get_includable_names(Client), **params) @@ -641,18 +629,18 @@ def find_clients(self, **params: te.Unpack[FindAllKwargs]) -> ResourceListResult def update_client( self, - client_id: Client | uuid.UUID | str, + clientId: Client | uuid.UUID | str, name: str | UNSET_T = UNSET, secret: str | None | UNSET_T = UNSET, - display_name: str | None | UNSET_T = UNSET, + displayName: str | None | UNSET_T = UNSET, description: str | None | UNSET_T = UNSET, - redirect_uri: str | None | UNSET_T = UNSET, + redirectUri: str | None | UNSET_T = UNSET, active: bool | UNSET_T = UNSET, - is_confidential: bool | UNSET_T = UNSET, - secret_hashed: bool | UNSET_T = UNSET, - grant_types: str | None | UNSET_T = UNSET, - auth_method: ClientAuthMethod | UNSET_T = UNSET, - token_binding_method: ClientTokenBindingMethod | UNSET_T = UNSET, + isConfidential: bool | UNSET_T = UNSET, + secretHashed: bool | UNSET_T = UNSET, + grantTypes: str | None | UNSET_T = UNSET, + authMethod: ClientAuthMethod | UNSET_T = UNSET, + tokenBindingMethod: ClientTokenBindingMethod | UNSET_T = UNSET, **params: te.Unpack[BaseKwargs], ) -> Client: return self._update_resource( @@ -660,17 +648,17 @@ def update_client( UpdateClient( name=name, secret=secret, - display_name=display_name, + displayName=displayName, description=description, - redirect_uri=redirect_uri, + redirectUri=redirectUri, active=active, - is_confidential=is_confidential, - secret_hashed=secret_hashed, - grant_types=grant_types, - auth_method=auth_method, - token_binding_method=token_binding_method, + isConfidential=isConfidential, + secretHashed=secretHashed, + grantTypes=grantTypes, + authMethod=authMethod, + tokenBindingMethod=tokenBindingMethod, ), "clients", - client_id, + clientId, **params, ) diff --git a/tests/test_auth.py b/tests/test_auth.py index a266b82..97bfe4e 100644 --- a/tests/test_auth.py +++ b/tests/test_auth.py @@ -101,9 +101,9 @@ def user_role_includables(): @pytest.fixture() def client(auth_client, master_realm): - new_client = auth_client.create_client(name=next_random_string().lower(), realm_id=master_realm) + new_client = auth_client.create_client(name=next_random_string().lower(), realmId=master_realm) yield new_client - auth_client.delete_client(client_id=new_client) + auth_client.delete_client(clientId=new_client) @pytest.fixture(scope="session") @@ -228,8 +228,8 @@ def test_get_role_permissions(auth_client, role_permission, role_permission_incl @pytest.mark.xfail(reason="bug in authup") def test_find_role_permissions(auth_client, role_permission, role_permission_includables): - # Use "role_id" for filtering because there is no filter mechanism for attribute "id". - role_perms_find = auth_client.find_role_permissions(filter={"role_id": role_permission.role_id}) + # Use "roleId" for filtering because there is no filter mechanism for attribute "id". + role_perms_find = auth_client.find_role_permissions(filter={"roleId": role_permission.roleId}) assert [role_permission.id] == [rp.id for rp in role_perms_find] assert all( @@ -295,8 +295,8 @@ def test_get_user_permissions(auth_client, user_permission, user_permission_incl @pytest.mark.xfail(reason="bug in authup") def test_find_user_permissions(auth_client, user_permission, user_permission_includables): - # Use "user_id" for filtering because there is no filter mechanism for attribute "id". - user_perms_find = auth_client.find_user_permissions(filter={"user_id": user_permission.user_id}) + # Use "userId" for filtering because there is no filter mechanism for attribute "id". + user_perms_find = auth_client.find_user_permissions(filter={"userId": user_permission.userId}) assert len(user_perms_find) > 0 assert all( @@ -326,22 +326,22 @@ def test_get_user_roles(auth_client, user_role, user_role_includables): @pytest.mark.xfail(reason="bug in authup") def test_find_user_roles(auth_client, user_role, user_role_includables): - # Use "user_id" for filtering because there is no filter mechanism for attribute "id". - user_roles_find = auth_client.find_user_roles(filter={"user_id": user_role.user_id}) + # Use "userId" for filtering because there is no filter mechanism for attribute "id". + user_roles_find = auth_client.find_user_roles(filter={"userId": user_role.userId}) assert len(user_roles_find) > 0 assert all(includable in ur.model_fields_set for ur in user_roles_find for includable in user_role_includables) def test_get_client(auth_client, client, client_includables): - client_get = auth_client.get_client(client_id=client) + client_get = auth_client.get_client(clientId=client) assert client_get.id == client.id assert all(includable in client_get.model_fields_set for includable in client_includables) def test_get_client_not_found(auth_client): - assert auth_client.get_client(client_id=next_uuid()) is None + assert auth_client.get_client(clientId=next_uuid()) is None def test_get_clients(auth_client, client, client_includables): @@ -361,7 +361,7 @@ def test_find_clients(auth_client, client, client_includables): def test_update_client(auth_client, client): new_name = next_random_string().lower() - new_client = auth_client.update_client(client_id=client, name=new_name) + new_client = auth_client.update_client(clientId=client, name=new_name) assert client != new_client assert new_client.name == new_name diff --git a/tests/test_flow.py b/tests/test_flow.py index f2397b3..8ed53db 100644 --- a/tests/test_flow.py +++ b/tests/test_flow.py @@ -29,7 +29,7 @@ def test_password_auth_reissue(password_auth, auth_base_url): def test_client_auth(auth_client, auth_base_url, master_realm): client_secret = next_random_string(length=64) - client_resource = auth_client.create_client(name=next_random_string(), realm_id=master_realm, secret=client_secret) + client_resource = auth_client.create_client(name=next_random_string(), realmId=master_realm, secret=client_secret) client_id = str(client_resource.id) client_auth = ClientAuth(