cqrenet/mxids
3
0
Fork 0
Code Pull Requests 10 Actions Releases Activity

Polishing, prepare for proxying 3PID sessions

Browse Source
This commit is contained in:
Maxime Dor
2017-09-21 07:26:33 +02:00
parent ace6019197
commit a4b4a3f24c
13 changed files with 217 additions and 119 deletions
Download Patch File Download Diff File Expand all files Collapse all files

8
src/main/resources/application.yaml
View File

@@ -81,17 +81,19 @@ threepid:
template:
invite: 'classpath:email/invite-template.eml'
session:
validation: 'classpath:email/validate-template.eml'
validation:
local: 'classpath:email/validate-local-template.eml'
remote: 'classpath:email/validate-remote-template.eml'
session.policy.validation:
enabled: true
forLocal:
enabled: true
toLocal: true
toLocal: true # This should not be changed unless you know exactly the implications!
toRemote: true
forRemote:
enabled: true
toLocal: true # This should not be changed unless you know exactly the implications!
toLocal: true
toRemote: true
storage:

91
src/main/resources/email/validate-local-template.eml Normal file
View File

@@ -0,0 +1,91 @@
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 there!
We have received a request to link this email address with your Matrix account.
If it was really you who made this request, you can click on the following link to
complete the verification of your email address:
%VALIDATION_LINK%
If you didn't make this request, you can safely disregard this email.
Thanks!
%DOMAIN_PRETTY% Admins
--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ
Content-Type: multipart/related;
boundary="M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR";
type="text/html"
--M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR
Content-Type: text/html; charset=UTF-8
Content-Disposition: inline
<!doctype html>
<html lang="en">
<head>
<style type="text/css">
body {
margin: 0px;
}
pre, code {
word-break: break-word;
white-space: pre-wrap;
}
#page {
font-family: 'Open Sans', Helvetica, Arial, Sans-Serif;
font-color: #454545;
font-size: 12pt;
width: 100%%;
padding: 20px;
}
#inner {
width: 640px;
}
.notif_link a, .footer a {
color: #76CFA6 ! important;
}
</style>
</head>
<body>
<table id="page">
<tr>
<td></td>
<td id="inner">
<p>Hello there!</p>
<p>We have received a request to link this email address with your Matrix account.</p>
<p>If it was really you who made this request, you can click on the following link to
complete the verification of your email address:</p>
<p><a href="%VALIDATION_LINK%">Complete email verification</a></p>
<p>If you didn't make this request, you can safely disregard this email.</p>
<p>Thanks!</p>
<p>%DOMAIN_PRETTY% Admins</p>
</td>
<td></td>
</tr>
</table>
</body>
</html>
--M3yzHl5YZehm9v4bAM8sKEdcOoVnRnKR--
--7REaIwWQCioQ6NaBlAQlg8ztbUQj6PKJ--

66
src/main/resources/email/validate-template.eml
View File

@@ -1,66 +0,0 @@
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--