ChromaGaming/ButtonWebsiteModule
1
0
Fork 0
Code Issues 4 Pull requests Projects Releases Packages Wiki Activity

Removed autoupdate, addded deploy and build notifications #7

Merged
NorbiPeti merged 9 commits from dev into master 2017-07-04 16:41:29 +00:00
Conversation 0 Commits 9 Files changed 8 +3 -3
2 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files
Showing only changes of commit 2aa02a34cb - Show all commits

2
src/buttondevteam/website/WebUser.java
View file

@ -17,6 +17,6 @@ public class WebUser extends ChromaGamerBase {
}
public PlayerData<UUID> sessionID() {
return data();
return data(null);
}
}

4
src/buttondevteam/website/io/IOHelper.java
View file

@ -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;