From 78ef0fed4bca7b03bff18c49381f13e47475f50e Mon Sep 17 00:00:00 2001 From: NorbiPeti Date: Tue, 29 May 2018 01:16:27 +0200 Subject: [PATCH] Fixes, cookie fixes --- src/buttondevteam/website/LoginCommand.java | 2 +- src/buttondevteam/website/io/Cookies.java | 4 ++-- src/buttondevteam/website/page/LoginPage.java | 2 +- src/buttondevteam/website/page/Page.java | 14 +++++++------- 4 files changed, 11 insertions(+), 11 deletions(-) diff --git a/src/buttondevteam/website/LoginCommand.java b/src/buttondevteam/website/LoginCommand.java index 8c4384e..b2f5324 100644 --- a/src/buttondevteam/website/LoginCommand.java +++ b/src/buttondevteam/website/LoginCommand.java @@ -21,7 +21,7 @@ public class LoginCommand extends PlayerCommandBase { "ยง6---- Login ----", // "This command allows you to log in to our website using your Minecraft account.", // "If you are already logged in to the site, you can connect your MC account to it.", // - "This is good for getting Minecraft rewards if you're a patreon for example." // + "This is good for getting Minecraft rewards if you're a patron for example." // }; } } diff --git a/src/buttondevteam/website/io/Cookies.java b/src/buttondevteam/website/io/Cookies.java index 089cc67..e55e709 100644 --- a/src/buttondevteam/website/io/Cookies.java +++ b/src/buttondevteam/website/io/Cookies.java @@ -33,8 +33,8 @@ public class Cookies extends HashMap { public void AddHeaders(HttpExchange exchange) { for (Entry item : entrySet()) exchange.getResponseHeaders().add("Set-Cookie", - item.getKey() + "=" + item.getValue().getValue() + "; expires=" + expiretime); - exchange.getResponseHeaders().add("Set-Cookie", "expiretime=" + expiretime + "; expires=" + expiretime); + item.getKey() + "=" + item.getValue().getValue() + "; expires=" + expiretime + "; Secure; HttpOnly; Domain=figytuna.com"); //Allow for frontend + exchange.getResponseHeaders().add("Set-Cookie", "expiretime=" + expiretime + "; expires=" + expiretime + "; Secure; HttpOnly; Domain=figytuna.com"); } public Cookies add(Cookie cookie) { diff --git a/src/buttondevteam/website/page/LoginPage.java b/src/buttondevteam/website/page/LoginPage.java index 409b539..a8f1ee5 100644 --- a/src/buttondevteam/website/page/LoginPage.java +++ b/src/buttondevteam/website/page/LoginPage.java @@ -44,7 +44,7 @@ public class LoginPage extends Page { IOHelper.LoginUser(exchange, wu); states.remove(state); try { - return IOHelper.Redirect("https://tbmcplugins.github.io/", exchange); + return IOHelper.Redirect("https://chromagaming.figytuna.com/", exchange); } catch (IOException e) { throw new RuntimeException(e); } diff --git a/src/buttondevteam/website/page/Page.java b/src/buttondevteam/website/page/Page.java index a669067..c5f4c60 100644 --- a/src/buttondevteam/website/page/Page.java +++ b/src/buttondevteam/website/page/Page.java @@ -1,16 +1,16 @@ package buttondevteam.website.page; -import java.io.PrintStream; -import org.apache.commons.io.output.ByteArrayOutputStream; - -import com.sun.net.httpserver.*; - import buttondevteam.lib.TBMCCoreAPI; import buttondevteam.website.io.IOHelper; import buttondevteam.website.io.Response; +import com.sun.net.httpserver.HttpExchange; +import com.sun.net.httpserver.HttpHandler; +import org.apache.commons.io.output.ByteArrayOutputStream; + +import java.io.PrintStream; /** - * Add to {@link Main}.Pages + * Add using {@link buttondevteam.website.ButtonWebsiteModule#addPage(Page)} */ public abstract class Page implements HttpHandler { public abstract String GetName(); @@ -18,7 +18,7 @@ public abstract class Page implements HttpHandler { @Override public final void handle(HttpExchange exchange) { try { - exchange.getResponseHeaders().add("Access-Control-Allow-Origin", "https://tbmcplugins.github.io"); + exchange.getResponseHeaders().add("Access-Control-Allow-Origin", "https://chromagaming.figytuna.com"); if (exactPage() ? exchange.getRequestURI().getPath().equals("/" + GetName()) : true) IOHelper.SendResponse(handlePage(exchange)); else {