Merge branch 'master' into devel
This commit is contained in:
commit
5d0e20cc70
@ -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);
|
||||||
|
|
||||||
|
|
||||||
|
@ -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");
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
@ -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"/>
|
||||||
|
@ -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>
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
Loading…
Reference in New Issue
Block a user