From fce4d5e26e0fc660cc4efe6707294fb1390ef532 Mon Sep 17 00:00:00 2001 From: Shivam Mishra Date: Wed, 2 Oct 2024 13:21:02 +0530 Subject: [PATCH] feat: Show re-auth flag only for legacy Gmail and OAuth channels (#10189) --- app/models/channel/email.rb | 4 ++++ app/views/api/v1/models/_inbox.json.jbuilder | 6 ++++-- 2 files changed, 8 insertions(+), 2 deletions(-) diff --git a/app/models/channel/email.rb b/app/models/channel/email.rb index 274d19fb8..126596204 100644 --- a/app/models/channel/email.rb +++ b/app/models/channel/email.rb @@ -61,6 +61,10 @@ class Channel::Email < ApplicationRecord provider == 'google' end + def legacy_google? + imap_enabled && imap_address == 'imap.gmail.com' + end + private def ensure_forward_to_email diff --git a/app/views/api/v1/models/_inbox.json.jbuilder b/app/views/api/v1/models/_inbox.json.jbuilder index c49564e07..9cad3edc1 100644 --- a/app/views/api/v1/models/_inbox.json.jbuilder +++ b/app/views/api/v1/models/_inbox.json.jbuilder @@ -72,8 +72,10 @@ if resource.email? json.imap_port resource.channel.try(:imap_port) json.imap_enabled resource.channel.try(:imap_enabled) json.imap_enable_ssl resource.channel.try(:imap_enable_ssl) - # show this even for regular imap channels, to allow transitioning to OAuth - json.reauthorization_required resource.channel.try(:provider_config).empty? || resource.channel.try(:reauthorization_required?) + + if resource.channel.try(:microsoft?) || resource.channel.try(:google?) || resource.channel.try(:legacy_google?) + json.reauthorization_required resource.channel.try(:provider_config).empty? || resource.channel.try(:reauthorization_required?) + end end ## SMTP