Skip to content

Commit bf9c9a2

Browse files
committed
Made a minor change to allow a user with the correct username and password to login
1 parent 5d8c5b2 commit bf9c9a2

File tree

5 files changed

+9
-5
lines changed

5 files changed

+9
-5
lines changed

src/main/java/entities/user_entities/User.java

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,14 @@
11
package entities.user_entities;
22

3+
import data_access.UserDatabase;
34
import entities.chat.Chat;
45
import interface_adapters.profile_modification_IA.UserAuthenticationI;
56
import interface_adapters.login_interface_adapters.Login;
67
import use_cases.user_attribute_modification_use_case.Changeable;
78
import interface_adapters.app_screen_interface_adapters.UserAppScreenGateway;
89
import entities.chat.*;
910

11+
import java.io.File;
1012
import java.io.Serializable;
1113
import java.util.ArrayList;
1214

@@ -55,7 +57,7 @@ public Boolean PasswordMatch(String attempt){
5557
}
5658

5759
public void login(){
58-
UserAppScreenGateway appScreenGateway = new UserAppScreenGateway(this.getUsername());
60+
UserAppScreenGateway appScreenGateway = new UserAppScreenGateway(this.getUsername(), new UserDatabase(new File("test9")));
5961
}
6062

6163
public ArrayList<Chat> getChats() {

src/main/java/interface_adapters/app_screen_interface_adapters/UserAppScreenGateway.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -14,9 +14,9 @@ public class UserAppScreenGateway implements Login {
1414
/**
1515
* Create gateway between user and appscreen
1616
*/
17-
public UserAppScreenGateway(String username){
17+
public UserAppScreenGateway(String username, UserDatabase userDatabase){
1818
this.username = username;
19-
this.userDatabase = new UserDatabase();
19+
this.userDatabase = userDatabase;
2020
login();
2121
}
2222

src/main/java/interface_adapters/login_interface_adapters/UserLoginController.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -21,6 +21,7 @@ public void allowLogin(){
2121
try{
2222
boolean allowLogin = user.PasswordMatch(this.password);
2323
if(allowLogin){
24+
System.out.println("made it here");
2425
user.login();
2526
}else{
2627
accessDenied("Wrong Password");

src/main/java/screens/login_screen/UserLoginUI.java

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -47,13 +47,13 @@ public void getLoginCredentials(){
4747
JButton loginButton = new JButton("login");
4848
loginButton.setBounds(210, 95, 100, 25);
4949
loginPanel.add(loginButton);
50-
loginButton.addActionListener(this);
50+
loginButton.addActionListener(this::actionPerformed);
5151
loginFrame.setVisible(true);
5252

5353
}
5454

5555
public static void main(String[] args){
56-
UserRetriever testDB = new UserDatabase(new File("Test5"));
56+
UserRetriever testDB = new UserDatabase(new File("Test9"));
5757
UserLoginUI screen = new UserLoginUI(testDB);
5858
screen.getLoginCredentials();
5959
}

src/main/java/screens/user_registration_screen/UserRegistrationUI.java

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -102,6 +102,7 @@ public static void main(String[] args){
102102
UserDatabase testDB = new UserDatabase(new File("Test9"));
103103
System.out.println(testDB.UserExists("RandomUser", "[email protected]"));
104104
System.out.println(testDB.getList().size());
105+
System.out.println(testDB.getList().get(0).getUsername());
105106
UserRegistrationUI testUI = new UserRegistrationUI(testDB);
106107

107108
testUI.GetUserCredentials();

0 commit comments

Comments
 (0)