summaryrefslogtreecommitdiff
path: root/service/pixelated
diff options
context:
space:
mode:
authorRoald de Vries <rdevries@thoughtworks.com>2016-11-29 17:47:07 +0100
committerRoald de Vries <rdevries@thoughtworks.com>2016-11-29 17:47:07 +0100
commit9b5d5a797c9f407183d1b9a6a2aea552a06c5ea1 (patch)
tree4d3ae165dd4ab2e10f2c8fe2c75bacb1ae31590f /service/pixelated
parent798858c79c0b10565f42365c6cdbf7d0549d0a2e (diff)
make login resource part of the public root resource
Diffstat (limited to 'service/pixelated')
-rw-r--r--service/pixelated/resources/root_resource.py7
1 files changed, 5 insertions, 2 deletions
diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py
index 0788ffb1..24d097f9 100644
--- a/service/pixelated/resources/root_resource.py
+++ b/service/pixelated/resources/root_resource.py
@@ -46,6 +46,10 @@ class PublicRootResource(BaseResource):
def __init__(self, services_factory):
BaseResource.__init__(self, services_factory)
+ def initialize(self, provider=None, disclaimer_banner=None, authenticator=None):
+ self.putChild(LoginResource.BASE_URL,
+ LoginResource(self._services_factory, provider, disclaimer_banner=disclaimer_banner, authenticator=authenticator))
+
class RootResource(PublicRootResource):
@@ -94,6 +98,7 @@ class RootResource(PublicRootResource):
return csrf_input and csrf_input == xsrf_token
def initialize(self, provider=None, disclaimer_banner=None, authenticator=None):
+ PublicRootResource.initialize(self, provider, disclaimer_banner, authenticator)
self.putChild('sandbox', SandboxResource(self._static_folder))
self.putChild('keys', KeysResource(self._services_factory))
self.putChild(AttachmentsResource.BASE_URL, AttachmentsResource(self._services_factory))
@@ -105,8 +110,6 @@ class RootResource(PublicRootResource):
self.putChild('feedback', FeedbackResource(self._services_factory))
self.putChild('user-settings', UserSettingsResource(self._services_factory))
self.putChild('users', UsersResource(self._services_factory))
- self.putChild(LoginResource.BASE_URL,
- LoginResource(self._services_factory, provider, disclaimer_banner=disclaimer_banner, authenticator=authenticator))
self.putChild(LogoutResource.BASE_URL, LogoutResource(self._services_factory))
self._inbox_resource.initialize()