From c2743eaf069730ecbe0d4dd8c756f2f33b3c5300 Mon Sep 17 00:00:00 2001
From: Damien Mat <damien.mat@budget-insight.com>
Date: Tue, 9 Feb 2021 10:01:10 +0100
Subject: [PATCH] [bp] More robust 2FA messages handling

---
 modules/bp/browser.py     |  4 +++-
 modules/bp/pages/login.py | 20 ++++++++++----------
 2 files changed, 13 insertions(+), 11 deletions(-)

diff --git a/modules/bp/browser.py b/modules/bp/browser.py
index f3c308df7c..0ad701981b 100644
--- a/modules/bp/browser.py
+++ b/modules/bp/browser.py
@@ -491,7 +491,9 @@ def do_login(self):
                 raise BrowserQuestion(Value('code', label='Entrez le code reçu par SMS'))
 
             elif auth_method == 'no2fa':
-                self.location(self.page.get_skip_url())
+                skip_twofa_url = self.page.get_skip_twofa_url()
+                assert skip_twofa_url, 'No url found to skip 2FA'
+                self.location(skip_twofa_url)
 
         # If we are here, we don't need 2FA, we are logged
 
diff --git a/modules/bp/pages/login.py b/modules/bp/pages/login.py
index 5c296a0dab..12e4dce970 100644
--- a/modules/bp/pages/login.py
+++ b/modules/bp/pages/login.py
@@ -162,6 +162,12 @@ def on_load(self):
     def get_auth_method(self):
         status_message = CleanText('//div[@class="textFCK"]')(self.doc)
         if re.search(
+                'avez pas de solution d’authentification forte'
+                + "|avez pas encore activé votre service gratuit d'authentification forte",
+                status_message
+        ):
+            return 'no2fa'
+        elif re.search(
                 'Une authentification forte via Certicode Plus vous'
                 + '|vous rendre sur l’application mobile La Banque Postale',
                 status_message
@@ -173,12 +179,6 @@ def get_auth_method(self):
                 status_message
         ):
             return 'cer'
-        elif re.search(
-                'avez pas de solution d’authentification forte'
-                + "|avez pas encore activé votre service gratuit d'authentification forte",
-                status_message
-        ):
-            return 'no2fa'
         elif (
             'Nous rencontrons un problème pour valider votre opération. Veuillez reessayer plus tard'
             in status_message
@@ -190,18 +190,18 @@ def get_auth_method(self):
         ):
             # Only first sentence explains 'why', the rest is 'how'
             short_message = CleanText('(//div[@class="textFCK"])[1]//p[1]')(self.doc)
-            url = self.get_skip_url()
+            url = Link('//div[@class="certicode_footer"]/a')(self.doc)
             if not url:
                 raise ActionNeeded(
                     "Une authentification forte est requise sur votre espace client : %s" % short_message
                 )
             else:
-                # raise an error to avoid silencing other no2fa cases
+                # raise an error to avoid silencing other no2fa/2fa messages
                 raise AssertionError("No 2FA case to skip, or new 2FA case to trigger")
         raise AssertionError('Unhandled login message: "%s"' % status_message)
 
-    def get_skip_url(self):
-        return Link('//div[@class="certicode_footer"]/a')(self.doc)
+    def get_skip_twofa_url(self):
+        return Link('//div[@class="certicode_footer"]/a[contains(text(), "Poursuivre")]', default=None)(self.doc)
 
 
 class Validated2FAPage(MyHTMLPage):
-- 
GitLab