diff --git a/frontend/src/ketr-photos/ketr-photos.html b/frontend/src/ketr-photos/ketr-photos.html index 44ba971..6d78ac3 100755 --- a/frontend/src/ketr-photos/ketr-photos.html +++ b/frontend/src/ketr-photos/ketr-photos.html @@ -437,8 +437,8 @@
Create an account

To have your account activated, tell me who you know in the 'who do you know?' field. You will receive - an email with an authentication token; click the link in the email, and you're account will be verified. Once - verified, I can grant you access to the system. + an email with a verification link. Check your email and click the link to verify your email address.

+

Once verified, I can grant you access to the system.

Thanks,
James

diff --git a/server/app.js b/server/app.js index 68f37ee..997f025 100755 --- a/server/app.js +++ b/server/app.js @@ -191,7 +191,7 @@ app.use(basePath, function(req, res, next) { return new Promise(function (resolve, reject) { let attempts = 10; - + function send(envelope) { /* Rate limit to ten per second */ transporter.sendMail(envelope, function (error, info) { @@ -199,7 +199,7 @@ app.use(basePath, function(req, res, next) { console.log('Message sent: ' + info.response); return resolve(); } - + if (attempts == 0) { console.log("Error sending email: ", error) return reject(error); diff --git a/server/routes/users.js b/server/routes/users.js index 5b2c8d0..5257699 100755 --- a/server/routes/users.js +++ b/server/routes/users.js @@ -40,25 +40,26 @@ router.get("/", function(req, res/*, next*/) { const templates = { "html": [ - "

Dear {{username}},

", + "

Hello {{username}},

", "", - "

Welcome to ketrenos.com. Before you can access the system, you must authenticate", - "your email address ({{mail}}).

", + "

Welcome to ketrenos.com. You are almost done creating your account. ", + "Before you can access the system, you must verify your email address.

", "", - "

To do so, simply access this link, which contains your authentication ", - "token: {{secret}}

", + "

To do so, simply access this link:

", + "

VERIFY {{mail}} ADDRESS

", "", "

Sincerely,

", "

James

" ].join("\n"), "text": [ - "Dear {{username}},", + "Hello {{username}},", "", - "Welcome to ketrenos.com. Before you can access the system, you must authenticate", - "your email address ({{mail}}).", + "Welcome to ketrenos.com. You are almost done creating your account. ", + "Before you can access the system, you must verify your email address.", "", - "To do so, simply access this link, which contains your authentication ", - "token: {{url}}{{secret}}", + "To do so, simply access this link:", + "", + "{{url}}{{secret}}", "", "Sincerely,", "James"