fix: 💄 use alerts instead of modal for expert form submission

README.md

@@ -40,6 +40,14 @@ make up
 # stop
 make down
 ```
+
+### Authentication
+
+1. Login into keycloak
+2. Go to the Basegun realm
+3. Then in "Realm settings", go to "Keys"
+4. Copy the RS256 public key and paste it in the docker compose.
+
 ## Debugging
 
 * If the interface of the website does not appear on localhost:3000, there is an issue with frontend. In terminal, run `docker logs basegun-frontend`

backend/src/router.py

@@ -177,14 +177,15 @@ async def expert_contact(
     email: Annotated[str, Form()],
     seizure: Annotated[str, Form()],
     una_or_procedure_number: Annotated[str, Form()],
-    gun_type: Annotated[str, Form()],
-    gun_length: Annotated[int | None, Form()],
-    gun_barrel_length: Annotated[int | None, Form()],
-    markings_description: Annotated[str | None, Form()],
     files: Annotated[
         list[UploadFile], File(description="Multiple files as UploadFile")
     ],
     current_user: Annotated[dict, Depends(get_current_user)],
+    # Optionnal fields
+    markings_description: Annotated[str, Form()] = None,
+    gun_type: Annotated[str, Form()] = None,
+    gun_barrel_length: Annotated[int, Form()] = None,
+    gun_length: Annotated[int, Form()] = None,
 ):
     await send_mail(
         subject="[Basegun] Demande d'identification",

backend/tests/test_auth.py

@@ -6,10 +6,10 @@
 
 client = TestClient(app)
 
-token = "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJFYUxsTVlreWVOal93M19Ub0phajZ1OWdQc241M1dtM1JTQkNPeFdjdnVrIn0.eyJleHAiOjE3MjIwMDU0NzIsImlhdCI6MTcyMjAwNTQxMiwiYXV0aF90aW1lIjoxNzIyMDA1NDExLCJqdGkiOiJlNTZjZjU1OS03ZWEwLTQxOWEtOTE4OS00YmQ5MDk0MzYxMGYiLCJpc3MiOiJodHRwOi8vbG9jYWxob3N0OjgwODAvcmVhbG1zL2Jhc2VndW4iLCJhdWQiOiJtYXN0ZXItcmVhbG0iLCJzdWIiOiIyMWE1YTk3Ni1lYzYwLTQ5MjEtYmYzOC02YjU1MzMyMTcwYzciLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJiYXNlZ3VuIiwic2lkIjoiNWIxMTI3MjctMmFhNC00MTA5LWJhNTAtYjZmOTBjYjc5ZDQ3IiwiYWNyIjoiMCIsImFsbG93ZWQtb3JpZ2lucyI6WyJodHRwOi8vbG9jYWxob3N0OjMwMDAiLCJodHRwOi8vbG9jYWxob3N0OjUxNzMiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbImNyZWF0ZS1yZWFsbSIsImFkbWluIl19LCJyZXNvdXJjZV9hY2Nlc3MiOnsibWFzdGVyLXJlYWxtIjp7InJvbGVzIjpbInZpZXctcmVhbG0iLCJ2aWV3LWlkZW50aXR5LXByb3ZpZGVycyIsIm1hbmFnZS1pZGVudGl0eS1wcm92aWRlcnMiLCJpbXBlcnNvbmF0aW9uIiwiY3JlYXRlLWNsaWVudCIsIm1hbmFnZS11c2VycyIsInF1ZXJ5LXJlYWxtcyIsInZpZXctYXV0aG9yaXphdGlvbiIsInF1ZXJ5LWNsaWVudHMiLCJxdWVyeS11c2VycyIsIm1hbmFnZS1ldmVudHMiLCJtYW5hZ2UtcmVhbG0iLCJ2aWV3LWV2ZW50cyIsInZpZXctdXNlcnMiLCJ2aWV3LWNsaWVudHMiLCJtYW5hZ2UtYXV0aG9yaXphdGlvbiIsIm1hbmFnZS1jbGllbnRzIiwicXVlcnktZ3JvdXBzIl19fSwic2NvcGUiOiJvcGVuaWQgZW1haWwgcHJvZmlsZSIsImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwicHJlZmVycmVkX3VzZXJuYW1lIjoiYWRtaW4ifQ.fbRu9uOlu4TufhdSyqesyGBESPjQHIF0p9ZH-4XBGoVzA4OWZkPAN0ypdQk5TIFXF58mMQV-LYTFzTeBGZGwRmorbjsKIFxYEuf2a7CN40H5Ek92c-puo0laeqP4x3UgcN_2pQDGv9MjjAdid63U8xZY59pQ59Gy9e3hUnJ1R3cVyXDAwcqelS-V6NatezdNXSkQjIYMqoAjd1C9YOFbqJh_zLr6ilhuY8srQN36eWu3dtji_okBoWE8GLWAkp1We_1LUpISnS3nn6ZrleQ2K01PEcknHwLS36F-zDl0Tc-2_pL__mdRvDt3CvAlUkWTTvp_4orMKMqaId3J9QsWTg"
+token = "eyJhbGciOiJSUzI1NiIsInR5cCIgOiAiSldUIiwia2lkIiA6ICJvTlgya3hzM0RrdUJZNG9QY01LWnFiXzdWZVlfRmlXNEdrT1hIUjlBQkFBIn0.eyJleHAiOjE3MjU4OTM5NTcsImlhdCI6MTcyNTg5MDM1NywiYXV0aF90aW1lIjoxNzI1ODkwMzU2LCJqdGkiOiI3NjJiYzZkMy0yNWQ3LTRkMWYtYTdiYi04ZDA3MDBjOTVhZTgiLCJpc3MiOiJodHRwOi8vbG9jYWxob3N0OjgwODAvcmVhbG1zL2Jhc2VndW4iLCJzdWIiOiJmYjFjNjYyNC0wMDdhLTQ2NTUtYTRiYS1kZmU1NGE2ZWE2YTAiLCJ0eXAiOiJCZWFyZXIiLCJhenAiOiJiYXNlZ3VuIiwic2lkIjoiMzM4ZGY5YmEtYmY0Yy00MmE5LTliNjEtZmU2MGY4ZDcwOTg3IiwiYWNyIjoiMSIsImFsbG93ZWQtb3JpZ2lucyI6WyJodHRwOi8vbG9jYWxob3N0OjMwMDAiLCJodHRwOi8vbG9jYWxob3N0OjUxNzMiXSwicmVhbG1fYWNjZXNzIjp7InJvbGVzIjpbInVzZXIiXX0sInNjb3BlIjoib3BlbmlkIGVtYWlsIHByb2ZpbGUiLCJuaWdlbmQiOiIxMjM0NTY3OCIsImVtYWlsX3ZlcmlmaWVkIjpmYWxzZSwiaWRwIjoicHJveHltYSIsInNlcnZpY2UiOiJETlBBRiAvIFJPSVNTWSA5NSIsIm5hbWUiOiJKYW5lIERvZSIsInBob25lX251bWJlciI6IjAxMjM0NTY3ODkiLCJwcmVmZXJyZWRfdXNlcm5hbWUiOiJnZW5kYXJtZXJpZSIsImdpdmVuX25hbWUiOiJKYW5lIiwiZmFtaWx5X25hbWUiOiJEb2UiLCJlbWFpbCI6ImphbmUuZG9lQGdlbmRhcm1lcmllLmdvdXYuZnIifQ.pChWFGGPU8PKSJo0IKpExrVLUCH_zfnihDcXnTb7Vx_Tfto_JCB6JV7mSguTdz5p1ZA-wWLjbSsLBH8xZ8RnGshSuLORs3bWHFPKMSO_0xurWj8S1GwF3Lf6T4mPWpVfQahlB9HWcLvT9gJTMklTRLmoktqu5cKzuyy5PSzVZeZKTHgz3BcS6cN80_frujmZcDdB3Vjl6FeuFrvXkjQSaM3XvyfzeujAEoPg7VcGfBbm3lhpzNXBjuw86RdM5PtQLn3LS4yEbsmtCsztC5MNL70ctTK2eoq2cv7drXUVO1VfpMwKQVdKZDUvzs8ApziDtsUGJUeMb8O51u1SV6DPig"
 
 
-@pytest.mark.skip(reason="Cannot currently run in CI.")
+# @pytest.mark.skip(reason="Cannot currently run in CI.")
 class TestAuthentication:
     def test_jwks(self):
         print(PUBLIC_KEY)
@@ -18,6 +18,5 @@ def test_jwks(self):
                 token,
                 PUBLIC_KEY,
                 algorithms=["RS256"],
-                audience=["master-realm", "account"],
             )
         )