Remove hardcoding of types

Author: rmccue

inc/endpoints/class-authorization.php

@@ -3,6 +3,7 @@
 namespace WP\OAuth2\Endpoints;
 
 use WP_Error;
+use WP\OAuth2;
 use WP\OAuth2\Client;
 use WP\OAuth2\Types;
 
@@ -24,21 +25,18 @@ public function handle_request() {
 			$type = null;
 		}
 
-		switch ( $type ) {
-			case 'code':
-				$handler = new Types\AuthorizationCode();
-				break;
-
-			case 'token':
-				$handler = new Types\Implicit();
-				break;
-
-			default:
-				$result = new WP_Error(
-					'oauth2.endpoints.authorization.handle_request.invalid_type',
-					__( 'Invalid response type specified.', 'oauth2' )
-				);
-				break;
+		// Match type to a handler.
+		$grant_types = OAuth2\get_grant_types();
+		foreach ( $grant_types as $type_handler ) {
+			if ( $type_handler->get_response_type_code() === $type ) {
+				$handler = $type_handler;
+			}
+		}
+		if ( empty( $handler ) ) {
+			$result = new WP_Error(
+				'oauth2.endpoints.authorization.handle_request.invalid_type',
+				__( 'Invalid response type specified.', 'oauth2' )
+			);
 		}
 
 		if ( empty( $result ) ) {

inc/types/class-authorization-code.php

@@ -6,6 +6,17 @@
 use WP\OAuth2\Client;
 
 class AuthorizationCode extends Base {
+	/**
+	 * Get response_type code for authorisation page.
+	 *
+	 * This is used to determine which type to route requests to.
+	 *
+	 * @return string
+	 */
+	public function get_response_type_code() {
+		return 'code';
+	}
+
 	protected function handle_authorization_submission( $submit, Client $client, $data ) {
 		$redirect_uri = $data['redirect_uri'];
 

inc/types/class-implicit.php

@@ -6,6 +6,16 @@
 use WP\OAuth2\Client;
 
 class Implicit extends Base {
+	/**
+	 * Get response_type code for authorisation page.
+	 *
+	 * This is used to determine which type to route requests to.
+	 *
+	 * @return string
+	 */
+	public function get_response_type_code() {
+		return 'token';
+	}
 
 	protected function handle_authorization_submission( $submit, Client $client, $data ) {
 		$redirect_uri = $data['redirect_uri'];

inc/types/class-type.php

@@ -4,4 +4,13 @@
 
 interface Type {
 	public function handle_authorisation();
+
+	/**
+	 * Get response_type code for authorisation page.
+	 *
+	 * This is used to determine which type to route requests to.
+	 *
+	 * @return string
+	 */
+	public function get_response_type_code();
 }