sebclem/ClaptrapBot
1
0
Fork 0
Code Issues 1 Pull Requests Packages Projects Releases 1 Wiki Activity

Merge branch 'master' into devel

Browse Source
This commit is contained in:
Sebastien 2018-09-12 10:28:36 +03:00
commit 5d0e20cc70
4 changed files with 4 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
src/main/java/net/Broken/RestApi/UserManagerAPIController.java
View File

@ -127,7 +127,7 @@ public class UserManagerAPIController {
public ResponseEntity<UserConnectionData> oauthLogin(@RequestParam(value = "token") String discordToken){ public ResponseEntity<UserConnectionData> oauthLogin(@RequestParam(value = "token") String discordToken){
logger.debug(discordToken); logger.debug(discordToken);
UserEntity user = Oauth.getInstance().getUserEntity(discordToken, userRepository); 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); return new ResponseEntity<>(new UserConnectionData(true, user.getName(), user.getApiToken(), ""), HttpStatus.OK);

1
src/main/java/net/Broken/webView/RegisterWebView.java
View File

@ -14,6 +14,7 @@ public class RegisterWebView {
@RequestMapping("/register") @RequestMapping("/register")
public String music(@RequestParam(value="id", required = true, defaultValue = "") String id, Model model){ public String music(@RequestParam(value="id", required = true, defaultValue = "") String id, Model model){
model.addAttribute("id", id); model.addAttribute("id", id);
model.addAttribute("redirect_url", System.getenv("OAUTH_URL"));
return CheckPage.getPageIfReady("register"); return CheckPage.getPageIfReady("register");
} }
} }

2
src/main/resources/log4j2.xml
View File

@ -25,7 +25,7 @@
</File> </File>
</Appenders> </Appenders>
<Loggers> <Loggers>
<Logger name="net.Broken" level="debug" additivity="false"> <Logger name="net.Broken" level="info" additivity="false">
<AppenderRef ref="Console"/> <AppenderRef ref="Console"/>
<AppenderRef ref="current"/> <AppenderRef ref="current"/>
<AppenderRef ref="RollingFile"/> <AppenderRef ref="RollingFile"/>

2
src/main/resources/templates/register.html
View File

@ -14,7 +14,7 @@
<body class="blue-grey lighten-5" > <body class="blue-grey lighten-5" >
<div th:replace="header :: header ('','')">...</div> <div th:replace="header :: header ('','',${redirect_url})">...</div>