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

Enable passing of API information to MiningBuddy, cleaned out some debug statements

Browse Source
This commit is contained in:
Andrew Williams
2010-03-22 15:44:02 +00:00
parent d54920a1b8
commit 8a2bd17e0e
2 changed files with 8 additions and 3 deletions
Download Patch File Download Diff File Expand all files Collapse all files

2
sso/models.py
View File

@@ -68,7 +68,6 @@ class SSOUser(models.Model):
@staticmethod @staticmethod
def create_user_profile(sender, instance, created, **kwargs): def create_user_profile(sender, instance, created, **kwargs):
print 'trigger', instance
if created: if created:
profile, created = SSOUser.objects.get_or_create(user=instance) profile, created = SSOUser.objects.get_or_create(user=instance)
@@ -128,7 +127,6 @@ class ServiceAccount(models.Model):
eveapi = eacc eveapi = eacc
break break
print eveapi
reddit = RedditAccount.objects.filter(user=self.user) reddit = RedditAccount.objects.filter(user=self.user)
self.service_uid = api.add_user(self.username, self.password, user=self.user, character=self.character, eveapi=eveapi, reddit=reddit) self.service_uid = api.add_user(self.username, self.password, user=self.user, character=self.character, eveapi=eveapi, reddit=reddit)
else: else:

9
sso/services/miningbuddy/__init__.py
View File

@@ -1,5 +1,6 @@
import crypt import crypt
import random import random
import time
from django.db import load_backend, transaction from django.db import load_backend, transaction
from sso.services import BaseService from sso.services import BaseService
import settings import settings
@@ -16,7 +17,7 @@ class MiningBuddyService(BaseService):
SQL_ADD_USER = r"INSERT INTO users (username, password, email, emailvalid, confirmed) VALUES (%s, %s, %s, 0, 1)" SQL_ADD_USER = r"INSERT INTO users (username, password, email, emailvalid, confirmed) VALUES (%s, %s, %s, 0, 1)"
SQL_ADD_API = r"INSERT INTO api_keys (userid, time, apiID, apiKey, api_valid) values (%s, %s, %s, %s, 1)" SQL_ADD_API = r"INSERT INTO api_keys (userid, time, apiID, apiKey, api_valid, charid) values (%s, %s, %s, %s, 1, %s)"
SQL_DIS_USER = r"UPDATE users SET canLogin = 0 WHERE username = %s" SQL_DIS_USER = r"UPDATE users SET canLogin = 0 WHERE username = %s"
SQL_ENABLE_USER = r"UPDATE users SET canLogin = 1, password = %s WHERE username = %s" SQL_ENABLE_USER = r"UPDATE users SET canLogin = 1, password = %s WHERE username = %s"
SQL_CHECK_USER = r"SELECT username from users WHERE username = %s and deleted = 0" SQL_CHECK_USER = r"SELECT username from users WHERE username = %s and deleted = 0"
@@ -59,6 +60,12 @@ class MiningBuddyService(BaseService):
self._dbcursor.execute(self.SQL_ADD_USER, [self._clean_username(username), pwhash, email]) self._dbcursor.execute(self.SQL_ADD_USER, [self._clean_username(username), pwhash, email])
self._db.connection.commit() 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()
return self._clean_username(username) return self._clean_username(username)
def check_user(self, username): def check_user(self, username):