From 912511170819616fad4498237854191fb16053ee Mon Sep 17 00:00:00 2001 From: "Claudio Maggioni (maggicl)" Date: Wed, 27 May 2020 00:01:55 +0200 Subject: [PATCH] Wip --- .../sa4/sanmarinoes/smarthut/models/ConfirmationToken.java | 4 ++++ src/main/resources/application-dev.properties | 2 +- src/main/resources/application-prod.properties | 2 +- 3 files changed, 6 insertions(+), 2 deletions(-) diff --git a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java index ca250bc..74028cb 100644 --- a/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java +++ b/src/main/java/ch/usi/inf/sa4/sanmarinoes/smarthut/models/ConfirmationToken.java @@ -45,6 +45,10 @@ public class ConfirmationToken { resetPassword = false; } + public ConfirmationToken() { + this((User) null); + } + @Override public boolean equals(Object o) { if (this == o) return true; diff --git a/src/main/resources/application-dev.properties b/src/main/resources/application-dev.properties index 9f460b4..81e2a02 100644 --- a/src/main/resources/application-dev.properties +++ b/src/main/resources/application-dev.properties @@ -33,4 +33,4 @@ email.resetpasswordSubject=SmartHut.sm password reset email.resetpassword=To reset your password, please click here: email.resetpasswordPath=http://localhost:3000/password-reset?token= email.resetPasswordRedirect=http://localhost:3000/conf-reset-pass -camera.videoUrl="/security_camera_videos/security_camera_1.mp4" \ No newline at end of file +camera.videoUrl=/security_camera_videos/security_camera_1.mp4 \ No newline at end of file diff --git a/src/main/resources/application-prod.properties b/src/main/resources/application-prod.properties index d607427..570d997 100644 --- a/src/main/resources/application-prod.properties +++ b/src/main/resources/application-prod.properties @@ -40,4 +40,4 @@ email.resetpasswordSubject=SmartHut.sm password reset email.resetpassword=To reset your password, please click here: email.resetpasswordPath=${FRONTEND_URL}/password-reset?token= email.resetPasswordRedirect=${FRONTEND_URL}/conf-reset-pass -camera.videoUrl="/security_camera_videos/security_camera_1.mp4" \ No newline at end of file +camera.videoUrl=/security_camera_videos/security_camera_1.mp4 \ No newline at end of file