Merge pull request #73 from pehala/rhsso_auth_endpoint

Fix running with newer Keycloak versions
Kuadrant · Sep 6, 2022 · 725f790 · 725f790
2 parents 602b03e + 532c185
commit 725f790
Showing 1 changed file with 19 additions and 10 deletions.
diff --git a/testsuite/rhsso/objects.py b/testsuite/rhsso/objects.py
@@ -1,7 +1,7 @@
 """Object wrappers of RHSSO resources"""
 from urllib.parse import urlparse
 
-from keycloak import KeycloakOpenID, KeycloakAdmin
+from keycloak import KeycloakOpenID, KeycloakAdmin, KeycloakPostError
 
 
 class Realm:
@@ -93,15 +93,24 @@ class RHSSO:
     """Helper class for RHSSO server"""
 
     def __init__(self, server_url, username, password) -> None:
-        # python-keycloak API requires url to be pointed at auth/ endpoint
-        # pylint: disable=protected-access
-        self.server_url = urlparse(server_url)._replace(path="auth/").geturl()
-        self.master = KeycloakAdmin(server_url=self.server_url,
-                                    username=username,
-                                    password=password,
-                                    realm_name="master",
-                                    verify=False,
-                                    auto_refresh_token=['get', 'put', 'post', 'delete'])
+        try:
+            self.master = KeycloakAdmin(server_url=server_url,
+                                        username=username,
+                                        password=password,
+                                        realm_name="master",
+                                        verify=False,
+                                        auto_refresh_token=['get', 'put', 'post', 'delete'])
+            self.server_url = server_url
+        except KeycloakPostError:
+            # Older Keycloaks versions (and RHSSO) needs requires url to be pointed at auth/ endpoint
+            # pylint: disable=protected-access
+            self.server_url = urlparse(server_url)._replace(path="auth/").geturl()
+            self.master = KeycloakAdmin(server_url=self.server_url,
+                                        username=username,
+                                        password=password,
+                                        realm_name="master",
+                                        verify=False,
+                                        auto_refresh_token=['get', 'put', 'post', 'delete'])
 
     def create_realm(self, name: str, **kwargs) -> Realm:
         """Creates new realm"""