feat(apps): add oauth support in thunderbird config

zakuciael · Sep 30, 2024 · 6babe72 · 6babe72
1 parent 27e0c6f
commit 6babe72
Show file tree

Hide file tree

Showing 3 changed files with 29 additions and 14 deletions.
diff --git a/hosts/laptop/secrets.yaml b/hosts/laptop/secrets.yaml
@@ -88,7 +88,7 @@ email:
         userName: ENC[AES256_GCM,data:Nq8ciRLevhx0lTNBJveWnXW+13Wm,iv:LJv09g75MsO+zq69eII6yEKRxkNhcsPY0IU0aq+wkZ0=,tag:OwnEAvPpSXE8yvtInSChcQ==,type:str]
         aliases: {}
         imap:
-            host: ENC[AES256_GCM,data:kPyFJjLyQlu+v7yRxHpev3S8uaSw,iv:fbheBzhQ4ZMSxR1wDkGVtCPLbivuE15IBxMLSjIvODg=,tag:eYPrNFF5gDu1RxTUwh/y8w==,type:str]
+            host: ENC[AES256_GCM,data:goHkXelgU+sXQrqt4fJfCZ88Im+8,iv:1QbA1zKcg5Tb7qj5FXLHAfoYf5RdZBBRge2IdELOW0Q=,tag:PYmYjJgBbd2CeGZ41w8s0A==,type:str]
             port: ENC[AES256_GCM,data:50MW,iv:Dxoxk/tuY6ofXtY9pLkv7x2yJJ/h4wJfU4tAg8uQYVo=,tag:vU2YoDV0ALYJkL/39lfGZw==,type:str]
             tls:
                 enable: {}
@@ -113,7 +113,7 @@ email:
         userName: ENC[AES256_GCM,data:LVnYTLdsgjPZ8fnCc5l1CsXY,iv:8gGnqjeP76plUwM1tSuhh65CWWIruetKgoLInxZx4p8=,tag:R6i06JwgH6ZjhRibGUVrmA==,type:str]
         aliases: {}
         imap:
-            host: ENC[AES256_GCM,data:9qhbluV2cmdPzZQTalPUlInscqVr,iv:/wZwch9zWRYZWeDlSZ4BDHl6OwvqLtVjdt6i3SekABk=,tag:qh/kyGBL3Y5G4vE97Wtm+Q==,type:str]
+            host: ENC[AES256_GCM,data:qNAUyadBHsSxHu9b/H+WDVMHLfPM,iv:bHyQao+OzeBi6qRzDfBNxAy5PKiDBzvr+KWH38KNA1M=,tag:mK0xkDY4oXH+MWkPYdM0MQ==,type:str]
             port: ENC[AES256_GCM,data:B9Ir,iv:j0AXBKyDIN3r8qCQVox7Uq1596f0TxpzffdeoF7IUYo=,tag:Skw3shz8/k2do76Fz0UjmQ==,type:str]
             tls:
                 enable: {}
@@ -138,7 +138,7 @@ email:
         userName: ENC[AES256_GCM,data:fxbgLbJs2p6lwkkBBnkM879Vt6g=,iv:4ff651YR/r9Z95/Y9w3Q3BxecSD4JqSyod+LS3HEzng=,tag:AXhMwwLV5a43lUlqUTWdbA==,type:str]
         aliases: {}
         imap:
-            host: ENC[AES256_GCM,data:t4ldffSBdMCCGODZeIcN1v/FKLCa,iv:WaAAmzdl7v11MwgT2E6fflT99Nd+dT3HUH/A8KqwRd0=,tag:/7+7j4nPaF8RgLDatp/ZcA==,type:str]
+            host: ENC[AES256_GCM,data:zTkMXADgNvA+xNno9n25HusVrjj1,iv:Ap4XHAr+ectiS1Hgz690qvzaT37P3NUBBICT4I+Cpcc=,tag:yky5ekLHpSc2149RNM3IHw==,type:str]
             port: ENC[AES256_GCM,data:KgEi,iv:1ATLrKrX/oJ9+jOYnKGOrjKmUTw4BS726wmhPES7Nuw=,tag:Sai5CL0MzYIHuXutUu1l9Q==,type:str]
             tls:
                 enable: {}
@@ -171,8 +171,8 @@ sops:
             cXY0Q0c1c1RTeE55UmR4UXQ3WUF5REEKmWCz1p1a4XiLYEXjjQDf3AymsJarAREr
             7sEzo5NgODyowqylz4OYUKo++kSfmrbd9EKNQRWVZnxQ2eNDZak3Gg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-09-21T12:37:19Z"
-    mac: ENC[AES256_GCM,data:rct59y9vljIgtCqNXqkbD8ByWoyrlCPzYSiyUu2So97C/Wbju2u9NmlLogWhkCTVUpG9BzoKw0/xJKw5voIz2DMhzEadeThh3mDitlp44ba/IXJiDUcgkkE9RD3Fx5T2z9URuE7rzABYPDLId1cqP6UzUKUNIP8/ZPFYMLH43ZU=,iv:V2Gjh4j1kAAagdW54ZMU5N2h9MhHtG8BKOl1xRg4DK0=,tag:Bj5eMEcKby/rgwqGqFuVrw==,type:str]
+    lastmodified: "2024-09-23T14:07:59Z"
+    mac: ENC[AES256_GCM,data:22vCbssa0ih2zGWMqZOFN1+GYGd9sPW16jfNhMRylT1SUNd9LSlWwOCKB86eyUHthJIoKBAgO0zSo/GyYrKqTg+tH7vojmSFoAI7OBJCDfmrNHrImUGP/DotwNy8ZV00qe0luyDgScbl249wFgDieezl12SGaawKMd1if6MESiU=,iv:XiaOG2qxp+Qp2kO8/h/CY4/HaH42dllY1HcpVFwkIIU=,tag:TsteC/p2CFSu9WVnsrV4Uw==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
diff --git a/hosts/pc/secrets.yaml b/hosts/pc/secrets.yaml
@@ -88,16 +88,18 @@ email:
         userName: ENC[AES256_GCM,data:ILj0RoP4r8RGRTOJrBg9CFAu4O+Y,iv:SbwfTx0kec+tn71FsgBf5kQ5EJFE1wbR/hrx2pEYlFY=,tag:DzG4f7MXicTdg6Sj4vkdaA==,type:str]
         aliases: {}
         imap:
-            host: ENC[AES256_GCM,data:g/MaGNMSVQOWzHR1LsvtFpLK6F4D,iv:euYRg1ucxH+1rhaHc6yQUBAQJrB5cgiryC7LSZb37fY=,tag:6Y02TaeKGxX9ccYkqNKgSA==,type:str]
+            host: ENC[AES256_GCM,data:AL8ZxRMtBgfaCnZgGpo19gX8VpIP,iv:RKfLtTYA0yS59MTzxa+S1bO6YHlcZn8Kz/ItluRxY54=,tag:Fvjt7Ey6EKQ3gvCWCrI9Ug==,type:str]
             port: ENC[AES256_GCM,data:mvUq,iv:0HQ1TzQXyk9PvQbct4nRjOM8WDmeK61Sg2/EsOKF4MM=,tag:ZmuKBInD0PiuMOnWSFsjRg==,type:str]
             tls:
                 enable: {}
+            oauth: {}
         smtp:
-            host: ENC[AES256_GCM,data:g02Ar+biYO8SqX4Jl5gKj8+tkcsl,iv:vc9dA9pqP9PTZxBKa/MnYeYBxgzRR7cCs0qF9/90hFM=,tag:oqHGrTRcG6asV7HiBH+/Vg==,type:str]
+            host: ENC[AES256_GCM,data:D1JFSCpro3tawPz5CKuXVBBe,iv:C8yXaOpWRCRSm0Yen3Sr9VpOFSzNM0aF6DdWX4OgzOw=,tag:RdaRL52a6zaO94Zcnnr2Kw==,type:str]
             port: ENC[AES256_GCM,data:on5Q,iv:P9x7s5wsTbu/0d3keXjktCkvBX6Y0YSxcMMuiTaEYLQ=,tag:Bc+CoECKtlCx7PAlUkQeiA==,type:str]
             tls:
                 enable: {}
                 useStartTls: {}
+            oauth: {}
         folders:
             spam: ENC[AES256_GCM,data:TyUAZw==,iv:8gWvb5V7rYom0h6HSLPcWBrdgcUv4YJfKxCZAHscOxE=,tag:+l7zTAYNwaCs3NPfCAkHSw==,type:str]
             trash: ENC[AES256_GCM,data:bPjKCc52ZQ==,iv:Sy1wCi9OKy1QEbXC0M6Jw+rSxUyjawpQub555A5WR1E=,tag:jo352AhBwPI1R86aISqKMA==,type:str]
@@ -113,16 +115,18 @@ email:
         userName: ENC[AES256_GCM,data:i/hg+HSC2UdlkV/JZDW3CQ8v,iv:SXyKJR/r3Dj+UTMtJ1OJy/FXXgMFHAT8Jlr2+U1eQco=,tag:d+/OFH/NKBtMwuBTNIWGEQ==,type:str]
         aliases: {}
         imap:
-            host: ENC[AES256_GCM,data:4yHhGkN2Fkf7WjyGp46LaiQ/Nwsh,iv:oEn3qnzMw5eO1D83v2JzdKxVdJUPy0He73/LtEq4pQU=,tag:LnruV6ggv0a5yfqpnvO+hg==,type:str]
+            host: ENC[AES256_GCM,data:p/AC4ORb8wqZL9M9UhQHrcXt2CHz,iv:YDW1Q+XJ2hYu99pDphhf+yvGpOnUH9bhlmSof51s6hw=,tag:Y71oneiPKAIxbecIKHlzZw==,type:str]
             port: ENC[AES256_GCM,data:dv7T,iv:bOSH4UqYbrY48DqZnbrK1bRfDwXAD7MiGENSKWh+gBA=,tag:xwa9UBsuTykWx9pnjCkMdA==,type:str]
             tls:
                 enable: {}
+            oauth: {}
         smtp:
-            host: ENC[AES256_GCM,data:mJCoVteS44m86sLSsUqWCyGNWTs3,iv:TeRiS8zagjRxyYHkMRKoEbDhc72VUUKzlNFQVHHx7bA=,tag:ouXAv9AQrv+heMG/37zqPA==,type:str]
+            host: ENC[AES256_GCM,data:XfdESCP06OyTNU4OWSG5tX7v,iv:tia4UFmf242PnOgno+YprvE4lZSpJlL/eyYv7hUG+EM=,tag:Jdv1poD0wNn1EX9vlHUKKg==,type:str]
             port: ENC[AES256_GCM,data:Qnj9,iv:bcQeNBgphxPEZRozwRzeh+cuF8I2H/k2RkdN5xRKs88=,tag:7HiERb0hcneoU5PVgGneeg==,type:str]
             tls:
                 enable: {}
                 useStartTls: {}
+            oauth: {}
         folders:
             spam: ENC[AES256_GCM,data:0ioPBQ==,iv:eMunajhqTD2nKtiPDjP5zJhywLF6zxkx6LPbSs4Vmvw=,tag:6rdo59Oe2zROOK4oXOi9Fw==,type:str]
             trash: ENC[AES256_GCM,data:NJRIDWNz2A==,iv:gBQC3F9xMsvbqPr9XAHwkjVie87aODwLE5ZhC9F5gAo=,tag:p1C0M1maVfdb4BjWpcxZvA==,type:str]
@@ -138,16 +142,18 @@ email:
         userName: ENC[AES256_GCM,data:yAaGpVre8MmdM9kyd1QU5+SYgQk=,iv:Zlu0K3RGZZ3u0tt935UREI26RuAI71YxYICORCienO8=,tag:7QTN7x4CnoWa5UtcGXXjYA==,type:str]
         aliases: {}
         imap:
-            host: ENC[AES256_GCM,data:JboYGZheXr59f2ocVc8pH0Ik2ILx,iv:0fqWgdxEzk8D7kNJoYKUDlVhzIJBAPGCmEzyU4dwPys=,tag:RwRv6bw0E7kiEUnmgxObGw==,type:str]
+            host: ENC[AES256_GCM,data:W/EOuQ5kDes0Xyya10bQgtu7ctmA,iv:E8aRgfyccSCy/9Htk/SSc5INlMi00FDbh+2bEsmlrcE=,tag:d+8rDBfCYiEBVllZYlVTUw==,type:str]
             port: ENC[AES256_GCM,data:UtT6,iv:ZKH4UbwVthfLdc7+7GzKVmXoe3BOaq3W18rQsI7Q8y8=,tag:svZWR6tccrKL4pMpbWJ4SQ==,type:str]
             tls:
                 enable: {}
+            oauth: {}
         smtp:
-            host: ENC[AES256_GCM,data:+n80r9hWcSYkURwBWgPbIoIKI6rz,iv:dR8UJiKnx8WemWtFGtx5a/xdfYkjEcR/K0lGJ48R32o=,tag:OV3IbP1L4JzHXNV/R4praw==,type:str]
+            host: ENC[AES256_GCM,data:WrJC52Vor2lfGw7VGMcGVhRJ,iv:dTr9RraDuSGDyTDHCSbyiRGSYCafqDp7dFuzAdLYWmE=,tag:xyTesxTUNt5i1OcqBXr9TA==,type:str]
             port: ENC[AES256_GCM,data:zfRX,iv:3J2UHULcmRTOwforIKvmoxmPRE9rtiZazCELHunYglk=,tag:zkbVQNyzO0jaBVXAZRO9mA==,type:str]
             tls:
                 enable: {}
                 useStartTls: {}
+            oauth: {}
         folders:
             spam: ENC[AES256_GCM,data:hzDcBA==,iv:JbQQJ5uZs0LpgzpJ8AvuQ6KeKzOWmI/sYfhBO2C+AL0=,tag:GqdvuHLETRc5b0MeLm9K9g==,type:str]
             trash: ENC[AES256_GCM,data:xLZj6uEgBQ==,iv:1kr3KLMU6QlSwQqaJRX4oB4k0t8Vg+8ibnQWr9ciS94=,tag:CyPOkGTp4Y56RZibIIUEsw==,type:str]
@@ -171,8 +177,8 @@ sops:
             cXY0Q0c1c1RTeE55UmR4UXQ3WUF5REEKmWCz1p1a4XiLYEXjjQDf3AymsJarAREr
             7sEzo5NgODyowqylz4OYUKo++kSfmrbd9EKNQRWVZnxQ2eNDZak3Gg==
             -----END AGE ENCRYPTED FILE-----
-    lastmodified: "2024-09-21T12:03:22Z"
-    mac: ENC[AES256_GCM,data:v504qV27PzyYeCYPFHBg9YVl+3OCc4ITcbf/+JqESK0SyoFkAjw9twArmTi94IpKO3ei8GCz8lN8u24qfPTWulGrMXrciJm2sykHm2BiqwpyYbsSJyq7rSf9R2F3AiBkAr4TFWWyDiS5l9KTnKlhFyftZ7gNOC95Rvc1txcalGA=,iv:MEh3utdu0yWoVwLkPwjr/kxdK4Eej0BYeVGpMk3+9jo=,tag:dpnuUmLZFulLdA9NINYf2g==,type:str]
+    lastmodified: "2024-09-30T08:44:41Z"
+    mac: ENC[AES256_GCM,data:O0KAkJzjA1Gr2036V5yNZCs7Fh8sz5CjkDq44YV/Gtv3N8YtTSFhA5O9wUYeWnCfflHOIcE9XXO+0htnivY5XalTXLZZOxlj7iUpvhIT3UQe5rszxrFe/2kIHn56I/fi0EpT7Gp98aKxcyxPCfPKiexxlpASiSXY+iDZJS3gUeE=,iv:/Hafwsy3fi7CFqNbuSQ40RwlkFTv8mDrYBK8q9DUGg4=,tag:Fpd1FU5TyDeoZAg8I7og9g==,type:str]
     pgp: []
     unencrypted_suffix: _unencrypted
     version: 3.8.1
diff --git a/modules/desktop/apps/thunderbird.nix b/modules/desktop/apps/thunderbird.nix
@@ -92,6 +92,11 @@ with lib.my.utils; let
     // optionalAttrs (hasAttrByPath ["imap"] account) {
       "mail.server.server_${id}.directory" = "${thunderbirdProfilesPath}/${profile}/ImapMail/${id}";
       "mail.server.server_${id}.directory-rel" = "[ProfD]ImapMail/${id}";
+      "mail.server.server_${id}.authMethod" = mkLiteral (
+        if (hasAttrByPath ["imap" "oauth"] account)
+        then 10
+        else 3
+      );
       "mail.server.server_${id}.hostname" = mkSecretPlaceholder config [base account.name "imap" "host"];
       "mail.server.server_${id}.login_at_startup" = mkLiteral true;
       "mail.server.server_${id}.name" =
@@ -123,7 +128,11 @@ with lib.my.utils; let
     }
     // optionalAttrs (hasAttrByPath ["smtp"] account) {
       "mail.identity.id_${id}.smtpServer" = "smtp_${id}";
-      "mail.smtpserver.smtp_${id}.authMethod" = mkLiteral 3;
+      "mail.smtpserver.smtp_${id}.authMethod" = mkLiteral (
+        if (hasAttrByPath ["smtp" "oauth"] account)
+        then 10
+        else 3
+      );
       "mail.smtpserver.smtp_${id}.hostname" = mkSecretPlaceholder config [base account.name "smtp" "host"];
       "mail.smtpserver.smtp_${id}.port" = mkLiteral (
         if (hasAttrByPath ["smtp" "port"] account)