Unverified Commit 5e080223 authored by mvdbeek's avatar mvdbeek
Browse files

Only create histories if client includes session cookie

parent 78147685

lib/galaxy/webapps/base/webapp.py

+4 −4
Original line number Diff line number Diff line
@@ -650,11 +650,11 @@ class GalaxyWebTransaction(base.DefaultWebTransaction, context.ProvidesHistoryCo 
            galaxy_session = self.__create_new_session(prev_galaxy_session, user_for_new_session)

            galaxy_session_requires_flush = True

            self.galaxy_session = galaxy_session

            if self.webapp.name == "galaxy":

                self.get_or_create_default_history()

            self.__update_session_cookie(name=session_cookie)

        else:

            self.galaxy_session = galaxy_session

            if self.webapp.name == "galaxy":

                self.get_or_create_default_history()

        # Do we need to flush the session?

        if galaxy_session_requires_flush:

            self.sa_session.add(galaxy_session)
@@ -799,10 +799,10 @@ class GalaxyWebTransaction(base.DefaultWebTransaction, context.ProvidesHistoryCo 
            and not users_last_session.current_history.deleted

        ):

            history = users_last_session.current_history

        elif not history:

            history = self.get_history(create=True, most_recent=True)

        if history not in self.galaxy_session.histories:

            self.galaxy_session.add_history(history)

        if not history:

            history = self.new_history()

        if history.user is None:

            history.user = user

        self.galaxy_session.current_history = history