From 360b68742dfd35aa68f358cb606cb25c22d2eb1d Mon Sep 17 00:00:00 2001 From: Sebastien Date: Mon, 10 Sep 2018 16:21:52 +0300 Subject: [PATCH 1/4] Change log level --- src/main/resources/log4j2.xml | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/log4j2.xml b/src/main/resources/log4j2.xml index 7b81aed..16b037f 100644 --- a/src/main/resources/log4j2.xml +++ b/src/main/resources/log4j2.xml @@ -25,7 +25,7 @@ - + From 06d90f869bd9a7d0a8dc836556d469a6d20d23cd Mon Sep 17 00:00:00 2001 From: Sebastien Date: Mon, 10 Sep 2018 16:39:54 +0300 Subject: [PATCH 2/4] Correct /register bug --- src/main/java/net/Broken/RestApi/UserManagerAPIController.java | 2 +- src/main/resources/templates/register.html | 2 +- 2 files changed, 2 insertions(+), 2 deletions(-) diff --git a/src/main/java/net/Broken/RestApi/UserManagerAPIController.java b/src/main/java/net/Broken/RestApi/UserManagerAPIController.java index e98dd66..f7a7d45 100644 --- a/src/main/java/net/Broken/RestApi/UserManagerAPIController.java +++ b/src/main/java/net/Broken/RestApi/UserManagerAPIController.java @@ -127,7 +127,7 @@ public class UserManagerAPIController { public ResponseEntity oauthLogin(@RequestParam(value = "token") String discordToken){ logger.debug(discordToken); UserEntity user = Oauth.getInstance().getUserEntity(discordToken, userRepository); - logger.debug(user.getName()); + logger.info("OAuth login for " + user.getName()); return new ResponseEntity<>(new UserConnectionData(true, user.getName(), user.getApiToken(), ""), HttpStatus.OK); diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html index 96f1ab7..591f749 100644 --- a/src/main/resources/templates/register.html +++ b/src/main/resources/templates/register.html @@ -14,7 +14,7 @@ -
...
+
...
From ec0c82a8c6fd33942f2ea9fd48d80295f3cb2141 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Mon, 10 Sep 2018 16:47:47 +0300 Subject: [PATCH 3/4] Correct can't login with discord on register page --- src/main/java/net/Broken/webView/RegisterWebView.java | 1 + 1 file changed, 1 insertion(+) diff --git a/src/main/java/net/Broken/webView/RegisterWebView.java b/src/main/java/net/Broken/webView/RegisterWebView.java index 49e403b..1aa5551 100644 --- a/src/main/java/net/Broken/webView/RegisterWebView.java +++ b/src/main/java/net/Broken/webView/RegisterWebView.java @@ -14,6 +14,7 @@ public class RegisterWebView { @RequestMapping("/register") public String music(@RequestParam(value="id", required = true, defaultValue = "") String id, Model model){ model.addAttribute("id", id); + model.addAttribute("redirect_url", System.getenv("OAUTH_URL")); return CheckPage.getPageIfReady("register"); } } From 71d9fb33751da5e8d18f7d13b3bba0a6c2015fb1 Mon Sep 17 00:00:00 2001 From: Sebastien Date: Mon, 10 Sep 2018 16:51:56 +0300 Subject: [PATCH 4/4] Missing file --- src/main/resources/templates/register.html | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/src/main/resources/templates/register.html b/src/main/resources/templates/register.html index 591f749..d4b9df0 100644 --- a/src/main/resources/templates/register.html +++ b/src/main/resources/templates/register.html @@ -14,7 +14,7 @@ -
...
+
...