Skip to content
This repository was archived by the owner on Jun 23, 2023. It is now read-only.

Commit b6b8658

Browse files
nsklikasnsklikas
committed
Fix tests
1 parent 713a1cf commit b6b8658

1 file changed

Lines changed: 23 additions & 82 deletions

File tree

‎tests/test_24_oauth2_token_endpoint.py‎

Lines changed: 23 additions & 82 deletions
Original file line numberDiff line numberDiff line change
@@ -47,7 +47,7 @@
4747
AUTH_REQ = AuthorizationRequest(
4848
client_id="client_1",
4949
redirect_uri="https://example.com/cb",
50-
scope=["openid"],
50+
scope=["email"],
5151
state="STATE",
5252
response_type="code",
5353
)
@@ -302,7 +302,7 @@ def test_process_request_using_private_key_jwt(self):
302302

303303
def test_do_refresh_access_token(self):
304304
areq = AUTH_REQ.copy()
305-
areq["scope"] = ["openid", "offline_access"]
305+
areq["scope"] = ["email"]
306306

307307
session_id = self._create_session(areq)
308308
grant = self.endpoint_context.authz(session_id, areq)
@@ -324,7 +324,7 @@ def test_do_refresh_access_token(self):
324324
_token.usage_rules["supports_minting"] = ["access_token", "refresh_token"]
325325

326326
_req = self.token_endpoint.parse_request(_request.to_json())
327-
_resp = self.token_endpoint.process_request(request=_req)
327+
_resp = self.token_endpoint.process_request(request=_req, issue_refresh=True)
328328
assert set(_resp.keys()) == {"cookie", "response_args", "http_headers"}
329329
assert set(_resp["response_args"].keys()) == {
330330
"access_token",
@@ -338,7 +338,7 @@ def test_do_refresh_access_token(self):
338338

339339
def test_do_2nd_refresh_access_token(self):
340340
areq = AUTH_REQ.copy()
341-
areq["scope"] = ["openid", "offline_access"]
341+
areq["scope"] = ["email"]
342342

343343
session_id = self._create_session(areq)
344344
grant = self.endpoint_context.authz(session_id, areq)
@@ -364,12 +364,12 @@ def test_do_2nd_refresh_access_token(self):
364364
]
365365

366366
_req = self.token_endpoint.parse_request(_request.to_json())
367-
_resp = self.token_endpoint.process_request(request=_req)
367+
_resp = self.token_endpoint.process_request(request=_req, issue_refresh=True)
368368

369369
_2nd_request = REFRESH_TOKEN_REQ.copy()
370370
_2nd_request["refresh_token"] = _resp["response_args"]["refresh_token"]
371371
_2nd_req = self.token_endpoint.parse_request(_request.to_json())
372-
_2nd_resp = self.token_endpoint.process_request(request=_req)
372+
_2nd_resp = self.token_endpoint.process_request(request=_req, issue_refresh=True)
373373

374374
assert set(_2nd_resp.keys()) == {"cookie", "response_args", "http_headers"}
375375
assert set(_2nd_resp["response_args"].keys()) == {
@@ -392,7 +392,7 @@ def test_new_refresh_token(self, conf):
392392
}
393393

394394
areq = AUTH_REQ.copy()
395-
areq["scope"] = ["openid", "offline_access"]
395+
areq["scope"] = ["email"]
396396

397397
session_id = self._create_session(areq)
398398
grant = self.endpoint_context.authz(session_id, areq)
@@ -423,7 +423,7 @@ def test_new_refresh_token(self, conf):
423423

424424
def test_refresh_scopes(self):
425425
areq = AUTH_REQ.copy()
426-
areq["scope"] = ["openid", "offline_access", "profile"]
426+
areq["scope"] = ["email", "profile"]
427427

428428
session_id = self._create_session(areq)
429429
grant = self.endpoint_context.authz(session_id, areq)
@@ -432,14 +432,14 @@ def test_refresh_scopes(self):
432432
_token_request = TOKEN_REQ_DICT.copy()
433433
_token_request["code"] = code.value
434434
_req = self.token_endpoint.parse_request(_token_request)
435-
_resp = self.token_endpoint.process_request(request=_req)
435+
_resp = self.token_endpoint.process_request(request=_req, issue_refresh=True)
436436

437437
_request = REFRESH_TOKEN_REQ.copy()
438438
_request["refresh_token"] = _resp["response_args"]["refresh_token"]
439-
_request["scope"] = ["openid", "offline_access"]
439+
_request["scope"] = ["email"]
440440

441441
_req = self.token_endpoint.parse_request(_request.to_json())
442-
_resp = self.token_endpoint.process_request(request=_req)
442+
_resp = self.token_endpoint.process_request(request=_req, issue_refresh=True)
443443
assert set(_resp.keys()) == {"cookie", "response_args", "http_headers"}
444444
assert set(_resp["response_args"].keys()) == {
445445
"access_token",
@@ -462,7 +462,7 @@ def test_refresh_scopes(self):
462462

463463
def test_refresh_more_scopes(self):
464464
areq = AUTH_REQ.copy()
465-
areq["scope"] = ["openid", "offline_access"]
465+
areq["scope"] = ["email"]
466466

467467
session_id = self._create_session(areq)
468468
grant = self.endpoint_context.authz(session_id, areq)
@@ -471,15 +471,15 @@ def test_refresh_more_scopes(self):
471471
_token_request = TOKEN_REQ_DICT.copy()
472472
_token_request["code"] = code.value
473473
_req = self.token_endpoint.parse_request(_token_request)
474-
_resp = self.token_endpoint.process_request(request=_req)
474+
_resp = self.token_endpoint.process_request(request=_req, issue_refresh=True)
475475

476476
_request = REFRESH_TOKEN_REQ.copy()
477477
_request["refresh_token"] = _resp["response_args"]["refresh_token"]
478-
_request["scope"] = ["openid", "offline_access", "profile"]
478+
_request["scope"] = ["email", "profile"]
479479

480480
_req = self.token_endpoint.parse_request(_request.to_json())
481481
assert isinstance(_req, TokenErrorResponse)
482-
_resp = self.token_endpoint.process_request(request=_req)
482+
_resp = self.token_endpoint.process_request(request=_req, issue_refresh=True)
483483

484484
assert _resp.to_dict() == {
485485
"error": "invalid_request",
@@ -488,7 +488,7 @@ def test_refresh_more_scopes(self):
488488

489489
def test_refresh_more_scopes_2(self):
490490
areq = AUTH_REQ.copy()
491-
areq["scope"] = ["openid", "offline_access", "profile"]
491+
areq["scope"] = ["email", "profile"]
492492

493493
session_id = self._create_session(areq)
494494
grant = self.endpoint_context.authz(session_id, areq)
@@ -497,24 +497,24 @@ def test_refresh_more_scopes_2(self):
497497
_token_request = TOKEN_REQ_DICT.copy()
498498
_token_request["code"] = code.value
499499
_req = self.token_endpoint.parse_request(_token_request)
500-
_resp = self.token_endpoint.process_request(request=_req)
500+
_resp = self.token_endpoint.process_request(request=_req, issue_refresh=True)
501501

502502
_request = REFRESH_TOKEN_REQ.copy()
503503
_request["refresh_token"] = _resp["response_args"]["refresh_token"]
504-
_request["scope"] = ["openid", "offline_access"]
504+
_request["scope"] = ["email"]
505505

506506
_token_value = _resp["response_args"]["refresh_token"]
507507

508508
_req = self.token_endpoint.parse_request(_request.to_json())
509-
_resp = self.token_endpoint.process_request(request=_req)
509+
_resp = self.token_endpoint.process_request(request=_req, issue_refresh=True)
510510

511511
_token_value = _resp["response_args"]["refresh_token"]
512512
_request["refresh_token"] = _token_value
513513
# We should be able to request the original requests scopes
514-
_request["scope"] = ["openid", "offline_access", "profile"]
514+
_request["scope"] = ["email", "profile"]
515515

516516
_req = self.token_endpoint.parse_request(_request.to_json())
517-
_resp = self.token_endpoint.process_request(request=_req)
517+
_resp = self.token_endpoint.process_request(request=_req, issue_refresh=True)
518518

519519
assert set(_resp.keys()) == {"cookie", "response_args", "http_headers"}
520520
assert set(_resp["response_args"].keys()) == {
@@ -536,68 +536,9 @@ def test_refresh_more_scopes_2(self):
536536

537537
assert at.scope == rt.scope == _request["scope"]
538538

539-
def test_refresh_no_openid_scope(self):
540-
areq = AUTH_REQ.copy()
541-
areq["scope"] = ["openid", "offline_access"]
542-
543-
session_id = self._create_session(areq)
544-
grant = self.endpoint_context.authz(session_id, areq)
545-
code = self._mint_code(grant, areq["client_id"])
546-
547-
_token_request = TOKEN_REQ_DICT.copy()
548-
_token_request["code"] = code.value
549-
_req = self.token_endpoint.parse_request(_token_request)
550-
_resp = self.token_endpoint.process_request(request=_req)
551-
552-
_request = REFRESH_TOKEN_REQ.copy()
553-
_request["refresh_token"] = _resp["response_args"]["refresh_token"]
554-
_request["scope"] = ["offline_access"]
555-
556-
_token_value = _resp["response_args"]["refresh_token"]
557-
558-
_req = self.token_endpoint.parse_request(_request.to_json())
559-
_resp = self.token_endpoint.process_request(request=_req)
560-
561-
assert set(_resp.keys()) == {"cookie", "response_args", "http_headers"}
562-
assert set(_resp["response_args"].keys()) == {
563-
"access_token",
564-
"token_type",
565-
"expires_in",
566-
"refresh_token",
567-
"scope",
568-
}
569-
570-
def test_refresh_no_offline_access_scope(self):
571-
areq = AUTH_REQ.copy()
572-
areq["scope"] = ["openid", "offline_access"]
573-
574-
session_id = self._create_session(areq)
575-
grant = self.endpoint_context.authz(session_id, areq)
576-
code = self._mint_code(grant, areq["client_id"])
577-
578-
_token_request = TOKEN_REQ_DICT.copy()
579-
_token_request["code"] = code.value
580-
_req = self.token_endpoint.parse_request(_token_request)
581-
_resp = self.token_endpoint.process_request(request=_req)
582-
583-
_request = REFRESH_TOKEN_REQ.copy()
584-
_request["refresh_token"] = _resp["response_args"]["refresh_token"]
585-
_request["scope"] = ["openid"]
586-
587-
_req = self.token_endpoint.parse_request(_request.to_json())
588-
_resp = self.token_endpoint.process_request(request=_req)
589-
590-
assert set(_resp.keys()) == {"cookie", "response_args", "http_headers"}
591-
assert set(_resp["response_args"].keys()) == {
592-
"access_token",
593-
"token_type",
594-
"expires_in",
595-
"scope",
596-
}
597-
598539
def test_do_refresh_access_token_not_allowed(self):
599540
areq = AUTH_REQ.copy()
600-
areq["scope"] = ["openid", "offline_access"]
541+
areq["scope"] = ["email"]
601542

602543
session_id = self._create_session(areq)
603544
grant = self.endpoint_context.authz(session_id, areq)
@@ -621,7 +562,7 @@ def test_do_refresh_access_token_not_allowed(self):
621562

622563
def test_do_refresh_access_token_revoked(self):
623564
areq = AUTH_REQ.copy()
624-
areq["scope"] = ["openid"]
565+
areq["scope"] = ["email"]
625566

626567
session_id = self._create_session(areq)
627568
grant = self.endpoint_context.authz(session_id, areq)

0 commit comments

Comments
 (0)