send email via SMTP

chatwoot · sojan-official · Jan 16, 2023 · Dec 30, 2022 · Dec 30, 2022 · Jan 3, 2023
commit 44a55ac6d924040a5ffbd2e1691cc2262cae5e83
diff --git a/.env.example b/.env.example
@@ -220,4 +220,4 @@ DIRECT_UPLOADS_ENABLED=
 #MS OAUTH creds
 AZURE_APP_ID=
 AZURE_APP_SECRET=
-AZURE_SCOPES = 'offline_access https://graph.microsoft.com/IMAP.AccessAsUser.All https://graph.microsoft.com/SMTP.Send'
+AZURE_SCOPES = 'Mail.Send offline_access https://graph.microsoft.com/IMAP.AccessAsUser.All https://graph.microsoft.com/SMTP.Send'
diff --git a/app/helpers/api/v1/microsoft_graph_helper.rb b/app/helpers/api/v1/microsoft_graph_helper.rb
@@ -0,0 +1,38 @@
+require 'httparty'
+
+# This will roll out smtp mail sender in the future
+# No use as of now
+module Api::V1::MicrosoftGraphHelper
+  GRAPH_HOST = 'https://graph.microsoft.com'.freeze
+
+  def make_api_call(method, endpoint, token, payload = nil)
+    headervals ||= {}
+    headervals[:Authorization] = "Bearer #{token}"
+    headervals[:Accept] = 'application/json'
+
+    params ||= {}
+
+    case method.upcase
+    when 'GET'
+      HTTParty.get "#{GRAPH_HOST}#{endpoint}",
+                   headers: headervals,
+                   query: params
+    when 'POST'
+      headervals['Content-Type'] = 'application/json'
+      HTTParty.post "#{GRAPH_HOST}#{endpoint}",
+                    headers: headervals,
+                    query: params,
+                    body: payload&.to_json
+    else
+      raise "HTTP method #{method.upcase} not implemented"
+    end
+  end
+
+  def send_reply_to_mail(token, _timezone, _subject, body)
+    create_message_reply_url = '/v1.0/me/sendMail'
+
+    mail_body = body
+
+    make_api_call 'POST', create_message_reply_url, token, mail_body
+  end
+end
diff --git a/app/jobs/inboxes/fetch_imap_emails_job.rb b/app/jobs/inboxes/fetch_imap_emails_job.rb
@@ -55,8 +55,8 @@ def fetch_mail_for_ms_oauth_channel(channel)
     imap.authenticate('XOAUTH2', channel.imap_login, access_token)
     imap.select('INBOX')
 
-    yesterday = (Date.today - 1).strftime('%d-%b-%Y')
-    tomorrow = (Date.today + 1).strftime('%d-%b-%Y')
+    yesterday = (Time.zone.today - 1).strftime('%d-%b-%Y')
+    tomorrow = (Time.zone.today + 1).strftime('%d-%b-%Y')
     imap.search(['BEFORE', tomorrow, 'SINCE', yesterday]).each do |message_id|
       inbound_mail = Mail.read_from_string imap.fetch(message_id, 'RFC822')[0].attr['RFC822']
 

diff --git a/app/mailers/conversation_reply_mailer_helper.rb b/app/mailers/conversation_reply_mailer_helper.rb
@@ -13,13 +13,33 @@ def prepare_mail(cc_bcc_enabled)
       @options[:cc] = cc_bcc_emails[0]
       @options[:bcc] = cc_bcc_emails[1]
     end
-
+    ms_smtp_settings
     set_delivery_method
+
     mail(@options)
   end
 
   private
 
+  def ms_smtp_settings
+    return unless @inbox.email? && @channel.imap_enabled && @inbox.channel.provider == 'microsoft'
+
+    smtp_settings = {
+      address: 'smtp.office365.com',
+      port: 587,
+      user_name: @channel.imap_login,
+      password: @channel.provider_config['access_token'],
+      domain: 'smtp.office365.com',
+      tls: false,
+      enable_starttls_auto: true,
+      openssl_verify_mode: 'none',
+      authentication: 'xoauth2'
+    }
+
+    @options[:delivery_method] = :smtp
+    @options[:delivery_method_options] = smtp_settings
+  end
+
   def set_delivery_method
     return unless @inbox.inbox_type == 'Email' && @channel.smtp_enabled
 
@@ -47,8 +67,12 @@ def email_imap_enabled
     @inbox.inbox_type == 'Email' && @channel.imap_enabled
   end
 
+  def email_microsoft_auth_enabled
+    @inbox.inbox_type == 'Email' && @channel.provider == 'microsoft'
+  end
+
   def email_from
-    email_smtp_enabled ? @channel.email : from_email_with_name
+    email_microsoft_auth_enabled || email_smtp_enabled ? @channel.email : from_email_with_name
   end
 
   def email_reply_to