diff --git a/src/main/java/com/github/cato447/AbizeitungVotingSystem/AbizeitungVotingSystemApplication.java b/src/main/java/com/github/cato447/AbizeitungVotingSystem/AbizeitungVotingSystemApplication.java index f6d55d4..25336d1 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/AbizeitungVotingSystemApplication.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/AbizeitungVotingSystemApplication.java @@ -1,7 +1,9 @@ package com.github.cato447.AbizeitungVotingSystem; import org.springframework.boot.SpringApplication; +import org.springframework.boot.autoconfigure.EnableAutoConfiguration; import org.springframework.boot.autoconfigure.SpringBootApplication; +import org.springframework.boot.autoconfigure.web.servlet.error.ErrorMvcAutoConfiguration; import org.springframework.data.jpa.repository.config.EnableJpaRepositories; @SpringBootApplication diff --git a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java index 67220c4..34bfa35 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/controller/VotingController.java @@ -108,8 +108,13 @@ public class VotingController { LOGGER.warn(name + " has already submitted its candidates"); return "errors/alreadysubmittedcandidates.html"; } else { - AuthCode authCode = tableAction.generateToken(name, RandomNumber.getRandomNumberString(), authCodesRepository); - sendSimpleMessage(name, "Code zur Authentifizierung", "Dein Code lautet: " + authCode.getCode()); + if (authCodesRepository.findByName(name) == null) { + AuthCode authCode = tableAction.generateToken(name, RandomNumber.getRandomNumberString(), authCodesRepository); + sendSimpleMessage(name, "Code zur Authentifizierung", "Dein Code lautet: " + authCode.getCode()); + } else if (authCodesRepository.findByName(name) != null && authCodesRepository.findByName(name).isExpired()){ + AuthCode authCode = tableAction.generateToken(name, RandomNumber.getRandomNumberString(), authCodesRepository); + sendSimpleMessage(name, "Code zur Authentifizierung", "Dein Code lautet: " + authCode.getCode()); + } model.addAttribute("name", name); model.addAttribute("codeExpired", false); model.addAttribute("codeFalse", false); diff --git a/src/main/java/com/github/cato447/AbizeitungVotingSystem/entities/AuthCode.java b/src/main/java/com/github/cato447/AbizeitungVotingSystem/entities/AuthCode.java index 62f2742..84ab6ce 100644 --- a/src/main/java/com/github/cato447/AbizeitungVotingSystem/entities/AuthCode.java +++ b/src/main/java/com/github/cato447/AbizeitungVotingSystem/entities/AuthCode.java @@ -37,6 +37,10 @@ public class AuthCode { return time; } + public boolean isExpired(){ + return System.currentTimeMillis() >= (time + 600*1000); + } + public void setTime(long time) { this.time = time; } diff --git a/src/main/resources/static/styles/authenticate.css b/src/main/resources/static/styles/authenticate.css index 46f1fd3..d2178b4 100644 --- a/src/main/resources/static/styles/authenticate.css +++ b/src/main/resources/static/styles/authenticate.css @@ -17,6 +17,7 @@ body { padding: 20px; width: 100%; overflow: auto; + transform: scale(); } h1 { diff --git a/src/main/resources/templates/authenticate.html b/src/main/resources/templates/authenticate.html index 9812ff0..d20b486 100644 --- a/src/main/resources/templates/authenticate.html +++ b/src/main/resources/templates/authenticate.html @@ -10,6 +10,13 @@ + +

Bitte gebe den Authentifizierungscode ein

diff --git a/src/main/resources/templates/error.html b/src/main/resources/templates/error.html new file mode 100644 index 0000000..4e05b4b --- /dev/null +++ b/src/main/resources/templates/error.html @@ -0,0 +1,10 @@ + + + + +

Something went wrong!

+

Our Engineers are on it

+ Go Home + + + \ No newline at end of file