Revert "Merge branch '629-cookie-auth' into 'develop'"

This reverts commit 8b47af8b81, reversing
changes made to c0055b3b20.
This commit is contained in:
Eliot Berriot 2019-03-15 15:52:30 +01:00
parent 666409dce0
commit b9f0c6aecd
No known key found for this signature in database
GPG key ID: DD6965E2476E5C27
18 changed files with 153 additions and 203 deletions

View file

@ -1,5 +1,4 @@
from channels.routing import ProtocolTypeRouter, URLRouter
from channels.sessions import SessionMiddlewareStack
from django.conf.urls import url
from funkwhale_api.common.auth import TokenAuthMiddleware
@ -8,12 +7,8 @@ from funkwhale_api.instance import consumers
application = ProtocolTypeRouter(
{
# Empty for now (http->django views is added by default)
"websocket": SessionMiddlewareStack(
TokenAuthMiddleware(
URLRouter(
[url("^api/v1/activity$", consumers.InstanceActivityConsumer)]
)
)
"websocket": TokenAuthMiddleware(
URLRouter([url("^api/v1/activity$", consumers.InstanceActivityConsumer)])
)
}
)