Revert "Hack in support for OpenID scopes"

This reverts commit a91b1d2

Keep removal of dummy user in development profile

Author: Sheikah45

src/main/java/com/faforever/api/security/FafUserAuthenticationConverter.java

@@ -8,11 +8,9 @@
 import org.springframework.security.oauth2.provider.token.DefaultUserAuthenticationConverter;
 
 import java.util.Collection;
-import java.util.HashSet;
 import java.util.List;
 import java.util.Map;
 import java.util.Optional;
-import java.util.Set;
 
 /**
  * Converts a {@link FafUserDetails} from and to an {@link Authentication} for use in a JWT token.
@@ -44,11 +42,7 @@ public Authentication extractAuthentication(Map<String, ?> map) {
       String username = (String) map.get(USERNAME);
       boolean accountNonLocked = Optional.ofNullable((Boolean) map.get(NON_LOCKED)).orElse(true);
       Collection<? extends GrantedAuthority> authorities = getAuthorities(map);
-
-      // This is a violation of separation of User and Client permission, but the whole code is deprecated once we use
-      // OpenID everywhere!
-      Set<String> scopes = new HashSet<>((List<String>) map.get("scope"));
-      UserDetails user = new FafUserDetails(id, username, "N/A", accountNonLocked, authorities, scopes);
+      UserDetails user = new FafUserDetails(id, username, "N/A", accountNonLocked, authorities);
 
       return new UsernamePasswordAuthenticationToken(user, "N/A", authorities);
     } else {
@@ -68,9 +62,7 @@ public Authentication extractAuthentication(Map<String, ?> map) {
         .map(role -> (GrantedAuthority) () -> "ROLE_" + role)
         .toList();
 
-      var scopes = new HashSet<>((List<String>) map.get("scp"));
-
-      UserDetails user = new FafUserDetails(id, "username", "N/A", false, authorities, scopes);
+      UserDetails user = new FafUserDetails(id, "username", "N/A", false, authorities);
       return new UsernamePasswordAuthenticationToken(user, "N/A", authorities);
     }
 

src/main/java/com/faforever/api/security/FafUserDetails.java

@@ -5,25 +5,19 @@
 import org.springframework.security.core.GrantedAuthority;
 
 import java.util.Collection;
-import java.util.Set;
 
 @Getter
 public class FafUserDetails extends org.springframework.security.core.userdetails.User {
 
   private final int id;
-  /**
-   * Workaround for compatibility with old Spring OAuth2 token AND new OpenID Connect token
-   */
-  private final Set<String> scopes;
 
-  public FafUserDetails(User user, Collection<? extends GrantedAuthority> authorities, Set<String> scopes) {
-    this(user.getId(), user.getLogin(), user.getPassword(), !user.isGlobalBanned(), authorities, scopes);
+  public FafUserDetails(User user, Collection<? extends GrantedAuthority> authorities) {
+    this(user.getId(), user.getLogin(), user.getPassword(), !user.isGlobalBanned(), authorities);
   }
 
-  public FafUserDetails(int id, String username, String password, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities, Set<String> scopes) {
+  public FafUserDetails(int id, String username, String password, boolean accountNonLocked, Collection<? extends GrantedAuthority> authorities) {
     super(username, password, true, true, true, accountNonLocked, authorities);
     this.id = id;
-    this.scopes = scopes;
   }
 
   public boolean hasPermission(String permission) {

src/main/java/com/faforever/api/security/FafUserDetailsService.java

@@ -36,7 +36,7 @@ public UserDetails loadUserByUsername(String usernameOrEmail) throws UsernameNot
     authorities.addAll(getUserRoles(user));
     authorities.addAll(getPermissionRoles(user));
 
-    return new FafUserDetails(user, authorities, Set.of());
+    return new FafUserDetails(user, authorities);
   }
 
   private Collection<GrantedAuthority> getUserRoles(User user) {

src/main/java/com/faforever/api/security/UserSupplier.java

@@ -4,7 +4,6 @@
 import org.springframework.stereotype.Component;
 
 import java.util.List;
-import java.util.Set;
 import java.util.function.Supplier;
 
 @Component
@@ -16,7 +15,7 @@ public FafUserDetails get() {
     if (principal instanceof FafUserDetails) {
       return (FafUserDetails) principal;
     } else {
-      return new FafUserDetails(-1, principal.toString(), null, false, List.of(), Set.of());
+      return new FafUserDetails(-1, principal.toString(), null, false, List.of());
     }
   }
 }

src/main/java/com/faforever/api/security/elide/permission/FafUserCheck.java

@@ -33,12 +33,11 @@ private boolean checkOAuthScopes(String... scope) {
 
     OAuth2Authentication oAuth2Authentication = ((OAuth2Authentication) authentication);
     OAuth2Request oAuth2Request = oAuth2Authentication.getOAuth2Request();
-    var requestScopes = ((FafUserDetails) oAuth2Authentication.getPrincipal()).getScopes();
 
     List<String> missedScopes = new ArrayList<>();
 
     for (String currentScope : scope) {
-      if (!requestScopes.contains(currentScope)) {
+      if (!oAuth2Request.getScope().contains(currentScope)) {
         missedScopes.add(currentScope);
       }
     }