Contributor backend 21

Pipfile

@@ -22,11 +22,11 @@ name = "pypi"
 # 5. Run `pipenv install --dev` in your terminal.
 
 [packages]
-codeforlife = {ref = "v0.20.0", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
+codeforlife = {ref = "v0.21.0", git = "https://github.com/ocadotechnology/codeforlife-package-python.git"}
 # 🚫 Don't add [packages] below that are inherited from the CFL package.
 
 [dev-packages]
-codeforlife = {ref = "v0.20.0", git = "https://github.com/ocadotechnology/codeforlife-package-python.git", extras = ["dev"]}
+codeforlife = {ref = "v0.21.0", git = "https://github.com/ocadotechnology/codeforlife-package-python.git", extras = ["dev"]}
 # codeforlife = {file = "../codeforlife-package-python", editable = true, extras = ["dev"]}
 # 🚫 Don't add [dev-packages] below that are inherited from the CFL package.
 

api/auth/backends/github.py

@@ -6,20 +6,21 @@
 import typing as t
 
 import requests
-from codeforlife.request import HttpRequest
+from codeforlife.request import BaseHttpRequest
 from codeforlife.types import JsonDict
 from django.conf import settings
 from django.contrib.auth.backends import BaseBackend
 
 from ...models import Contributor
+from ...models.session import SessionStore
 
 
 class GitHubBackend(BaseBackend):
     """Authenticate a user using the code returned by github's callback url."""
 
     def authenticate(  # type: ignore[override]
         self,
-        request: t.Optional[HttpRequest],
+        request: t.Optional[BaseHttpRequest[SessionStore, Contributor]],
         code: t.Optional[str] = None,
         **kwargs,
     ):

api/auth/backends/github_test.py

@@ -7,12 +7,13 @@
 from unittest.mock import Mock, patch
 
 import requests
-from codeforlife.request import HttpRequest
+from codeforlife.request import BaseHttpRequest
 from codeforlife.tests import TestCase
 from django.conf import settings
 from rest_framework import status
 
 from ...models import Contributor
+from ...models.session import SessionStore
 from .github import GitHubBackend
 
 
@@ -24,7 +25,7 @@ def setUp(self):
         # Set up initial test data
         self.contributor1 = Contributor.objects.get(id=1)
         self.backend = GitHubBackend()
-        self.request = HttpRequest()
+        self.request = BaseHttpRequest[SessionStore, Contributor]()
 
         self.gh_access_token_response = requests.Response()
         self.gh_access_token_response.status_code = status.HTTP_200_OK