Manually merge PR245 to redirect users to the vhost base URL after successfully logging out from OIDC and all sessions.

git-svn-id: svn+ssh://svn.code.sf.net/p/migrid/code/trunk@6235 b75ad72c-e7d7-11dd-a971-7dbc132099af

Author: jonasbardino

mig/shared/functionality/logout.py

@@ -194,10 +194,8 @@ def main(client_id, user_arguments_dict, environ=None):
                          % (auth_type, identity))
             # NOTE: OpenID Connect module handles remote logout on vanity url
             terminate_session_url = '/dynamic/redirect_uri'
-            # NOTE: upstream currently requires fixed logout callback url
-            # TODO: change return_page to reentry_page when upstream allows it
-            return_page = build_logout_url(configuration, environ)
-            terminate_query = urlencode({'logout': return_page})
+            # NOTE: we request return to reentry_page after logout
+            terminate_query = urlencode({'logout': reentry_page})
             reentry_page = terminate_session_url + '?%s' % terminate_query
             logger.debug("send %s to %s for logout" % (client_id,
                                                        reentry_page))