fix: don't override google or microsoft settings

2025-04-22 22:19:31 +05:30
2 changed files with 2 additions and 3 deletions
@@ -47,7 +47,6 @@ class OauthCallbackController < ApplicationController
    channel_email.update!({
                            imap_login: users_data['email'], imap_address: imap_address,
                            imap_port: '993', imap_enabled: true,
-                            smtp_enabled: false,
                            provider: provider_name,
                            provider_config: {
                              access_token: parsed_body['access_token'],
@@ -15,7 +15,7 @@ module ConversationReplyMailerHelper
    end
    ms_smtp_settings
    google_smtp_settings
-    set_delivery_method
+    set_delivery_method unless @inbox.imap_enabled? && (@channel.microsoft? || @channel.google?)

    # Email type detection logic:
    # - email_reply: Sets @message with a single message
@@ -92,7 +92,7 @@ module ConversationReplyMailerHelper
  end

  def set_delivery_method
-    return unless @inbox.inbox_type == 'Email' && @channel.smtp_enabled
+    return unless @inbox.email? && @channel.smtp_enabled

    smtp_settings = {
      address: @channel.smtp_address,