Commit 08cb5ab7 authored by John Red Medrano's avatar John Red Medrano

Merge pull request #27 in RMS/api-main-service from red-develop to dev

* commit '5f374d54':
  bug fixing
parents 5facf2ab 5f374d54
...@@ -9,7 +9,7 @@ from api.utils import (CustomPagination, BadRequestException, ...@@ -9,7 +9,7 @@ from api.utils import (CustomPagination, BadRequestException,
status_message_response) status_message_response)
ACCOUNT_GROUP = settings.ACCOUNT_GROUP AUTHENTICATOR_GROUP = settings.AUTHENTICATOR_GROUP
class ApplicationViewSet(viewsets.ModelViewSet): class ApplicationViewSet(viewsets.ModelViewSet):
...@@ -68,7 +68,7 @@ class ApplicationViewSet(viewsets.ModelViewSet): ...@@ -68,7 +68,7 @@ class ApplicationViewSet(viewsets.ModelViewSet):
results = [] results = []
for item in serializer.data: for item in serializer.data:
ids = item['id'] ids = item['id']
req = requests.get(f'{ACCOUNT_GROUP}/{ids}/') req = requests.get(f'{AUTHENTICATOR_GROUP}/{ids}/')
groups = req.json()['groups'] groups = req.json()['groups']
modules = req.json()['modules'] modules = req.json()['modules']
item['groups'] = groups item['groups'] = groups
......
...@@ -33,4 +33,4 @@ AUTHENTICATOR_IP = config['SERVICE']['AUTHENTICATOR_IP'] ...@@ -33,4 +33,4 @@ AUTHENTICATOR_IP = config['SERVICE']['AUTHENTICATOR_IP']
AUTHENTICATOR_PATH = '/api/v1/authenticator' AUTHENTICATOR_PATH = '/api/v1/authenticator'
VALIDATE_TOKEN_URL = f'http://{AUTHENTICATOR_IP}{AUTHENTICATOR_PATH}/authenticator-validate-token/' VALIDATE_TOKEN_URL = f'http://{AUTHENTICATOR_IP}{AUTHENTICATOR_PATH}/authenticator-validate-token/'
ACCOUNT_GROUP = f'http://{AUTHENTICATOR_IP}{AUTHENTICATOR_PATH}/authenticator-group' AUTHENTICATOR_GROUP = f'http://{AUTHENTICATOR_IP}{AUTHENTICATOR_PATH}/authenticator-group'
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment