Unverified Commit d20b3331 authored by mvdbeek's avatar mvdbeek
Browse files

Use get_app_with_request_session as dependency resolver

parent 20cedf7b

lib/galaxy/webapps/galaxy/api/__init__.py

+4 −3
Original line number Diff line number Diff line
@@ -120,9 +120,10 @@ class GalaxyTypeDepends(Depends): 
        self.galaxy_type_depends = dep_type





def depends(dep_type: Type[T], get_app=get_app) -> T:

    def _do_resolve(request: Request):

        return get_app().resolve(dep_type)

def depends(dep_type: Type[T], app=get_app_with_request_session) -> T:

    async def _do_resolve(request: Request):

        async for _dep in app():

            yield _dep.resolve(dep_type)



    return cast(T, GalaxyTypeDepends(_do_resolve, dep_type))

lib/tool_shed/webapp/api2/__init__.py

+1 −1
Original line number Diff line number Diff line
@@ -81,7 +81,7 @@ api_key_cookie = APIKeyCookie(name=AUTH_COOKIE_NAME, auto_error=False) 




def depends(dep_type: Type[T]) -> T:

    return framework_depends(dep_type, get_app=get_app)

    return framework_depends(dep_type, app=get_app_with_request_session)





def get_api_user(