Merge pull request #6 from crane-cloud/fx-authentication

fx: fix authentication and prome error

Author: Mubangizi

app/controllers/app.py

@@ -7,6 +7,7 @@
 )
 from app.helpers.utils import get_app_data
 
+
 class AppMemoryUsageView(Resource):
     @jwt_required
     def post(self, project_id, app_id):
@@ -31,7 +32,14 @@ def post(self, project_id, app_id):
         except Exception as error:
             return dict(status='fail', message=str(error)), 500
 
-        new_data = json.loads(prom_memory_data)
+        if not prom_memory_data:
+            return dict(status='fail', message="Failed to connect to prometheus"), 500
+
+        try:
+            new_data = json.loads(prom_memory_data)
+        except Exception as error:
+            return dict(status='fail', message=str(prom_memory_data)), 500
+
         final_data_list = []
 
         try:
@@ -70,7 +78,14 @@ def post(self, project_id, app_id):
         except Exception as error:
             return dict(status='fail', message=str(error)), 500
 
-        new_data = json.loads(prom_cpu_data)
+        if not prom_cpu_data:
+            return dict(status='fail', message="Failed to connect to prometheus"), 500
+
+        try:
+            new_data = json.loads(prom_cpu_data)
+        except Exception as error:
+            return dict(status='fail', message=str(prom_cpu_data)), 500
+
         final_data_list = []
 
         try:
@@ -109,7 +124,14 @@ def post(self, project_id, app_id):
         except Exception as error:
             return dict(status='fail', message=str(error)), 500
 
-        new_data = json.loads(prom_net_data)
+        if not prom_net_data:
+            return dict(status='fail', message="Failed to connect to prometheus"), 500
+
+        try:
+            new_data = json.loads(prom_net_data)
+        except Exception as error:
+            return dict(status='fail', message=str(prom_net_data)), 500
+
         final_data_list = []
 
         try:

app/controllers/project.py

@@ -31,7 +31,14 @@ def post(self, project_id):
         except Exception as error:
             return dict(status='fail', message=str(error)), 500
 
-        new_data = json.loads(prom_memory_data)
+        if not prom_memory_data:
+            return dict(status='fail', message="Failed to connect to prometheus"), 500
+
+        try:
+            new_data = json.loads(prom_memory_data)
+        except Exception as error:
+            return dict(status='fail', message=str(prom_memory_data)), 500
+
         final_data_list = []
 
         try:
@@ -70,9 +77,15 @@ def post(self, project_id):
         except Exception as error:
             return dict(status='fail', message=str(error)), 500
 
-        new_data = json.loads(prom_cpu_data)
-        final_data_list = []
+        if not prom_cpu_data:
+            return dict(status='fail', message="Failed to connect to prometheus"), 500
 
+        try:
+            new_data = json.loads(prom_cpu_data)
+        except Exception as error:
+            return dict(status='fail', message=str(prom_cpu_data)), 500
+
+        final_data_list = []
         try:
             for value in new_data["data"]["result"][0]["values"]:
                 mem_case = {'timestamp': float(
@@ -109,7 +122,14 @@ def post(self, project_id):
         except Exception as error:
             return dict(status='fail', message=str(error)), 500
 
-        new_data = json.loads(prom_ntw_data)
+        if not prom_ntw_data:
+            return dict(status='fail', message="Failed to connect to prometheus"), 500
+
+        try:
+            new_data = json.loads(prom_ntw_data)
+        except Exception as error:
+            return dict(status='fail', message=str(prom_ntw_data)), 500
+
         final_data_list = []
 
         try:

app/helpers/authenticate.py

@@ -1,9 +1,9 @@
-from flask_jwt_extended import (
-    jwt_required as jwt,
-    verify_jwt_in_request
-)
+# from flask_jwt_extended import (
+#     jwt_required as jwt,
+#     verify_jwt_in_request
+# )
 from functools import wraps
-import jwt
+from jose import jwt
 from flask import request, jsonify
 import os
 
@@ -18,7 +18,6 @@ def wrapper(*args, **kwargs):
 
         if access_token is None:
             return dict(message='Access token was not supplied'), 401
-
         try:
             token = access_token.split(' ')[1]
             if (access_token.split(' ')[0] != "Bearer"):
@@ -27,7 +26,8 @@ def wrapper(*args, **kwargs):
             payload = jwt.decode(token, os.getenv(
                 'JWT_SALT'), algorithms=['HS256'])
 
-        except jwt.exceptions.DecodeError:
+        except Exception as e:
+            print(e)
             return dict(message="Access token is not valid or key"), 401
 
         return fn(*args, **kwargs)

app/helpers/utils.py

@@ -37,6 +37,7 @@ def get_project_data(project_id, request):
         return SimpleNamespace(status='failed', message="Failed to fetch project for current user", status_code=400)
 
     project_response = project_response.json()
+    # print(project_response)
 
     project_data = project_response['data']['project']
 

docker-compose.yml

@@ -30,7 +30,7 @@ services:
       FLASK_APP: server.py
       PRODUCT_BASE_URL: ${PRODUCT_BASE_URL:-http://127.0.0.1:5000}
     ports:
-      - "${FLASK_PORT:-4000}:4000"
+      - "${FLASK_PORT:-4000}:5000"
     volumes:
       - .:/app
     depends_on:

requirements.txt

@@ -30,3 +30,5 @@ six==1.16.0
 urllib3==2.2.1
 Werkzeug==3.0.2
 marshmallow==3.21.1
+python-jose==3.3.0
+