poging testen

backend/Dockerfile_auth → backend/Dockerfile_auth_test

@@ -2,7 +2,7 @@ FROM python:3.9
 RUN mkdir /auth-app
 WORKDIR /auth-app
 ADD ./test_auth_server /auth-app/
-COPY requirements.txt /auth-app/requirements.txt
+COPY auth_requirements.txt /auth-app/requirements.txt
 RUN pip3 install -r requirements.txt
 COPY . /auth-app
 ENTRYPOINT ["python"]

backend/auth_requirements.txt

@@ -0,0 +1,4 @@
+flask~=3.0.2
+flask-restful
+python-dotenv~=1.0.1
+psycopg2-binary

backend/test_auth_server/__main__.py

@@ -1,10 +1,48 @@
 """Main entry point for the application."""
 
 from dotenv import load_dotenv
-from test_auth_server import create_app_with_db
-from test_auth_server.db_in import url
+from flask import Flask
+
+"""Index api point"""
+from flask import Blueprint, request
+from flask_restful import Resource, Api
+
+index_bp = Blueprint("index", __name__)
+index_endpoint = Api(index_bp)
+
+token_dict = {
+    "teacher1":{
+        "id":"brinkmann",
+        "jobCategory":"teacher"
+    },
+    "teacher2":{
+        "id":"laermans",
+        "jobCategory":"teacher"
+    }
+}
+
+class Index(Resource):
+    """Api endpoint for the / route"""
+
+    def get(self):
+        auth = request.headers.get("Authorization")
+        if not auth:
+            return {"message":"Please give authorization"}, 401
+        bearer, token = auth.split(" ")
+        if bearer != "Bearer":
+            return {"message":"Not this kind of authorization"}, 401
+        if token in token_dict.keys():
+            return token_dict[token], 200
+        return {"message":"Wrong address"}, 401
+
+
+index_bp.add_url_rule("/", view_func=Index.as_view("index"))
 
 if __name__ == "__main__":
     load_dotenv()
-    app = create_app_with_db(url)
-    app.run(debug=True, host='0.0.0.0')
+
+    app = Flask(__name__)
+    app.register_blueprint(index_bp)
+
+    app.run(debug=True, host='0.0.0.0')
+

backend/tests.yaml

@@ -15,36 +15,15 @@ services:
       start_period: 5s
     volumes:
       - ./db_construct.sql:/docker-entrypoint-initdb.d/init.sql
-  auth-db:
-    image: postgres:latest
-    environment:
-      POSTGRES_USER: auth-user
-      POSTGRES_PASSWORD: auth-password
-      POSTGRES_DB: auth-database
-    healthcheck:
-      test: ["CMD-SHELL", "pg_isready -U auth-user -d auth-database"]
-      interval: 5s
-      timeout: 3s
-      retries: 3
-      start_period: 5s
-    volumes:
-      - ./test_auth_server/db_construct.sql:/docker-entrypoint-initdb.d/init.sql
   auth-server:
     build:
       context: .
-      dockerfile: ./Dockerfile_auth
-    depends_on:
-      auth-db:
-        condition: service_healthy
+      dockerfile: ./Dockerfile_auth_test
     environment:
-      POSTGRES_HOST: auth-db  # Use the service name defined in Docker Compose
-      POSTGRES_USER: auth-user
-      POSTGRES_PASSWORD: auth-password
-      POSTGRES_DB: auth-database
       API_HOST: http://auth-server
     volumes:
       - .:/auth-app
-    command: ["test_auth_server"]
+    command: ["CMD", "flask run"]
 
 
   test-runner:
@@ -54,6 +33,8 @@ services:
     depends_on:
       postgres:
         condition: service_healthy
+      auth-server:
+        condition: service_started
     environment:
       POSTGRES_HOST: postgres  # Use the service name defined in Docker Compose
       POSTGRES_USER: test_user