utils/login: Add create_login_manager

1 files changed, 2 insertions, 14 deletions

diff --git a/accounts/__init__.py b/accounts/__init__.py
index a86974e..0eb202a 100644
--- a/accounts/__init__.py
+++ b/accounts/__init__.py
@@ -1,11 +1,10 @@
 # -*- coding: utf-8 -*-
 from flask import Flask, g, session
-from flask.ext.login import LoginManager
 
 from models import Service
 from utils import *
 from utils.sessions import EncryptedSessionInterface
-from utils.login import parse_userid
+from utils.login import create_login_manager
 from views import default, login, admin
 
 
@@ -30,16 +29,5 @@ if app.config.get('USERNAME_BLACKLIST_FILE'):
     with open(app.config['USERNAME_BLACKLIST_FILE']) as f:
         app.username_blacklist = f.read().split('\n')
 
-login_manager = LoginManager()
+login_manager = create_login_manager()
 login_manager.init_app(app)
-login_manager.login_message = 'Bitte einloggen'
-login_manager.login_view = 'login.login'
-
-@login_manager.user_loader
-def load_user(user_id):
-    try:
-        username, password = parse_userid(user_id)
-        return current_app.user_backend.auth(username, password)
-    except (current_app.user_backend.NoSuchUserError,
-            current_app.user_backend.InvalidPasswordError):
-        return None