From 50a28ee30205c71b2eee3e822b1127340daefda3 Mon Sep 17 00:00:00 2001
From: Florian Duguet <florian.duguet@budget-insight.com>
Date: Mon, 26 Oct 2020 11:58:09 +0100
Subject: [PATCH] [orange] move change_password detection in do_login

---
 modules/orange/browser.py     | 9 ++++-----
 modules/orange/pages/login.py | 1 +
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/modules/orange/browser.py b/modules/orange/browser.py
index e366e6865f..5594df5389 100644
--- a/modules/orange/browser.py
+++ b/modules/orange/browser.py
@@ -110,6 +110,10 @@ def do_login(self):
 
             data = self.page.do_login_and_get_token(self.username, self.password)
             self.password_page.go(json=data)
+            error_message = self.page.get_change_password_message()
+            if error_message:
+                raise BrowserPasswordExpired(error_message)
+
             self.portal_page.go()
 
         except ClientError as error:
@@ -120,11 +124,6 @@ def do_login(self):
                 raise BrowserIncorrectPassword(error.response.json())
             raise
 
-        if self.password_page.is_here():
-            error_message = self.page.get_change_password_message()
-            if error_message:
-                raise BrowserPasswordExpired(error_message)
-
     def get_nb_remaining_free_sms(self):
         raise NotImplementedError()
 
diff --git a/modules/orange/pages/login.py b/modules/orange/pages/login.py
index 36256a7e83..b87842056e 100644
--- a/modules/orange/pages/login.py
+++ b/modules/orange/pages/login.py
@@ -47,6 +47,7 @@ def do_login_and_get_token(self, username, password):
 
 
 class PasswordPage(JsonPage):
+    ENCODING = 'utf-8'
     def get_change_password_message(self):
         if self.doc.get('stage') != 'changePassword':
             # when stage is not present everything is okay, and if it's not changePassword we prefer do nothing here
-- 
GitLab