Skip to content

refactor: Remove else #24

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
choigiseong merged 1 commit into from
Apr 2, 2021
Merged

refactor: Remove else #24

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
6 changes: 3 additions & 3 deletions src/main/java/controller/ListUserController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -5,13 +5,13 @@

import java.io.IOException;

public class ListUserController implements Controller{
public class ListUserController implements Controller {
@Override
public void service(HttpRequest httpRequest, HttpResponse httpResponse) throws IOException {
if ("true".equals(httpRequest.cookie("logined"))) {
httpResponse.forward("/user/list.html");
} else {
httpResponse.redirect("/user/login.html");
return;
}
httpResponse.redirect("/user/login.html");
}
}
15 changes: 7 additions & 8 deletions src/main/java/controller/LoginController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -7,19 +7,18 @@

import java.io.IOException;

public class LoginController implements Controller{
public class LoginController implements Controller {
@Override
public void service(HttpRequest httpRequest, HttpResponse httpResponse) throws IOException {
User user = DataBase.findUserById(httpRequest.data("userId"));
if (user == null) {
httpResponse.addHeader("Set-Cookie", "logined=false; Path=/");
httpResponse.redirect("/user/login_failed.html");
} else if (user.checkPassword(httpRequest.data("password"))) {

if (user != null && user.checkPassword(httpRequest.data("password"))) {
httpResponse.addHeader("Set-Cookie", "logined=true; Path=/");
httpResponse.redirect("/index.html");
} else {
httpResponse.addHeader("Set-Cookie", "logined=false; Path=/");
httpResponse.redirect("/user/login_failed.html");
return;
}

httpResponse.addHeader("Set-Cookie", "logined=false; Path=/");
httpResponse.redirect("/user/login_failed.html");
}
}
7 changes: 4 additions & 3 deletions src/main/java/http/HttpResponse.java
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -23,11 +23,12 @@ public void forward(String url) throws IOException {
startLine = "HTTP/1.1 200 OK \r\n";
byte[] body = Files.readAllBytes(new File("./webapp" + url).toPath());

String contentTypeValue = "text/html;charset=utf-8";
if (url.endsWith(".css")) {
addHeader("Content-Type", "text/css;charset=utf-8");
} else {
addHeader("Content-Type", "text/html;charset=utf-8");
contentTypeValue = "text/css;charset=utf-8";
}

addHeader("Content-Type", contentTypeValue);
addHeader("Content-Length", String.valueOf(body.length));

processHeaders();
Expand Down
16 changes: 7 additions & 9 deletions src/main/java/webserver/WebServer.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
package webserver;

import java.net.ServerSocket;
import java.net.Socket;
import java.util.HashMap;
import java.util.Map;

import controller.*;
import http.HttpMethod;
import org.slf4j.Logger;
import org.slf4j.LoggerFactory;

import java.net.ServerSocket;
import java.net.Socket;
import java.util.HashMap;
import java.util.Map;

public class WebServer {
private static final Logger log = LoggerFactory.getLogger(WebServer.class);
private static final int DEFAULT_PORT = 8080;
Expand All @@ -24,10 +24,8 @@ public class WebServer {
}

public static void main(String args[]) throws Exception {
int port = 0;
if (args == null || args.length == 0) {
port = DEFAULT_PORT;
} else {
int port = DEFAULT_PORT;
if (args != null && args.length > 0) {
port = Integer.parseInt(args[0]);
}

Expand Down