DGNum/demarches-normaliennes
13
1
Fork 0
Code Issues 1 Pull requests Projects Releases Packages Wiki Activity

use Current.application_name in app excluding mail

Browse source
This commit is contained in:
simon lehericey 2024-03-20 11:34:54 +01:00
parent b9fcb25f1a
commit efa35e04a5
43 changed files with 66 additions and 66 deletions
Download patch file Download diff file Expand all files Collapse all files

10
app/controllers/france_connect/particulier_controller.rb
View file

@ -60,7 +60,7 @@ class FranceConnect::ParticulierController < ApplicationController
@fci.delete_merge_token!
@fci.delete_email_merge_token!
flash.notice = t('france_connect.particulier.flash.connection_done', application_name: APPLICATION_NAME)
flash.notice = t('france_connect.particulier.flash.connection_done', application_name: Current.application_name)
connect_france_connect_particulier(user)
end
else
@ -74,7 +74,7 @@ class FranceConnect::ParticulierController < ApplicationController
@fci.update(user: user)
@fci.delete_merge_token!
flash.notice = t('france_connect.particulier.flash.connection_done', application_name: APPLICATION_NAME)
flash.notice = t('france_connect.particulier.flash.connection_done', application_name: Current.application_name)
connect_france_connect_particulier(user)
else # same behaviour as redirect nicely with message when instructeur/administrateur
@fci.destroy
@ -89,7 +89,7 @@ class FranceConnect::ParticulierController < ApplicationController
@fci.associate_user!(sanitized_email_params)
@fci.delete_merge_token!
flash.notice = t('france_connect.particulier.flash.connection_done', application_name: APPLICATION_NAME)
flash.notice = t('france_connect.particulier.flash.connection_done', application_name: Current.application_name)
connect_france_connect_particulier(@fci.user)
else
@email = sanitized_email_params
@ -117,7 +117,7 @@ class FranceConnect::ParticulierController < ApplicationController
@fci = FranceConnectInformation.find_by(email_merge_token: email_merge_token_params)
if @fci.nil? || !@fci.valid_for_email_merge?
flash.alert = t('france_connect.particulier.flash.merger_token_expired', application_name: APPLICATION_NAME)
flash.alert = t('france_connect.particulier.flash.merger_token_expired', application_name: Current.application_name)
redirect_to root_path
else
@ -129,7 +129,7 @@ class FranceConnect::ParticulierController < ApplicationController
@fci = FranceConnectInformation.find_by(merge_token: merge_token_params)
if @fci.nil? || !@fci.valid_for_merge?
flash.alert = t('france_connect.particulier.flash.merger_token_expired', application_name: APPLICATION_NAME)
flash.alert = t('france_connect.particulier.flash.merger_token_expired', application_name: Current.application_name)
redirect_to root_path
end

2
app/controllers/users/sessions_controller.rb
View file

@ -23,7 +23,7 @@ class Users::SessionsController < Devise::SessionsController
def reset_link_sent
if send_login_token_or_bufferize(current_instructeur)
flash[:notice] = "Nous venons de vous renvoyer un nouveau lien de connexion sécurisée à #{APPLICATION_NAME}"
flash[:notice] = "Nous venons de vous renvoyer un nouveau lien de connexion sécurisée à #{Current.application_name}"
end
signed_email = message_verifier.generate(current_instructeur.email, purpose: :reset_link, expires_in: 1.hour)