From b6a8e508bf2629d528b1bba3e1b12d6da83b1abf Mon Sep 17 00:00:00 2001 From: Lance Edgar Date: Tue, 20 Aug 2024 22:16:01 -0500 Subject: [PATCH] fix: prefer wuttaweb config for "home redirect to login" feature --- tailbone/views/common.py | 17 +++++++++++++++-- 1 file changed, 15 insertions(+), 2 deletions(-) diff --git a/tailbone/views/common.py b/tailbone/views/common.py index 7e9ddb09..26ef2626 100644 --- a/tailbone/views/common.py +++ b/tailbone/views/common.py @@ -25,6 +25,7 @@ Various common views """ import os +import warnings from collections import OrderedDict from rattail.batch import consume_batch_id @@ -50,9 +51,21 @@ class CommonView(View): Home page view. """ app = self.get_rattail_app() + + # maybe auto-redirect anons to login if not self.request.user: - if self.rattail_config.getbool('tailbone', 'login_is_home', default=True): - raise self.redirect(self.request.route_url('login')) + redirect = self.config.get_bool('wuttaweb.home_redirect_to_login') + if redirect is None: + redirect = self.config.get_bool('tailbone.login_is_home') + if redirect is not None: + warnings.warn("tailbone.login_is_home setting is deprecated; " + "please set wuttaweb.home_redirect_to_login instead", + DeprecationWarning) + else: + # TODO: this is opposite of upstream default, should change + redirect = True + if redirect: + return self.redirect(self.request.route_url('login')) image_url = self.rattail_config.get( 'tailbone', 'main_image_url',