nikdoof/test-auth
1
0
Fork 0
mirror of https://github.com/nikdoof/test-auth.git synced 2025-12-15 15:22:17 +00:00
Code Issues Packages Projects Releases Wiki Activity

Services fixes, Mumble deletion works and Wiki now returns values

Browse Source
This commit is contained in:
Andrew Williams
2010-04-08 08:24:53 +01:00
parent 8af9b851e2
commit 5e4669955c
2 changed files with 12 additions and 4 deletions
Download Patch File Download Diff File Expand all files Collapse all files

14
sso/services/mumble/__init__.py
View File

@@ -26,9 +26,9 @@ class MumbleService(BaseService):
if tag: if tag:
username = "[%s]%s" % (tag, username) username = "[%s]%s" % (tag, username)
return self.raw_add_user(username, password, user) return self.raw_add_user(username, password)
def raw_add_user(username, password): def raw_add_user(self, username, password):
mumbleuser = MumbleUser() mumbleuser = MumbleUser()
mumbleuser.name = username mumbleuser.name = username
mumbleuser.password = password mumbleuser.password = password
@@ -48,8 +48,14 @@ class MumbleService(BaseService):
def delete_user(self, uid): def delete_user(self, uid):
""" Delete a user by uid """ """ Delete a user by uid """
mumbleuser = MumbleUser.objects.get(name=uid, server=self._get_server()) try:
mumbleuser.delete() mumbleuser = MumbleUser.objects.get(name=uid, server=self._get_server())
except MumbleUser.DoesNotExist:
return True
try:
mumbleuser.delete()
except:
pass
return True return True
def disable_user(self, uid): def disable_user(self, uid):

2
sso/services/wiki/__init__.py
View File

@@ -78,11 +78,13 @@ class MediawikiService(BaseService):
self._dbcursor.execute(self.SQL_DEL_REV, [uid]) self._dbcursor.execute(self.SQL_DEL_REV, [uid])
self._dbcursor.execute(self.SQL_DEL_USER, [uid]) self._dbcursor.execute(self.SQL_DEL_USER, [uid])
self._db.connection.commit() self._db.connection.commit()
return True
def disable_user(self, uid): def disable_user(self, uid):
""" Disable a user """ """ Disable a user """
self._dbcursor.execute(self.SQL_DIS_USER, [uid]) self._dbcursor.execute(self.SQL_DIS_USER, [uid])
self._db.connection.commit() self._db.connection.commit()
return True
def enable_user(self, uid, password): def enable_user(self, uid, password):
""" Enable a user """ """ Enable a user """