diff options
Diffstat (limited to 'service/pixelated/resources/root_resource.py')
| -rw-r--r-- | service/pixelated/resources/root_resource.py | 11 |
1 files changed, 8 insertions, 3 deletions
diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py index 504d156d..70d8a565 100644 --- a/service/pixelated/resources/root_resource.py +++ b/service/pixelated/resources/root_resource.py @@ -19,6 +19,7 @@ import os from string import Template from pixelated.resources import BaseResource, UnAuthorizedResource, UnavailableResource +from pixelated.resources import IPixelatedSession from pixelated.resources.attachments_resource import AttachmentsResource from pixelated.resources.sandbox_resource import SandboxResource from pixelated.resources.contacts_resource import ContactsResource @@ -34,6 +35,10 @@ from pixelated.resources.keys_resource import KeysResource from twisted.web.resource import NoResource from twisted.web.static import File +from twisted.logger import Logger + +log = Logger() + from pixelated.resources.users import UsersResource CSRF_TOKEN_LENGTH = 32 @@ -82,13 +87,13 @@ class RootResource(BaseResource): csrf_input = request.args.get('csrftoken', [None])[0] or json.loads(request.content.read()).get('csrftoken', [None])[0] return csrf_input and csrf_input == xsrf_token - def initialize(self, portal=None, disclaimer_banner=None): + def initialize(self, provider=None, disclaimer_banner=None, authenticator=None): self._child_resources.add('sandbox', SandboxResource(self._static_folder)) self._child_resources.add('assets', File(self._static_folder)) self._child_resources.add('keys', KeysResource(self._services_factory)) self._child_resources.add(AttachmentsResource.BASE_URL, AttachmentsResource(self._services_factory)) self._child_resources.add('contacts', ContactsResource(self._services_factory)) - self._child_resources.add('features', FeaturesResource(portal)) + self._child_resources.add('features', FeaturesResource(provider)) self._child_resources.add('tags', TagsResource(self._services_factory)) self._child_resources.add('mails', MailsResource(self._services_factory)) self._child_resources.add('mail', MailResource(self._services_factory)) @@ -96,7 +101,7 @@ class RootResource(BaseResource): self._child_resources.add('user-settings', UserSettingsResource(self._services_factory)) self._child_resources.add('users', UsersResource(self._services_factory)) self._child_resources.add(LoginResource.BASE_URL, - LoginResource(self._services_factory, portal, disclaimer_banner=disclaimer_banner)) + LoginResource(self._services_factory, provider, disclaimer_banner=disclaimer_banner, authenticator=authenticator)) self._child_resources.add(LogoutResource.BASE_URL, LogoutResource(self._services_factory)) self._mode = MODE_RUNNING |