108536490: add the proxy_fix

This commit is contained in:
Rebecca Law
2015-11-30 14:32:58 +00:00
parent af382885d3
commit 3f017b30f2
9 changed files with 48 additions and 24 deletions

View File

@@ -1,8 +1,13 @@
from app import db
from app import db, login_manager
from app.models import User
from app.main.encryption import encrypt
@login_manager.user_loader
def load_user(user_id):
return get_user_by_id(user_id)
def insert_user(user):
user.password = encrypt(user.password)
db.session.add(user)

View File

@@ -3,7 +3,6 @@ from datetime import datetime
from flask import render_template, redirect, jsonify
from flask_login import login_user
from app import login_manager
from app.main import main
from app.main.forms import LoginForm
from app.main.dao import users_dao
@@ -11,11 +10,6 @@ from app.models import User
from app.main.encryption import encrypt
@login_manager.user_loader
def load_user(user_id):
return users_dao.get_user_by_id(user_id)
@main.route("/sign-in", methods=(['GET']))
def render_sign_in():
return render_template('signin.html', form=LoginForm())
@@ -27,13 +21,13 @@ def process_sign_in():
if form.validate_on_submit():
user = users_dao.get_user_by_email(form.email_address.data)
if user is None:
return jsonify(authorization=False), 404
return jsonify(authorization=False), 401
if user.password == encrypt(form.password.data):
login_user(user)
else:
return jsonify(authorization=False), 404
return jsonify(authorization=False), 401
else:
return jsonify(form.errors), 404
return jsonify(form.errors), 400
return redirect('/two-factor')