Account class completely rewritten + plugins updated

1 files changed, 8 insertions, 9 deletions

diff --git a/module/plugins/accounts/OboomCom.py b/module/plugins/accounts/OboomCom.py
index abb223e65..c19396854 100644
--- a/module/plugins/accounts/OboomCom.py
+++ b/module/plugins/accounts/OboomCom.py
@@ -23,7 +23,7 @@ from module.plugins.internal.Account import Account
 class OboomCom(Account):
     __name__    = "OboomCom"
     __type__    = "account"
-    __version__ = "0.28"
+    __version__ = "0.29"
     __status__  = "testing"
 
     __description__ = """Oboom.com account plugin"""
@@ -31,10 +31,9 @@ class OboomCom(Account):
     __authors__     = [("stanley", "stanley.foerster@gmail.com")]
 
 
-    def load_account_data(self, user, req):
-        passwd = self.get_info(user)['login']['password']
-        salt   = passwd[::-1]
-        pbkdf2 = PBKDF2(passwd, salt, 1000).hexread(16)
+    def load_account_data(self, user, password):
+        salt   = password[::-1]
+        pbkdf2 = PBKDF2(password, salt, 1000).hexread(16)
 
         result = json_loads(self.load("http://www.oboom.com/1/login",  #@TODO: Revert to `https` in 0.4.10
                                       get={'auth': user,
@@ -47,8 +46,8 @@ class OboomCom(Account):
         return result[1]
 
 
-    def grab_info(self, name, req):
-        account_data = self.load_account_data(name, req)
+    def grab_info(self, user, password, data):
+        account_data = self.load_account_data(user, password)
 
         userData = account_data['user']
 
@@ -73,5 +72,5 @@ class OboomCom(Account):
                 'session'    : session}
 
 
-    def login(self, user, password, data, req):
-        self.load_account_data(user, req)
+    def signin(self, user, password, data):
+        self.load_account_data(user, password)