From 8a2bd17e0ee06c996d316d5edbe68f47c9d78fec Mon Sep 17 00:00:00 2001
From: Andrew Williams <andy@tensixtyone.com>
Date: Mon, 22 Mar 2010 15:44:02 +0000
Subject: [PATCH] Enable passing of API information to MiningBuddy, cleaned out
 some debug statements

---
 sso/models.py                        | 2 --
 sso/services/miningbuddy/__init__.py | 9 ++++++++-
 2 files changed, 8 insertions(+), 3 deletions(-)

diff --git a/sso/models.py b/sso/models.py
index 5e2eba8..ccb0376 100644
--- a/sso/models.py
+++ b/sso/models.py
@@ -68,7 +68,6 @@ class SSOUser(models.Model):
 
     @staticmethod
     def create_user_profile(sender, instance, created, **kwargs):   
-        print 'trigger', instance
         if created:   
             profile, created = SSOUser.objects.get_or_create(user=instance) 
 
@@ -128,7 +127,6 @@ class ServiceAccount(models.Model):
                             eveapi = eacc
                             break
 
-                    print eveapi
                     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)
                 else:
diff --git a/sso/services/miningbuddy/__init__.py b/sso/services/miningbuddy/__init__.py
index bb570ae..86784bd 100644
--- a/sso/services/miningbuddy/__init__.py
+++ b/sso/services/miningbuddy/__init__.py
@@ -1,5 +1,6 @@
 import crypt
 import random
+import time
 from django.db import load_backend, transaction
 from sso.services import BaseService
 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_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_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"
@@ -59,6 +60,12 @@ class MiningBuddyService(BaseService):
 
         self._dbcursor.execute(self.SQL_ADD_USER, [self._clean_username(username), pwhash, email])
         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)
 
     def check_user(self, username):