Merge remote-tracking branch 'origin/20-django-api-token' into 20-dja…

…ngo-api-token # Conflicts: # README.md
QCDIS · Sep 5, 2023 · e751f67 · e751f67
2 parents c80a726 + 1aee9ef
commit e751f67
Show file tree

Hide file tree

Showing 5 changed files with 16 additions and 3 deletions.
diff --git a/README.md b/README.md
@@ -159,6 +159,18 @@ echo -n $ARGO_TOKEN | base64 -w 0
 2. Create a token for the user in the Django admin panel
 3. Use the token in the header of the request
 
+```python
+    resp = requests.get(
+        f"{api_endpoint}/api/workflows/",
+        headers={
+            'Authorization': 'Token '+ naavre_api_token
+        }
+    )
+```
+1. Create a user in the Django admin panel
+2. Create a token for the user in the Django admin panel
+3. Use the token in the header of the request
+
 ```python
     resp = requests.get(
         f"{api_endpoint}/api/workflows/",

diff --git a/vre-panel/pages/vlabs/[slug].tsx b/vre-panel/pages/vlabs/[slug].tsx
@@ -208,7 +208,7 @@ export async function getServerSideProps(context:any) {
     const { req } = context;
     const secret = process.env.SECRET;
     const token = await getToken({ req, secret });
-
+    console.log(token)
     return {
         props: {
             token: token

diff --git a/vreapis/requirements.txt b/vreapis/requirements.txt
@@ -4,6 +4,7 @@ djangorestframework-gis~=1.0.0
 django-filter~=22.1.0
 whitenoise
 django-keycloak-auth
+python-keycloak
 gunicorn
 pyyaml
 requests

diff --git a/vreapis/vreapis/settings/base.py b/vreapis/vreapis/settings/base.py
@@ -30,7 +30,7 @@
 ]
 
 KEYCLOAK_EXEMPT_URIS = []
-
+#
 KEYCLOAK_CONFIG = {
     'KEYCLOAK_SERVER_URL': os.getenv('KEYCLOAK_SERVER_URL'),
     'KEYCLOAK_REALM': os.getenv('KEYCLOAK_REALM'),

diff --git a/vreapis/workflows/views.py b/vreapis/workflows/views.py
@@ -151,7 +151,7 @@ def submit(self, request, *args, **kwargs):
         try:
             vlab = VirtualLab.objects.get(slug=vlab_slug)
         except VirtualLab.DoesNotExist:
-            return Response({'message': 'Virtual Lab not found'}, status=404)
+            return Response({'message': 'Virtual Lab: ' + vlab_slug + ' not found'}, status=404)
         if not argo_url:
             return Response({'message': 'Argo URL not set'}, status=500)
         argo_exec_url = f"{argo_url}/workflows/{namespace}/{resp_detail_data['metadata']['name']}"