diff options
Diffstat (limited to 'module/plugins/accounts/RPNetBiz.py')
| -rw-r--r-- | module/plugins/accounts/RPNetBiz.py | 45 |
1 files changed, 23 insertions, 22 deletions
diff --git a/module/plugins/accounts/RPNetBiz.py b/module/plugins/accounts/RPNetBiz.py index 829e54a46..d713cedca 100644 --- a/module/plugins/accounts/RPNetBiz.py +++ b/module/plugins/accounts/RPNetBiz.py @@ -1,51 +1,52 @@ # -*- coding: utf-8 -*- -from module.plugins.Account import Account +from module.plugins.internal.Account import Account from module.common.json_layer import json_loads class RPNetBiz(Account): __name__ = "RPNetBiz" __type__ = "account" - __version__ = "0.12" + __version__ = "0.15" + __status__ = "testing" __description__ = """RPNet.biz account plugin""" __license__ = "GPLv3" __authors__ = [("Dman", "dmanugm@gmail.com")] - def loadAccountInfo(self, user, req): - # Get account information from rpnet.biz - res = self.getAccountStatus(user, req) + def parse_info(self, user, password, data, req): + #: Get account information from rpnet.biz + res = self.get_account_status(user, password, req) try: if res['accountInfo']['isPremium']: - # Parse account info. Change the trafficleft later to support per host info. - account_info = {"validuntil": float(res['accountInfo']['premiumExpiry']), - "trafficleft": -1, "premium": True} + #: Parse account info. Change the trafficleft later to support per host info. + account_info = {'validuntil': float(res['accountInfo']['premiumExpiry']), + 'trafficleft': -1, 'premium': True} else: - account_info = {"validuntil": None, "trafficleft": None, "premium": False} + account_info = {'validuntil': None, 'trafficleft': None, 'premium': False} except KeyError: - #handle wrong password exception - account_info = {"validuntil": None, "trafficleft": None, "premium": False} + #: Handle wrong password exception + account_info = {'validuntil': None, 'trafficleft': None, 'premium': False} return account_info - def login(self, user, data, req): - # Get account information from rpnet.biz - res = self.getAccountStatus(user, req) + def login(self, user, password, data, req): + #: Get account information from rpnet.biz + res = self.get_account_status(user, password, req) - # If we have an error in the res, we have wrong login information + #: If we have an error in the res, we have wrong login information if 'error' in res: - self.wrongPassword() + self.login_fail() - def getAccountStatus(self, user, req): - # Using the rpnet API, check if valid premium account - res = req.load("https://premium.rpnet.biz/client_api.php", - get={"username": user, "password": self.getAccountData(user)['password'], - "action": "showAccountInformation"}) - self.logDebug("JSON data: %s" % res) + def get_account_status(self, user, password, req): + #: Using the rpnet API, check if valid premium account + res = self.load("https://premium.rpnet.biz/client_api.php", + get={'username': user, 'password': password, + 'action': "showAccountInformation"}) + self.log_debug("JSON data: %s" % res) return json_loads(res) |