Personal/realms-wiki
1
0
Fork 0
Code Issues Pull requests Releases Wiki Activity

implements #4, use env to configure app

Browse source
This commit is contained in:
Matthew Scragg 2014-09-29 15:22:20 -05:00
parent 675ec9c9f9
commit 2895308667
5 changed files with 48 additions and 41 deletions
Download patch file Download diff file Expand all files Collapse all files

4
realms/modules/auth/forms.py
View file

@ -1,6 +1,6 @@
from flask_wtf import Form, RecaptchaField
from wtforms import StringField, PasswordField, validators
from realms import config
from realms import app
class RegistrationForm(Form):
@ -12,7 +12,7 @@ class RegistrationForm(Form):
])
confirm = PasswordField('Repeat Password')
if config.RECAPTCHA_ENABLE:
if app.config['RECAPTCHA_ENABLE']:
setattr(RegistrationForm, 'recaptcha', RecaptchaField("You Human?"))

14
realms/modules/auth/views.py
View file

@ -1,16 +1,16 @@
from flask import g, render_template, request, redirect, Blueprint, flash, url_for
from realms.modules.auth.models import User
from realms.modules.auth.forms import LoginForm, RegistrationForm
from realms import config
from realms import app
blueprint = Blueprint('auth', __name__, url_prefix=config.RELATIVE_PATH)
blueprint = Blueprint('auth', __name__, url_prefix=app.config['RELATIVE_PATH'])
@blueprint.route("/logout")
def logout_page():
User.logout()
flash("You are now logged out")
return redirect(url_for(config.ROOT_ENDPOINT))
return redirect(url_for(app.config['ROOT_ENDPOINT']))
@blueprint.route("/login", methods=['GET', 'POST'])
@ -23,7 +23,7 @@ def login():
return redirect(url_for('auth.login'))
if User.auth(request.form['email'], request.form['password']):
return redirect(request.args.get("next") or url_for(config.ROOT_ENDPOINT))
return redirect(request.args.get("next") or url_for(app.config['ROOT_ENDPOINT']))
else:
flash('Email or Password Incorrect', 'warning')
return redirect(url_for('auth.login'))
@ -34,9 +34,9 @@ def login():
@blueprint.route("/register", methods=['GET', 'POST'])
def register():
if not config.REGISTRATION_ENABLED:
if not app.config['REGISTRATION_ENABLED']:
flash("Registration is disabled")
return redirect(url_for(config.ROOT_ENDPOINT))
return redirect(url_for(app.config['ROOT_ENDPOINT']))
form = RegistrationForm()
@ -57,7 +57,7 @@ def register():
User.create(request.form['username'], request.form['email'], request.form['password'])
User.auth(request.form['email'], request.form['password'])
return redirect(request.args.get("next") or url_for(config.ROOT_ENDPOINT))
return redirect(request.args.get("next") or url_for(app.config['ROOT_ENDPOINT']))
return render_template("auth/register.html", form=form)