Replace custom code with ldapalchemys 1-n-relationships

ldapalchemy @ db135ec7

-Subproject commit 6a0b85f2c6a11951d99d4b4e84b1df992580d964
+Subproject commit db135ec7a4940a384e82a4500cfb0e73ecd2f557

uffd/mfa/models.py

@@ -13,6 +13,7 @@ import crypt
 
 from flask import request, current_app
 from sqlalchemy import Column, Integer, Enum, String, DateTime, Text
+from ldapalchemy.dbutils import DBRelationship
 
 from uffd.database import db
 from uffd.user.models import User
@@ -29,6 +30,7 @@ class MFAMethod(db.Model):
 	created = Column(DateTime())
 	name = Column(String(128))
 	dn = Column(String(128))
+	user = DBRelationship('dn', User, backref='mfa_methods')
 
 	__mapper_args__ = {
 		'polymorphic_on': type,
@@ -39,14 +41,6 @@ class MFAMethod(db.Model):
 		self.name = name
 		self.created = datetime.datetime.now()
 
-	@property
-	def user(self):
-		return User.query.get(self.dn)
-
-	@user.setter
-	def user(self, new_user):
-		self.dn = new_user.dn
-
 class RecoveryCodeMethod(MFAMethod):
 	code_salt = Column('recovery_salt', String(64))
 	code_hash = Column('recovery_hash', String(256))

uffd/oauth2/models.py

 from flask import current_app
 from sqlalchemy import Column, Integer, String, DateTime, Text
+from ldapalchemy.dbutils import DBRelationship
 
 from uffd.database import db
 from uffd.user.models import User
@@ -36,14 +37,7 @@ class OAuth2Grant(db.Model):
 	id = Column(Integer, primary_key=True)
 
 	user_dn = Column(String(128))
-
-	@property
-	def user(self):
-		return User.query.get(self.user_dn)
-
-	@user.setter
-	def user(self, newuser):
-		self.user_dn = newuser.dn
+	user = DBRelationship('user_dn', User, backref='oauth2_grants')
 
 	client_id = Column(String(40))
 
@@ -76,13 +70,7 @@ class OAuth2Token(db.Model):
 	id = Column(Integer, primary_key=True)
 
 	user_dn = Column(String(128))
-	@property
-	def user(self):
-		return User.query.get(self.user_dn)
-
-	@user.setter
-	def user(self, newuser):
-		self.user_dn = newuser.dn
+	user = DBRelationship('user_dn', User, backref='oauth2_tokens')
 
 	client_id = Column(String(40))