login works now.

1 files changed, 10 insertions, 8 deletions

diff --git a/app.py b/app.py
index 1bf035f..c43f0be 100644
--- a/app.py
+++ b/app.py
@@ -1,8 +1,7 @@
 # -*- coding: utf-8 -*-
 import os
-from flask import Flask, request
-from flask_login import login_required, login_user, logout_user
-from utils import templated, login_manager
+from flask import Flask, request, redirect, url_for, flash, session
+from utils import templated, login_required, encrypt_password, decrypt_password, login_user, logout_user
 from forms import RegisterForm, LoginForm
 
 
@@ -10,7 +9,6 @@ app = Flask(__name__)
 app.config.from_object('default_settings')
 if 'SPLINE_ACCOUNT_WEB_SETTINGS' in os.environ:
     app.config.from_envvar('SPLINE_ACCOUNT_WEB_SETTINGS')
-login_manager.setup_app(app)
 
 
 @app.route('/', methods=['GET', 'POST'])
@@ -18,8 +16,11 @@ login_manager.setup_app(app)
 def index():
     form = LoginForm(request.form)
     if request.method == 'POST' and form.validate():
-        login_user(form.username.data)
-        return redirect(url_for('index'))
+        if login_user(form.username.data, form.password.data):
+            flash(u'Erfolgreich eingeloggt (%s)' % session['username'])
+            return redirect(url_for('index'))
+        else:
+            flash(u'Ungültiger Benutzername und/oder Passwort', 'error')
 
     return {'form': form}
 
@@ -45,13 +46,14 @@ def settings():
 
 
 @app.route('/logout')
-@login_required
 def logout():
     logout_user()
     return redirect(url_for('index'))
 
 
-
+@app.route('/debug')
+def debug():
+    raise Exception()
 
 
 if __name__ == '__main__':