remove PublicRootResource and use a flag on RootResource instead

2 files changed, 64 insertions, 5 deletions

diff --git a/service/test/unit/resources/test_auth.py b/service/test/unit/resources/test_auth.py
index 793069dd..f4012b1b 100644
--- a/service/test/unit/resources/test_auth.py
+++ b/service/test/unit/resources/test_auth.py
@@ -1,7 +1,7 @@
 from mockito import mock, when, any as ANY
 from pixelated.resources.auth import SessionChecker, PixelatedRealm, PixelatedAuthSessionWrapper
 from pixelated.resources.login_resource import LoginResource
-from pixelated.resources.root_resource import PublicRootResource, RootResource
+from pixelated.resources.root_resource import RootResource
 from test.unit.resources import DummySite
 from twisted.cred import error
 from twisted.cred.checkers import ANONYMOUS, AllowAnonymousAccess
@@ -41,7 +41,7 @@ class TestPixelatedAuthSessionWrapper(unittest.TestCase):
         self.portal = Portal(self.realm_mock, [session_checker, AllowAnonymousAccess()])
         self.user_uuid_mock = mock()
         self.root_resource = RootResource(services_factory)
-        self.anonymous_resource = PublicRootResource(services_factory)
+        self.anonymous_resource = RootResource(services_factory, public=True)
 
         self.session_wrapper = PixelatedAuthSessionWrapper(self.portal, self.root_resource, self.anonymous_resource)
         self.request = DummyRequest([])
@@ -55,7 +55,7 @@ class TestPixelatedAuthSessionWrapper(unittest.TestCase):
         d = deferred_resource.d
 
         def assert_public_root_resource(resource):
-            self.assertIsInstance(resource, PublicRootResource)
+            self.assertIs(resource, self.anonymous_resource)
 
         return d.addCallback(assert_public_root_resource)
 
diff --git a/service/test/unit/resources/test_root_resource.py b/service/test/unit/resources/test_root_resource.py
index 1543f650..b674103c 100644
--- a/service/test/unit/resources/test_root_resource.py
+++ b/service/test/unit/resources/test_root_resource.py
@@ -6,6 +6,7 @@ from mockito import mock, when, any as ANY
 
 import pixelated
 from pixelated.application import UserAgentMode
+from pixelated.resources import UnAuthorizedResource
 from pixelated.resources.features_resource import FeaturesResource
 from pixelated.resources.login_resource import LoginResource
 from test.unit.resources import DummySite
@@ -15,15 +16,55 @@ from twisted.trial import unittest
 from twisted.web.resource import IResource, getChildForRequest
 from twisted.web.static import File
 from twisted.web.test.requesthelper import DummyRequest
-from pixelated.resources.root_resource import InboxResource, PublicRootResource, RootResource, MODE_STARTUP, MODE_RUNNING
+from pixelated.resources.root_resource import InboxResource, RootResource, MODE_STARTUP, MODE_RUNNING
 
 
 class TestPublicRootResource(unittest.TestCase):
 
     def setUp(self):
-        self.public_root_resource = PublicRootResource(mock())
+        self.public_root_resource = RootResource(mock(), public=True)
         self.web = DummySite(self.public_root_resource)
 
+    def test_put_child_public_adds_resource(self):
+        self.public_root_resource.initialize(provider=mock(), authenticator=mock())
+        url_fragment, resource_mock = 'some-url-fragment', mock()
+        self.public_root_resource.putChildPublic(url_fragment, resource_mock)
+        request = DummyRequest([url_fragment])
+        request.addCookie = lambda key, value: 'stubbed'
+        child_resource = getChildForRequest(self.public_root_resource, request)
+        self.assertIs(child_resource, resource_mock)
+
+    def test_put_child_protected_adds_unauthorized(self):
+        self.public_root_resource.initialize(provider=mock(), authenticator=mock())
+        url_fragment, resource_mock = 'some-url-fragment', mock()
+        self.public_root_resource.putChildProtected(url_fragment, resource_mock)
+        request = DummyRequest([url_fragment])
+        request.addCookie = lambda key, value: 'stubbed'
+        child_resource = getChildForRequest(self.public_root_resource, request)
+        self.assertIsInstance(child_resource, UnAuthorizedResource)
+
+    def test_put_child_adds_unauthorized(self):
+        self.public_root_resource.initialize(provider=mock(), authenticator=mock())
+        url_fragment, resource_mock = 'some-url-fragment', mock()
+        self.public_root_resource.putChild(url_fragment, resource_mock)
+        request = DummyRequest([url_fragment])
+        request.addCookie = lambda key, value: 'stubbed'
+        child_resource = getChildForRequest(self.public_root_resource, request)
+        self.assertIsInstance(child_resource, UnAuthorizedResource)
+
+    def test_private_resource_returns_401(self):
+        self.public_root_resource.initialize(provider=mock(), authenticator=mock())
+        request = DummyRequest(['mails'])
+        request.addCookie = lambda key, value: 'stubbed'
+        d = self.web.get(request)
+
+        def assert_unauthorized(request):
+            self.assertEqual(401, request.responseCode)
+            self.assertEqual("Unauthorized!", request.written[0])
+
+        d.addCallback(assert_unauthorized)
+        return d
+
     def test_login_url_should_delegate_to_login_resource(self):
         self.public_root_resource.initialize(provider=mock(), authenticator=mock())
         request = DummyRequest(['login'])
@@ -61,6 +102,24 @@ class TestRootResource(unittest.TestCase):
         self.root_resource = RootResource(self.services_factory)
         self.web = DummySite(self.root_resource)
 
+    def test_put_child_protected_adds_resource(self):
+        self.root_resource.initialize(provider=mock(), authenticator=mock())
+        url_fragment, resource_mock = 'some-url-fragment', mock()
+        self.root_resource.putChildProtected(url_fragment, resource_mock)
+        request = DummyRequest([url_fragment])
+        request.addCookie = lambda key, value: 'stubbed'
+        child_resource = getChildForRequest(self.root_resource, request)
+        self.assertIs(child_resource, resource_mock)
+
+    def test_put_child_adds_resource(self):
+        self.root_resource.initialize(provider=mock(), authenticator=mock())
+        url_fragment, resource_mock = 'some-url-fragment', mock()
+        self.root_resource.putChild(url_fragment, resource_mock)
+        request = DummyRequest([url_fragment])
+        request.addCookie = lambda key, value: 'stubbed'
+        child_resource = getChildForRequest(self.root_resource, request)
+        self.assertIs(child_resource, resource_mock)
+
     def test_root_url_should_delegate_to_inbox(self):
         request = DummyRequest([''])
         request.addCookie = lambda key, value: 'stubbed'