From f677bb72f4e522ad26ea4d02b1c7102773c5f0ef Mon Sep 17 00:00:00 2001 From: Andrew Williams Date: Thu, 14 Oct 2010 09:39:10 +0100 Subject: [PATCH] Remove eveapi/reddit from add_user call, all is accessible by user/char --- sso/models.py | 3 ++- sso/services/miningbuddy/__init__.py | 5 ++--- sso/services/postracker/__init__.py | 6 +----- 3 files changed, 5 insertions(+), 9 deletions(-) diff --git a/sso/models.py b/sso/models.py index d1a8458..d79fac5 100644 --- a/sso/models.py +++ b/sso/models.py @@ -194,6 +194,7 @@ class Service(models.Model): return setdict + class ServiceAccount(models.Model): """ ServiceAccount represents the user's account on a Service. @@ -239,7 +240,7 @@ class ServiceAccount(models.Model): break reddit = RedditAccount.objects.filter(user=self.user) - d = api.add_user(self.username, self.password, user=self.user, character=self.character, eveapi=eveapi, reddit=reddit) + d = api.add_user(self.username, self.password, user=self.user, character=self.character) if not d: raise ServiceError('Error occured while trying to create the Service Account, please try again later') else: diff --git a/sso/services/miningbuddy/__init__.py b/sso/services/miningbuddy/__init__.py index 7ca4e45..6c3270f 100644 --- a/sso/services/miningbuddy/__init__.py +++ b/sso/services/miningbuddy/__init__.py @@ -49,9 +49,8 @@ class MiningBuddyService(BaseDBService): self.db.connection.commit() userid = self.dbcursor.lastrowid - if 'eveapi' in kwargs: - self.dbcursor.execute(self.SQL_ADD_API, [userid, int(time.time()), kwargs['eveapi'].api_user_id, kwargs['eveapi'].api_key, kwargs['character'].id]) - self.db.connection.commit() + self.dbcursor.execute(self.SQL_ADD_API, [userid, int(time.time()), kwargs['character'].eveaccount.api_user_id, kwargs['character'].eveaccount.api_key, kwargs['character'].id]) + self.db.connection.commit() return { 'username': self._clean_username(username), 'password': password } diff --git a/sso/services/postracker/__init__.py b/sso/services/postracker/__init__.py index 5c430c8..c3f8859 100644 --- a/sso/services/postracker/__init__.py +++ b/sso/services/postracker/__init__.py @@ -34,11 +34,7 @@ class POSTrackerService(BaseDBService): """ Add a user """ email = kwargs['user'].email pwhash, salt = self._gen_pwhash(password) - - if 'eveapi' in kwargs: - eveid = kwargs['eveapi'].api_user_id - else: - eveid = None + eveid = kwargs['character'].eveaccount.api_user_id self.dbcursor.execute(self.SQL_ADD_USER, [eveid, username, "%s%s" % (salt, pwhash) , email]) self.db.connection.commit()