Discord authorization works!

bristermitten · bristermitten · commit 6352c8faa22a · 2021-06-21T16:49:40.000+01:00
diff --git a/src/main/java/net/developerden/backend/controller/InfoController.java b/src/main/java/net/developerden/backend/controller/InfoController.java
@@ -0,0 +1,16 @@
+package net.developerden.backend.controller;
+
+import net.developerden.backend.security.DiscordUser;
+import org.springframework.security.core.annotation.AuthenticationPrincipal;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class InfoController {
+
+    @GetMapping("/user")
+    public String user(@AuthenticationPrincipal DiscordUser principal) {
+        return "Hello, " + principal.getName();
+    }
+}
diff --git a/src/main/java/net/developerden/backend/security/DiscordUser.java b/src/main/java/net/developerden/backend/security/DiscordUser.java
@@ -1,4 +1,32 @@
 package net.developerden.backend.security;
 
-public record DiscordUser(String id, String username, String discriminator, String locale) {
+import org.springframework.security.core.GrantedAuthority;
+import org.springframework.security.oauth2.core.user.OAuth2User;
+
+import java.util.Collection;
+import java.util.Map;
+
+public record DiscordUser(String id, String username, String discriminator, String locale) implements OAuth2User {
+    private String fullName() {
+        return username + "#" + discriminator;
+    }
+
+    @Override
+    public Map<String, Object> getAttributes() {
+        return Map.of(
+                "id", id,
+                "username", fullName(),
+                "locale", locale
+        );
+    }
+
+    @Override
+    public Collection<? extends GrantedAuthority> getAuthorities() {
+        return null;
+    }
+
+    @Override
+    public String getName() {
+        return fullName();
+    }
 }
diff --git a/src/main/java/net/developerden/backend/security/DiscordUserService.java b/src/main/java/net/developerden/backend/security/DiscordUserService.java
@@ -7,33 +7,31 @@
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserRequest;
 import org.springframework.security.oauth2.client.userinfo.OAuth2UserService;
 import org.springframework.security.oauth2.core.OAuth2AuthenticationException;
-import org.springframework.security.oauth2.core.user.DefaultOAuth2User;
 import org.springframework.security.oauth2.core.user.OAuth2User;
 import org.springframework.web.client.RestTemplate;
 
 import java.util.List;
-import java.util.Map;
 
 public class DiscordUserService implements OAuth2UserService<OAuth2UserRequest, OAuth2User> {
     private static final String DISCORD_USERINFO_URI = "https://discord.com/api/users/@me";
 
 
     @Override
     public OAuth2User loadUser(OAuth2UserRequest userRequest) throws OAuth2AuthenticationException {
-        var headers = new HttpHeaders();
-        headers.add("Authorization", "Bearer: " + userRequest.getAccessToken().getTokenValue());
+        final var headers = new HttpHeaders();
+
+        final String authorization = userRequest.getAccessToken().getTokenType().getValue() + " " + userRequest.getAccessToken().getTokenValue();
+        headers.add("Authorization", authorization);
+
         headers.setAccept(List.of(MediaType.APPLICATION_JSON));
-        var entity = new HttpEntity<>(headers);
 
-        var user = new RestTemplate()
+        final var entity = new HttpEntity<>(headers);
+
+        final var user = new RestTemplate()
                 .exchange(DISCORD_USERINFO_URI, HttpMethod.GET,
                         entity, DiscordUser.class)
                 .getBody();
 
-        return new DefaultOAuth2User(
-                null,
-                Map.of("username", user.username()),
-                "username"
-        );
+        return user;
     }
 }
diff --git a/src/main/resources/static/index.html b/src/main/resources/static/index.html
@@ -7,9 +7,6 @@
     <meta name="description" content=""/>
     <meta name="viewport" content="width=device-width"/>
     <base href="/"/>
-    <link rel="stylesheet" type="text/css" href="/webjars/bootstrap/css/bootstrap.min.css"/>
-    <script type="text/javascript" src="/webjars/jquery/jquery.min.js"></script>
-    <script type="text/javascript" src="/webjars/bootstrap/js/bootstrap.min.js"></script>
 </head>
 <body>
 <h1>Demo</h1>
