Commit 47050bbe authored by Cage, Gregory's avatar Cage, Gregory
Browse files

Clear External Redirect Cookie after logging in via OAUTH

parent 4100b116

lib/galaxy/webapps/galaxy/controllers/authnz.py

+1 −3
Original line number Diff line number Diff line
@@ -91,8 +91,6 @@ class OIDC(JSAppLauncher): 
            trans.set_cookie(value="/", name=LOGIN_NEXT_COOKIE_NAME)

        success, message, redirect_uri = trans.app.authnz_manager.authenticate(provider, trans, idphint)

        if success:



            # ORNL ONLY logic

            if external_redirect:

                trans.set_cookie(value=external_redirect, name=trans.app.config.external_login_redirect_cookie)

                return trans.response.send_redirect(url_for(redirect_uri))
@@ -156,9 +154,9 @@ class OIDC(JSAppLauncher): 
        # Clear the login next cookie back to default.

        trans.set_cookie(value="/", name=LOGIN_NEXT_COOKIE_NAME)



        # ORNL ONLY logic

        external_login = trans.get_cookie(trans.app.config.external_login_redirect_cookie)

        if external_login and (external_login.find("https://") == 0 or external_login.find("http://") == 0):

            trans.set_cookie(value="", name=trans.app.config.external_login_redirect_cookie)

            return trans.response.send_redirect(url_for(external_login))

        return trans.response.send_redirect(url_for(redirect_url))