Move back user group into views.

This commit is contained in:
Alexis Lahouze 2016-06-19 22:10:48 +02:00
parent a0fa75a26d
commit 8ec99a2cec
2 changed files with 23 additions and 21 deletions

View File

@ -15,8 +15,6 @@
along with Accountant. If not, see <http://www.gnu.org/licenses/>. along with Accountant. If not, see <http://www.gnu.org/licenses/>.
""" """
# vim: set tw=80 ts=4 sw=4 sts=4: # vim: set tw=80 ts=4 sw=4 sts=4:
import click
from passlib.hash import sha256_crypt as crypt from passlib.hash import sha256_crypt as crypt
from itsdangerous import (URLSafeTimedSerializer as Serializer, from itsdangerous import (URLSafeTimedSerializer as Serializer,
BadSignature, SignatureExpired) BadSignature, SignatureExpired)
@ -28,25 +26,6 @@ from flask_login import UserMixin
from accountant import db from accountant import db
# Define commands to handle users.
@app.cli.group()
def user():
""" User management. """
pass
@user.command()
def add(email, password):
""" Add a new user. """
user = User()
user.email = email
user.password = User.hash_password(password)
db.session.add(user)
click.echo("User '%s' successfully added." % email)
class User(UserMixin, db.Model): class User(UserMixin, db.Model):
id = db.Column(db.Integer, primary_key=True) id = db.Column(db.Integer, primary_key=True)
email = db.Column(db.String(200), nullable=False, unique=True, index=True) email = db.Column(db.String(200), nullable=False, unique=True, index=True)

View File

@ -15,6 +15,8 @@
along with Accountant. If not, see <http://www.gnu.org/licenses/>. along with Accountant. If not, see <http://www.gnu.org/licenses/>.
""" """
# vim: set tw=80 ts=4 sw=4 sts=4: # vim: set tw=80 ts=4 sw=4 sts=4:
import click
import arrow import arrow
from functools import wraps from functools import wraps
@ -30,6 +32,27 @@ from ..models.users import User
from .models import user_model, token_model, login_model from .models import user_model, token_model, login_model
from accountant import db
# Define commands to handle users.
@app.cli.group()
def user():
""" User management. """
pass
@user.command()
def add(email, password):
""" Add a new user. """
user = User()
user.email = email
user.password = User.hash_password(password)
db.session.add(user)
click.echo("User '%s' successfully added." % email)
def load_user_from_token(token): def load_user_from_token(token):
return User.verify_auth_token(token) return User.verify_auth_token(token)