improve: use usersservice for getting domains instead of api gateway - closes #460

Signed-off-by: Marcin Fabrykowski git@fabrykowski.pl

app/tests/conftest.py

@@ -66,7 +66,7 @@ def make_tested_request(
 def app(mocker):
     mocker.patch('ldap.initialize')
     os.environ['LDAP_BASE'] = 'dc=example,dc=com'
-    os.environ['APIGATEWAY_URL'] = 'http://127.0.0.1:8001'
+    os.environ['DOMAINSSERVICE_ENDPOINT'] = 'http://127.0.0.1:8001'
     os.environ['AUTHSERVICE_ENDPOINT'] = 'http://127.0.0.1:8000'
     app = create_app()
     yield app
@@ -98,15 +98,23 @@ def client(app):
 
 @pytest.fixture
 def domains_mock(app, mocker):
-    response = {
-        'data': {'domain': {'domains': [
-            {'name': 'example.com', 'org': 'test-org'},
-            {'name': 'local.domain', 'org': 'test-org'}
-        ]}},
+    response = [
+      {'name': 'example.com', 'org': 'test-org'},
+      {'name': 'local.domain', 'org': 'test-org'}
+     ]
+    response_userinfo = {
         "claims": {"iss": "https://auth.usersservice-22-dev-authservice-va444e.ci.exphost.pl/dex", "sub": "CgR0ZXN0EgRsZGFw", "aud": "exphost-controller", "exp": 1697202958, "iat": 1697116558, "at_hash": "XDGcSLVlPMa-gGIok8d62A", "email": "test@mail.ru", "email_verified": True, "groups": ["test-org"], "name": "test"}} # workaround for auth_required and mock problem # noqa 501
     mock_response = requests.Response()
     mock_response.status_code = 200
     mock_response._content = json.dumps(response).encode()
+    mocker.patch.object(
+        app.DAODomains.requests,
+        'get',
+        return_value=mock_response
+    )
+    mock_response = requests.Response()
+    mock_response.status_code = 200
+    mock_response._content = json.dumps(response_userinfo).encode()
     mocker.patch.object(
         app.DAODomains.requests,
         'post',

app/usersservice/__init__.py

@@ -16,7 +16,7 @@ def create_app(test_config=None):
         LDAP_DN=os.environ.get("LDAP_DN", ""),
         LDAP_PASSWORD=os.environ.get("LDAP_PASSWORD", ""),
         AUTHSERVICE_ENDPOINT=os.environ.get("AUTHSERVICE_ENDPOINT", None),
-        APIGATEWAY_URL=os.environ.get("APIGATEWAY_URL")
+        DOMAINSSERVICE_ENDPOINT=os.environ.get("DOMAINSSERVICE_ENDPOINT")
     )
     if not app.config['AUTHSERVICE_ENDPOINT']:
         raise Exception('AUTHSERVICE_ENDPOINT is not defined')
@@ -28,7 +28,7 @@ def create_app(test_config=None):
     app.logger.info(" LDAP_BASE="+app.config['LDAP_BASE'])
     app.logger.info(" LDAP_DN="+app.config['LDAP_DN'])
     app.logger.info(" LDAP_PASSWORD="+str(bool(app.config['LDAP_PASSWORD'])))
-    app.logger.info("APIGATEWAY_URL="+app.config['APIGATEWAY_URL'])
+    app.logger.info("DOMAINSSERVICE_ENDPOINT="+app.config['DOMAINSSERVICE_ENDPOINT']) # noqa 501
     app.DAO = DAO(app)
     app.DAODomains = DAODomains(app)
     if test_config is None:

app/usersservice/dao_domains.py

@@ -4,30 +4,14 @@ import requests
 class DAODomains:
     def __init__(self, app):
         self.requests = requests
-        self.api = app.config['APIGATEWAY_URL']
+        self.api = app.config['DOMAINSSERVICE_ENDPOINT']
 
     def get_domains(self, org, token):
-        query = '''query GetDomains($org: String) {
-            domain(org: $org) {
-                domains {
-                    name,
-                    org,
-                },
-                error
-            }
-        }'''
-        variables = {'org': org}
-        response = self.requests.post(
-            self.api,
-            json={
-                "query": query,
-                "variables": variables
-            },
-            cookies={
-                'accessToken': token.split(' ')[1]
-            }
+        response = self.requests.get(
+            self.api + '/api/domains/v1/domains?org=' + org,
+            headers={'Authorization': token}
         )
-        return response.json()['data']['domain']['domains']
+        return response.json()
 
     def check_domain_access(self, domain, org, token):
         return domain in [d['name'] for d in self.get_domains(org, token)]

chart/templates/deployment.yaml

@@ -42,8 +42,8 @@ spec:
                   name: {{ .Values.ldap.password.secret }}
                   key: {{ .Values.ldap.password.key }}
 {{- end }}
-            - name: APIGATEWAY_URL
-              value: {{ .Values.endpoints.apigateway }}
+            - name: DOMAINSSERVICE_ENDPOINT
+              value: "https://{{ .Values.global.domain }}"
             - name: AUTHSERVICE_ENDPOINT
               value: "https://{{ .Values.global.domain }}"
           ports: