Sutty/trabajo-afectivo
5
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Follow up 0b449839ea - Fixes #3956 - Migration of the MS365 account fails by upper and lower case differences in email address.

Browse source
This commit is contained in:
Rolf Schmidt 2022-02-10 16:24:35 +00:00
parent 5707517181
commit bf945b4ea1
2 changed files with 2 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

3
lib/external_credential/google.rb
View file

@ -85,10 +85,9 @@ class ExternalCredential::Google
migrate_channel = nil
Channel.where(area: 'Email::Account').find_each do |channel|
next if channel.options.dig(:inbound, :options, :user)&.downcase != user_data[:email].downcase
next if channel.options.dig(:inbound, :options, :host)&.downcase != 'imap.gmail.com'
next if channel.options.dig(:outbound, :options, :user)&.downcase != user_data[:email].downcase
next if channel.options.dig(:outbound, :options, :host)&.downcase != 'smtp.gmail.com'
next if channel.options.dig(:outbound, :options, :user)&.downcase != user_data[:email].downcase && channel.options.dig(:outbound, :email)&.downcase != user_data[:email].downcase
migrate_channel = channel

3
lib/external_credential/microsoft365.rb
View file

@ -89,10 +89,9 @@ class ExternalCredential::Microsoft365
migrate_channel = nil
Channel.where(area: 'Email::Account').find_each do |channel|
next if channel.options.dig(:inbound, :options, :user)&.downcase != user_data[:email].downcase
next if channel.options.dig(:inbound, :options, :host)&.downcase != 'outlook.office365.com'
next if channel.options.dig(:outbound, :options, :user)&.downcase != user_data[:email].downcase
next if channel.options.dig(:outbound, :options, :host)&.downcase != 'smtp.office365.com'
next if channel.options.dig(:outbound, :options, :user)&.downcase != user_data[:email].downcase && channel.options.dig(:outbound, :email)&.downcase != user_data[:email].downcase
migrate_channel = channel