diff --git a/modules/edfprofessionnel/browser_collectivites.py b/modules/edfprofessionnel/browser_collectivites.py index 1c14c1c2ea1d6391170b2a1936af81a3847c6d76..32bc23b807b11cb8b9d44f7a14a20feea3309712 100644 --- a/modules/edfprofessionnel/browser_collectivites.py +++ b/modules/edfprofessionnel/browser_collectivites.py @@ -11,20 +11,20 @@ from .collectivites_pages import ( ClientSpace, CnicePage, AuraPage, PdfPage, AuthenticationErrorPage, - ValidatePage, AiguillagePage, RedirectPage, + ValidatePage, AiguillagePage, RedirectPage, ClientPremiumSpace, ) class EdfproCollectivitesBrowser(LoginBrowser): BASEURL = 'https://entreprises-collectivites.edf.fr' + premium_client_space = URL(r'/espaceclientpremium/s/aiguillage', ClientPremiumSpace) client_space = URL( r'/espaceclient/s/$', - r'/espaceclient(?:premium)?/s/aiguillage', + r'/espaceclient/s/aiguillage', r'/espaces/s/$', ClientSpace, ) - premium_client_space = URL(r'/espaceclientpremium/s/aiguillage', ClientSpace) authentication_error = URL(r'/espaceclient/_nc_external', AuthenticationErrorPage) cnice = URL(r'/espace(s|client)/services/authcallback/CNICE', CnicePage) aura = URL(r'/espaceclient/s/sfsites/aura', AuraPage) diff --git a/modules/edfprofessionnel/collectivites_pages.py b/modules/edfprofessionnel/collectivites_pages.py index d1883e6e964428600cb3415f0edb1ee8548c9c74..22fc36d006bb098191719d635bc8f211f7776398 100644 --- a/modules/edfprofessionnel/collectivites_pages.py +++ b/modules/edfprofessionnel/collectivites_pages.py @@ -65,6 +65,10 @@ def get_token(self): return aura_config['token'] +class ClientPremiumSpace(ClientSpace): + pass + + class CnicePage(HTMLPage): def get_frontdoor_url(self): return Regexp(Attr('//head/meta[@http-equiv="Refresh"]', 'content'), r'URL=(.*)')(self.doc)