Fix configuration errors

Author: MarcialRosales

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

@@ -0,0 +1,20 @@
+package com.rabbitmq.authorization_server;
+
+import org.springframework.beans.factory.annotation.Autowired;
+import org.springframework.security.oauth2.server.authorization.client.RegisteredClient;
+import org.springframework.security.oauth2.server.authorization.client.RegisteredClientRepository;
+import org.springframework.web.bind.annotation.GetMapping;
+import org.springframework.web.bind.annotation.RequestParam;
+import org.springframework.web.bind.annotation.RestController;
+
+@RestController
+public class ClientController {
+
+    @Autowired
+    private RegisteredClientRepository registeredClientRepository;
+
+    @GetMapping("/api/client")
+    public RegisteredClient findClientById(@RequestParam String clientId) {
+        return registeredClientRepository.findByClientId(clientId);
+    }
+}

selenium/authorization-server/src/main/resources/application.yml

@@ -1,32 +1,52 @@
 server:
-  port: 8080
-
-logging:
-  level:
-    org.springframework.security: trace
-
+  port: 8443
+  ssl:
+    bundle: spring-authorizationserver
+  
 spring:
+  ssl:
+    bundle:
+      jks:
+        spring-authorizationserver:
+          key:
+            alias: server-spring-tls
+            password: foobar
+          keystore:
+            location: ../test/oauth/spring/server_spring.jks
+            password: foobar
+            type: PKCS12
   security:
-    user:
-      name: user
-      password: password
     oauth2:
       authorizationserver:
         client:
-          oidc-client:
+          mgt_api_client:
             registration:
-              client-id: "oidc-client"
-              client-secret: "{noop}secret"
+              provider: spring
+              client-id: mgt_api_client
+              authorization-grant-types: 
+                - client_credentials
               client-authentication-methods:
-                - "client_secret_basic"
-              authorization-grant-types:
-                - "authorization_code"
-                - "refresh_token"
-              redirect-uris:
-                - "http://127.0.0.1:15672/login/oauth2/code/oidc-client"
-              post-logout-redirect-uris:
-                - "http://127.0.0.1:15672/"
-              scopes:
-                - "openid"
-                - "profile"
-            require-authorization-consent: true
+                - client_secret_basic
+              require-proof-key: true
+              scopes: 
+                - openid
+                - profile
+                - rabbitmq.tag:management
+              client-name: mgt_api_client
+          rabbitmq_client_code:
+            registration:
+              provider: spring
+              client-id: rabbitmq_client_code
+              authorization-grant-types: 
+                - authorization_code
+              client-authentication-methods:
+                - none
+              redirect-uris: 
+                - "https://localhost:15671/js/oidc-oauth/login-callback.html"
+              scopes: 
+                - openid 
+                - profile 
+                - rabbitmq.tag:administrator
+              client-name: rabbitmq_client_code
+
+            

selenium/bin/components/spring

@@ -1,6 +1,6 @@
 #!/usr/bin/env bash
 
-SPRING_DOCKER_IMAGE=pivotalrabbitmq/spring-authorization-server:0.0.2
+SPRING_DOCKER_IMAGE=pivotalrabbitmq/spring-authorization-server:0.0.4
 
 ensure_spring() {
   if docker ps | grep spring &> /dev/null; then

selenium/test/oauth/spring/application.yml

@@ -17,24 +17,36 @@ spring:
             type: PKCS12
   security:
     oauth2:
-      client:
-        registration:
+      authorizationserver:
+        client:
           mgt_api_client:
-            provider: spring
-            client-id: mgt_api_client
-            authorization-grant-type: client_credentials
-            scopes: 
-              - openid
-              - profile
-              - rabbitmq.tag:management
-            client-name: mgt_api_client
+            registration:
+              provider: spring
+              client-id: mgt_api_client
+              authorization-grant-types: 
+                - client_credentials
+              client-authentication-methods:
+                - client_secret_basic
+              require-proof-key: true
+              scopes: 
+                - openid
+                - profile
+                - rabbitmq.tag:management
+              client-name: mgt_api_client
           rabbitmq_client_code:
-            provider: spring
-            client-id: rabbitmq_client_code
-            authorization-grant-type: authorization_code
-            redirect-uri: "https://localhost:15671/js/oidc-oauth/login-callback.html"
-            scopes: 
-              - openid 
-              - profile 
-              - rabbitmq.tag:administrator
-            client-name: rabbitmq_client_code
+            registration:
+              provider: spring
+              client-id: rabbitmq_client_code
+              authorization-grant-types: 
+                - authorization_code
+              client-authentication-methods:
+                - none
+              redirect-uris: 
+                - "https://localhost:15671/js/oidc-oauth/login-callback.html"
+              scopes: 
+                - openid 
+                - profile 
+                - rabbitmq.tag:administrator
+              client-name: rabbitmq_client_code
+
+