Cope with users possibly not being in a team

Author: PeterJCLaw

code_submitter/auth.py

@@ -13,7 +13,7 @@
 
 
 class User(SimpleUser):
-    def __init__(self, username: str, team: str) -> None:
+    def __init__(self, username: str, team: Optional[str]) -> None:
         super().__init__(username)
         self.team = team
 
@@ -61,7 +61,7 @@ async def authenticate(
 
 
 class DummyBackend(BasicAuthBackend):
-    def __init__(self, team: str = 'SRZ') -> None:
+    def __init__(self, team: Optional[str] = 'SRZ') -> None:
         self.team = team
 
     async def validate(self, username: str, password: str) -> ValidationResult:

code_submitter/server.py

@@ -14,6 +14,7 @@
 from starlette.middleware.authentication import AuthenticationMiddleware
 
 from . import auth, config
+from .auth import User
 from .tables import Archive, ChoiceHistory
 
 database = databases.Database(config.DATABASE_URL, force_rollback=config.TESTING)
@@ -57,6 +58,14 @@ async def homepage(request: Request) -> Response:
 @requires('authenticated')
 @database.transaction()
 async def upload(request: Request) -> Response:
+    user: User = request.user
+
+    if not user.team:
+        return Response(
+            "Must be a member of a team to be able to upload files",
+            status_code=403,
+        )
+
     form = await request.form()
     archive = form['archive']
 

templates/index.html

@@ -31,13 +31,14 @@
     <div class="container">
       <h1>Virtual Competition Code Submission</h1>
       <div class="row">
+        {% if request.user.team %}
         <form
           class="col-sm-6"
           action="{{ request.app.url_path_for('upload') }}"
           enctype="multipart/form-data"
           method="POST"
         >
-          <h3>Upload a new submission</h3>
+          <h3>Upload a new submission for team {{ request.user.team }}</h3>
           <div class="form-group">
             <label for="archive"> Select ZIP archive </label>
             <input
@@ -63,6 +64,9 @@ <h3>Upload a new submission</h3>
           </div>
           <button class="btn btn-primary" type="submit">Upload</button>
         </form>
+        {% else %}
+        <em>You are not in a team and so cannot upload files.</em>
+        {% endif %}
       </div>
       <div class="row">
         <div class="col-sm-6">

tests/tests_app.py

@@ -64,6 +64,9 @@ def test_app(self) -> None:
         response = self.session.get(self.url_path_for('homepage'))
         self.assertEqual(200, response.status_code)
 
+        html = response.text
+        self.assertIn("Upload a new submission", html)
+
     def test_app_requires_auth(self) -> None:
         self.session.auth = None
         response = self.session.get(self.url_path_for('homepage'))