From f5d10eec1f36e8c32ed2956420cebf859bdf8ea9 Mon Sep 17 00:00:00 2001
From: Minh Tran <minhtran.2404@outlook.com>
Date: Mon, 4 Dec 2023 00:01:24 +0700
Subject: [PATCH] chore: update mailkit

---
 .../templates/external-email-sender.yaml          | 15 ++-------------
 k8s/charts/communication-api/values.yaml          |  4 ++--
 src/BuildingBlocks/Email.MailKit/MailKitSender.cs |  2 +-
 3 files changed, 5 insertions(+), 16 deletions(-)

diff --git a/k8s/charts/communication-api/templates/external-email-sender.yaml b/k8s/charts/communication-api/templates/external-email-sender.yaml
index b1503bd..61730ee 100644
--- a/k8s/charts/communication-api/templates/external-email-sender.yaml
+++ b/k8s/charts/communication-api/templates/external-email-sender.yaml
@@ -4,17 +4,6 @@ apiVersion: v1
 metadata:
   name: external-email-sender
 spec:
-  ports:
-    - port: 587
-      targetPort: 587
----
-kind: Endpoints
-apiVersion: v1
-metadata:
-  name: external-email-sender
-subsets:
-  - addresses:
-      - ip: 198.54.122.135
-    ports:
-      - port: 587
+  type: ExternalName
+  externalName: {{ .Values.externalEmailSender.host }}
 {{- end }}
diff --git a/k8s/charts/communication-api/values.yaml b/k8s/charts/communication-api/values.yaml
index c2e147c..4ecb932 100644
--- a/k8s/charts/communication-api/values.yaml
+++ b/k8s/charts/communication-api/values.yaml
@@ -23,7 +23,7 @@ ingress:
 
 externalEmailSender:
   enabled: true
-  host: mail.privateemail.com
+  host: 'mail.privateemail.com'
 
 resources:
   limits:
@@ -73,7 +73,7 @@ env:
       value: http://identity-api:15101
 
     - name: MailKit__SmtpHost
-      value: mail.privateemail.com
+      value: external-email-sender
     - name: MailKit__SmtpPort
       value: '587'
     - name: MailKit__Username
diff --git a/src/BuildingBlocks/Email.MailKit/MailKitSender.cs b/src/BuildingBlocks/Email.MailKit/MailKitSender.cs
index 97fc63b..47866f8 100644
--- a/src/BuildingBlocks/Email.MailKit/MailKitSender.cs
+++ b/src/BuildingBlocks/Email.MailKit/MailKitSender.cs
@@ -21,7 +21,7 @@ public MailKitSender(SmtpClient smtpClient, IOptionsMonitor<MailKitOptions> mail
 
     public async Task SendAsync(EmailData email, CancellationToken cancellationToken)
     {
-        await _smtpClient.ConnectAsync(_mailkitOptions.SmtpHost, _mailkitOptions.Port, true, cancellationToken);
+        await _smtpClient.ConnectAsync(_mailkitOptions.SmtpHost, _mailkitOptions.Port, false, cancellationToken);
 
         if (!string.IsNullOrEmpty(_mailkitOptions.Username))
         {