admin/raven
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Browse Source
This commit is contained in:
John Cardinal
2020-11-19 18:06:08 +00:00
parent d991c0abad
commit 54dc8d863b
5 changed files with 18 additions and 11 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
server/AyaNova/biz/UserBiz.cs
View File

@@ -303,9 +303,9 @@ namespace AyaNova.Biz
dbObject.Password = Hasher.hash(dbObject.Salt, newPassword);
//remove reseet code and date so it can't be used again
dbObject.PasswordResetCode=null;
dbObject.DlKeyExpire=null;
dbObject.PasswordResetCode = null;
dbObject.DlKeyExpire = null;
await ct.SaveChangesAsync();
//Log modification and save context
@@ -341,7 +341,7 @@ namespace AyaNova.Biz
var ResetCode = Hasher.GetRandomAlphanumericString(32);
dbObject.PasswordResetCode = ResetCode;
dbObject.PasswordResetCodeExpire = DateTime.UtcNow.AddHours(67);//This is enough time to issue a reset code on a friday at 5pm and use it Monday before noon
dbObject.PasswordResetCodeExpire = DateTime.UtcNow.AddHours(48);//This is not enough time to issue a reset code on a friday at 5pm and use it Monday before noon, but it is more understandable and clear
await ct.SaveChangesAsync();
//send message
@@ -357,9 +357,11 @@ namespace AyaNova.Biz
var Title = TransDict["PasswordResetMessageTitle"];
var MessageBody = TransDict["PasswordResetMessageBody"];
//Hello {user_name},\n\nYour online account for service is available to you after you set your password.\nYou can use the following link for the next 48 hours to set your password.\n\nSet your password: {action_link}\n\nIf you did not request an account or password reset, please ignore this email.\n\nThanks,\n{registered_to}"
MessageBody = MessageBody.Replace("{user_name}", dbObject.Name).Replace("{action_url}", $"{ServerUrl}/reset?{ResetCode}").Replace("{registered_to}", AyaNova.Core.License.ActiveKey.RegisteredTo);
IMailer m = AyaNova.Util.ServiceProviderProvider.Mailer;
await m.SendEmailAsync(dbObject.UserOptions.EmailAddress, Title, $"{MessageBody}{ServerUrl}/reset?{ResetCode}", ServerGlobalOpsSettingsCache.Notify);
await m.SendEmailAsync(dbObject.UserOptions.EmailAddress, Title, MessageBody, ServerGlobalOpsSettingsCache.Notify);
//Log modification and save context
await EventLogProcessor.LogEventToDatabaseAsync(new Event(UserId, dbObject.Id, BizType, AyaEvent.Modified, "SendPasswordResetCode"), ct);

4
server/AyaNova/resource/de.json
View File

@@ -1951,5 +1951,7 @@
"GeoCapture": "Auf aktuellen Standort einstellen",
"GeoView": "Ansicht auf Karte",
"MapUrlTemplate": "Karten-URL-Vorlage",
"Contacts": "Kontakte"
"Contacts": "Kontakte",
"PasswordResetMessageTitle": "Ihr Online-Konto ist fertig",
"PasswordResetMessageBody": "Hallo {user_name},\n\nIhr Online-Konto für den Dienst steht Ihnen nach dem Festlegen Ihres Kennworts zur Verfügung.\nSie können den Kennwort für die nächsten 48 Stunden über den folgenden Link festlegen.\n\nStellen Sie Ihr Kennwort ein: {action_link}\n\nWenn Sie kein Zurücksetzen des Kontos oder Kennworts angefordert haben, ignorieren Sie diese E-Mail.\n\nDanke,\n{registered_to}"
}

5
server/AyaNova/resource/en.json
View File

@@ -1952,7 +1952,6 @@
"GeoView": "View on map",
"MapUrlTemplate": "Map URL template",
"Contacts": "Contacts",
"PasswordResetMessageTitle": "PasswordResetMessageTitle",
"PasswordResetMessageBody":"PasswordResetMessageBody"
"PasswordResetMessageTitle": "Your online account is ready",
"PasswordResetMessageBody": "Hello {user_name},\n\nYour online account for service is available to you after you set your password.\nYou can use the following link for the next 48 hours to set your password.\n\nSet your password: {action_link}\n\nIf you did not request an account or password reset, please ignore this email.\n\nThanks,\n{registered_to}"
}

4
server/AyaNova/resource/es.json
View File

@@ -1951,5 +1951,7 @@
"GeoCapture": "Establecer en la ubicación actual",
"GeoView": "Ver en el mapa",
"MapUrlTemplate": "Plantilla de URL de mapa",
"Contacts": "Contactos"
"Contacts": "Contactos",
"PasswordResetMessageTitle": "Tu cuenta en línea está lista",
"PasswordResetMessageBody": "Hola, {user_name}:\n\nTu cuenta en línea para el servicio estará disponible después de que establezcas tu contraseña.\nPuedes usar el siguiente enlace durante las próximas 48 horas para establecer tu contraseña.\n\nConfigura tu contraseña: {action_link}\n\nSi no solicitó un restablecimiento de cuenta o contraseña, ignore este correo electrónico.\n\nGracias,\n{registered_to}"
}

4
server/AyaNova/resource/fr.json
View File

@@ -1951,5 +1951,7 @@
"GeoCapture": "Défini sur l'emplacement actuel",
"GeoView": "Voir sur la carte",
"MapUrlTemplate": "Modèle d'URL de carte",
"Contacts": "Contacts"
"Contacts": "Contacts",
"PasswordResetMessageTitle": "Votre compte en ligne est prêt",
"PasswordResetMessageBody": "Bonjour {user_name},\n\nVotre compte de service en ligne est disponible une fois que vous avez défini votre mot de passe.\nVous pouvez utiliser le lien suivant pendant les 48 prochaines heures pour définir votre mot de passe.\n\nDéfinissez votre mot de passe: {action_link}\n\nSi vous n'avez pas demandé de réinitialisation de compte ou de mot de passe, veuillez ignorer cet e-mail.\n\nMerci,\n{registered_to}"
}