From 2aa02a34cbc8e621c457109f0f0b3114a7bd69e6 Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Fri, 30 Jun 2017 18:21:03 +0200 Subject: [PATCH] Applied changes --- src/buttondevteam/website/WebUser.java | 2 +- src/buttondevteam/website/io/IOHelper.java | 4 ++-- 2 files changed, 3 insertions(+), 3 deletions(-) diff --git a/src/buttondevteam/website/WebUser.java b/src/buttondevteam/website/WebUser.java index 859e5ab..93feaee 100644 --- a/src/buttondevteam/website/WebUser.java +++ b/src/buttondevteam/website/WebUser.java @@ -17,6 +17,6 @@ public class WebUser extends ChromaGamerBase { } public PlayerData sessionID() { - return data(); + return data(null); } } diff --git a/src/buttondevteam/website/io/IOHelper.java b/src/buttondevteam/website/io/IOHelper.java index ba0ba46..bc9d5c9 100644 --- a/src/buttondevteam/website/io/IOHelper.java +++ b/src/buttondevteam/website/io/IOHelper.java @@ -78,7 +78,7 @@ public class IOHelper { user.sessionID().set(UUID.randomUUID()); user.save(); new Cookies(2).add(new Cookie("user_id", user.getUUID() + "")) - .add(new Cookie("session_id", user.sessionID().getOrDefault(null).toString())).SendHeaders(exchange); + .add(new Cookie("session_id", user.sessionID().get().toString())).SendHeaders(exchange); Bukkit.getLogger().fine("Logged in user."); } @@ -139,7 +139,7 @@ public class IOHelper { return null; WebUser user = ChromaGamerBase.getUser(cookies.get("user_id").getValue(), WebUser.class); if (user != null && cookies.get("session_id") != null - && cookies.get("session_id").getValue().equals(user.sessionID().getOrDefault(null))) { + && cookies.get("session_id").getValue().equals(user.sessionID().get())) { if (cookies.getExpireTimeParsed().minusYears(1).isBefore(ZonedDateTime.now(ZoneId.of("GMT")))) LoginUser(exchange, user); return user;