Skip to content

Commit 1071d3a

Browse files
roherohe
committed
Fixed tests. Blacked and isorted.
1 parent 722cd0b commit 1071d3a

19 files changed

+53
-92
lines changed

‎src/idpyoidc/server/oauth2/token_helper.py

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -18,8 +18,8 @@
1818
from idpyoidc.server.oauth2.authorization import check_unknown_scopes_policy
1919
from idpyoidc.server.session.grant import Grant
2020
from idpyoidc.server.session.token import AuthorizationCode
21-
from idpyoidc.server.session.token import RefreshToken
2221
from idpyoidc.server.session.token import MintingNotAllowed
22+
from idpyoidc.server.session.token import RefreshToken
2323
from idpyoidc.server.session.token import SessionToken
2424
from idpyoidc.server.token.exception import UnknownToken
2525
from idpyoidc.time_util import utc_time_sans_frac
@@ -36,7 +36,7 @@ def __init__(self, endpoint, config=None):
3636
self.error_cls = self.endpoint.error_cls
3737

3838
def post_parse_request(
39-
self, request: Union[Message, dict], client_id: Optional[str] = "", **kwargs
39+
self, request: Union[Message, dict], client_id: Optional[str] = "", **kwargs
4040
):
4141
"""Context specific parsing of the request.
4242
This is done after general request parsing and before processing
@@ -49,15 +49,15 @@ def process_request(self, req: Union[Message, dict], **kwargs):
4949
raise NotImplementedError
5050

5151
def _mint_token(
52-
self,
53-
token_class: str,
54-
grant: Grant,
55-
session_id: str,
56-
client_id: str,
57-
based_on: Optional[SessionToken] = None,
58-
scope: Optional[list] = None,
59-
token_args: Optional[dict] = None,
60-
token_type: Optional[str] = "",
52+
self,
53+
token_class: str,
54+
grant: Grant,
55+
session_id: str,
56+
client_id: str,
57+
based_on: Optional[SessionToken] = None,
58+
scope: Optional[list] = None,
59+
token_args: Optional[dict] = None,
60+
token_type: Optional[str] = "",
6161
) -> SessionToken:
6262
_context = self.endpoint.server_get("endpoint_context")
6363
_mngr = _context.session_manager
@@ -171,9 +171,9 @@ def process_request(self, req: Union[Message, dict], **kwargs):
171171
_response["expires_in"] = token.expires_at - utc_time_sans_frac()
172172

173173
if (
174-
issue_refresh
175-
and "refresh_token" in _supports_minting
176-
and "refresh_token" in grant_types_supported
174+
issue_refresh
175+
and "refresh_token" in _supports_minting
176+
and "refresh_token" in grant_types_supported
177177
):
178178
try:
179179
refresh_token = self._mint_token(
@@ -196,7 +196,7 @@ def process_request(self, req: Union[Message, dict], **kwargs):
196196
return _response
197197

198198
def post_parse_request(
199-
self, request: Union[Message, dict], client_id: Optional[str] = "", **kwargs
199+
self, request: Union[Message, dict], client_id: Optional[str] = "", **kwargs
200200
):
201201
"""
202202
This is where clients come to get their access tokens
@@ -300,9 +300,9 @@ def process_request(self, req: Union[Message, dict], **kwargs):
300300
token.register_usage()
301301

302302
if (
303-
"client_id" in req
304-
and req["client_id"] in _context.cdb
305-
and "revoke_refresh_on_issue" in _context.cdb[req["client_id"]]
303+
"client_id" in req
304+
and req["client_id"] in _context.cdb
305+
and "revoke_refresh_on_issue" in _context.cdb[req["client_id"]]
306306
):
307307
revoke_refresh = _context.cdb[req["client_id"]].get("revoke_refresh_on_issue")
308308
else:
@@ -314,7 +314,7 @@ def process_request(self, req: Union[Message, dict], **kwargs):
314314
return _resp
315315

316316
def post_parse_request(
317-
self, request: Union[Message, dict], client_id: Optional[str] = "", **kwargs
317+
self, request: Union[Message, dict], client_id: Optional[str] = "", **kwargs
318318
):
319319
"""
320320
This is where clients come to refresh their access tokens
@@ -405,10 +405,10 @@ def post_parse_request(self, request, client_id="", **kwargs):
405405
try:
406406
request.verify(keyjar=keyjar, opponent_id=client_id)
407407
except (
408-
MissingRequiredAttribute,
409-
ValueError,
410-
MissingRequiredValue,
411-
JWKESTException,
408+
MissingRequiredAttribute,
409+
ValueError,
410+
MissingRequiredValue,
411+
JWKESTException,
412412
) as err:
413413
return self.endpoint.error_cls(error="invalid_request", error_description="%s" % err)
414414

@@ -449,8 +449,8 @@ def _enforce_policy(self, request, token, config):
449449
)
450450

451451
if (
452-
"requested_token_type" in request
453-
and request["requested_token_type"] not in config["requested_token_types_supported"]
452+
"requested_token_type" in request
453+
and request["requested_token_type"] not in config["requested_token_types_supported"]
454454
):
455455
return TokenErrorResponse(
456456
error="invalid_request",
@@ -605,14 +605,14 @@ def validate_token_exchange_policy(request, context, subject_token, **kwargs):
605605
)
606606

607607
if (
608-
"requested_token_type" in request
609-
and request["requested_token_type"] == "urn:ietf:params:oauth:token-type:refresh_token"
608+
"requested_token_type" in request
609+
and request["requested_token_type"] == "urn:ietf:params:oauth:token-type:refresh_token"
610610
):
611611
if "offline_access" not in subject_token.scope:
612612
return TokenErrorResponse(
613613
error="invalid_request",
614614
error_description=f"Exchange {request['subject_token_type']} to refresh token "
615-
f"forbbiden",
615+
f"forbbiden",
616616
)
617617

618618
if "scope" in request:

‎src/idpyoidc/server/oidc/token_helper.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
from idpyoidc.server import oauth2
1212
from idpyoidc.server.oauth2.token_helper import TokenEndpointHelper
1313
from idpyoidc.server.session.token import AuthorizationCode
14-
from idpyoidc.server.session.token import RefreshToken
1514
from idpyoidc.server.session.token import MintingNotAllowed
15+
from idpyoidc.server.session.token import RefreshToken
1616
from idpyoidc.server.token.exception import UnknownToken
1717
from idpyoidc.util import sanitize
1818

‎src/idpyoidc/server/session/token.py

Lines changed: 0 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -273,4 +273,3 @@ def __init__(
273273
"refresh_token": RefreshToken,
274274
"id_token": IDToken,
275275
}
276-

‎src/idpyoidc/server/util.py

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -100,7 +100,7 @@ def lv_unpack(txt):
100100
while txt:
101101
l, v = txt.split(":", 1)
102102
res.append(v[: int(l)])
103-
txt = v[int(l):]
103+
txt = v[int(l) :]
104104
return res
105105

106106

@@ -176,6 +176,7 @@ def execute(spec, **kwargs):
176176
else:
177177
return kwargs
178178

179+
179180
# def sector_id_from_redirect_uris(uris):
180181
# if not uris:
181182
# return ""

‎src/idpyoidc/util.py

Lines changed: 1 addition & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -11,8 +11,8 @@
1111
from urllib.parse import urlsplit
1212
from urllib.parse import urlunsplit
1313

14-
from cryptojwt.utils import importer
1514
import yaml
15+
from cryptojwt.utils import importer
1616

1717
logger = logging.getLogger(__name__)
1818

@@ -138,4 +138,3 @@ def add_path(url, path):
138138
return "{}{}".format(url, path)
139139
else:
140140
return "{}/{}".format(url, path)
141-

‎tests/test_server_01_claims.py

Lines changed: 1 addition & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -83,14 +83,7 @@ def full_path(local_file):
8383
"read_only": False,
8484
"key_defs": [{"type": "oct", "bytes": "24", "use": ["enc"], "kid": "code"}],
8585
},
86-
"code": {
87-
"kwargs": {
88-
"lifetime": 600,
89-
"kwargs": {
90-
"crypt_conf": CRYPT_CONFIG
91-
}
92-
}
93-
},
86+
"code": {"kwargs": {"lifetime": 600, "kwargs": {"crypt_conf": CRYPT_CONFIG}}},
9487
"token": {
9588
"class": "idpyoidc.server.token.jwt_token.JWTToken",
9689
"kwargs": {

‎tests/test_server_03_authz_handling.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -97,12 +97,7 @@ class Endpoint_1(Endpoint):
9797
"read_only": False,
9898
"key_defs": [{"type": "oct", "bytes": "24", "use": ["enc"], "kid": "code"}],
9999
},
100-
"code": {
101-
"lifetime": 600,
102-
"kwargs": {
103-
"crypt_conf": CRYPT_CONFIG
104-
}
105-
},
100+
"code": {"lifetime": 600, "kwargs": {"crypt_conf": CRYPT_CONFIG}},
106101
"token": {
107102
"class": "idpyoidc.server.token.jwt_token.JWTToken",
108103
"kwargs": {

‎tests/test_server_06_grant.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -4,11 +4,11 @@
44
from idpyoidc.message.oidc import AuthorizationRequest
55
from idpyoidc.server import Server
66
from idpyoidc.server.authn_event import create_authn_event
7-
from idpyoidc.server.session.token import TOKEN_MAP
87
from idpyoidc.server.session.grant import Grant
98
from idpyoidc.server.session.grant import find_token
109
from idpyoidc.server.session.grant import get_usage_rules
1110
from idpyoidc.server.session.grant import remember_token
11+
from idpyoidc.server.session.token import TOKEN_MAP
1212
from idpyoidc.server.session.token import AuthorizationCode
1313
from idpyoidc.server.session.token import SessionToken
1414
from idpyoidc.server.token import DefaultToken

‎tests/test_server_08_id_token.py

Lines changed: 1 addition & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -71,12 +71,7 @@ def full_path(local_file):
7171
"read_only": False,
7272
"key_defs": [{"type": "oct", "bytes": "24", "use": ["enc"], "kid": "code"}],
7373
},
74-
"code": {
75-
"lifetime": 600,
76-
"kwargs": {
77-
"crypt_conf": CRYPT_CONFIG
78-
}
79-
},
74+
"code": {"lifetime": 600, "kwargs": {"crypt_conf": CRYPT_CONFIG}},
8075
"token": {
8176
"class": "idpyoidc.server.token.jwt_token.JWTToken",
8277
"kwargs": {

‎tests/test_server_09_authn_context.py

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -124,8 +124,8 @@ def create_authn_broker(self):
124124
"issuer": "https://example.com/",
125125
"token_handler_args": {
126126
"code": {"lifetime": 600, "kwargs": {"crypt_conf": CRYPT_CONFIG}},
127-
"token": {"lifetime": 600,"kwargs": {"crypt_conf": CRYPT_CONFIG}},
128-
"refresh": {"lifetime": 600,"kwargs": {"crypt_conf": CRYPT_CONFIG}},
127+
"token": {"lifetime": 600, "kwargs": {"crypt_conf": CRYPT_CONFIG}},
128+
"refresh": {"lifetime": 600, "kwargs": {"crypt_conf": CRYPT_CONFIG}},
129129
},
130130
"verify_ssl": False,
131131
"capabilities": CAPABILITIES,

0 commit comments

Comments
 (0)