AREG-68 fix the user service keycloak service

applications/accounts-api/backend/accounts_api/services/user_service.py

@@ -7,7 +7,6 @@
 from cloudharness.applications import get_configuration
 import typing
 import re
-from api.services.keycloak_service import KeycloakService
 
 # from cloudharness.models import User as CHUser # Cloudharness 2.0.0
 
@@ -164,13 +163,3 @@ def associate_orcid_id(userid: str, orcid: str):
 
 def validate_orcid_id( orcid: str) -> bool:
     return re.match(r'^https://orcid.org/\d{4}-\d{4}-\d{4}-\d{3}[0-9X]$', orcid)
-
-def check_if_user_is_admin():
-    """
-    Function that is used to validate the token and check if the user is an admin
-    """
-    auth = KeycloakService()
-    if auth.current_user_has_realm_role("administrator"):
-        return {}
-    raise Exception("User is not an admin")
-

applications/portal/backend/api/services/user_service.py

@@ -1,5 +1,6 @@
 import jwt
 from cloudharness.middleware import get_authentication_token
+from api.services.keycloak_service import KeycloakService
 
 class UnrecognizedUser(Exception):
     pass
@@ -10,4 +11,14 @@ def get_current_user_id() -> str:
         token = get_authentication_token().replace("Bearer ", "")
         return jwt.decode(token, options={"verify_signature": False}, algorithms='RS256')['sub']
     except Exception as e:
-        raise UnrecognizedUser()
+        raise UnrecognizedUser()
+
+def check_if_user_is_admin():
+    """
+    Function that is used to validate the token and check if the user is an admin
+    """
+    auth = KeycloakService()
+    if auth.current_user_has_realm_role("administrator"):
+        return {}
+    raise Exception("User is not an admin")
+