john/deighton-ar
1
0
Fork 0
Code Issues Pull Requests Projects Releases Wiki Activity

Update models more

Browse Source
This commit is contained in:
John Lyon-Smith
2018-03-22 10:18:34 -07:00
parent e15c38c0bc
commit 82fbd88dab
16 changed files with 7856 additions and 3925 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
server/config/default.json5
View File

@@ -11,11 +11,11 @@
uploadTimout: 3600,
},
email: {
senderEmail: 'support@kingstonsoftware.solutions',
senderEmail: 'support@kss.us.com',
maxEmailTokenAgeInHours: 36,
maxPasswordTokenAgeInHours: 3,
sendEmailDelayInSeconds: 3,
supportEmail: 'support@kingstonsoftware.solutions',
supportEmail: 'support@kss.us.com',
sendEmail: true
}
}

4
server/config/templates/welcome.txt
View File

@@ -1,6 +1,6 @@
Hello {{recipientFullName}},
Thank you for joining the Deighton AR system!
Welcome to the Deighton AR training system!
Please paste this link into your browser to go to the Deighton AR system and set your login password:
@@ -8,7 +8,7 @@ Please paste this link into your browser to go to the Deighton AR system and set
This invitation expires in {{confirmEmailLinkExpirationHours}} hours. If it has expired or you have any problems creating a password or logging into our system, please contact {{supportEmail}}.
Thank you and we look forward to working with you!
Look forward to seeing you in the training scenario!
Sincerely,

6
server/src/email/EmailHandlers.js
View File

@@ -51,7 +51,9 @@ export class EmailHandlers {
}
// configure AWS SDK
aws.config = new aws.Config(config.get('awsConfig'));
const awsConfig = config.get('awsConfig')
aws.config = new aws.Config(awsConfig)
// create Nodemailer SES transporter
let transporter = nodemailer.createTransport({
@@ -60,7 +62,7 @@ export class EmailHandlers {
})
});
const senderEmail = config.get('senderEmail')
const senderEmail = config.get('email.senderEmail')
const template = this.templates[templateName]
if (!template) {

4
server/src/message-service/MS.js
View File

@@ -13,8 +13,8 @@ export class MS {
async connect(amqpUri) {
this.connection = await amqp.connect(amqpUri)
this.connection.on('error', () => {
this.log.error(`RabbitMQ has gone, shutting down service`)
this.connection.on('error', (err) => {
this.log.error(`${err}. Shutting down service.`)
process.exit(-1)
})