From fafac3b4128a0993b0de1c6e8ca3062bf1ccc14e Mon Sep 17 00:00:00 2001 From: Roald de Vries Date: Thu, 8 Dec 2016 16:59:09 +0100 Subject: Revert "[#801] Merge branch 'signup'" This reverts commit d10f607a4d40587510b0dc31b31fe4750bf4a3a3, reversing changes made to c28abba2f5b1186c671ebef508d40ffaae6d5bc5. --- service/pixelated/application.py | 17 +++++------------ 1 file changed, 5 insertions(+), 12 deletions(-) (limited to 'service/pixelated/application.py') diff --git a/service/pixelated/application.py b/service/pixelated/application.py index 73095da4..46e5ba85 100644 --- a/service/pixelated/application.py +++ b/service/pixelated/application.py @@ -37,18 +37,12 @@ from pixelated.config.leap import initialize_leap_single_user, init_monkeypatche from pixelated.config.services import ServicesFactory, SingleUserServicesFactory from pixelated.config.site import PixelatedSite from pixelated.resources.auth import PixelatedRealm, PixelatedAuthSessionWrapper, SessionChecker +from pixelated.resources.login_resource import LoginResource from pixelated.resources.root_resource import RootResource log = Logger() -def get_static_folder(): - static_folder = os.path.abspath(os.path.join(os.path.dirname(os.path.abspath(__file__)), "..", "..", "web-ui", "public")) - if not os.path.exists(static_folder): - static_folder = os.path.join('/', 'usr', 'share', 'pixelated-user-agent') - return static_folder - - class UserAgentMode(object): def __init__(self, is_single_user): self.is_single_user = is_single_user @@ -100,7 +94,7 @@ def initialize(): args = arguments.parse_user_agent_args() logger.init(debug=args.debug) services_factory = _create_service_factory(args) - resource = RootResource(services_factory, static_folder=get_static_folder()) + resource = RootResource(services_factory) def start(): start_async = _start_mode(args, resource, services_factory) @@ -161,12 +155,11 @@ def _setup_multi_user(args, root_resource, services_factory): def set_up_protected_resources(root_resource, provider, services_factory, banner=None, authenticator=None): session_checker = SessionChecker(services_factory) - anonymous_resource = RootResource(services_factory, static_folder=get_static_folder(), public=True) - realm = PixelatedRealm(root_resource, anonymous_resource) + realm = PixelatedRealm() _portal = portal.Portal(realm, [session_checker, AllowAnonymousAccess()]) - protected_resource = PixelatedAuthSessionWrapper(_portal) - anonymous_resource.initialize(provider, disclaimer_banner=banner, authenticator=authenticator) + anonymous_resource = LoginResource(services_factory, provider, disclaimer_banner=banner, authenticator=authenticator) + protected_resource = PixelatedAuthSessionWrapper(_portal, root_resource, anonymous_resource, []) root_resource.initialize(provider, disclaimer_banner=banner, authenticator=authenticator) return protected_resource -- cgit v1.2.3