feat: add date and time into device login email (#30986)

pull/30975/head^2
Rafael Tapia 2 years ago committed by GitHub
parent 88833b24e9
commit 7ed7cb41ce
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      .changeset/old-buckets-camp.md
  2. 4
      apps/meteor/ee/server/lib/deviceManagement/session.ts
  3. 2
      apps/meteor/ee/server/lib/deviceManagement/startup.ts

@ -0,0 +1,7 @@
---
"@rocket.chat/meteor": patch
---
Add the date and time to the email sent when a new device logs in

@ -2,6 +2,7 @@ import type { ISocketConnection } from '@rocket.chat/core-typings';
import { Users } from '@rocket.chat/models';
import { Accounts } from 'meteor/accounts-base';
import { Meteor } from 'meteor/meteor';
import moment from 'moment';
import { UAParser } from 'ua-parser-js';
import * as Mailer from '../../../../app/mailer/server/api';
@ -58,6 +59,8 @@ export const listenSessionLogin = () => {
return;
}
const dateFormat = settings.get('Message_TimeAndDateFormat');
const {
name,
username,
@ -75,6 +78,7 @@ export const listenSessionLogin = () => {
}`,
ipInfo: connection.clientAddress,
userAgent: '',
date: moment().format(String(dateFormat)),
};
switch (device.type) {

@ -18,7 +18,7 @@ export const createEmailTemplates = async (): Promise<void> => {
});
await this.add(
'Device_Management_Email_Body',
'<h2 class="rc-color">{Login_Detected}</h2><p><strong>[name] ([username]) {Logged_In_Via}</strong></p><p><strong>{Device_Management_Client}:</strong> [browserInfo]<br><strong>{Device_Management_OS}:</strong> [osInfo]<br><strong>{Device_Management_Device}:</strong> [deviceInfo]<br><strong>{Device_Management_IP}:</strong>[ipInfo]</p><p><small>[userAgent]</small></p><a class="btn" href="[Site_URL]">{Access_Your_Account}</a><p>{Or_Copy_And_Paste_This_URL_Into_A_Tab_Of_Your_Browser}<br><a href="[Site_URL]">[SITE_URL]</a></p><p>{Thank_You_For_Choosing_RocketChat}</p>',
'<h2 class="rc-color">{Login_Detected}</h2><p><strong>[name] ([username]) {Logged_In_Via}</strong></p><p><strong>{Device_Management_Client}:</strong> [browserInfo]<br><strong>{Device_Management_OS}:</strong> [osInfo]<br><strong>{Device_Management_Device}:</strong> [deviceInfo]<br><strong>{Device_Management_IP}:</strong>[ipInfo]<br><strong>{Date}:</strong> [date]</p><p><small>[userAgent]</small></p><a class="btn" href="[Site_URL]">{Access_Your_Account}</a><p>{Or_Copy_And_Paste_This_URL_Into_A_Tab_Of_Your_Browser}<br><a href="[Site_URL]">[SITE_URL]</a></p><p>{Thank_You_For_Choosing_RocketChat}</p>',
{
type: 'code',
code: 'text/html',

Loading…
Cancel
Save