wip

app/core/auth.py

@@ -1,31 +1,34 @@
 from flask_login import LoginManager, UserMixin
 from werkzeug.security import generate_password_hash, check_password_hash
-from .extensions import db
+from .extensions import db, bcrypt
 from datetime import datetime
 
 login_manager = LoginManager()
 login_manager.login_view = 'auth.login'
 
 class User(UserMixin, db.Model):
+    __tablename__ = 'users'
+    
     id = db.Column(db.Integer, primary_key=True)
-    email = db.Column(db.String(120), unique=True, nullable=False)
-    password_hash = db.Column(db.String(128), nullable=False)
+    username = db.Column(db.String(64), unique=True, index=True)
+    email = db.Column(db.String(120), unique=True, index=True)
+    password_hash = db.Column(db.String(128))
     is_admin = db.Column(db.Boolean, default=False)
     created_at = db.Column(db.DateTime, default=datetime.utcnow)
     last_seen = db.Column(db.DateTime, default=datetime.utcnow)
     
+    def __repr__(self):
+        return f'<User {self.username}>'
+    
     def set_password(self, password):
-        self.password_hash = generate_password_hash(password)
-
+        self.password_hash = bcrypt.generate_password_hash(password).decode('utf-8')
+    
     def check_password(self, password):
-        return check_password_hash(self.password_hash, password)
+        return bcrypt.check_password_hash(self.password_hash, password)
 
     def get_id(self):
         return str(self.id)
 
-    def __repr__(self):
-        return f'<User {self.email}>'
-
 @login_manager.user_loader
 def load_user(user_id):
     return User.query.get(int(user_id))