refactor: add public import support for Trakt and improve OAuth redirect handling

- Add public username import option for Trakt alongside OAuth import
- Update OAuth redirect URIs to use request.build_absolute_uri() with reverse()
- Split Trakt and Simkl import endpoints into separate public/private routes
- Add comprehensive tests for both OAuth and public import flows
- Improve documentation and type hints for import functions

Author: FuzzyGrim

src/integrations/imports/anilist.py

@@ -5,6 +5,7 @@
 import requests
 from django.apps import apps
 from django.conf import settings
+from django.urls import reverse
 from django.utils import timezone
 
 import app
@@ -18,8 +19,6 @@
 
 def get_token(request):
     """View for getting the AniList OAuth2 token."""
-    domain = request.get_host()
-    scheme = request.scheme
     code = request.GET["code"]
 
     url = "https://anilist.co/api/v2/oauth/token"
@@ -29,7 +28,7 @@ def get_token(request):
         "client_secret": settings.ANILIST_SECRET,
         "code": code,
         "grant_type": "authorization_code",
-        "redirect_uri": f"{scheme}://{domain}/import/anilist/private",
+        "redirect_uri": request.build_absolute_uri(reverse("import_anilist_private")),
     }
 
     try:

src/integrations/imports/simkl.py

@@ -3,6 +3,7 @@
 
 import requests
 from django.conf import settings
+from django.urls import reverse
 from django.utils import timezone
 from django.utils.dateparse import parse_datetime
 
@@ -17,8 +18,6 @@
 
 def get_token(request):
     """View for getting the SIMKL OAuth2 token."""
-    domain = request.get_host()
-    scheme = request.scheme
     code = request.GET["code"]
     url = "https://api.simkl.com/oauth/token"
 
@@ -31,7 +30,7 @@ def get_token(request):
         "client_secret": settings.SIMKL_SECRET,
         "code": code,
         "grant_type": "authorization_code",
-        "redirect_uri": f"{scheme}://{domain}",
+        "redirect_uri": request.build_absolute_uri(reverse("import_simkl_private")),
     }
 
     try:

src/integrations/imports/trakt.py

@@ -4,6 +4,7 @@
 
 import requests
 from django.conf import settings
+from django.urls import reverse
 from django.utils.dateparse import parse_datetime
 from django_celery_beat.models import PeriodicTask
 
@@ -21,8 +22,6 @@
 
 def handle_oauth_callback(request):
     """View for getting the Trakt OAuth2 token."""
-    domain = request.get_host()
-    scheme = request.scheme
     code = request.GET["code"]
 
     url = "https://api.trakt.tv/oauth/token"
@@ -32,7 +31,7 @@ def handle_oauth_callback(request):
         "client_secret": settings.TRAKT_API_SECRET,
         "code": code,
         "grant_type": "authorization_code",
-        "redirect_uri": f"{scheme}://{domain}/import/trakt",
+        "redirect_uri": request.build_absolute_uri(reverse("import_trakt_private")),
     }
 
     try:
@@ -81,16 +80,18 @@ def get_username_from_oauth(access_token):
     return request["username"]
 
 
-def get_access_token(refresh_token):
-    """View for getting the Trakt OAuth2 access token."""
+def get_access_token(encrypted_refresh_token):
+    """Get access token from encrypted refresh token."""
     url = "https://api.trakt.tv/oauth/token"
 
+    decrypted_token = helpers.decrypt(encrypted_refresh_token)
+
     params = {
         "client_id": settings.TRAKT_API,
         "client_secret": settings.TRAKT_API_SECRET,
-        "refresh_token": helpers.decrypt(refresh_token),
+        "refresh_token": decrypted_token,
         "grant_type": "refresh_token",
-        "redirect_uri": f"{settings.BASE_URL}/import/trakt",
+        "redirect_uri": f"{settings.BASE_URL}/import/trakt/private",
     }
 
     try:
@@ -107,7 +108,7 @@ def get_access_token(refresh_token):
         raise
 
     # refresh tokens are one time use only
-    update_refresh_token(refresh_token, request["refresh_token"])
+    update_refresh_token(encrypted_refresh_token, request["refresh_token"])
     return request["access_token"]
 
 
@@ -125,8 +126,19 @@ def update_refresh_token(old_token, new_token):
         periodic_task.save()
 
 
-def importer(token, user, mode, username=None):
-    """Import the user's data from Trakt using OAuth."""
+def importer(token, user, mode, username):
+    """Import the user's data from Trakt.
+
+    Can import using either OAuth (token provided) or public username.
+    When using OAuth, username should be the authenticated user's username.
+    When using public import, username is the Trakt username and token should be None.
+
+    Args:
+        token (str, optional): Encrypted OAuth2 refresh token if using OAuth else None
+        user: Django user object to import data for
+        mode (str): Import mode ("new" or "overwrite")
+        username (str): Trakt username to import from
+    """
     trakt_importer = TraktImporter(username, user, mode, refresh_token=token)
     return trakt_importer.import_data()
 
@@ -141,7 +153,8 @@ def __init__(self, username, user, mode, refresh_token=None):
             username (str): Trakt username to import from
             user: Django user object to import data for
             mode (str): Import mode ("new" or "overwrite")
-            refresh_token (str, optional): OAuth2 refresh token if using OAuth
+            refresh_token (str, optional): Encrypted OAuth2 refresh token if
+                using OAuth, None for public import
         """
         self.username = username
         self.user = user

src/integrations/tasks.py

@@ -78,7 +78,10 @@ def import_media(importer_func, identifier, user_id, mode, oauth_username=None):
 
 @shared_task(name="Import from Trakt")
 def import_trakt(user_id, mode, token=None, username=None):
-    """Celery task for importing media data from Trakt."""
+    """Celery task for importing media data from Trakt.
+
+    Can import using either OAuth (token provided) or public username.
+    """
     return import_media(trakt.importer, token, user_id, mode, username)
 
 

src/integrations/tests/test_imports.py

@@ -614,15 +614,109 @@ def test_process_comments(self, mock_get_metadata, mock_make_request):
         movie_obj = trakt_importer.bulk_media[MediaTypes.MOVIE.value][0]
         self.assertEqual(movie_obj.notes, "Great movie!")
 
-    @patch("integrations.imports.trakt.TraktImporter.import_data")
-    def test_importer_function(self, mock_import_data):
-        """Test the main importer function."""
-        mock_import_data.return_value = (1, 2, 3, 4, "No warnings")
+    @patch("integrations.imports.trakt.TraktImporter._get_paginated_data")
+    @patch("integrations.imports.trakt.TraktImporter._make_api_request")
+    @patch("integrations.imports.trakt.TraktImporter._get_metadata")
+    def test_public_import_full_flow(
+        self,
+        mock_get_metadata,
+        mock_make_request,
+        mock_get_paginated,
+    ):
+        """Test full import flow with public username (no OAuth)."""
+        # Mock paginated data - history returns movies, comments returns empty
+        mock_get_paginated.side_effect = [
+            [
+                {
+                    "type": "movie",
+                    "movie": {"title": "Public Movie", "ids": {"tmdb": 999}},
+                    "watched_at": "2023-01-01T00:00:00.000Z",
+                },
+            ],
+            [],  # Empty comments
+        ]
+
+        # Mock API requests for watchlist and ratings
+        mock_make_request.return_value = []
+
+        # Mock metadata
+        mock_get_metadata.return_value = {
+            "title": "Public Movie",
+            "image": "movie.jpg",
+        }
+
+        # Import with no token (public)
+        imported_counts, _ = importer(None, self.user, "new", "public_user")
+
+        # Verify movie was imported
+        self.assertEqual(imported_counts[MediaTypes.MOVIE.value], 1)
+        self.assertEqual(Movie.objects.filter(user=self.user).count(), 1)
+
+    @patch("integrations.imports.trakt.TraktImporter._get_paginated_data")
+    @patch("integrations.imports.trakt.TraktImporter._make_api_request")
+    @patch("integrations.imports.trakt.TraktImporter._get_metadata")
+    def test_oauth_import_full_flow(
+        self,
+        mock_get_metadata,
+        mock_make_request,
+        mock_get_paginated,
+    ):
+        """Test full import flow with OAuth token."""
+        # Mock paginated data - history returns movies, comments returns empty
+        mock_get_paginated.side_effect = [
+            [
+                {
+                    "type": "movie",
+                    "movie": {"title": "OAuth Movie", "ids": {"tmdb": 888}},
+                    "watched_at": "2023-01-01T00:00:00.000Z",
+                },
+            ],
+            [],  # Empty comments
+        ]
+
+        # Mock API requests for watchlist and ratings
+        mock_make_request.return_value = []
+
+        # Mock metadata
+        mock_get_metadata.return_value = {
+            "title": "OAuth Movie",
+            "image": "movie.jpg",
+        }
+
+        # Import with encrypted token (OAuth)
+        encrypted_token = helpers.encrypt("test_refresh_token")
+        imported_counts, _ = importer(
+            encrypted_token,
+            self.user,
+            "new",
+            "oauth_user",
+        )
+
+        # Verify movie was imported
+        self.assertEqual(imported_counts[MediaTypes.MOVIE.value], 1)
+        self.assertEqual(Movie.objects.filter(user=self.user).count(), 1)
+
+    def test_trakt_importer_with_refresh_token(self):
+        """Test TraktImporter initialization with refresh token."""
+        encrypted_token = helpers.encrypt("test_token")
+        importer = TraktImporter(
+            "testuser",
+            self.user,
+            "new",
+            refresh_token=encrypted_token,
+        )
+
+        self.assertEqual(importer.username, "testuser")
+        self.assertEqual(importer.refresh_token, encrypted_token)
+        self.assertEqual(importer.mode, "new")
 
-        result = importer("testuser", self.user, "new")
+    def test_trakt_importer_without_refresh_token(self):
+        """Test TraktImporter initialization without refresh token (public)."""
+        importer = TraktImporter("testuser", self.user, "new", refresh_token=None)
 
-        # Check that the result is passed through correctly
-        self.assertEqual(result, (1, 2, 3, 4, "No warnings"))
+        self.assertEqual(importer.username, "testuser")
+        self.assertIsNone(importer.refresh_token)
+        self.assertEqual(importer.mode, "new")
 
 
 class ImportSimkl(TestCase):

src/integrations/urls.py

@@ -3,19 +3,30 @@
 from integrations import views
 
 urlpatterns = [
-    path("trakt-oauth", views.trakt_oauth, name="trakt_oauth"),
-    path("import/trakt", views.import_trakt, name="import_trakt"),
-    path("simkl-oauth", views.simkl_oauth, name="simkl_oauth"),
-    path("import/simkl", views.import_simkl, name="import_simkl"),
+    path("import/trakt-oauth", views.trakt_oauth, name="trakt_oauth"),
+    path(
+        "import/trakt/private",
+        views.import_trakt_private,
+        name="import_trakt_private",
+    ),
+    path("import/trakt/public", views.import_trakt_public, name="import_trakt_public"),
+    path("import/simkl-oauth", views.simkl_oauth, name="simkl_oauth"),
+    path(
+        "import/simkl_private",
+        views.import_simkl_private,
+        name="import_simkl_private",
+    ),
     path("import/mal", views.import_mal, name="import_mal"),
     path("import/anilist/oauth", views.anilist_oauth, name="import_anilist_oauth"),
-    path("import/anilist/private",
-         views.import_anilist_private,
-         name="import_anilist_private",
+    path(
+        "import/anilist/private",
+        views.import_anilist_private,
+        name="import_anilist_private",
     ),
-    path("import/anilist/public",
-         views.import_anilist_public,
-         name="import_anilist_public",
+    path(
+        "import/anilist/public",
+        views.import_anilist_public,
+        name="import_anilist_public",
     ),
     path("import/kitsu", views.import_kitsu, name="import_kitsu"),
     path("import/yamtrack", views.import_yamtrack, name="import_yamtrack"),

src/integrations/views.py

@@ -26,7 +26,7 @@
 @require_POST
 def trakt_oauth(request):
     """View for initiating Trakt OAuth2 authorization flow."""
-    redirect_uri = request.build_absolute_uri(reverse("import_trakt"))
+    redirect_uri = request.build_absolute_uri(reverse("import_trakt_private"))
     url = "https://trakt.tv/oauth/authorize"
     state = {
         "mode": request.POST["mode"],
@@ -41,8 +41,8 @@ def trakt_oauth(request):
 
 
 @require_GET
-def import_trakt(request):
-    """View for getting the Trakt OAuth2 token."""
+def import_trakt_private(request):
+    """View for handling Trakt OAuth2 callback and scheduling private import."""
     oauth_callback = trakt.handle_oauth_callback(request)
     enc_token = helpers.encrypt(oauth_callback["refresh_token"])
     state_token = request.GET["state"]
@@ -72,10 +72,41 @@ def import_trakt(request):
     return redirect("import_data")
 
 
+@require_POST
+def import_trakt_public(request):
+    """View for importing Trakt data using public username."""
+    username = request.POST.get("user")
+    if not username:
+        messages.error(request, "Trakt username is required.")
+        return redirect("import_data")
+
+    mode = request.POST["mode"]
+    frequency = request.POST["frequency"]
+    import_time = request.POST["time"]
+
+    if frequency == "once":
+        tasks.import_trakt.delay(
+            user_id=request.user.id,
+            mode=mode,
+            username=username,
+        )
+        messages.info(request, "The task to import media from Trakt has been queued.")
+    else:
+        helpers.create_import_schedule(
+            username=username,
+            request=request,
+            mode=mode,
+            frequency=frequency,
+            import_time=import_time,
+            source="Trakt",
+        )
+    return redirect("import_data")
+
+
 @require_POST
 def simkl_oauth(request):
     """View for initiating the SIMKL OAuth2 authorization flow."""
-    redirect_uri = request.build_absolute_uri(reverse("import_simkl"))
+    redirect_uri = request.build_absolute_uri(reverse("import_simkl_private"))
     url = "https://simkl.com/oauth/authorize"
 
     state = {
@@ -92,7 +123,7 @@ def simkl_oauth(request):
 
 
 @require_GET
-def import_simkl(request):
+def import_simkl_private(request):
     """View for getting the SIMKL OAuth2 token."""
     oauth_callback = simkl.get_token(request)
     enc_token = helpers.encrypt(oauth_callback["access_token"])
@@ -167,6 +198,7 @@ def anilist_oauth(request):
         f"{url}?client_id={settings.ANILIST_ID}&redirect_uri={redirect_uri}&response_type=code&state={state_token}",
     )
 
+
 @require_GET
 def import_anilist_private(request):
     """View for getting the AniList OAuth2 token."""