Update login handling for dev env

Author: mshriver

backend/ibutsu_server/controllers/login_controller.py

@@ -152,14 +152,32 @@ def login(body=None):
 
 def support():
     """Return the authentication types that the server supports"""
-    return {
-        "user": current_app.config.get("USER_LOGIN_ENABLED", True),
-        "keycloak": get_keycloak_config().get("client_id") is not None,
-        "google": get_provider_config("google")["client_id"] is not None,
-        "github": get_provider_config("github")["client_id"] is not None,
-        "facebook": get_provider_config("facebook")["app_id"] is not None,
-        "gitlab": get_provider_config("gitlab")["client_id"] is not None,
-    }
+    try:
+        keycloak_config = get_keycloak_config()
+        google_config = get_provider_config("google")
+        github_config = get_provider_config("github")
+        facebook_config = get_provider_config("facebook")
+        gitlab_config = get_provider_config("gitlab")
+
+        return {
+            "user": current_app.config.get("USER_LOGIN_ENABLED", True),
+            "keycloak": keycloak_config.get("client_id") is not None,
+            "google": google_config.get("client_id") is not None,
+            "github": github_config.get("client_id") is not None,
+            "facebook": facebook_config.get("app_id") is not None,
+            "gitlab": gitlab_config.get("client_id") is not None,
+        }
+    except Exception as e:
+        # Log error but return default config with user login enabled
+        print(f"Error getting login support configuration: {e}")
+        return {
+            "user": current_app.config.get("USER_LOGIN_ENABLED", True),
+            "keycloak": False,
+            "google": False,
+            "github": False,
+            "facebook": False,
+            "gitlab": False,
+        }
 
 
 def config(provider):

backend/tests/controllers/test_login_controller.py

@@ -124,3 +124,28 @@ def test_login_inactive_user(flask_app):
 
     response_data = response.get_json()
     assert response_data["code"] == "INACTIVE"
+
+
+def test_login_support(flask_app):
+    """Test case for getting login support configuration"""
+    client, _jwt_token = flask_app
+
+    headers = {"Accept": "application/json"}
+    response = client.get("/api/login/support", headers=headers)
+    assert response.status_code == 200, f"Response body is : {response.data.decode('utf-8')}"
+
+    response_data = response.get_json()
+    # Should always return a dict with these keys
+    assert "user" in response_data
+    assert "keycloak" in response_data
+    assert "google" in response_data
+    assert "github" in response_data
+    assert "facebook" in response_data
+    assert "gitlab" in response_data
+    # All values should be booleans
+    assert isinstance(response_data["user"], bool)
+    assert isinstance(response_data["keycloak"], bool)
+    assert isinstance(response_data["google"], bool)
+    assert isinstance(response_data["github"], bool)
+    assert isinstance(response_data["facebook"], bool)
+    assert isinstance(response_data["gitlab"], bool)

scripts/ibutsu-pod.sh

@@ -393,9 +393,13 @@ if [[ $CREATE_PROJECT = true ]]; then
                 done
             fi
         fi
-        RUNS_COUNT=$(curl --no-progress-meter --header "Authorization: Bearer ${LOGIN_TOKEN}" \
-            http://127.0.0.1:8080/api/run | jq -r '.runs | length')
-        echo "Total runs in the database: ${RUNS_COUNT}"
+        # Get runs count from both projects
+        RUNS_COUNT_1=$(curl --no-progress-meter --header "Authorization: Bearer ${LOGIN_TOKEN}" \
+            "http://127.0.0.1:8080/api/run?filter=project_id=${PROJECT_ID_1}&page_size=1" 2>/dev/null | jq -r '.pagination.totalItems // 0')
+        RUNS_COUNT_2=$(curl --no-progress-meter --header "Authorization: Bearer ${LOGIN_TOKEN}" \
+            "http://127.0.0.1:8080/api/run?filter=project_id=${PROJECT_ID_2}&page_size=1" 2>/dev/null | jq -r '.pagination.totalItems // 0')
+        TOTAL_RUNS=$((RUNS_COUNT_1 + RUNS_COUNT_2))
+        echo "Total runs in the database: ${TOTAL_RUNS}"
         echo ""
         echo "Import Summary:"
         echo "  my-project-1: ${SUCCESSFUL_IMPORTS_1} successful, ${FAILED_IMPORTS_1} failed"
@@ -510,7 +514,7 @@ if [[ $CREATE_PROJECT = true ]]; then
 
         # Fallback: try to get component from first run in project
         local runs_data
-        runs_data=$(api_get "/api/run?project=${project_id}&page_size=1")
+        runs_data=$(api_get "/api/run?filter=project_id=${project_id}&page_size=1")
         local component
         component=$(echo "$runs_data" | jq -r '.runs[0].component // empty' 2>/dev/null)