smarthut/backend
2
0
Fork 0
Code Issues Pull requests Projects Releases Wiki Activity

Merge branch 'userstory3fix-fil-new-new' into 'dev'

Browse source 
Wip

See merge request sa4-2020/the-sanmarinoes/backend!196
This commit is contained in:
Claudio Maggioni 2020-05-27 00:07:12 +02:00
commit a5bbe87e4d
3 changed files with 6 additions and 2 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

4
src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java
View file

@ -45,6 +45,10 @@ public class ConfirmationToken {
resetPassword = false; resetPassword = false;
} }
public ConfirmationToken() {
this((User) null);
}
@Override @Override
public boolean equals(Object o) { public boolean equals(Object o) {
if (this == o) return true; if (this == o) return true;

2
src/main/resources/application-dev.properties
View file

@ -33,4 +33,4 @@ email.resetpasswordSubject=SmartHut.sm password reset
email.resetpassword=To reset your password, please click here: email.resetpassword=To reset your password, please click here:
email.resetpasswordPath=http://localhost:3000/password-reset?token= email.resetpasswordPath=http://localhost:3000/password-reset?token=
email.resetPasswordRedirect=http://localhost:3000/conf-reset-pass email.resetPasswordRedirect=http://localhost:3000/conf-reset-pass
camera.videoUrl="/security_camera_videos/security_camera_1.mp4" camera.videoUrl=/security_camera_videos/security_camera_1.mp4

2
src/main/resources/application-prod.properties
View file

@ -40,4 +40,4 @@ email.resetpasswordSubject=SmartHut.sm password reset
email.resetpassword=To reset your password, please click here: email.resetpassword=To reset your password, please click here:
email.resetpasswordPath=${FRONTEND_URL}/password-reset?token= email.resetpasswordPath=${FRONTEND_URL}/password-reset?token=
email.resetPasswordRedirect=${FRONTEND_URL}/conf-reset-pass email.resetPasswordRedirect=${FRONTEND_URL}/conf-reset-pass
camera.videoUrl="/security_camera_videos/security_camera_1.mp4" camera.videoUrl=/security_camera_videos/security_camera_1.mp4