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

Commit 318225a

Browse files
committed
Use get/set on dynamic context attributes.
Updated dependency on oidcservice. state_db now part of service_context.
1 parent 17ab0e4 commit 318225a

23 files changed

Lines changed: 1725 additions & 201 deletions

flask_rp/views.py

Lines changed: 5 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -96,8 +96,7 @@ def finalize(op_hash, request_args):
9696
logger.error(rp.response[0].decode())
9797
return rp.response[0], rp.status_code
9898

99-
session['client_id'] = rp.service_context.registration_response. \
100-
get('client_id', rp.service_context.client_id)
99+
session['client_id'] = rp.service_context.get('client_id')
101100

102101
session['state'] = request_args.get('state')
103102

@@ -120,7 +119,7 @@ def finalize(op_hash, request_args):
120119

121120
if 'userinfo' in res:
122121
endpoints = {}
123-
for k, v in rp.service_context.provider_info.items():
122+
for k, v in rp.service_context.get('provider_info').items():
124123
if k.endswith('_endpoint'):
125124
endp = k.replace('_', ' ')
126125
endp = endp.capitalize()
@@ -132,7 +131,7 @@ def finalize(op_hash, request_args):
132131
_status_check_info = rp.service_context.add_on.get('status_check')
133132
if _status_check_info:
134133
# Does the OP support session status checking ?
135-
_chk_iframe = rp.service_context.provider_info.get('check_session_iframe')
134+
_chk_iframe = rp.service_context.get('provider_info').get('check_session_iframe')
136135
if _chk_iframe:
137136
kwargs['check_session_iframe'] = _chk_iframe
138137
kwargs["status_check_iframe"] = _status_check_info['rp_iframe_path']
@@ -215,7 +214,7 @@ def session_change():
215214
def session_logout(op_hash):
216215
_rp = get_rp(op_hash)
217216
logger.debug('post_logout')
218-
return "Post logout from {}".format(_rp.service_context.issuer)
217+
return "Post logout from {}".format(_rp.service_context.get('issuer'))
219218

220219

221220
# RP initiated logout
@@ -245,7 +244,7 @@ def frontchannel_logout(op_hash):
245244
_rp = get_rp(op_hash)
246245
sid = request.args['sid']
247246
_iss = request.args['iss']
248-
if _iss != _rp.service_context.issuer:
247+
if _iss != _rp.service_context.get('issuer'):
249248
return 'Bad request', 400
250249
_state = _rp.session_interface.get_state_by_sid(sid)
251250
_rp.session_interface.remove_state(_state)

setup.py

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -64,7 +64,7 @@ def run_tests(self):
6464
"Programming Language :: Python :: 3.6",
6565
"Topic :: Software Development :: Libraries :: Python Modules"],
6666
install_requires=[
67-
'oidcservice>=0.6.10',
67+
'oidcservice>=1.0.0',
6868
'pyyaml'
6969
],
7070
tests_require=[

0 commit comments

Comments
 (0)