Merge branch 'main' into release

Author: Szyntos

backend/src/main/kotlin/backend/utils/UserMapper.kt

@@ -19,8 +19,7 @@ class UserMapper(
         val token = authorizationHeader.removePrefix("Bearer ").trim()
         val bypassAuth = System.getProperty("BYPASS_AUTH") ?: System.getenv("BYPASS_AUTH")
         if (bypassAuth == "true") {
-            val bypassToken = System.getProperty("BYPASS_TOKEN") ?: System.getenv("BYPASS_TOKEN")
-
+            val bypassToken = System.getProperty("VITE_BYPASS_TOKEN") ?: System.getenv("VITE_BYPASS_TOKEN")
             if (token.startsWith(bypassToken)) {
                 val id = token.substringAfter(bypassToken).toLongOrNull()
                 if (id?.toInt() == 0){

backend/src/main/python/insert_data.py

@@ -290,7 +290,7 @@ def check_if_coordinator_present():
             "port": "5432"
         }
         headers["x-hasura-admin-secret"] = os.getenv("HASURA_GRAPHQL_ADMIN_SECRET")
-        headers["Authorization"] = f"Bearer {os.getenv('BYPASS_TOKEN')}1"
+        headers["Authorization"] = f"Bearer {os.getenv('VITE_BYPASS_TOKEN')}1"
         admin_mail = os.getenv("ADMIN_MAIL")
         print("Configuration for demo loaded successfully.")
     if check_if_coordinator_present():

docker-compose.yaml

@@ -53,7 +53,7 @@ services:
       POSTGRES_USER: ${POSTGRES_USER}
       POSTGRES_PASSWORD: ${POSTGRES_PASSWORD}
       POSTGRES_URL: jdbc:postgresql://postgres:5432/${POSTGRES_DB}
-      BYPASS_TOKEN: ${BYPASS_TOKEN}
+      VITE_BYPASS_TOKEN: ${VITE_BYPASS_TOKEN}
     env_file:
       - .env
     volumes:
@@ -99,7 +99,11 @@ services:
         VITE_FIREBASE_APP_ID: ${VITE_FIREBASE_APP_ID}
         VITE_FIREBASE_MEASUREMENT_ID: ${VITE_FIREBASE_MEASUREMENT_ID}
         VITE_PUBLIC_IP: ${VITE_PUBLIC_IP}
+<<<<<<< HEAD
         VITE_BYPASS_TOKEN: ${BYPASS_TOKEN}
+=======
+        VITE_BYPASS_TOKEN: ${VITE_BYPASS_TOKEN}
+>>>>>>> main
 
     ports:
       - "80:80" # Map frontend port (nginx serves it)
@@ -124,7 +128,11 @@ services:
       DO_INSERT_DEMO_DATA: ${DO_INSERT_DEMO_DATA}
       INIT_DATA: ${INIT_DATA}
       BYPASS_AUTH: ${BYPASS_AUTH}
+<<<<<<< HEAD
       BYPASS_TOKEN: ${BYPASS_TOKEN}
+=======
+      VITE_BYPASS_TOKEN: ${VITE_BYPASS_TOKEN}
+>>>>>>> main
       ADMIN_MAIL: ${ADMIN_MAIL}
     volumes:
       - ./backend/src/main/python:/app