Further work

2017-09-20 17:22:51 +02:00
parent 0b087ee08c
commit bf2afd8739
22 changed files with 623 additions and 206 deletions
--- a/src/main/resources/application.yaml
+++ b/src/main/resources/application.yaml
@@ -63,18 +63,25 @@ forward:
    - "https://vector.im"

 threepid:
-  email:
-    connector:
-      active: 'smtp'
-      provider:
-        smtp:
-          port: 587
-          tls: 1
-
-invite:
  medium:
    email:
-      template: 'classpath:email/invite-template.eml'
+      identity:
+        from: ''
+        name: ''
+      connector: 'smtp'
+      generator: 'template'
+      connectors:
+        smtp:
+          host: ''
+          port: 587
+          tls: 1
+          login: ''
+          password: ''
+      generators:
+        template:
+          invite: 'classpath:email/invite-template.eml'
+          session:
+            validation: 'classpath:email/validate-template.eml'

 storage:
  backend: 'sqlite'
--- a/src/main/resources/email/validate-template.eml
+++ b/src/main/resources/email/validate-template.eml
@@ -0,0 +1,66 @@
+Subject: Your Matrix Validation Token
+MIME-Version: 1.0
+Content-Type: multipart/alternative; 
+	boundary="7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ"
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
+Content-Type: text/plain; charset=UTF-8
+Content-Disposition: inline
+
+Hello,
+
+We have received a request to link this email address with a Matrix account.
+If this was you who made this request, you may use the following link to complete the verification of your email address:
+
+  %VALIDATION_LINK%
+
+If your client requires a code, the code is %VALIDATION_TOKEN%
+
+If you aren't aware of making such a request, please disregard this email.
+
+Regards,
+%DOMAIN_PRETTY% Admins
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
+Content-Type: text/html; charset=UTF-8
+Content-Disposition: inline
+
+<!DOCTYPE html>
+<html>
+<head>
+<meta charset="utf-8" />
+<title></title>
+<style>
+body {
+    font-family: "Myriad Pro", "Myriad", Helvetica, Arial, sans-serif;
+    font-size: 12pt;
+    margin: 0px;
+}
+</style>
+</head>
+<body>
+<p>Hello,</p>
+
+<p>We have received a request to link this email address with a Matrix account.
+   If this was you who made this request, you may use the following link to
+   complete the verification of your email address:</p>
+
+<p><a href=%VALIDATION_LINK%">Complete email verification</a></p>
+
+<p>...or copy this link into your web browser:</p>
+
+<p>%VALIDATION_LINK%</p>
+
+<p>If your client requires a code, the code is %VALIDATION_TOKEN%</p>
+
+<p>If you aren't aware of making such a request, please disregard this
+email.</p>
+
+<br>
+<p>Regards,<br>
+   %DOMAIN_PRETTY% Admins</p>
+
+</body>
+</html>
+
+--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ--