diff --git a/backend/src/router.py b/backend/src/router.py index 64374a887..bce1725e0 100644 --- a/backend/src/router.py +++ b/backend/src/router.py @@ -41,7 +41,10 @@ def version(): async def phone_number( current_user: Annotated[dict, Depends(get_current_user)], ): - return PHONE_NUMBER, CELLPHONE_NUMBER + return { + "phone": PHONE_NUMBER, + "cellphone": CELLPHONE_NUMBER, + } @router.post("/upload") diff --git a/backend/tests/test_api.py b/backend/tests/test_api.py index 11b25701c..5446dc646 100644 --- a/backend/tests/test_api.py +++ b/backend/tests/test_api.py @@ -186,3 +186,15 @@ def test_403(self): response = client.post("/api/expert-contact") response.data = response.json() assert response.status_code == 403 + +class TestExpertDetails: + @pytest.mark.skip("Need to authenticate to run that test.") + def test_success(self): + response = client.get("/api/contact-details") + response.data = response.json() + assert response.status_code == 200 + + def test_403(self): + response = client.get("/api/contact-details") + response.data = response.json() + assert response.status_code == 403 diff --git a/frontend/src/views/GuideContactExpert/ExpertSituation.vue b/frontend/src/views/GuideContactExpert/ExpertSituation.vue index 8577a62e6..39ca5b5ce 100644 --- a/frontend/src/views/GuideContactExpert/ExpertSituation.vue +++ b/frontend/src/views/GuideContactExpert/ExpertSituation.vue @@ -6,14 +6,14 @@ import { mgr } from "@/utils/authentication"; import { getContactDetails } from "@/api/api-client"; const getAccessToken: Ref = ref(""); -const authIDP: Ref = ref(""); +const userAuthIDP: Ref = ref(""); // Récupération des données de l'utilisateur const getUserData = async () => { try { const user = await mgr.getUser(); getAccessToken.value = user?.access_token; - authIDP.value = user?.profile.auth_idp; + userAuthIDP.value = user?.profile.auth_idp; } catch (error) { console.error( "Erreur pendant la récupération des données de l'utilisateur :", @@ -25,8 +25,8 @@ const getUserData = async () => { const getIRCGNDetails = async () => { try { const response = await getContactDetails(getAccessToken.value); - IRCGN.fixe = response[0]; - IRCGN.phone = response[1]; + IRCGN.fixe = response.cellphone; + IRCGN.phone = response.phone; console.log("Détails de contact récupérés avec succès :", response); } catch (error) { console.error( @@ -38,7 +38,7 @@ const getIRCGNDetails = async () => { onMounted(async () => { await getUserData(); - if (authIDP.value === "proxyma") { + if (userAuthIDP.value === "proxyma") { await getIRCGNDetails(); } }); @@ -72,15 +72,17 @@ const currentPhone = computed(() => {

- Contacter un expert de l'IRCGN - Contacter un expert en arme + Contacter un expert en arme

-
+

Sélectionnez votre situation actuelle :

-
+
Basegun ne fournit pas de {
-
+
@@ -165,7 +167,7 @@ const currentPhone = computed(() => {
-
+

Exemple de cas d'urgences :