From 8058260d11aa6efc3bb8c8ba2673cee6d3f1a821 Mon Sep 17 00:00:00 2001
From: Stefaan Lippens <stefaan.lippens@vito.be>
Date: Wed, 24 Jan 2024 10:07:41 +0100
Subject: [PATCH] Issue #19 Drop unused capfd logic to simplify auth setup in
 CI (#9)

---
 src/openeo_gfmap/backend.py | 37 ++++++++-----------------------------
 1 file changed, 8 insertions(+), 29 deletions(-)

diff --git a/src/openeo_gfmap/backend.py b/src/openeo_gfmap/backend.py
index c38c5a3..d9f3d48 100644
--- a/src/openeo_gfmap/backend.py
+++ b/src/openeo_gfmap/backend.py
@@ -4,7 +4,7 @@
 """
 from dataclasses import dataclass
 from enum import Enum
-from typing import Callable, Dict, Optional
+from typing import Callable, Dict
 
 import openeo
 
@@ -29,7 +29,7 @@ class BackendContext:
     backend: Backend
 
 
-def vito_connection(capfd: Optional = None) -> openeo.Connection:
+def vito_connection() -> openeo.Connection:
     """Performs a connection to the VITO backend using the oidc authentication."""
     # Note: this generic `authenticate_oidc()` call allows both:
     # - device code/refresh token based authentication for manual test
@@ -39,42 +39,21 @@ def vito_connection(capfd: Optional = None) -> openeo.Connection:
     # See https://open-eo.github.io/openeo-python-client/auth.html#oidc-authentication-dynamic-method-selection  # NOQA
     # and Jenkinsfile, where Jenkins fetches the env vars from VITO TAP Vault.
     connection = openeo.connect("openeo.vito.be")
-
-    if capfd is not None:
-        with capfd.disabled():
-            # Temporarily disable output capturing, to make sure that OIDC device
-            # code instructions (if any) are shown.
-            connection.authenticate_oidc()
-    else:
-        connection.authenticate_oidc()
+    connection.authenticate_oidc()
     return connection
 
 
-def cdse_connection(capfd: Optional = None) -> openeo.Connection:
+def cdse_connection() -> openeo.Connection:
     """Performs a connection to the CDSE backend using oidc authentication."""
-    connection = openeo.connect(
-        "https://openeo.dataspace.copernicus.eu/openeo/1.2"
-    )
-    if capfd is not None:
-        with capfd.disabled():
-            # Temporarily disable output capturing, to make sure that OIDC device
-            # code instructions (if any) are shown.
-            connection.authenticate_oidc()
-    else:
-        connection.authenticate_oidc()
+    connection = openeo.connect("https://openeo.dataspace.copernicus.eu/openeo/1.2")
+    connection.authenticate_oidc()
     return connection
 
 
-def eodc_connection(capfd: Optional = None) -> openeo.Connection:
+def eodc_connection() -> openeo.Connection:
     """Perfroms a connection to the EODC backend using the oidc authentication."""
     connection = openeo.connect("https://openeo.eodc.eu/openeo/1.1.0")
-    if capfd is not None:
-        with capfd.disabled():
-            # Temporarily disable output capturing, to make sure that OIDC device
-            # code instructions (if any) are shown.
-            connection.authenticate_oidc()
-    else:
-        connection.authenticate_oidc()
+    connection.authenticate_oidc()
     return connection