Merge branch 'reset-key' into 'master'

Add placeholder in reset mail for reset key

See merge request !135

src/main/java/de/thm/arsnova/service/UserServiceImpl.java

@@ -585,7 +585,13 @@ public class UserServiceImpl extends DefaultEntityServiceImpl<UserProfile> imple
 			resetPasswordPath,
 			UriUtils.encodeQueryParam(userProfile.getLoginId(), "UTF-8"), account.getPasswordResetKey());
 
-		sendEmail(userProfile, resetPasswordMailSubject, MessageFormat.format(resetPasswordMailBody, resetPasswordUrl));
+		String mailBody = MessageFormat.format(
+				resetPasswordMailBody,
+				resetPasswordUrl,
+				account.getPasswordResetKey()
+		);
+
+		sendEmail(userProfile, resetPasswordMailSubject, MessageFormat.format(mailBody, resetPasswordUrl));
 	}
 
 	@Override

src/main/resources/arsnova.properties.example

@@ -116,7 +116,8 @@ security.user-db.registration-mail.body=Welcome to ARSnova!\n\nPlease confirm \
     Afterwards, you can log into ARSnova with your e-mail address and password.
 security.user-db.reset-password-mail.subject=ARSnova Password Reset
 security.user-db.reset-password-mail.body=You requested to reset your \
-    password.\n\nPlease follow the link below to set a new password:\n{0}
+    password.\n\nPlease follow the link below to set a new password:\n{0}\n\n\
+    Your reset key is:\n{1}
 
 # LDAP authentication
 #

src/test/resources/arsnova.test.properties.example

@@ -116,7 +116,8 @@ security.user-db.registration-mail.body=Welcome to ARSnova!\n\nPlease confirm \
     Afterwards, you can log into ARSnova with your e-mail address and password.
 security.user-db.reset-password-mail.subject=ARSnova Password Reset
 security.user-db.reset-password-mail.body=You requested to reset your \
-    password.\n\nPlease follow the link below to set a new password:\n{0}
+    password.\n\nPlease follow the link below to set a new password:\n{0}\n\n\
+    Your reset key is:\n{1}
 
 # LDAP authentication
 #