Merge branch 'incl_oidcservice' of github.com:IdentityPython/JWTConnect-Python-OidcRP into incl_oidcservice

Author: rohe

example/flask_rp/views.py

@@ -233,7 +233,7 @@ def logout():
 def backchannel_logout(op_hash):
     _rp = get_rp(op_hash)
     try:
-        _state = rp_handler.backchannel_logout(request.data, _rp)
+        _state = rp_handler.backchannel_logout(_rp, request.data)
     except Exception as err:
         logger.error('Exception: {}'.format(err))
         return 'System error!', 400

src/oidcrp/rp_handler.py

@@ -839,7 +839,7 @@ def logout(self, state, client=None, post_logout_redirect_uri=''):
             client = self.get_client_from_session_key(state)
 
         try:
-            srv = client.service['end_session']
+            srv = client.client_get('service', 'end_session')
         except KeyError:
             raise OidcServiceError("Does not know how to logout")
 
@@ -866,7 +866,6 @@ def backchannel_logout(client, request='', request_args=None):
     :param request: URL encoded logout request
     :return:
     """
-
     if request:
         req = BackChannelLogoutRequest().from_urlencoded(as_unicode(request))
     else:
@@ -887,17 +886,15 @@ def backchannel_logout(client, request='', request_args=None):
         raise MessageException('Bogus logout request: {}'.format(err))
 
     # Find the subject through 'sid' or 'sub'
-
-    try:
-        sub = req[verified_claim_name('logout_token')]['sub']
-    except KeyError:
-        try:
-            sid = req[verified_claim_name('logout_token')]['sid']
-        except KeyError:
-            raise MessageException('Neither "sid" nor "sub"')
-        else:
-            _state = _context.state.get_state_by_sid(sid)
-    else:
+    sub = req[verified_claim_name('logout_token')].get('sub')
+    sid = None
+    if not sub:
+        sid = req[verified_claim_name('logout_token')].get('sid')
+
+    if not sub and not sid:
+        raise MessageException('Neither "sid" nor "sub"')
+    elif sub:
         _state = _context.state.get_state_by_sub(sub)
-
+    elif sid:
+        _state = _context.state.get_state_by_sid(sid)
     return _state