Breakout auth tooling into separate module

Author: alukach

dockerfiles/Dockerfile.raster

@@ -9,6 +9,9 @@ RUN python -m pip install psycopg[binary,pool]
 COPY runtimes/eoapi/raster /tmp/raster
 RUN python -m pip install /tmp/raster
 RUN rm -rf /tmp/raster
+COPY runtimes/eoapi/auth /tmp/auth
+RUN pip install /tmp/auth
+RUN rm -rf /tmp/auth
 
 ENV MODULE_NAME eoapi.raster.app
 ENV VARIABLE_NAME app

dockerfiles/Dockerfile.stac

@@ -7,6 +7,9 @@ ENV CURL_CA_BUNDLE /etc/ssl/certs/ca-certificates.crt
 COPY runtimes/eoapi/stac /tmp/stac
 RUN python -m pip install /tmp/stac
 RUN rm -rf /tmp/stac
+COPY runtimes/eoapi/auth /tmp/auth
+RUN pip install /tmp/auth
+RUN rm -rf /tmp/auth
 
 ENV MODULE_NAME eoapi.stac.app
 ENV VARIABLE_NAME app

dockerfiles/Dockerfile.vector

@@ -5,6 +5,9 @@ FROM ghcr.io/vincentsarago/uvicorn-gunicorn:${PYTHON_VERSION}
 COPY runtimes/eoapi/vector /tmp/vector
 RUN python -m pip install /tmp/vector
 RUN rm -rf /tmp/vector
+COPY runtimes/eoapi/auth /tmp/auth
+RUN pip install /tmp/auth
+RUN rm -rf /tmp/auth
 
 ENV MODULE_NAME eoapi.vector.app
 ENV VARIABLE_NAME app

runtimes/eoapi/auth/README.md

@@ -14,6 +14,9 @@
 logger = logging.getLogger(__name__)
 
 
+__version__ = "0.1.0"
+
+
 class Scope(TypedDict, total=False):
     """More strict version of Starlette's Scope."""
 

runtimes/eoapi/raster/eoapi/raster/auth.py renamed to runtimes/eoapi/auth/eoapi/auth.py

@@ -0,0 +1,40 @@
+[build-system]
+build-backend = "pdm.pep517.api"
+requires = ["pdm-pep517"]
+
+[tool.pdm.version]
+path = "eoapi/auth.py"
+source = "file"
+
+[tool.pdm.build]
+excludes = ["tests/", "**/.mypy_cache", "**/.DS_Store"]
+includes = ["eoapi"]
+
+[project]
+authors = [
+  {name = "Anthony Lukach", email = "[email protected]"},
+]
+dependencies = [
+  "pydantic-settings>=2.2.1",
+  "pyjwt>=2.9.0",
+  "cryptography>=43.0.0",
+]
+description = "Authentication module for EOAPI"
+dynamic = ["version"]
+license = {text = "MIT"}
+name = "eoapi.auth"
+readme = "README.md"
+requires-python = ">=3.8"
+
+[project.optional-dependencies]
+testing = [
+  "pytest>=6.0",
+  "coverage",
+]
+
+[tool.setuptools]
+include-package-data = true
+py-modules = ["eoapi.auth"]
+
+[tool.setuptools.packages.find]
+where = ["src"]

runtimes/eoapi/auth/pyproject.toml

@@ -7,6 +7,7 @@
 
 import jinja2
 import pystac
+from eoapi import auth
 from fastapi import Depends, FastAPI, Query
 from psycopg import OperationalError
 from psycopg.rows import dict_row
@@ -38,7 +39,7 @@
 from titiler.pgstac.reader import PgSTACReader
 
 from . import __version__ as eoapi_raster_version
-from . import auth, config, logs
+from . import config, logs
 
 settings = config.ApiSettings()
 auth_settings = auth.AuthSettings()

runtimes/eoapi/raster/eoapi/raster/app.py

@@ -24,8 +24,6 @@ dependencies = [
     "titiler.extensions",
     "starlette-cramjam>=0.3,<0.4",
     "importlib_resources>=1.1.0;python_version<'3.9'",
-    "pyjwt",
-    "cryptography",
 ]
 
 [project.optional-dependencies]

runtimes/eoapi/raster/pyproject.toml

@@ -3,6 +3,7 @@
 import logging
 from contextlib import asynccontextmanager
 
+from eoapi import auth
 from fastapi import FastAPI
 from fastapi.responses import ORJSONResponse
 from stac_fastapi.api.app import StacApi
@@ -34,7 +35,7 @@
 from starlette.templating import Jinja2Templates
 from starlette_cramjam.middleware import CompressionMiddleware
 
-from . import auth, config, extension, logs
+from . import config, extension, logs
 
 try:
     from importlib.resources import files as resources_files  # type: ignore

runtimes/eoapi/stac/eoapi/stac/app.py

@@ -24,8 +24,7 @@ dependencies = [
     "starlette-cramjam>=0.3,<0.4",
     "importlib_resources>=1.1.0;python_version<'3.9'",
     "psycopg_pool",
-    "pyjwt",
-    "cryptography"
+    "fastapi-authorization-gateway<=0.0.3"
 ]
 
 [project.optional-dependencies]

runtimes/eoapi/stac/eoapi/stac/auth.py

@@ -4,6 +4,7 @@
 from contextlib import asynccontextmanager
 
 import jinja2
+from eoapi import auth
 from fastapi import FastAPI, Request
 from starlette.middleware.cors import CORSMiddleware
 from starlette.templating import Jinja2Templates
@@ -16,7 +17,7 @@
 from tipg.settings import PostgresSettings
 
 from . import __version__ as eoapi_vector_version
-from . import auth, config, logs
+from . import config, logs
 
 try:
     from importlib.resources import files as resources_files  # type: ignore