shibayan · shibayan · Jan 6, 2025 · Jan 6, 2025
diff --git a/KeyVault.Acmebot/Internal/LegacyTeamsPayloadBuilder.cs b/KeyVault.Acmebot/Internal/LegacyTeamsPayloadBuilder.cs
@@ -0,0 +1,39 @@
+using System;
+using System.Collections.Generic;
+
+namespace KeyVault.Acmebot.Internal;
+
+internal class LegacyTeamsPayloadBuilder : IWebhookPayloadBuilder
+{
+    public object BuildCompleted(string certificateName, DateTimeOffset? expirationDate, IEnumerable<string> dnsNames, string acmeEndpoint)
+    {
+        return new
+        {
+            title = "Acmebot",
+            text = @$"A new certificate has been issued.
+
+**Certificate Name**: {certificateName}
+
+**Expiration Date**: {expirationDate}
+
+**ACME Endpoint**: {acmeEndpoint}
+
+**DNS Names**: {string.Join(", ", dnsNames)}",
+            themeColor = "2EB886"
+        };
+    }
+
+    public object BuildFailed(string functionName, string reason)
+    {
+        return new
+        {
+            title = "Acmebot",
+            text = @$"**{functionName}**
+
+**Reason**
+
+{reason}",
+            themeColor = "A30200"
+        };
+    }
+}
diff --git a/KeyVault.Acmebot/Internal/TeamsPayloadBuilder.cs b/KeyVault.Acmebot/Internal/TeamsPayloadBuilder.cs
@@ -9,31 +9,90 @@ public object BuildCompleted(string certificateName, DateTimeOffset? expirationD
     {
         return new
         {
-            title = "Acmebot",
-            text = @$"A new certificate has been issued.
-
-**Certificate Name**: {certificateName}
-
-**Expiration Date**: {expirationDate}
-
-**ACME Endpoint**: {acmeEndpoint}
-
-**DNS Names**: {string.Join(", ", dnsNames)}",
-            themeColor = "2EB886"
+            type = "message",
+            attachments = new[]
+            {
+                new
+                {
+                    contentType = "application/vnd.microsoft.card.adaptive",
+                    content = new
+                    {
+                        type = "AdaptiveCard",
+                        body = new object[]
+                        {
+                            new
+                            {
+                                type = "TextBlock",
+                                text = "A new certificate has been issued.",
+                                wrap = true
+                            },
+                            new{
+                                type = "FactSet",
+                                facts = new object[]
+                                {
+                                    new
+                                    {
+                                        title = "Certificate Name",
+                                        value = certificateName
+                                    },
+                                    new
+                                    {
+                                        title = "Expiration Date",
+                                        value = expirationDate
+                                    },
+                                    new
+                                    {
+                                        title = "ACME Endpoint",
+                                        value = acmeEndpoint
+                                    },
+                                    new
+                                    {
+                                        title = "DNS Names",
+                                        value = string.Join("\n", dnsNames)
+                                    }
+                                }
+                            }
+                        }
+                    }
+                }
+            }
         };
     }
 
     public object BuildFailed(string functionName, string reason)
     {
         return new
         {
-            title = "Acmebot",
-            text = @$"**{functionName}**
-
-**Reason**
-
-{reason}",
-            themeColor = "A30200"
+            type = "message",
+            attachments = new[]
+            {
+                new
+                {
+                    contentType = "application/vnd.microsoft.card.adaptive",
+                    content = new
+                    {
+                        type = "AdaptiveCard",
+                        body = new object[]
+                        {
+                            new
+                            {
+  
8000
                              type = "TextBlock",
+                                size = "Medium",
+                                weight = "Bolder",
+                                text = functionName,
+                                style = "heading",
+                                wrap = true
+                            },
+                            new
+                            {
+                                type = "TextBlock",
+                                text = reason,
+                                wrap = true
+                            }
+                        }
+                    }
+                }
+            }
         };
     }
 }
diff --git a/KeyVault.Acmebot/Startup.cs b/KeyVault.Acmebot/Startup.cs
@@ -97,11 +97,16 @@ public override void Configure(IFunctionsHostBuilder builder)
                 return new SlackPayloadBuilder();
             }
 
-            if (options.Webhook.Host.EndsWith(".office.com", StringComparison.OrdinalIgnoreCase))
+            if (options.Webhook.Host.EndsWith(".logic.azure.com", StringComparison.OrdinalIgnoreCase))
             {
                 return new TeamsPayloadBuilder();
             }
 
+            if (options.Webhook.Host.EndsWith(".office.com", StringComparison.
5AF7
OrdinalIgnoreCase))
+            {
+                return new LegacyTeamsPayloadBuilder();
+            }
+
             return new GenericPayloadBuilder(options);
         });