Merge pull request #5782 from betagouv/fix-api-entreprise-token-header

Appelle l'API entreprise avec le token en Header

app/lib/api_entreprise/api.rb

@@ -59,8 +59,9 @@ class ApiEntreprise::API
   private
 
   def self.call_with_token(resource_name, token)
-    url = "#{API_ENTREPRISE_URL}/privileges?token=#{token}"
+    url = "#{API_ENTREPRISE_URL}/#{resource_name}"
     response = Typhoeus.get(url,
+      headers: { Authorization: "Bearer #{token}" },
       timeout: TIMEOUT)
 
     if response.success?
@@ -76,6 +77,7 @@ class ApiEntreprise::API
     params = params(siret_or_siren, procedure_id, user_id)
 
     response = Typhoeus.get(url,
+      headers: { Authorization: "Bearer #{token_for_procedure(procedure_id)}" },
       params: params,
       timeout: TIMEOUT)
 
@@ -112,8 +114,7 @@ class ApiEntreprise::API
       context: "demarches-simplifiees.fr",
       recipient: siret_or_siren,
       object: "procedure_id: #{procedure_id}",
-      non_diffusables: true,
+      non_diffusables: true
-      token: token_for_procedure(procedure_id)
     }
     # rubocop:enable DS/ApplicationName
     params[:user_id] = user_id if user_id.present?

spec/controllers/champs/siret_controller_spec.rb

@@ -30,7 +30,7 @@ describe Champs::SiretController, type: :controller do
 
       before do
         sign_in user
-        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}?.*token=/)
+        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}/)
           .to_return(status: api_etablissement_status, body: api_etablissement_body)
         allow_any_instance_of(ApiEntrepriseToken).to receive(:roles)
           .and_return(["attestations_fiscales", "attestations_sociales", "bilans_entreprise_bdf"])

spec/controllers/users/dossiers_controller_spec.rb

@@ -206,7 +206,7 @@ describe Users::DossiersController, type: :controller do
 
     before do
       sign_in(user)
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}?.*token=/)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}/)
         .to_return(status: api_etablissement_status, body: api_etablissement_body)
       allow_any_instance_of(ApiEntrepriseToken).to receive(:roles)
         .and_return(["attestations_fiscales", "attestations_sociales", "bilans_entreprise_bdf"])

spec/features/users/dossier_creation_spec.rb

@@ -66,17 +66,17 @@ feature 'Creating a new dossier:' do
       let(:dossier) { procedure.dossiers.last }
 
       before do
-        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}?.*token=/)
+        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}/)
           .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/etablissements.json'))
-        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}?.*token=/)
+        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}/)
           .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/entreprises.json'))
-        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/exercices\/#{siret}?.*token=/)
+        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/exercices\/#{siret}/)
           .to_return(status: 200, body: File.read('spec/fixtures/files/api_entreprise/exercices.json'))
-        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\/#{siret}?.*token=/)
+        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\/#{siret}/)
           .to_return(status: 404, body: '')
-        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/effectifs_mensuels_acoss_covid\/2020\/02\/entreprise\/#{siren}?.*token=/)
+        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/effectifs_mensuels_acoss_covid\/2020\/02\/entreprise\/#{siren}/)
           .to_return(status: 404, body: '')
-        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/effectifs_annuels_acoss_covid\/#{siren}?.*token=/)
+        stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/effectifs_annuels_acoss_covid\/#{siren}/)
           .to_return(status: 404, body: '')
         allow_any_instance_of(ApiEntrepriseToken).to receive(:roles).and_return([])
         allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)

spec/jobs/api_entreprise/association_job_spec.rb

@@ -7,7 +7,7 @@ RSpec.describe ApiEntreprise::AssociationJob, type: :job do
   let(:status) { 200 }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\/.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\//)
       .to_return(body: body, status: status)
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
   end

spec/jobs/api_entreprise/attestation_fiscale_job_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe ApiEntreprise::AttestationFiscaleJob, type: :job do
   let(:status) { 200 }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/attestations_fiscales_dgfip\/#{siren}\?.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/attestations_fiscales_dgfip\/#{siren}/)
       .to_return(body: body, status: status)
     stub_request(:get, "https://storage.entreprise.api.gouv.fr/siade/1569156756-f6b7779f99fa95cd60dc03c04fcb-attestation_fiscale_dgfip.pdf")
       .to_return(body: "body attestation", status: 200)

spec/jobs/api_entreprise/attestation_sociale_job_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe ApiEntreprise::AttestationSocialeJob, type: :job do
   let(:status) { 200 }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/attestations_sociales_acoss\/#{siren}\?.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/attestations_sociales_acoss\/#{siren}/)
       .to_return(body: body, status: status)
     stub_request(:get, "https://storage.entreprise.api.gouv.fr/siade/1569156881-f749d75e2bfd443316e2e02d59015f-attestation_vigilance_acoss.pdf")
       .to_return(body: "body attestation", status: 200)

spec/jobs/api_entreprise/bilans_bdf_job_spec.rb

@@ -9,7 +9,7 @@ RSpec.describe ApiEntreprise::BilansBdfJob, type: :job do
   let(:bilans_bdf) { JSON.parse(body)["bilans"] }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/bilans_entreprises_bdf\/#{siren}\?.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/bilans_entreprises_bdf\/#{siren}/)
       .to_return(body: body, status: status)
     allow_any_instance_of(ApiEntrepriseToken).to receive(:roles).and_return(["bilans_entreprise_bdf"])
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)

spec/jobs/api_entreprise/effectifs_annuels_job_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe ApiEntreprise::EffectifsAnnuelsJob, type: :job do
   let(:status) { 200 }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/effectifs_annuels_acoss_covid\/#{siren}\?.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/effectifs_annuels_acoss_covid\/#{siren}/)
       .to_return(body: body, status: status)
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
   end

spec/jobs/api_entreprise/effectifs_job_spec.rb

@@ -11,7 +11,7 @@ RSpec.describe ApiEntreprise::EffectifsJob, type: :job do
   let(:status) { 200 }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/effectifs_mensuels_acoss_covid\/#{annee}\/#{mois}\/entreprise\/#{siren}\?.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/effectifs_mensuels_acoss_covid\/#{annee}\/#{mois}\/entreprise\/#{siren}/)
       .to_return(body: body, status: status)
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
   end

spec/jobs/api_entreprise/entreprise_job_spec.rb

@@ -8,7 +8,7 @@ RSpec.describe ApiEntreprise::EntrepriseJob, type: :job do
   let(:status) { 200 }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}?.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}/)
       .to_return(body: body, status: status)
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
   end

spec/jobs/api_entreprise/exercices_job_spec.rb

@@ -6,7 +6,7 @@ RSpec.describe ApiEntreprise::ExercicesJob, type: :job do
   let(:status) { 200 }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/exercices\/.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/exercices\//)
       .to_return(body: body, status: status)
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
   end

spec/lib/api_entreprise/api_spec.rb

@@ -7,7 +7,7 @@ describe ApiEntreprise::API do
     subject { described_class.entreprise(siren, procedure_id) }
 
     before do
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}?.*token=#{token}/)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}/)
         .to_return(status: status, body: body)
       allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
     end
@@ -68,7 +68,7 @@ describe ApiEntreprise::API do
 
         it 'call api-entreprise with specfic token' do
           subject
-          expect(WebMock).to have_requested(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}?.*token=#{token}/)
+          expect(WebMock).to have_requested(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}/)
         end
       end
 
@@ -78,7 +78,7 @@ describe ApiEntreprise::API do
 
         it 'call api-entreprise with specfic token' do
           subject
-          expect(WebMock).to have_requested(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}?.*token=#{token}/)
+          expect(WebMock).to have_requested(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}/)
         end
       end
     end
@@ -87,7 +87,7 @@ describe ApiEntreprise::API do
   describe '.etablissement' do
     subject { described_class.etablissement(siret, procedure_id) }
     before do
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}?.*non_diffusables=true&.*token=/)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}?.*non_diffusables=true/)
         .to_return(status: status, body: body)
       allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
     end
@@ -115,7 +115,7 @@ describe ApiEntreprise::API do
 
   describe '.exercices' do
     before do
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/exercices\/.*token=/)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/exercices\//)
         .to_return(status: status, body: body)
       allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
     end
@@ -147,7 +147,7 @@ describe ApiEntreprise::API do
 
   describe '.rna' do
     before do
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\/.*token=/)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\//)
         .to_return(status: status, body: body)
       allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
     end
@@ -182,7 +182,7 @@ describe ApiEntreprise::API do
     before do
       allow_any_instance_of(ApiEntrepriseToken).to receive(:roles).and_return(roles)
       allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/attestations_sociales_acoss\/#{siren}?.*token=/)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/attestations_sociales_acoss\/#{siren}/)
         .to_return(body: body, status: status)
     end
 
@@ -211,7 +211,7 @@ describe ApiEntreprise::API do
     before do
       allow_any_instance_of(ApiEntrepriseToken).to receive(:roles).and_return(roles)
       allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/attestations_fiscales_dgfip\/#{siren}?.*token=#{token}&user_id=#{user_id}/)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/attestations_fiscales_dgfip\/#{siren}/)
         .to_return(body: body, status: status)
     end
 
@@ -239,7 +239,7 @@ describe ApiEntreprise::API do
     before do
       allow_any_instance_of(ApiEntrepriseToken).to receive(:roles).and_return(roles)
       allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/bilans_entreprises_bdf\/#{siren}?.*token=#{token}/)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/bilans_entreprises_bdf\/#{siren}/)
         .to_return(body: body, status: status)
     end
 
@@ -268,7 +268,7 @@ describe ApiEntreprise::API do
 
     it 'makes no call to api-entreprise' do
       subject
-      expect(WebMock).not_to have_requested(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}?.*token=#{token}/)
+      expect(WebMock).not_to have_requested(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}/)
     end
   end
 end

spec/lib/api_entreprise/attestation_fiscale_adapter_spec.rb

@@ -7,7 +7,7 @@ describe ApiEntreprise::AttestationFiscaleAdapter do
   subject { adapter.to_params }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/attestations_fiscales_dgfip\/#{siren}\?.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/attestations_fiscales_dgfip\/#{siren}/)
       .to_return(body: body, status: status)
     allow_any_instance_of(ApiEntrepriseToken).to receive(:roles).and_return(["attestations_fiscales"])
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)

spec/lib/api_entreprise/attestation_sociale_adapter_spec.rb

@@ -6,7 +6,7 @@ describe ApiEntreprise::AttestationSocialeAdapter do
   subject { adapter.to_params }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/attestations_sociales_acoss\/#{siren}\?.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/attestations_sociales_acoss\/#{siren}/)
       .to_return(body: body, status: status)
     allow_any_instance_of(ApiEntrepriseToken).to receive(:roles).and_return(["attestations_sociales"])
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)

spec/lib/api_entreprise/bilans_bdf_adapter_spec.rb

@@ -7,7 +7,7 @@ describe ApiEntreprise::BilansBdfAdapter do
   subject { adapter.to_params }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/bilans_entreprises_bdf\/#{siren}\?.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/bilans_entreprises_bdf\/#{siren}/)
       .to_return(body: body, status: status)
     allow_any_instance_of(ApiEntrepriseToken).to receive(:roles).and_return(["bilans_entreprise_bdf"])
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)

spec/lib/api_entreprise/effectifs_adapter_spec.rb

@@ -9,7 +9,7 @@ describe ApiEntreprise::EffectifsAdapter do
   subject { adapter.to_params }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/effectifs_mensuels_acoss_covid\/#{annee}\/#{mois}\/entreprise\/#{siren}\?.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/effectifs_mensuels_acoss_covid\/#{annee}\/#{mois}\/entreprise\/#{siren}/)
       .to_return(body: body, status: status)
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
   end

spec/lib/api_entreprise/effectifs_annuels_adapter_spec.rb

@@ -7,7 +7,7 @@ describe ApiEntreprise::EffectifsAnnuelsAdapter do
   subject { adapter.to_params }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/effectifs_annuels_acoss_covid\/#{siren}\?.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/effectifs_annuels_acoss_covid\/#{siren}/)
       .to_return(body: body, status: status)
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
   end

spec/lib/api_entreprise/entreprise_adapter_spec.rb

@@ -6,7 +6,7 @@ describe ApiEntreprise::EntrepriseAdapter do
   subject { adapter.to_params }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}?.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/entreprises\/#{siren}/)
       .to_return(body: body, status: status)
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
   end

spec/lib/api_entreprise/etablissement_adapter_spec.rb

@@ -12,7 +12,7 @@ describe ApiEntreprise::EtablissementAdapter do
     subject { described_class.new(siret, procedure_id).to_params }
 
     before do
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}?.*token=/)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}/)
         .to_return(body: File.read(fixture, status: 200))
     end
 
@@ -99,7 +99,7 @@ describe ApiEntreprise::EtablissementAdapter do
     subject { described_class.new(siret, procedure_id).to_params }
 
     before do
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}?.*token=/)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}/)
         .to_return(body: File.read('spec/fixtures/files/api_entreprise/etablissements_private.json', status: 200))
     end
 
@@ -113,7 +113,7 @@ describe ApiEntreprise::EtablissementAdapter do
     subject { described_class.new(bad_siret, procedure_id).to_params }
 
     before do
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{bad_siret}?.*token=/)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{bad_siret}/)
         .to_return(body: 'Fake body', status: 404)
     end
 

spec/lib/api_entreprise/exercices_adapter_spec.rb

@@ -4,7 +4,7 @@ describe ApiEntreprise::ExercicesAdapter do
   subject { described_class.new(siret, procedure.id).to_params }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/exercices\/.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/exercices\//)
       .to_return(body: File.read('spec/fixtures/files/api_entreprise/exercices.json', status: 200))
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
   end

spec/lib/api_entreprise/rna_adapter_spec.rb

@@ -9,7 +9,7 @@ describe ApiEntreprise::RNAAdapter do
   subject { adapter.to_params }
 
   before do
-    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\/.*token=/)
+    stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/associations\//)
       .to_return(body: body, status: status)
     allow_any_instance_of(ApiEntrepriseToken).to receive(:expired?).and_return(false)
   end

spec/services/api_entreprise_service_spec.rb

@@ -1,7 +1,7 @@
 describe ApiEntrepriseService do
   describe '#create_etablissement' do
     before do
-      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}?.*token=/)
+      stub_request(:get, /https:\/\/entreprise.api.gouv.fr\/v2\/etablissements\/#{siret}/)
         .to_return(body: etablissements_body, status: etablissements_status)
     end