From c141c30b068e91f58b0c64649462589f7442a2df Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Wed, 1 Feb 2017 16:07:37 -0200 Subject: [#922] Create route for account recovery with @tayanefernandes --- .../resources/account_recovery_resource.py | 66 ++++++++++++++++++++++ service/pixelated/resources/root_resource.py | 2 + 2 files changed, 68 insertions(+) create mode 100644 service/pixelated/resources/account_recovery_resource.py (limited to 'service') diff --git a/service/pixelated/resources/account_recovery_resource.py b/service/pixelated/resources/account_recovery_resource.py new file mode 100644 index 00000000..12eb9f95 --- /dev/null +++ b/service/pixelated/resources/account_recovery_resource.py @@ -0,0 +1,66 @@ +# +# Copyright (c) 2017 ThoughtWorks, Inc. +# +# Pixelated is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Pixelated is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with Pixelated. If not, see . + +import os +from xml.sax import SAXParseException + +from pixelated.resources import BaseResource, UnAuthorizedResource +from twisted.python.filepath import FilePath +from pixelated.resources import get_static_folder +from twisted.web.http import OK +from twisted.web.resource import NoResource +from twisted.web.template import Element, XMLFile, renderElement + + + +def parse_accept_language(all_headers): + accepted_languages = ['pt-BR', 'en-US'] + languages = all_headers.get('accept-language', '').split(';')[0] + for language in accepted_languages: + if language in languages: + return language + return 'pt-BR' + + + +class AccountRecoveryPage(Element): + loader = XMLFile(FilePath(os.path.join(get_static_folder(), 'account_recovery.html'))) + + def __init__(self): + super(AccountRecoveryPage, self).__init__() + + +class AccountRecoveryResource(BaseResource): + BASE_URL = 'recovery' + + def __init__(self, services_factory): + BaseResource.__init__(self, services_factory) + + + def getChild(self, path, request): + if path == BASE_URL: + return self + if not self.is_logged_in(request): + return UnAuthorizedResource() + return NoResource() + + def render_GET(self, request): + request.setResponseCode(OK) + return self._render_template(request) + + def _render_template(self, request): + site = AccountRecoveryPage() + return renderElement(request, site) diff --git a/service/pixelated/resources/root_resource.py b/service/pixelated/resources/root_resource.py index d3e0456e..a97bd049 100644 --- a/service/pixelated/resources/root_resource.py +++ b/service/pixelated/resources/root_resource.py @@ -23,6 +23,7 @@ from pixelated.resources import BaseResource, UnAuthorizedResource, UnavailableR from pixelated.resources import get_startup_folder, get_static_folder from pixelated.resources.attachments_resource import AttachmentsResource from pixelated.resources.sandbox_resource import SandboxResource +from pixelated.resources.account_recovery_resource import AccountRecoveryResource from pixelated.resources.contacts_resource import ContactsResource from pixelated.resources.features_resource import FeaturesResource from pixelated.resources.feedback_resource import FeedbackResource @@ -88,6 +89,7 @@ class RootResource(BaseResource): return csrf_input and csrf_input == xsrf_token def initialize(self, provider=None, disclaimer_banner=None, authenticator=None): + self._child_resources.add('recovery', AccountRecoveryResource(self._services_factory)) 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)) -- cgit v1.2.3 From b4c5dae4272722860fe5b145883214a93f9962db Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 2 Feb 2017 15:10:59 -0200 Subject: [#922] Fixes lint errors in accout recovery resource with @tayanefernandes --- service/pixelated/resources/account_recovery_resource.py | 12 ------------ 1 file changed, 12 deletions(-) (limited to 'service') diff --git a/service/pixelated/resources/account_recovery_resource.py b/service/pixelated/resources/account_recovery_resource.py index 12eb9f95..4b88ff44 100644 --- a/service/pixelated/resources/account_recovery_resource.py +++ b/service/pixelated/resources/account_recovery_resource.py @@ -25,17 +25,6 @@ from twisted.web.resource import NoResource from twisted.web.template import Element, XMLFile, renderElement - -def parse_accept_language(all_headers): - accepted_languages = ['pt-BR', 'en-US'] - languages = all_headers.get('accept-language', '').split(';')[0] - for language in accepted_languages: - if language in languages: - return language - return 'pt-BR' - - - class AccountRecoveryPage(Element): loader = XMLFile(FilePath(os.path.join(get_static_folder(), 'account_recovery.html'))) @@ -49,7 +38,6 @@ class AccountRecoveryResource(BaseResource): def __init__(self, services_factory): BaseResource.__init__(self, services_factory) - def getChild(self, path, request): if path == BASE_URL: return self -- cgit v1.2.3 From 1a37dcd2dc8a02eda2a0cc3f90521b0ebc1c9198 Mon Sep 17 00:00:00 2001 From: Anike Arni Date: Thu, 2 Feb 2017 16:58:46 -0200 Subject: [#922] Adds test for recovery resouce with @tayanefernandes --- .../resources/account_recovery_resource.py | 12 +----- .../resources/test_account_recovery_resource.py | 43 ++++++++++++++++++++++ 2 files changed, 45 insertions(+), 10 deletions(-) create mode 100644 service/test/unit/resources/test_account_recovery_resource.py (limited to 'service') diff --git a/service/pixelated/resources/account_recovery_resource.py b/service/pixelated/resources/account_recovery_resource.py index 4b88ff44..a69cac9a 100644 --- a/service/pixelated/resources/account_recovery_resource.py +++ b/service/pixelated/resources/account_recovery_resource.py @@ -17,11 +17,10 @@ import os from xml.sax import SAXParseException -from pixelated.resources import BaseResource, UnAuthorizedResource +from pixelated.resources import BaseResource from twisted.python.filepath import FilePath from pixelated.resources import get_static_folder from twisted.web.http import OK -from twisted.web.resource import NoResource from twisted.web.template import Element, XMLFile, renderElement @@ -33,18 +32,11 @@ class AccountRecoveryPage(Element): class AccountRecoveryResource(BaseResource): - BASE_URL = 'recovery' + isLeaf = True def __init__(self, services_factory): BaseResource.__init__(self, services_factory) - def getChild(self, path, request): - if path == BASE_URL: - return self - if not self.is_logged_in(request): - return UnAuthorizedResource() - return NoResource() - def render_GET(self, request): request.setResponseCode(OK) return self._render_template(request) diff --git a/service/test/unit/resources/test_account_recovery_resource.py b/service/test/unit/resources/test_account_recovery_resource.py new file mode 100644 index 00000000..01ffaed2 --- /dev/null +++ b/service/test/unit/resources/test_account_recovery_resource.py @@ -0,0 +1,43 @@ +# +# Copyright (c) 2017 ThoughtWorks, Inc. +# +# Pixelated is free software: you can redistribute it and/or modify +# it under the terms of the GNU Affero General Public License as published by +# the Free Software Foundation, either version 3 of the License, or +# (at your option) any later version. +# +# Pixelated is distributed in the hope that it will be useful, +# but WITHOUT ANY WARRANTY; without even the implied warranty of +# MERCHANTABILITY or FITNESS FOR A PARTICULAR PURPOSE. See the +# GNU Affero General Public License for more details. +# +# You should have received a copy of the GNU Affero General Public License +# along with Pixelated. If not, see . + +import os + +from mock import MagicMock, patch +from twisted.trial import unittest +from twisted.web.test.requesthelper import DummyRequest + +from pixelated.resources.account_recovery_resource import AccountRecoveryResource +from test.unit.resources import DummySite + + +class TestAccountRecoveryResource(unittest.TestCase): + def setUp(self): + self.services_factory = MagicMock() + self.resource = AccountRecoveryResource(self.services_factory) + self.web = DummySite(self.resource) + + def test_get(self): + request = DummyRequest(['/recovery']) + request.method = 'GET' + d = self.web.get(request) + + def assert_200_when_user_logged_in(_): + self.assertEqual(200, request.responseCode) + self.assertIn("DOCTYPE html", request.written[0]) + + d.addCallback(assert_200_when_user_logged_in) + return d -- cgit v1.2.3