diff --git a/modules/lcl/backend.py b/modules/lcl/backend.py index c52945c0..d596eb69 100644 --- a/modules/lcl/backend.py +++ b/modules/lcl/backend.py @@ -53,8 +53,7 @@ class LCLBackend(BaseBackend, ICapBank): self.config['password'].get()) else: self.BROWSER = LCLBrowser - return self.create_browser(self.config['agency'].get(), - self.config['login'].get(), + return self.create_browser(self.config['login'].get(), self.config['password'].get()) def deinit(self): diff --git a/modules/lcl/browser.py b/modules/lcl/browser.py index 4c71bd4b..98c7b67e 100644 --- a/modules/lcl/browser.py +++ b/modules/lcl/browser.py @@ -52,10 +52,6 @@ class LCLBrowser(BaseBrowser): 'https://particuliers.secure.lcl.fr/index.html': SkipPage } - def __init__(self, agency, *args, **kwargs): - self.agency = agency - BaseBrowser.__init__(self, *args, **kwargs) - def is_logged(self): return not self.is_on_page(LoginPage) @@ -69,7 +65,7 @@ class LCLBrowser(BaseBrowser): % (self.PROTOCOL, self.DOMAIN), no_login=True) - if not self.page.login(self.username, self.password, self.agency) or \ + if not self.page.login(self.username, self.password) or \ (self.is_on_page(LoginPage) and self.page.is_error()) : raise BrowserIncorrectPassword("invalid login/password.\nIf you did not change anything, be sure to check for password renewal request\non the original web site.\nAutomatic renewal will be implemented later.") self.location('%s://%s/outil/UWSP/Synthese' diff --git a/modules/lcl/pages.py b/modules/lcl/pages.py index ef51357f..3f61dffe 100644 --- a/modules/lcl/pages.py +++ b/modules/lcl/pages.py @@ -89,7 +89,7 @@ class LoginPage(BasePage): s+=chr(seed^ord(value[i])) return s - def login(self, login, passwd, agency): + def login(self, login, passwd): try: vk=LCLVirtKeyboard(self) except VirtKeyboardError as err: @@ -114,11 +114,7 @@ class LoginPage(BasePage): self.browser.select_form( predicate=lambda x: x.attrs.get('id','')=='formAuthenticate') self.browser.form.set_all_readonly(False) - if len(agency) > 0: - self.browser['agenceId'] = agency.encode('utf-8') - self.browser['compteId'] = login.encode('utf-8') - else: - self.browser['identifiant'] = login.encode('utf-8') + self.browser['identifiant'] = login.encode('utf-8') self.browser['postClavierXor'] = base64.b64encode(self.myXOR(password,seed)) try: self.browser.submit(nologin=True)