Skip to content

Commit 4629ceb

Browse files
committed
Signup added
1 parent 9fb1376 commit 4629ceb

File tree

3 files changed

+17
-4
lines changed

3 files changed

+17
-4
lines changed

BackendDatabase.java

+8
Original file line numberDiff line numberDiff line change
@@ -68,6 +68,14 @@ ArrayList<Ticket> findTicket(String startDate) {
6868
ArrayList<Ticket> tickets = new ArrayList<Ticket>();
6969
HashMap<Integer, String> userPasses = new HashMap<Integer, String>();
7070

71+
public void SignUp(String email, String username, String pass)
72+
{
73+
User newUser=new User();
74+
newUser.setEmail(email);
75+
newUser.setUsername(username);
76+
newUser.setPassword(pass);
77+
users.add(newUser);
78+
}
7179
public Boolean login(String username, String password) {
7280
for (int i = 0; i < users.size(); i++)
7381
if (username.equals(users.get(i).username)) {

BackendServer.java

+8-3
Original file line numberDiff line numberDiff line change
@@ -135,19 +135,24 @@ public static synchronized APIResponse handleRequest(APIRequest req) {
135135
break;
136136
case "POST":
137137
case "/user/signup/":
138+
JsonObject signUpPayloadJson = req.payload.getAsJsonObject();
139+
String signUpUsername = req.username.toString();
140+
String signUpPass = signUpPayloadJson.get("password1").toString();
141+
String signUpEmail = signUpPayloadJson.get("email").toString();
142+
db.SignUp(signUpEmail, signUpUsername,signUpPass);
138143

139144

140145
case "/user/login/":
141146
User user = db.getUserByUsername(req.username);
142-
JsonObject payloadJson = req.payload.getAsJsonObject();
143-
String inputPassword = payloadJson.get("password").toString();
147+
JsonObject logInPayloadJson = req.payload.getAsJsonObject();
148+
String inputPassword = logInPayloadJson.get("password").toString();
144149
if (db.login(user.username, inputPassword)) {
145150
String finalUser = new Gson().toJson(user, User.class);
146151
result.payload = new Gson().fromJson(finalUser, JsonElement.class);
147152
}
148153

149154
break;
150-
case "PUT":
155+
case "PUT":g
151156
break;
152157
case "DELETE":
153158
break;

User.java

+1-1
Original file line numberDiff line numberDiff line change
@@ -42,7 +42,7 @@ public void changeEmail(String newEmail) {
4242
setEmail(newEmail);
4343
}
4444

45-
public void changenationalID(String newId) {
45+
public void changeNationalID(String newId) {
4646
setNationalId(newId);
4747
}
4848

0 commit comments

Comments
 (0)