cookies = GetCookies(exchange);
+ if (!cookies.containsKey("user_id") || !cookies.containsKey("session_id"))
+ return null;
+ try (DataProvider provider = new DataProvider()) {
+ User user = provider.getUser(Long.parseLong(cookies.get("user_id")));
+ if (user != null && cookies.get("session_id") != null
+ && cookies.get("session_id").equals(user.getSessionid()))
+ return user;
+ }
+ return null;
}
}
diff --git a/src/io/github/norbipeti/chat/server/db/DataProvider.java b/src/io/github/norbipeti/chat/server/db/DataProvider.java
index 0f16b4f..7d7fac0 100644
--- a/src/io/github/norbipeti/chat/server/db/DataProvider.java
+++ b/src/io/github/norbipeti/chat/server/db/DataProvider.java
@@ -57,6 +57,13 @@ public class DataProvider implements AutoCloseable {
em.close();
}
+ public User getUser(Long id) {
+ EntityManager em = emf.createEntityManager();
+ User managedUser = em.find(User.class, id);
+ em.close();
+ return managedUser;
+ }
+
@Override
public void close() {
if (emf != null)
diff --git a/src/io/github/norbipeti/chat/server/page/IndexPage.java b/src/io/github/norbipeti/chat/server/page/IndexPage.java
index 39b53c4..f908d33 100644
--- a/src/io/github/norbipeti/chat/server/page/IndexPage.java
+++ b/src/io/github/norbipeti/chat/server/page/IndexPage.java
@@ -1,18 +1,22 @@
package io.github.norbipeti.chat.server.page;
import java.io.IOException;
-
import com.sun.net.httpserver.HttpExchange;
import io.github.norbipeti.chat.server.IOHelper;
+import io.github.norbipeti.chat.server.db.domain.User;
public class IndexPage extends Page {
@Override
- public void handlePage(HttpExchange exchange) throws IOException {
- if ()
- System.out.println(exchange.getRequestHeaders().get("Cookie"));
- IOHelper.SendPage(200, this, exchange);
+ public void handlePage(HttpExchange exchange) throws IOException { //TODO: Make a base HTML and insert all pages into that
+ User user = IOHelper.GetLoggedInUser(exchange);
+ if (user == null)
+ IOHelper.SendModifiedPage(200, this,
+ (doc) -> doc.getElementById("loginbox").attr("style", "display: block").ownerDocument(), exchange);
+ else
+ IOHelper.SendModifiedPage(200, this,
+ (doc) -> doc.getElementById("userbox").attr("style", "display: block").ownerDocument(), exchange);
}
@Override
diff --git a/src/io/github/norbipeti/chat/server/page/LoginPage.java b/src/io/github/norbipeti/chat/server/page/LoginPage.java
index 675d13d..3094398 100644
--- a/src/io/github/norbipeti/chat/server/page/LoginPage.java
+++ b/src/io/github/norbipeti/chat/server/page/LoginPage.java
@@ -3,6 +3,7 @@ package io.github.norbipeti.chat.server.page;
import java.io.IOException;
import java.util.HashMap;
+import org.jsoup.nodes.Element;
import org.mindrot.jbcrypt.BCrypt;
import com.sun.net.httpserver.HttpExchange;
@@ -29,8 +30,13 @@ public class LoginPage extends Page {
}
}
if (loginuser == null || !BCrypt.checkpw(post.get("pass"), loginuser.getPassword())) {
- IOHelper.SendModifiedPage(200, this, "", "The E-mail or password is incorrect
",
- exchange);
+ IOHelper.SendModifiedPage(200, this, (doc) -> {
+ Element errorelement = doc.getElementById("errormsg");
+ errorelement.appendElement("p").text("The username or password is invalid.");
+ errorelement.attr("style", "display: block");
+ return doc; // TODO: Automatically redirect on every
+ // request, load HTML file directly for login
+ }, exchange);
return;
}
IOHelper.LoginUser(exchange, loginuser);
diff --git a/src/io/github/norbipeti/chat/server/page/RegisterPage.java b/src/io/github/norbipeti/chat/server/page/RegisterPage.java
index b11c84e..c4b1e85 100644
--- a/src/io/github/norbipeti/chat/server/page/RegisterPage.java
+++ b/src/io/github/norbipeti/chat/server/page/RegisterPage.java
@@ -18,7 +18,9 @@ public class RegisterPage extends Page {
if (post.size() > 0) {
String errormsg = CheckValues(post, "name", "email", "pass", "pass2");
if (errormsg.length() > 0) {
- IOHelper.SendModifiedPage(200, this, "", errormsg, exchange);
+ final String msg = errormsg;
+ IOHelper.SendModifiedPage(200, this, (doc) -> doc.getElementById("errormsg").text(msg).ownerDocument(),
+ exchange);
return; // TODO: Use JavaScript too, for error checks
}
try (DataProvider provider = new DataProvider()) {
@@ -31,7 +33,9 @@ public class RegisterPage extends Page {
if (!post.get("pass").equals(post.get("pass2")))
errormsg += "The passwords don't match
";
if (errormsg.length() > 0) {
- IOHelper.SendModifiedPage(200, this, "", errormsg, exchange);
+ final String msg = errormsg;
+ IOHelper.SendModifiedPage(200, this,
+ (doc) -> doc.getElementById("errormsg").text(msg).ownerDocument(), exchange);
return;
}
User user = new User();
diff --git a/src/io/github/norbipeti/chat/server/page/StylePage.java b/src/io/github/norbipeti/chat/server/page/StylePage.java
new file mode 100644
index 0000000..5d8a944
--- /dev/null
+++ b/src/io/github/norbipeti/chat/server/page/StylePage.java
@@ -0,0 +1,33 @@
+package io.github.norbipeti.chat.server.page;
+
+import java.io.File;
+import java.io.IOException;
+
+import com.sun.net.httpserver.HttpExchange;
+
+import io.github.norbipeti.chat.server.IOHelper;
+
+public class StylePage extends Page {
+
+ @Override
+ public boolean getDo404() {
+ return false;
+ }
+
+ @Override
+ public String GetName() {
+ return "css/";
+ }
+
+ @Override
+ public void handlePage(HttpExchange exchange) throws IOException {
+ if (exchange.getRequestURI().getPath().startsWith("/css/")) {
+ File cssfile = new File("pages", exchange.getRequestURI().getPath());
+ if (!cssfile.exists())
+ IOHelper.SendResponse(404, "CSS file not found
", exchange);
+ else
+ IOHelper.SendResponse(200, IOHelper.ReadFile(cssfile), exchange);
+ } else
+ System.out.println(exchange.getRequestURI().getPath());
+ }
+}