Remove SipaLoginManager

Author: sebschrader

sipa/base.py

@@ -6,14 +6,14 @@
 disjoint from any blueprint.
 """
 from flask import request, session
-from flask_login import AnonymousUserMixin
+from flask_login import AnonymousUserMixin, LoginManager
 from werkzeug.routing import IntegerConverter as BaseIntegerConverter
 
-from sipa.login_manager import SipaLoginManager
 from sipa.backends import backends
 
-login_manager = SipaLoginManager()
+login_manager = LoginManager()
 login_manager.login_view = "generic.login"
+login_manager.login_message = "Bitte melde Dich an, um die Seite zu sehen."
 
 
 class IntegerConverter(BaseIntegerConverter):

sipa/login_manager.py

@@ -1,5 +1,5 @@
 # -*- coding: utf-8 -*-
-from flask import Flask, Blueprint, url_for, session, request
+from flask import Flask, url_for
 from flask_login import current_user, login_user
 from flask_testing import TestCase
 
@@ -51,63 +51,3 @@ def test_authentication_works(self):
         self.login()
         response = self.client.get(url_for('restricted'))
         self.assertEqual(response.data.decode('utf-8'), "test_user")
-
-    def test_decorator_called_without_parameter(self):
-        with self.assertRaises(TypeError):
-            @self.app.route('/view')
-            @self.mgr.disable_user_loading  # note that `()` is missing
-            def view():
-                return False
-
-
-class AppLevelUserLoadingDisabledTest(SipaLoginManagerTest):
-    def create_app(self):
-        app = super().create_app()
-
-        @app.route('/images')
-        @self.mgr.disable_user_loading()
-        def show_images():
-            # We don't take kindly to your types around here!
-            self.assertFalse(current_user.is_authenticated)
-            return "Images :-)"
-
-        return app
-
-    def test_login_manager(self):
-        self.login()
-        response = self.client.get(url_for('show_images'))
-        self.assertEqual(response.data.decode('utf-8'), "Images :-)")
-        self.assertIn('show_images', self.mgr.ignored_endpoints)
-
-
-class BlueprintLevelUserLoadingDisabledTest(SipaLoginManagerTest):
-    def create_app(self):
-        app = super().create_app()
-        bp = Blueprint(name='documents', import_name='documents')
-
-        @bp.route('/documents')
-        @self.mgr.disable_user_loading(bp)
-        def show_documents():
-            self.assertFalse(current_user.is_authenticated)
-            return "Documents :-)"
-
-        @bp.route('/images')
-        def show_images_as_well():
-            self.assertFalse(current_user.is_authenticated)
-            return "Images :-)"
-        self.mgr.ignore_endpoint('documents.show_images_as_well')
-
-        app.register_blueprint(bp)
-        return app
-
-    def test_documents_no_user(self):
-        self.login()
-        response = self.client.get(url_for('documents.show_documents'))
-        self.assertEqual(response.data.decode('utf-8'), "Documents :-)")
-        self.assertIn('documents.show_documents', self.mgr.ignored_endpoints)
-
-    def test_images_no_user(self):
-        self.login()
-        response = self.client.get(url_for('documents.show_images_as_well'))
-        self.assertEqual(response.data.decode('utf-8'), "Images :-)")
-        self.assertIn('documents.show_images_as_well', self.mgr.ignored_endpoints)