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

Servie Adduser now returns a Service UID for each addition

Browse Source
This commit is contained in:
Andrew Williams
2010-03-07 01:35:57 +00:00
parent d31034d950
commit 0e345ce65b
3 changed files with 7 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

3
sso/models.py
View File

@@ -91,6 +91,7 @@ class ServiceAccount(models.Model):
user = models.ForeignKey(User, blank=False) user = models.ForeignKey(User, blank=False)
service = models.ForeignKey(Service, blank=False) service = models.ForeignKey(Service, blank=False)
username = models.CharField("Service Username", max_length=200, blank=True) username = models.CharField("Service Username", max_length=200, blank=True)
service_uid = models.CharField("Service UID", max_length=200, blank=True)
active = models.BooleanField(default=True) active = models.BooleanField(default=True)
password = None password = None
@@ -108,7 +109,7 @@ class ServiceAccount(models.Model):
if self.active: if self.active:
if not api.check_user(self.username): if not api.check_user(self.username):
api.add_user(self.username, self.password) self.service_uid = api.add_user(self.username, self.password)
else: else:
raise ExistingUser('Username %s has already been took' % self.username) raise ExistingUser('Username %s has already been took' % self.username)
else: else:

6
sso/services/jabber/__init__.py
View File

@@ -24,9 +24,11 @@ class JabberService(BaseService):
def add_user(self, username, password): def add_user(self, username, password):
""" Add user to service """ """ Add user to service """
if self.method == "xmpp": if self.method == "xmpp":
return self.jabberadmin.adduser('%s@%s' % (username, settings.JABBER_SERVER), password) if self.jabberadmin.adduser('%s@%s' % (username, settings.JABBER_SERVER), password):
return '%s@%s' % (username, settings.JABBER_SERVER)
else: else:
return self.ejctl.register(username.lower(), settings.JABBER_SERVER, password) if self.ejctl.register(username.lower(), settings.JABBER_SERVER, password):
return '%s@%s' % (username, settings.JABBER_SERVER)
def delete_user(self, username): def delete_user(self, username):
""" Delete a user """ """ Delete a user """

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

@@ -53,6 +53,7 @@ class MediawikiService(BaseService):
pwhash = self._gen_mw_hash(password) pwhash = self._gen_mw_hash(password)
self._dbcursor.execute(self.SQL_ADD_USER, [self._clean_username(username), pwhash]) self._dbcursor.execute(self.SQL_ADD_USER, [self._clean_username(username), pwhash])
self._db.connection.commit() self._db.connection.commit()
return self._clean_username(username)
def delete_user(self, username): def delete_user(self, username):
""" Delete a user """ """ Delete a user """