Todo se fue a docker igual que el otro repo

Decidi pasar todo esto a docker igual para tener todo ahi, parece mas
ordenado y mas facil de mantener en mi servidor

de paso tambien hice el trabajo de pasar los modelos a sqlalchemy para
usar mysql :3
This commit is contained in:
Daniel Cortes
2019-03-15 03:16:59 -03:00
parent 6b34e909f2
commit c9ffcb8dca
22 changed files with 253 additions and 264 deletions

View File

@@ -1,11 +1,12 @@
import functools
from www.db import get_db
from werkzeug.exceptions import abort
from werkzeug.security import check_password_hash
from flask import Blueprint, request, flash, render_template, session, g, redirect, url_for
from flask import Blueprint, render_template, request, session
from flask import url_for, flash, redirect, g
from www.models import User
bp = Blueprint('auth', __name__, url_prefix='/auth')
@@ -16,21 +17,18 @@ def login():
username = request.form['username']
password = request.form['password']
db = get_db()
error = None
user = db.execute(
'SELECT * FROM users WHERE username = ?', (username,)
).fetchone()
user = User.query.filter_by(username=username).first()
if user is None:
error = 'Incorrect username.'
elif not check_password_hash(user['password'], password):
elif not check_password_hash(user.password, password):
error = 'Incorrect password.'
if error is None:
session.clear()
session['user_id'] = user['id']
session['user_id'] = user.id
return redirect(url_for('index'))
flash(error)
@@ -49,9 +47,7 @@ def load_logged_in_user():
if user_id is None:
g.user = None
else:
g.user = get_db().execute(
'SELECT * FROM users WHERE id = ?', (user_id,)
).fetchone()
g.user = User.query.get(user_id)
def admin_required(view):
@functools.wraps(view)