fraport/fradrive
3
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch '718-hinweis-auf-ablauffrist-in-e-mail-zum-passwort-zurucksetzen' into 'master'

Browse Source 
Resolve "Hinweis auf Ablauffrist in E-Mail zum Passwort zurücksetzen"

Closes #718

See merge request uni2work/uni2work!48
This commit is contained in:
Sarah Vaupel 2021-08-20 13:58:10 +02:00
commit 6150daa6b4
5 changed files with 5 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
messages/uniworx/categories/jobs_handler/de-de-formal.msg
View File

@ -17,3 +17,4 @@ InvitationAcceptDecline: Einladung annehmen/ablehnen
InvitationFromTip displayName@Text: Sie erhalten diese Einladung, weil #{displayName} ihren Versand in Uni2work ausgelöst hat.
InvitationFromTipAnonymous: Sie erhalten diese Einladung, weil ein nicht eingeloggter Benutzer/eine nichteingeloggte Benutzerin ihren Versand in Uni2work ausgelöst hat.
InvitationUniWorXTip: Uni2work ist ein webbasiertes Lehrverwaltungssystem der LMU München.
LinkActiveUntil time@Text: Der Link ist nur bis #{time} aktiv!

1
messages/uniworx/categories/jobs_handler/en-eu.msg
View File

@ -17,3 +17,4 @@ InvitationAcceptDecline: Accept/Decline invitation
InvitationFromTip displayName: You are receiving this invitation because #{displayName} has caused it to be sent from within Uni2work.
InvitationFromTipAnonymous: You are receiving this invitiation because an user who didn't log in has caused it to be send from within Uni2work.
InvitationUniWorXTip: Uni2work is a web based teaching management system at LMU Munich.
LinkActiveUntil time@Text: The link is only active until #{time}!

1
src/Foundation/I18n.hs
View File

@ -426,7 +426,6 @@ instance ToMessage Natural where
toMessage = tshow
instance ToMessage Word64 where
toMessage = tshow
instance HasResolution a => ToMessage (Fixed a) where
toMessage = toMessage . showFixed True

4
src/Jobs/Handler/SendPasswordReset.hs
View File

@ -34,7 +34,7 @@ dispatchJobSendPasswordReset jRecipient = JobHandlerException . userMailT jRecip
let resetBearer = resetBearer'
& bearerRestrict (UserPasswordR cID) (decodeUtf8 . Base64.encode . BA.convert $ computeUserAuthenticationDigest userAuthentication)
encodedBearer <- encodeBearer resetBearer
resetUrl <- toTextUrl (UserPasswordR cID, [(toPathPiece GetBearer, toPathPiece encodedBearer)])
activeTime <- formatTimeMail SelFormatDateTime tomorrowEndOfDay
addHtmlMarkdownAlternatives ($(ihamletFile "templates/mail/passwordReset.hamlet") :: HtmlUrlI18n (SomeMessage UniWorX) (Route UniWorX))

1
templates/mail/passwordReset.hamlet
View File

@ -13,3 +13,4 @@ $newline never
<h1>
<a href=#{resetUrl}>
_{SomeMessage MsgResetPassword}
_{SomeMessage $ MsgLinkActiveUntil activeTime}