tobias/lrc-backend
1
0
Fork 0
Code Issues Pull Requests Releases Wiki Activity

removed old dB code and continued on group and user mgmt

Browse Source
This commit is contained in:
Tobias
2019-04-11 16:18:46 +02:00
parent 2451a56403
commit cbc269edf2
13 changed files with 42 additions and 104 deletions
Download Patch File Download Diff File Expand all files Collapse all files

19
models/user_model.py
View File

@@ -101,17 +101,10 @@ class User(UserMixin, db.Model):
super(User, self).__init__(**kwargs)
password = kwargs.get("password", None)
external_user = kwargs.get("external_user", None)
groups = kwargs.get("groups", None)
if password is not None:
self.password = sha256_crypt.encrypt(password)
if external_user is not None:
self.external_user = external_user
if groups is not None:
if isinstance(groups, list):
for g in groups:
self.groups.append(g)
elif isinstance(groups, str):
self.groups.append(groups)
@staticmethod
@login_manager.user_loader
@@ -417,13 +410,15 @@ class BlacklistToken(db.Model):
class Group(db.Model):
id = db.Column(db.Integer, autoincrement=True, primary_key=True)
name = db.Column(db.Unicode(63), unique=True, nullable=False)
description = db.Column(db.Unicode(255), unique=False, nullable=True, default="")
users = db.relationship('User', secondary=user_group_table, back_populates='groups')
permissions = db.relationship('Permission', secondary=group_permission_table, back_populates='groups')
def __init__(self, **kwargs):
super(Group, self).__init__(**kwargs)
id = db.Column(db.Integer, autoincrement=True, primary_key=True)
name = db.Column(db.Unicode(63), unique=True, nullable=False)
users = db.relationship('User', secondary=user_group_table, back_populates='groups')
permissions = db.relationship('Permission', secondary=group_permission_table, back_populates='groups')
@staticmethod
def get_by_name(name):
@@ -457,6 +452,6 @@ class Permission(db.Model):
"""Table containing permissions associated with groups."""
id = db.Column(db.Integer, autoincrement=True, primary_key=True)
name = db.Column(db.Unicode(63), unique=True, nullable=False)
description = db.Column(db.Unicode(255))
description = db.Column(db.Unicode(511))
groups = db.relationship(Group, secondary=group_permission_table,
back_populates='permissions')