Refactor to use upstream Ninja auth

bats_ai/core/api.py

@@ -0,0 +1,21 @@
+from ninja import NinjaAPI
+from resonant_utils.ninja import HttpOAuth2
+
+from bats_ai.core import views
+from bats_ai.core.views import nabat
+
+api = NinjaAPI(auth=HttpOAuth2())
+
+api.add_router('/recording/', views.RecordingRouter)
+api.add_router('/species/', views.SpeciesRouter)
+api.add_router('/grts/', views.GRTSCellsRouter)
+api.add_router('/guano/', views.GuanoMetadataRouter)
+api.add_router('/recording-annotation/', views.RecordingAnnotationRouter)
+api.add_router('/export-annotation/', views.ExportAnnotationRouter)
+api.add_router('/configuration/', views.ConfigurationRouter)
+api.add_router('/processing-task/', views.ProcessingTaskRouter)
+api.add_router('/recording-tag/', views.RecordingTagRouter)
+api.add_router('/vetting/', views.VettingRouter)
+
+api.add_router('/nabat/recording/', nabat.NABatRecordingRouter)
+api.add_router('/nabat/configuration/', nabat.NABatConfigurationRouter)

bats_ai/core/tests/conftest.py

@@ -2,7 +2,7 @@
 from ninja.testing import TestClient
 import pytest
 
-from bats_ai.api import api
+from bats_ai.core.api import api
 
 
 @pytest.fixture

bats_ai/core/views/configuration.py

@@ -42,14 +42,14 @@ def get_configuration(request):
         default_spectrogram_background_color=config.default_spectrogram_background_color,
         non_admin_upload_enabled=config.non_admin_upload_enabled,
         mark_annotations_completed_enabled=config.mark_annotations_completed_enabled,
-        is_admin=request.user.is_authenticated and request.user.is_superuser,
+        is_admin=request.user.is_superuser,
     )
 
 
 # Endpoint to update the configuration (admin only)
 @router.patch('/')
 def update_configuration(request, payload: ConfigurationSchema):
-    if not request.user.is_authenticated or not request.user.is_superuser:
+    if not request.user.is_superuser:
         return JsonResponse({'error': 'Permission denied'}, status=403)
     config = Configuration.objects.first()
     if not config:
@@ -62,17 +62,13 @@ def update_configuration(request, payload: ConfigurationSchema):
 
 @router.get('/is_admin/')
 def check_is_admin(request):
-    if request.user.is_authenticated:
-        return {'is_admin': request.user.is_superuser}
-    return {'is_admin': False}
+    return {'is_admin': request.user.is_superuser}
 
 
 @router.get('/me')
 def get_current_user(request):
-    if request.user.is_authenticated:
-        return {
-            'email': request.user.email,
-            'name': request.user.username,
-            'id': request.user.id,
-        }
-    return {'email': '', 'name': ''}
+    return {
+        'email': request.user.email,
+        'name': request.user.username,
+        'id': request.user.id,
+    }

bats_ai/core/views/nabat/nabat_configuration.py

@@ -25,7 +25,7 @@
 
 @router.post('/update-species')
 def update_species_list(request: HttpRequest):
-    if not request.user.is_authenticated or not request.user.is_superuser:
+    if not request.user.is_superuser:
         return JsonResponse({'error': 'Permission denied'}, status=403)
     existing_task = ProcessingTask.objects.filter(
         metadata__type=ProcessingTaskType.UPDATING_SPECIES.value,
@@ -81,7 +81,7 @@ class RecordingListItemSchema(Schema):
 @router.get('/recordings', response=list[RecordingListItemSchema])
 @paginate
 def list_recordings(request: HttpRequest, filters: Query[RecordingFilterSchema]):
-    if not request.user.is_authenticated or not request.user.is_superuser:
+    if not request.user.is_superuser:
         return JsonResponse({'error': 'Permission denied'}, status=403)
 
     recordings = NABatRecording.objects.annotate(
@@ -154,7 +154,7 @@ class AnnotationSchema(Schema):
 def recording_annotations(
     request: HttpRequest, recording_id: int, filters: Query[AnnotationFilterSchema]
 ):
-    if not request.user.is_authenticated or not request.user.is_superuser:
+    if not request.user.is_superuser:
         return JsonResponse({'error': 'Permission denied'}, status=403)
 
     try:
@@ -188,7 +188,7 @@ def recording_annotations(
 
 @router.get('/stats')
 def get_stats(request: HttpRequest):
-    if not request.user.is_authenticated or not request.user.is_superuser:
+    if not request.user.is_superuser:
         return JsonResponse({'error': 'Permission denied'}, status=403)
 
     total_recordings = NABatRecording.objects.count()

bats_ai/core/views/nabat/nabat_recording.py

@@ -96,9 +96,8 @@ def get_email_if_authorized(
     `recording_id` is retrieved.
     """
     # Superuser shortcut
-    if request.user and request.user.is_authenticated:
-        if request.user.is_superuser:
-            return request.user.email or 'superuser@nabat.org'
+    if request.user and request.user.is_superuser:
+        return request.user.email or 'superuser@nabat.org'
     # Decode JWT token
     try:
         payload = decode_jwt(api_token)
@@ -412,7 +411,7 @@ def get_nabat_recording_annotation(
 
     fileAnnotations = NABatRecordingAnnotation.objects.filter(nabat_recording=nabat_recording_id)
 
-    if request.user.is_authenticated and request.user.is_superuser:
+    if request.user.is_superuser:
         # If the user is a superuser, return all annotations
         pass
     elif user_email:

bats_ai/urls.py

@@ -2,7 +2,7 @@
 from django.contrib import admin
 from django.urls import include, path
 
-from .api import api
+from bats_ai.core.api import api
 
 urlpatterns = [
     path('accounts/', include('allauth.urls')),

pyproject.toml

@@ -21,7 +21,7 @@ dependencies = [
   "django-extensions",
   "django-oauth-toolkit",
   "django-resonant-settings[allauth,celery]",
-  "django-resonant-utils[allauth,s3_storage]",
+  "django-resonant-utils[allauth,ninja,s3-storage]",
   "django-s3-file-field[s3]",
   "django-storages[s3]",
   "django-stubs-ext",