mirror of
https://github.com/lingble/chatwoot.git
synced 2025-11-01 19:48:08 +00:00
f18ed01eb7
When moving form using Gmail Legacy auth to using OAuth, we need the email address that will be used to connect. This is because we need to store this email address in the cache and reuse when we get the callback to find the associated inbox. However there are cases where the imap login might be `support@company.com` and the email used to communicate will be `contact@company.com` (Probably an alias) In that case, we need to send the correct email address to Chatwoot when re-authenticating At the moment, we used the inbox email. This PR adds a check that defaults to to `imap_login` if that is available and imap is enabled This PR also fixes an unrelated problem where the email inbox creation flow was not working --- Tested it, it is working correctly 
28 lines
647 B
Ruby
28 lines
647 B
Ruby
class Google::CallbacksController < OauthCallbackController
|
|
include GoogleConcern
|
|
|
|
def find_channel_by_email
|
|
# find by imap_login first, and then by email
|
|
# this ensures the legacy users can migrate correctly even if inbox email address doesn't match
|
|
imap_channel = Channel::Email.find_by(imap_login: users_data['email'], account: account)
|
|
return imap_channel if imap_channel
|
|
|
|
Channel::Email.find_by(email: users_data['email'], account: account)
|
|
end
|
|
|
|
private
|
|
|
|
def provider_name
|
|
'google'
|
|
end
|
|
|
|
def imap_address
|
|
'imap.gmail.com'
|
|
end
|
|
|
|
def oauth_client
|
|
# from GoogleConcern
|
|
google_client
|
|
end
|
|
end
|