Merge pull request #7 from datakind/sftp-integration

Sftp integration

Author: Mesh-ach

src/worker/authn.py

@@ -1,29 +1,17 @@
 import jwt
 
-from fastapi.security import (
-    OAuth2PasswordBearer,
-    APIKeyHeader,
-)
+from fastapi.security import OAuth2PasswordBearer
 from pydantic import BaseModel
 from datetime import timedelta, datetime, timezone
 from .config import env_vars
 from typing import Annotated
-from fastapi import Depends, HTTPException, status, Security
+from fastapi import Depends, HTTPException, status
 from jwt.exceptions import InvalidTokenError
 
 oauth2_scheme = OAuth2PasswordBearer(
     tokenUrl="token",
 )
 
-api_key_header = APIKeyHeader(name="X-API-KEY", scheme_name="api-key", auto_error=False)
-api_key_inst_header = APIKeyHeader(
-    name="INST", scheme_name="api-inst", auto_error=False
-)
-# The following is for use by the frontend enduser only.
-api_key_enduser_header = APIKeyHeader(
-    name="ENDUSER", scheme_name="api-enduser", auto_error=False
-)
-
 
 class Token(BaseModel):
     access_token: str
@@ -34,29 +22,6 @@ class TokenData(BaseModel):
     username: str | None = None
 
 
-def get_api_key(
-    api_key_header: str = Security(api_key_header),
-    api_key_inst_header: str = Security(api_key_inst_header),
-    api_key_enduser_header: str = Security(api_key_enduser_header),
-) -> tuple:
-    """Retrieve the api key and enduser header key if present.
-
-    Args:
-        api_key_header: The API key passed in the HTTP header.
-
-    Returns:
-        A tuple with the api key and enduser header if present. Authentication happens elsewhere.
-    Raises:
-        HTTPException: If the API key is invalid or missing.
-    """
-    if api_key_header:
-        return (api_key_header, api_key_inst_header, api_key_enduser_header)
-    raise HTTPException(
-        status_code=status.HTTP_401_UNAUTHORIZED,
-        detail="Invalid or missing API Key",
-    )
-
-
 def check_creds(username: str, password: str) -> bool:
     if username == env_vars["USERNAME"] and password == env_vars["PASSWORD"]:
         return True

src/worker/config.py

@@ -4,7 +4,6 @@
 from dotenv import load_dotenv
 
 # defaults to unit test values.
-os.environ["ENV_FILE_PATH"] = "/Users/oluwadolaposalako/sst-app-api/src/.env"
 
 env_vars = {
     "ENV": "LOCAL",

src/worker/main.py

@@ -3,7 +3,7 @@
 import numpy as np
 import logging
 from typing import Any, Annotated
-from fastapi import FastAPI, Depends, HTTPException, status, Security
+from fastapi import FastAPI, Depends, HTTPException, status
 from fastapi.responses import FileResponse
 
 from pydantic import BaseModel
@@ -15,13 +15,7 @@
     fetch_institution_ids,
 )
 from .config import sftp_vars, env_vars, startup_env_vars
-from .authn import (
-    Token,
-    get_current_username,
-    check_creds,
-    create_access_token,
-    get_api_key,
-)
+from .authn import Token, get_current_username, check_creds, create_access_token
 from datetime import timedelta
 import os
 
@@ -150,7 +144,6 @@ async def execute_pdp_pull(
     req: PdpPullRequest,
     current_username: Annotated[str, Depends(get_current_username)],
     storage_control: Annotated[StorageControl, Depends(StorageControl)],
-    api_key_enduser_tuple: str = Security(get_api_key),
 ) -> Any:
     """Performs the PDP pull of the file."""
     storage_control.create_bucket_if_not_exists(get_sftp_bucket_name(env_vars["ENV"]))
@@ -172,9 +165,7 @@ async def execute_pdp_pull(
 
         temp_valid_pdp_ids, temp_invalid_ids = fetch_institution_ids(
             pdp_ids=list(signed_urls.keys()),
-            backend_api_key=next(
-                key for key in api_key_enduser_tuple if key is not None
-            ),
+            backend_api_key=env_vars["BACKEND_API_KEY"],
         )
 
         valid_pdp_ids.append(temp_valid_pdp_ids)

src/worker/main_test.py

@@ -5,7 +5,7 @@
 
 from fastapi.testclient import TestClient
 from .main import app
-from .authn import get_current_username, get_api_key
+from .authn import get_current_username
 from unittest import mock
 from .utilities import StorageControl
 
@@ -20,14 +20,10 @@ def get_current_username_override():
     def storage_control_override():
         return MOCK_STORAGE
 
-    def get_api_key_override():
-        return ("valid_api_key", "end_user")
-
     app.dependency_overrides[StorageControl] = storage_control_override
 
     app.dependency_overrides[get_current_username] = get_current_username_override
 
-    app.dependency_overrides[get_api_key] = get_api_key_override
     client = TestClient(app, root_path="/workers/api/v1")
     yield client
     app.dependency_overrides.clear()