diff --git a/app/graphql/mutations/base_mutation.rb b/app/graphql/mutations/base_mutation.rb index 5113603d0..ec677ef18 100644 --- a/app/graphql/mutations/base_mutation.rb +++ b/app/graphql/mutations/base_mutation.rb @@ -5,6 +5,7 @@ module Mutations begin blob = ActiveStorage::Blob.find_signed(blob_id) blob.identify + nil rescue ActiveStorage::FileNotFoundError return { errors: ['Le fichier n’a pas été correctement téléversé sur le serveur de stockage'] } rescue ActiveSupport::MessageVerifier::InvalidSignature diff --git a/config/env.example.optional b/config/env.example.optional index fd59171fa..fc246b840 100644 --- a/config/env.example.optional +++ b/config/env.example.optional @@ -9,6 +9,10 @@ APPLICATION_BASE_URL="https://www.demarches-simplifiees.fr" # Utilisation de France Connect # FRANCE_CONNECT_ENABLED="disabled" # "enabled" par défaut +# Personnalisation d'instance - URLs des CGU et des mentions légales +# CGU_URL="" +# MENTIONS_LEGALES_URL="" + # Personnalisation d'instance - Adresses Email de l'application et téléphone # CONTACT_EMAIL="" # EQUIPE_EMAIL="" diff --git a/config/initializers/urls.rb b/config/initializers/urls.rb index 268174f5f..82ff12802 100644 --- a/config/initializers/urls.rb +++ b/config/initializers/urls.rb @@ -22,8 +22,8 @@ ADMINISTRATEUR_TUTORIAL_URL = [DOC_URL, "tutoriels", "tutoriel-administrateur"]. INSTRUCTEUR_TUTORIAL_URL = [DOC_URL, "tutoriels", "tutoriel-accompagnateur"].join("/") CADRE_JURIDIQUE_URL = [DOC_URL, "tutoriels/video-le-cadre-juridique"].join("/") LISTE_DES_DEMARCHES_URL = [DOC_URL, "listes-des-demarches"].join("/") -CGU_URL = [DOC_URL, "cgu"].join("/") -MENTIONS_LEGALES_URL = [DOC_URL, "mentions-legales"].join("/") +CGU_URL = ENV.fetch("CGU_URL", [DOC_URL, "cgu"].join("/")) +MENTIONS_LEGALES_URL = ENV.fetch("MENTIONS_LEGALES_URL", [DOC_URL, "mentions-legales"].join("/")) API_DOC_URL = [DOC_URL, "pour-aller-plus-loin", "api"].join("/") WEBHOOK_DOC_URL = [DOC_URL, "pour-aller-plus-loin", "webhook"].join("/") ARCHIVAGE_DOC_URL = [DOC_URL, "pour-aller-plus-loin", "archivage-longue-duree-des-demarches"].join("/") diff --git a/spec/controllers/api/v2/graphql_controller_spec.rb b/spec/controllers/api/v2/graphql_controller_spec.rb index 1a9c36c48..d30329d22 100644 --- a/spec/controllers/api/v2/graphql_controller_spec.rb +++ b/spec/controllers/api/v2/graphql_controller_spec.rb @@ -37,7 +37,7 @@ describe API::V2::GraphqlController do } end let(:blob) do - blob = ActiveStorage::Blob.create_before_direct_upload!(blob_info) + blob = ActiveStorage::Blob.create_before_direct_upload!(**blob_info) blob.upload(file) blob end