Disable client registry and enable user registry

Author: MarcialRosales

.github/workflows/authorization-server-make.yaml

@@ -14,7 +14,7 @@ on:
 
 env:
   REGISTRY_IMAGE: pivotalrabbitmq/spring-authorization-server
-  IMAGE_TAG: 0.0.3
+  IMAGE_TAG: 0.0.4
 jobs:
   docker:
     runs-on: ubuntu-latest

selenium/authorization-server/pom.xml

@@ -10,7 +10,7 @@
 	</parent>
 	<groupId>com.rabbitmq</groupId>
 	<artifactId>authorization-server</artifactId>
-	<version>0.0.3</version>
+	<version>0.0.4</version>
 	<name>authorization-server</name>
 	<description>Authorization Server for Selenium</description>
 	<url/>

selenium/authorization-server/src/main/java/com/rabbitmq/authorization_server/AuthorizationServerUserDetailsService.java

@@ -0,0 +1,47 @@
+package com.rabbitmq.authorization_server;
+
+import java.util.HashMap;
+import java.util.List;
+import java.util.Map;
+import org.slf4j.Logger;
+import org.slf4j.LoggerFactory;
+import org.springframework.security.core.authority.SimpleGrantedAuthority;
+import org.springframework.security.core.userdetails.User;
+import org.springframework.security.core.userdetails.UserDetails;
+import org.springframework.security.core.userdetails.UserDetailsService;
+import org.springframework.security.core.userdetails.UsernameNotFoundException;
+import jakarta.annotation.PostConstruct;
+
+public class AuthorizationServerUserDetailsService implements UserDetailsService {
+
+    private static final Logger LOGGER = LoggerFactory.getLogger(AuthorizationServerUserDetailsService.class);
+
+    private final Map<String, User> usersByUsername = new HashMap<>();
+    
+    public AuthorizationServerUserDetailsService() {
+        
+    }
+    UserDetails ud;
+
+    @PostConstruct
+    public void initUsers() {
+        List<SimpleGrantedAuthority> roles = List.of("openid", "profile", "rabbitmq.tag:administrator").stream().map(scope ->
+            new SimpleGrantedAuthority(scope)).toList();
+        User rabbit_admin = new User("rabbit_admin", "rabbit_admin", roles);
+        
+        usersByUsername.put(rabbit_admin.getUsername(), rabbit_admin);
+
+        LOGGER.info("Initialized users {}, {} and {}", rabbit_admin);
+    }
+
+    @Override
+    public UserDetails loadUserByUsername(String username) throws UsernameNotFoundException {
+        if (usersByUsername.containsKey(username)) {
+            LOGGER.info("Found user for {}", username);
+            return usersByUsername.get(username);
+        } else {   
+            LOGGER.warn("No user found for {}", username);
+            throw new UsernameNotFoundException("No user found for " + username);
+        }
+    }
+}

selenium/authorization-server/src/main/java/com/rabbitmq/authorization_server/SecurityConfig.java

@@ -89,14 +89,14 @@ public SecurityFilterChain defaultSecurityFilterChain(HttpSecurity http)
 	@Bean 
 	public UserDetailsService userDetailsService() {
 		UserDetails userDetails = User.withDefaultPasswordEncoder()
-				.username("admin")
-				.password("admin")
-				.roles("ADMIN")
+				.username("rabbit_admin")
+				.password("rabbit_admin")
+				.roles("openid profile rabbitmq.tag:administrator")
 				.build();
 
 		return new InMemoryUserDetailsManager(userDetails);
 	}
-
+/*
 	@Bean 
 	public RegisteredClientRepository registeredClientRepository() {
 		RegisteredClient oidcClient = RegisteredClient.withId(UUID.randomUUID().toString())
@@ -114,7 +114,7 @@ public RegisteredClientRepository registeredClientRepository() {
 
 		return new InMemoryRegisteredClientRepository(oidcClient);
 	}
-
+ */
 	@Bean 
 	public JWKSource<SecurityContext> jwkSource() {
 		KeyPair keyPair = generateRsaKey();