Skip to content

Commit eb44fbc

Browse files
aldbraldbr
committed
fix: adapt clients
1 parent 363bfe0 commit eb44fbc

10 files changed

Lines changed: 124 additions & 256 deletions

File tree

‎diracx-client/src/diracx/client/_generated/aio/operations/_operations.py‎

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
build_auth_initiate_authorization_flow_request,
3636
build_auth_initiate_device_flow_request,
3737
build_auth_revoke_refresh_token_by_jti_request,
38-
build_auth_revoke_refresh_token_by_refresh_token_request,
3938
build_auth_userinfo_request,
4039
build_config_serve_config_request,
4140
build_jobs_add_heartbeat_request,
@@ -293,6 +292,7 @@ def __init__(self, *args, **kwargs) -> None:
293292
raise_if_not_implemented(
294293
self.__class__,
295294
[
295+
"revoke_refresh_token_by_refresh_token",
296296
"get_oidc_token",
297297
],
298298
)
@@ -583,59 +583,6 @@ async def get_refresh_tokens(self, **kwargs: Any) -> List[Any]:
583583

584584
return deserialized # type: ignore
585585

586-
@distributed_trace_async
587-
async def revoke_refresh_token_by_refresh_token(self, *, refresh_token: str, client_id: str, **kwargs: Any) -> str:
588-
"""Revoke Refresh Token By Refresh Token.
589-
590-
Revoke a refresh token.
591-
592-
:keyword refresh_token: Required.
593-
:paramtype refresh_token: str
594-
:keyword client_id: Required.
595-
:paramtype client_id: str
596-
:return: str
597-
:rtype: str
598-
:raises ~azure.core.exceptions.HttpResponseError:
599-
"""
600-
error_map: MutableMapping = {
601-
401: ClientAuthenticationError,
602-
404: ResourceNotFoundError,
603-
409: ResourceExistsError,
604-
304: ResourceNotModifiedError,
605-
}
606-
error_map.update(kwargs.pop("error_map", {}) or {})
607-
608-
_headers = kwargs.pop("headers", {}) or {}
609-
_params = kwargs.pop("params", {}) or {}
610-
611-
cls: ClsType[str] = kwargs.pop("cls", None)
612-
613-
_request = build_auth_revoke_refresh_token_by_refresh_token_request(
614-
refresh_token=refresh_token,
615-
client_id=client_id,
616-
headers=_headers,
617-
params=_params,
618-
)
619-
_request.url = self._client.format_url(_request.url)
620-
621-
_stream = False
622-
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
623-
_request, stream=_stream, **kwargs
624-
)
625-
626-
response = pipeline_response.http_response
627-
628-
if response.status_code not in [200]:
629-
map_error(status_code=response.status_code, response=response, error_map=error_map)
630-
raise HttpResponseError(response=response)
631-
632-
deserialized = self._deserialize("str", pipeline_response.http_response)
633-
634-
if cls:
635-
return cls(pipeline_response, deserialized, {}) # type: ignore
636-
637-
return deserialized # type: ignore
638-
639586
@distributed_trace_async
640587
async def revoke_refresh_token_by_jti(self, jti: str, **kwargs: Any) -> str:
641588
"""Revoke Refresh Token By Jti.

‎diracx-client/src/diracx/client/_generated/models/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from ._models import ( # type: ignore
1515
BodyAuthGetOidcToken,
1616
BodyAuthGetOidcTokenGrantType,
17+
BodyAuthRevokeRefreshTokenByRefreshToken,
1718
BodyJobsRescheduleJobs,
1819
BodyJobsUnassignBulkJobsSandboxes,
1920
GroupInfo,
@@ -50,6 +51,7 @@
5051
)
5152

5253
from ._enums import ( # type: ignore
54+
BodyAuthRevokeRefreshTokenByRefreshTokenTypeHint,
5355
ChecksumAlgorithm,
5456
JobStatus,
5557
SandboxFormat,
@@ -65,6 +67,7 @@
6567
__all__ = [
6668
"BodyAuthGetOidcToken",
6769
"BodyAuthGetOidcTokenGrantType",
70+
"BodyAuthRevokeRefreshTokenByRefreshToken",
6871
"BodyJobsRescheduleJobs",
6972
"BodyJobsUnassignBulkJobsSandboxes",
7073
"GroupInfo",
@@ -98,6 +101,7 @@
98101
"ValidationErrorLocItem",
99102
"VectorSearchSpec",
100103
"VectorSearchSpecValues",
104+
"BodyAuthRevokeRefreshTokenByRefreshTokenTypeHint",
101105
"ChecksumAlgorithm",
102106
"JobStatus",
103107
"SandboxFormat",

‎diracx-client/src/diracx/client/_generated/models/_enums.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
from azure.core import CaseInsensitiveEnumMeta
99

1010

11+
class BodyAuthRevokeRefreshTokenByRefreshTokenTypeHint(str, Enum, metaclass=CaseInsensitiveEnumMeta):
12+
"""Hint for the type of token being revoked."""
13+
14+
ACCESS_TOKEN = "access_token"
15+
REFRESH_TOKEN = "refresh_token"
16+
17+
1118
class ChecksumAlgorithm(str, Enum, metaclass=CaseInsensitiveEnumMeta):
1219
"""ChecksumAlgorithm."""
1320

‎diracx-client/src/diracx/client/_generated/models/_models.py‎

Lines changed: 49 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -94,6 +94,55 @@ class BodyAuthGetOidcTokenGrantType(_serialization.Model):
9494
"""OAuth2 Grant type."""
9595

9696

97+
class BodyAuthRevokeRefreshTokenByRefreshToken(_serialization.Model):
98+
"""Body_auth_revoke_refresh_token_by_refresh_token.
99+
100+
All required parameters must be populated in order to send to server.
101+
102+
:ivar token: The refresh token to revoke. Required.
103+
:vartype token: str
104+
:ivar token_type_hint: Hint for the type of token being revoked. Known values are:
105+
"access_token" and "refresh_token".
106+
:vartype token_type_hint: str or
107+
~_generated.models.BodyAuthRevokeRefreshTokenByRefreshTokenTypeHint
108+
:ivar client_id: The client ID of the application requesting the revocation.
109+
:vartype client_id: str
110+
"""
111+
112+
_validation = {
113+
"token": {"required": True},
114+
}
115+
116+
_attribute_map = {
117+
"token": {"key": "token", "type": "str"},
118+
"token_type_hint": {"key": "token_type_hint", "type": "str"},
119+
"client_id": {"key": "client_id", "type": "str"},
120+
}
121+
122+
def __init__(
123+
self,
124+
*,
125+
token: str,
126+
token_type_hint: Union[str, "_models.BodyAuthRevokeRefreshTokenByRefreshTokenTypeHint"] = "refresh_token",
127+
client_id: str = "myDIRACClientID",
128+
**kwargs: Any
129+
) -> None:
130+
"""
131+
:keyword token: The refresh token to revoke. Required.
132+
:paramtype token: str
133+
:keyword token_type_hint: Hint for the type of token being revoked. Known values are:
134+
"access_token" and "refresh_token".
135+
:paramtype token_type_hint: str or
136+
~_generated.models.BodyAuthRevokeRefreshTokenByRefreshTokenTypeHint
137+
:keyword client_id: The client ID of the application requesting the revocation.
138+
:paramtype client_id: str
139+
"""
140+
super().__init__(**kwargs)
141+
self.token = token
142+
self.token_type_hint = token_type_hint
143+
self.client_id = client_id
144+
145+
97146
class BodyJobsRescheduleJobs(_serialization.Model):
98147
"""Body_jobs_reschedule_jobs.
99148

‎diracx-client/src/diracx/client/_generated/operations/_operations.py‎

Lines changed: 1 addition & 74 deletions
Original file line numberDiff line numberDiff line change
@@ -175,27 +175,6 @@ def build_auth_get_refresh_tokens_request(**kwargs: Any) -> HttpRequest:
175175
return HttpRequest(method="GET", url=_url, headers=_headers, **kwargs)
176176

177177

178-
def build_auth_revoke_refresh_token_by_refresh_token_request( # pylint: disable=name-too-long
179-
*, refresh_token: str, client_id: str, **kwargs: Any
180-
) -> HttpRequest:
181-
_headers = case_insensitive_dict(kwargs.pop("headers", {}) or {})
182-
_params = case_insensitive_dict(kwargs.pop("params", {}) or {})
183-
184-
accept = _headers.pop("Accept", "application/json")
185-
186-
# Construct URL
187-
_url = "/api/auth/revoke"
188-
189-
# Construct parameters
190-
_params["refresh_token"] = _SERIALIZER.query("refresh_token", refresh_token, "str")
191-
_params["client_id"] = _SERIALIZER.query("client_id", client_id, "str")
192-
193-
# Construct headers
194-
_headers["Accept"] = _SERIALIZER.header("accept", accept, "str")
195-
196-
return HttpRequest(method="POST", url=_url, params=_params, headers=_headers, **kwargs)
197-
198-
199178
def build_auth_revoke_refresh_token_by_jti_request( # pylint: disable=name-too-long
200179
jti: str, **kwargs: Any
201180
) -> HttpRequest:
@@ -816,6 +795,7 @@ def __init__(self, *args, **kwargs) -> None:
816795
raise_if_not_implemented(
817796
self.__class__,
818797
[
798+
"revoke_refresh_token_by_refresh_token",
819799
"get_oidc_token",
820800
],
821801
)
@@ -1104,59 +1084,6 @@ def get_refresh_tokens(self, **kwargs: Any) -> List[Any]:
11041084

11051085
return deserialized # type: ignore
11061086

1107-
@distributed_trace
1108-
def revoke_refresh_token_by_refresh_token(self, *, refresh_token: str, client_id: str, **kwargs: Any) -> str:
1109-
"""Revoke Refresh Token By Refresh Token.
1110-
1111-
Revoke a refresh token.
1112-
1113-
:keyword refresh_token: Required.
1114-
:paramtype refresh_token: str
1115-
:keyword client_id: Required.
1116-
:paramtype client_id: str
1117-
:return: str
1118-
:rtype: str
1119-
:raises ~azure.core.exceptions.HttpResponseError:
1120-
"""
1121-
error_map: MutableMapping = {
1122-
401: ClientAuthenticationError,
1123-
404: ResourceNotFoundError,
1124-
409: ResourceExistsError,
1125-
304: ResourceNotModifiedError,
1126-
}
1127-
error_map.update(kwargs.pop("error_map", {}) or {})
1128-
1129-
_headers = kwargs.pop("headers", {}) or {}
1130-
_params = kwargs.pop("params", {}) or {}
1131-
1132-
cls: ClsType[str] = kwargs.pop("cls", None)
1133-
1134-
_request = build_auth_revoke_refresh_token_by_refresh_token_request(
1135-
refresh_token=refresh_token,
1136-
client_id=client_id,
1137-
headers=_headers,
1138-
params=_params,
1139-
)
1140-
_request.url = self._client.format_url(_request.url)
1141-
1142-
_stream = False
1143-
pipeline_response: PipelineResponse = self._client._pipeline.run( # pylint: disable=protected-access
1144-
_request, stream=_stream, **kwargs
1145-
)
1146-
1147-
response = pipeline_response.http_response
1148-
1149-
if response.status_code not in [200]:
1150-
map_error(status_code=response.status_code, response=response, error_map=error_map)
1151-
raise HttpResponseError(response=response)
1152-
1153-
deserialized = self._deserialize("str", pipeline_response.http_response)
1154-
1155-
if cls:
1156-
return cls(pipeline_response, deserialized, {}) # type: ignore
1157-
1158-
return deserialized # type: ignore
1159-
11601087
@distributed_trace
11611088
def revoke_refresh_token_by_jti(self, jti: str, **kwargs: Any) -> str:
11621089
"""Revoke Refresh Token By Jti.

‎extensions/gubbins/gubbins-client/src/gubbins/client/_generated/aio/operations/_operations.py‎

Lines changed: 1 addition & 54 deletions
Original file line numberDiff line numberDiff line change
@@ -35,7 +35,6 @@
3535
build_auth_initiate_authorization_flow_request,
3636
build_auth_initiate_device_flow_request,
3737
build_auth_revoke_refresh_token_by_jti_request,
38-
build_auth_revoke_refresh_token_by_refresh_token_request,
3938
build_auth_userinfo_request,
4039
build_config_serve_config_request,
4140
build_jobs_add_heartbeat_request,
@@ -296,6 +295,7 @@ def __init__(self, *args, **kwargs) -> None:
296295
raise_if_not_implemented(
297296
self.__class__,
298297
[
298+
"revoke_refresh_token_by_refresh_token",
299299
"get_oidc_token",
300300
],
301301
)
@@ -586,59 +586,6 @@ async def get_refresh_tokens(self, **kwargs: Any) -> List[Any]:
586586

587587
return deserialized # type: ignore
588588

589-
@distributed_trace_async
590-
async def revoke_refresh_token_by_refresh_token(self, *, refresh_token: str, client_id: str, **kwargs: Any) -> str:
591-
"""Revoke Refresh Token By Refresh Token.
592-
593-
Revoke a refresh token.
594-
595-
:keyword refresh_token: Required.
596-
:paramtype refresh_token: str
597-
:keyword client_id: Required.
598-
:paramtype client_id: str
599-
:return: str
600-
:rtype: str
601-
:raises ~azure.core.exceptions.HttpResponseError:
602-
"""
603-
error_map: MutableMapping = {
604-
401: ClientAuthenticationError,
605-
404: ResourceNotFoundError,
606-
409: ResourceExistsError,
607-
304: ResourceNotModifiedError,
608-
}
609-
error_map.update(kwargs.pop("error_map", {}) or {})
610-
611-
_headers = kwargs.pop("headers", {}) or {}
612-
_params = kwargs.pop("params", {}) or {}
613-
614-
cls: ClsType[str] = kwargs.pop("cls", None)
615-
616-
_request = build_auth_revoke_refresh_token_by_refresh_token_request(
617-
refresh_token=refresh_token,
618-
client_id=client_id,
619-
headers=_headers,
620-
params=_params,
621-
)
622-
_request.url = self._client.format_url(_request.url)
623-
624-
_stream = False
625-
pipeline_response: PipelineResponse = await self._client._pipeline.run( # pylint: disable=protected-access
626-
_request, stream=_stream, **kwargs
627-
)
628-
629-
response = pipeline_response.http_response
630-
631-
if response.status_code not in [200]:
632-
map_error(status_code=response.status_code, response=response, error_map=error_map)
633-
raise HttpResponseError(response=response)
634-
635-
deserialized = self._deserialize("str", pipeline_response.http_response)
636-
637-
if cls:
638-
return cls(pipeline_response, deserialized, {}) # type: ignore
639-
640-
return deserialized # type: ignore
641-
642589
@distributed_trace_async
643590
async def revoke_refresh_token_by_jti(self, jti: str, **kwargs: Any) -> str:
644591
"""Revoke Refresh Token By Jti.

‎extensions/gubbins/gubbins-client/src/gubbins/client/_generated/models/__init__.py‎

Lines changed: 4 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -14,6 +14,7 @@
1414
from ._models import ( # type: ignore
1515
BodyAuthGetOidcToken,
1616
BodyAuthGetOidcTokenGrantType,
17+
BodyAuthRevokeRefreshTokenByRefreshToken,
1718
BodyJobsRescheduleJobs,
1819
BodyJobsUnassignBulkJobsSandboxes,
1920
ExtendedMetadata,
@@ -50,6 +51,7 @@
5051
)
5152

5253
from ._enums import ( # type: ignore
54+
BodyAuthRevokeRefreshTokenByRefreshTokenTypeHint,
5355
ChecksumAlgorithm,
5456
JobStatus,
5557
SandboxFormat,
@@ -65,6 +67,7 @@
6567
__all__ = [
6668
"BodyAuthGetOidcToken",
6769
"BodyAuthGetOidcTokenGrantType",
70+
"BodyAuthRevokeRefreshTokenByRefreshToken",
6871
"BodyJobsRescheduleJobs",
6972
"BodyJobsUnassignBulkJobsSandboxes",
7073
"ExtendedMetadata",
@@ -98,6 +101,7 @@
98101
"ValidationErrorLocItem",
99102
"VectorSearchSpec",
100103
"VectorSearchSpecValues",
104+
"BodyAuthRevokeRefreshTokenByRefreshTokenTypeHint",
101105
"ChecksumAlgorithm",
102106
"JobStatus",
103107
"SandboxFormat",

‎extensions/gubbins/gubbins-client/src/gubbins/client/_generated/models/_enums.py‎

Lines changed: 7 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -8,6 +8,13 @@
88
from azure.core import CaseInsensitiveEnumMeta
99

1010

11+
class BodyAuthRevokeRefreshTokenByRefreshTokenTypeHint(str, Enum, metaclass=CaseInsensitiveEnumMeta):
12+
"""Hint for the type of token being revoked."""
13+
14+
ACCESS_TOKEN = "access_token"
15+
REFRESH_TOKEN = "refresh_token"
16+
17+
1118
class ChecksumAlgorithm(str, Enum, metaclass=CaseInsensitiveEnumMeta):
1219
"""ChecksumAlgorithm."""
1320

0 commit comments

Comments
 (0)