From 4296661315443f35845e6511745c2f77c68eefdd Mon Sep 17 00:00:00 2001
From: matildvf <matildvf@stud.ntnu.no>
Date: Mon, 6 Apr 2020 17:01:06 +0200
Subject: [PATCH] No repeat password on signinscene
---
src/App/Scenes/SignInScene.java | 39 +++++++++++++--------------------
1 file changed, 15 insertions(+), 24 deletions(-)
diff --git a/src/App/Scenes/SignInScene.java b/src/App/Scenes/SignInScene.java
index 5844614..2442e1e 100644
--- a/src/App/Scenes/SignInScene.java
+++ b/src/App/Scenes/SignInScene.java
@@ -21,8 +21,6 @@ public class SignInScene extends SceneBuilder{
private TextField usernameField = new TextField();
private Label passwordLabel = new Label("Password: ");
private PasswordField passwordField = new PasswordField();
- private Label repeatpasswordLabel = new Label("Repeat password: ");
- private PasswordField repeatpasswordField = new PasswordField();
private Button signinButton = new Button("Sign in");
private Button signupButton = new Button("Sign up");
private Label feedbackLabel = new Label();
@@ -46,29 +44,24 @@ public class SignInScene extends SceneBuilder{
usernameField.setPromptText("Username");
passwordField.setPromptText("Password");
- repeatpasswordField.setPromptText("Repeat password");
super.getGridPane().add(usernameLabel, 0, 0);
super.getGridPane().add(usernameField, 0, 1);
super.getGridPane().add(passwordLabel, 0, 2);
super.getGridPane().add(passwordField, 0, 3);
- super.getGridPane().add(repeatpasswordLabel, 0, 4);
- super.getGridPane().add(repeatpasswordField, 0, 5);
- super.getGridPane().add(signinButton, 0, 6);
- super.getGridPane().add(signupButton, 1, 6);
- super.getGridPane().add(feedbackLabel, 0, 7);
+ super.getGridPane().add(signinButton, 0, 4);
+ super.getGridPane().add(signupButton, 1, 4);
+ super.getGridPane().add(feedbackLabel, 0, 5);
Css.setLabel(usernameLabel);
Css.setLabel(passwordLabel);
- Css.setLabel(repeatpasswordLabel);
Css.setTextField(usernameField);
Css.setTextField(passwordField);
- Css.setTextField(repeatpasswordField);
Css.setUniversalButton(signinButton);
Css.setUniversalButton(signupButton);
Css.setLabel(feedbackLabel);
- signinButton.setOnAction(event -> signin(usernameField.getText(), passwordField.getText(), repeatpasswordField.getText()));
+ signinButton.setOnAction(event -> signin(usernameField.getText(), passwordField.getText()));
signupButton.setOnAction(event -> StageInitializer.setSignUpScene());
@@ -78,24 +71,22 @@ public class SignInScene extends SceneBuilder{
* Method to check if username and password is correct
* @param username
* @param password
- * @param repeatpassword
*/
- private void signin(String username, String password, String repeatpassword) {
- if (password.equals(repeatpassword)) {
- EntityManager em = getEm();
- Query q = em.createNativeQuery("SELECT user FROM users WHERE user.username = ?1", User.class)
- .setParameter(1, username);
- User user = (User) q.getSingleResult();
- if (user.getHashpass().equals(hashPassword(password,user.getSalt()))) {
+ private void signin(String username, String password) {
+ EntityManager em = getEm();
+ Query q = em.createNativeQuery("SELECT user FROM users WHERE user.username = ?1", User.class)
+ .setParameter(1, username);
+ User user = (User) q.getSingleResult();
+ if (user == null) {
+ feedbackLabel.setText("Wrong username");
+ }
+ else {
+ if (user.getHashpass().equals(hashPassword(password, user.getSalt()))) {
StageInitializer.setMainMenuScene();
- }
- else {
+ } else {
feedbackLabel.setText("Wrong password");
}
}
- else {
- feedbackLabel.setText("Wrong username");
- }
}
/**
--
GitLab