jjkiers/cloudron-box
1
0
Fork 0
Code Issues Pull Requests 1 Actions Packages Projects Releases Wiki Activity

move dashboard setting into dashboard.js

Browse Source
This commit is contained in:
Girish Ramakrishnan
2023-08-11 19:41:05 +05:30
parent 27ce8f9351
commit eee49a8291
25 changed files with 157 additions and 156 deletions
Download Patch File Download Diff File Expand all files Collapse all files
src/mailer.js
+12 -7
View File
@@ -18,13 +18,13 @@ exports = module.exports = {
const assert = require('assert'),
BoxError = require('./boxerror.js'),
branding = require('./branding.js'),
dashboard = require('./dashboard.js'),
debug = require('debug')('box:mailer'),
ejs = require('ejs'),
mailServer = require('./mailserver.js'),
nodemailer = require('nodemailer'),
path = require('path'),
safe = require('safetydance'),
settings = require('./settings.js'),
support = require('./support.js'),
translation = require('./translation.js'),
util = require('util');
@@ -35,10 +35,11 @@ const MAIL_TEMPLATES_DIR = path.join(__dirname, 'mail_templates');
async function getMailConfig() {
const cloudronName = await branding.getCloudronName();
const supportConfig = await support.getConfig();
const { domain:dashboardDomain } = await dashboard.getLocation();
return {
cloudronName,
notificationFrom: `"${cloudronName}" <no-reply@${settings.dashboardDomain()}>`,
notificationFrom: `"${cloudronName}" <no-reply@${dashboardDomain}>`,
supportEmail: supportConfig.email
};
}
@@ -51,13 +52,14 @@ async function sendMail(mailOptions) {
return;
}
const { domain:dashboardDomain } = await dashboard.getLocation();
const data = await mailServer.getMailAuth();
const transport = nodemailer.createTransport({
host: data.ip,
port: data.port,
auth: {
user: mailOptions.authUser || `no-reply@${settings.dashboardDomain()}`,
user: mailOptions.authUser || `no-reply@${dashboardDomain}`,
pass: data.relayToken
}
});
@@ -98,14 +100,15 @@ async function sendInvite(user, invitor, email, inviteLink) {
const mailConfig = await getMailConfig();
const translationAssets = await translation.getTranslations();
const { fqdn:dashboardFqdn } = await dashboard.getLocation();
const templateData = {
user: user.displayName || user.username || user.email,
webadminUrl: `https://${settings.dashboardFqdn()}`,
webadminUrl: `https://${dashboardFqdn}`,
inviteLink: inviteLink,
invitor: invitor ? invitor.email : null,
cloudronName: mailConfig.cloudronName,
cloudronAvatarUrl: `https://${settings.dashboardFqdn()}/api/v1/cloudron/avatar`
cloudronAvatarUrl: `https://${dashboardFqdn}/api/v1/cloudron/avatar`
};
const mailOptions = {
@@ -132,6 +135,7 @@ async function sendNewLoginLocation(user, loginLocation) {
const mailConfig = await getMailConfig();
const translationAssets = await translation.getTranslations();
const { fqdn:dashboardFqdn } = await dashboard.getLocation();
const templateData = {
user: user.displayName || user.username || user.email,
@@ -140,7 +144,7 @@ async function sendNewLoginLocation(user, loginLocation) {
country,
city,
cloudronName: mailConfig.cloudronName,
cloudronAvatarUrl: `https://${settings.dashboardFqdn()}/api/v1/cloudron/avatar`
cloudronAvatarUrl: `https://${dashboardFqdn}/api/v1/cloudron/avatar`
};
const mailOptions = {
@@ -161,12 +165,13 @@ async function passwordReset(user, email, resetLink) {
const mailConfig = await getMailConfig();
const translationAssets = await translation.getTranslations();
const { fqdn:dashboardFqdn } = await dashboard.getLocation();
const templateData = {
user: user.displayName || user.username || user.email,
resetLink: resetLink,
cloudronName: mailConfig.cloudronName,
cloudronAvatarUrl: `https://${settings.dashboardFqdn()}/api/v1/cloudron/avatar`
cloudronAvatarUrl: `https://${dashboardFqdn}/api/v1/cloudron/avatar`
};
const mailOptions = {