Fix: url api (#222)

* fix url api * fix return function pour renvoyer les données codeCommune, codeRegon etc..
anct-cnum · Sep 24, 2024 · 65483c0 · 65483c0
1 parent c247614
commit 65483c0
Show file tree

Hide file tree

Showing 7 changed files with 10 additions and 6 deletions.
diff --git a/.env b/.env
@@ -5,3 +5,4 @@ VITE_APP_CANDIDAT_URL=https://candidat.conseiller-numerique.gouv.fr/login
 VITE_APP_FORMS_URL=https://app.conseiller-numerique.gouv.fr/candidature
 VITE_APP_AIDE_URL=https://aide.conseiller-numerique.gouv.fr/fr
 VITE_APP_API_URL=http://localhost:8080
+VITE_APP_API_PILOTAGE_URL=http://localhost:8080
diff --git a/.github/workflows/deploy-production.yml b/.github/workflows/deploy-production.yml
@@ -39,6 +39,7 @@ jobs:
           envkey_VITE_APP_FORMS_URL: https://app.conseiller-numerique.gouv.fr/candidature
           envkey_VITE_APP_AIDE_URL: https://aide.conseiller-numerique.gouv.fr/fr
           envkey_VITE_APP_API_URL: ${{ secrets.REACT_APP_API_PRODUCTION }}
+          envkey_VITE_APP_API_PILOTAGE_URL: ${{ secrets.REACT_APP_API_PILOTAGE_PRODUCTION }}
           file_name: .env
       - name: Build application
         run: npm run build

diff --git a/.github/workflows/deploy-recette.yml b/.github/workflows/deploy-recette.yml
@@ -39,6 +39,7 @@ jobs:
           envkey_VITE_APP_FORMS_URL: https://uat-cnum-front.osc-fr1.scalingo.io/candidature
           envkey_VITE_APP_AIDE_URL: https://aide.conseiller-numerique.gouv.fr/fr
           envkey_VITE_APP_API_URL: ${{ secrets.REACT_APP_API_RECETTE }}
+          envkey_VITE_APP_API_PILOTAGE_URL: ${{ secrets.REACT_APP_API_PILOTAGE_RECETTE }}
           file_name: .env
       - name: Copy robots.txt
         uses: canastro/copy-file-action@master

diff --git a/src/views/candidature-conseiller/useApiAdmin.js b/src/views/candidature-conseiller/useApiAdmin.js
@@ -4,7 +4,7 @@ export const useApiAdmin = () => {
   const { getVilleParCode } = useGeoApi();
 
   const creerCandidatureConseiller = async conseillerData => {
-    const baseUrl = import.meta.env.VITE_APP_API_URL;
+    const baseUrl = import.meta.env.VITE_APP_API_PILOTAGE_URL;
     const requestOptions = {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
@@ -19,7 +19,7 @@ export const useApiAdmin = () => {
   };
 
   const creerCandidatureStructure = async structureData => {
-    const baseUrl = import.meta.env.VITE_APP_API_URL;
+    const baseUrl = import.meta.env.VITE_APP_API_PILOTAGE_URL;
     const requestOptions = {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
@@ -34,7 +34,7 @@ export const useApiAdmin = () => {
   };
 
   const creerCandidatureCoordinateur = async structureData => {
-    const baseUrl = import.meta.env.VITE_APP_API_URL;
+    const baseUrl = import.meta.env.VITE_APP_API_PILOTAGE_URL;
     const requestOptions = {
       method: 'POST',
       headers: { 'Content-Type': 'application/json' },
@@ -109,6 +109,7 @@ export const useApiAdmin = () => {
     const codePostal = structureData.adresse.match(/\d{5}/)?.[0];
     await handleInformationsVille(structureData, codePostal);
     delete structureData.adresse;
+    return structureData;
   };
 
   const buildStructureData = async (formData, geoLocation) => {

diff --git a/src/views/candidature-structure/useEntrepriseFinder.js b/src/views/candidature-structure/useEntrepriseFinder.js
@@ -51,7 +51,7 @@ export const useEntrepriseFinder = setGeoLocation => {
     }
     setLoading(true);
     try {
-      const baseUrl = import.meta.env.VITE_APP_API_URL;
+      const baseUrl = import.meta.env.VITE_APP_API_PILOTAGE_URL;
       const response = await fetch(`${baseUrl}/structure/verify-siret-or-ridet/${siretOrRidet}`);
       if (!response.ok) {
         throw new Error(`Error fetching data: ${response.statusText}`);

diff --git a/...confirmation-email-candidature-conseiller/useApiConfirmationEmailCandidatureConseiller.js b/...confirmation-email-candidature-conseiller/useApiConfirmationEmailCandidatureConseiller.js
@@ -3,7 +3,7 @@ export const useApiConfirmationEmailCandidatureConseiller = () => {
 
 
   const actionConfirmationEmailCandidatureConseiller = async token => {
-    const baseUrl = import.meta.env.VITE_APP_API_URL;
+    const baseUrl = import.meta.env.VITE_APP_API_PILOTAGE_URL;
     const requestOptions = {
       method: 'PATCH',
       headers: { 'Content-Type': 'application/json' },

diff --git a/...s/confirmation-email-candidature-structure/useApiConfirmationEmailCandidatureStructure.js b/...s/confirmation-email-candidature-structure/useApiConfirmationEmailCandidatureStructure.js
@@ -1,7 +1,7 @@
 export const useApiConfirmationEmailCandidatureStructure = () => {
 
   const actionConfirmationEmailCandidatureStructure = async token => {
-    const baseUrl = import.meta.env.VITE_APP_API_URL;
+    const baseUrl = import.meta.env.VITE_APP_API_PILOTAGE_URL;
     const requestOptions = {
       method: 'PATCH',
       headers: { 'Content-Type': 'application/json' },