be consistent in france_connect_email sanitation
This commit is contained in:
parent
6bad272825
commit
4c7b494c9d
1 changed files with 7 additions and 3 deletions
|
@ -14,7 +14,7 @@ class FranceConnect::ParticulierController < ApplicationController
|
||||||
fci = FranceConnectService.find_or_retrieve_france_connect_information(params[:code])
|
fci = FranceConnectService.find_or_retrieve_france_connect_information(params[:code])
|
||||||
|
|
||||||
if fci.user.nil?
|
if fci.user.nil?
|
||||||
preexisting_unlinked_user = User.find_by(email: fci.email_france_connect.downcase)
|
preexisting_unlinked_user = User.find_by(email: sanitize(fci.email_france_connect))
|
||||||
|
|
||||||
if preexisting_unlinked_user.nil?
|
if preexisting_unlinked_user.nil?
|
||||||
fci.associate_user!(fci.email_france_connect)
|
fci.associate_user!(fci.email_france_connect)
|
||||||
|
@ -67,7 +67,7 @@ class FranceConnect::ParticulierController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def mail_merge_with_existing_account
|
def mail_merge_with_existing_account
|
||||||
user = User.find_by(email: @fci.email_france_connect.downcase)
|
user = User.find_by(email: sanitize(@fci.email_france_connect.downcase))
|
||||||
if user.can_france_connect?
|
if user.can_france_connect?
|
||||||
@fci.update(user: user)
|
@fci.update(user: user)
|
||||||
@fci.delete_merge_token!
|
@fci.delete_merge_token!
|
||||||
|
@ -146,6 +146,10 @@ class FranceConnect::ParticulierController < ApplicationController
|
||||||
end
|
end
|
||||||
|
|
||||||
def sanitized_email_params
|
def sanitized_email_params
|
||||||
params[:email]&.gsub(/[[:space:]]/, ' ')&.strip&.downcase
|
sanitize(params[:email])
|
||||||
|
end
|
||||||
|
|
||||||
|
def sanitize(string)
|
||||||
|
string&.gsub(/[[:space:]]/, ' ')&.strip&.downcase
|
||||||
end
|
end
|
||||||
end
|
end
|
||||||
|
|
Loading…
Add table
Reference in a new issue