@@ -52,13 +52,13 @@ trait GrantHandler {
5252class RefreshToken extends GrantHandler {
5353
5454 override def handleRequest [U ](request : AuthorizationRequest , handler : AuthorizationHandler [U ])(implicit ctx : ExecutionContext ): Future [GrantHandlerResult [U ]] = {
55- val refreshTokenRequest = new RefreshTokenRequest (request)
55+ val refreshTokenRequest = RefreshTokenRequest (request)
5656 val clientCredential = refreshTokenRequest.clientCredential.getOrElse(throw new InvalidRequest (" Client credential is required" ))
5757 val refreshToken = refreshTokenRequest.refreshToken
5858
5959 handler.findAuthInfoByRefreshToken(refreshToken).flatMap { authInfoOption =>
6060 val authInfo = authInfoOption.getOrElse(throw new InvalidGrant (" Authorized information is not found by the refresh token" ))
61- if (authInfo.clientId != Some (clientCredential.clientId)) {
61+ if (! authInfo.clientId.contains (clientCredential.clientId)) {
6262 throw new InvalidClient
6363 }
6464
@@ -70,7 +70,7 @@ class RefreshToken extends GrantHandler {
7070class Password extends GrantHandler {
7171
7272 override def handleRequest [U ](request : AuthorizationRequest , handler : AuthorizationHandler [U ])(implicit ctx : ExecutionContext ): Future [GrantHandlerResult [U ]] = {
73- val passwordRequest = new PasswordRequest (request)
73+ val passwordRequest = PasswordRequest (request)
7474 if (clientCredentialRequired && passwordRequest.clientCredential.isEmpty) {
7575 throw new InvalidRequest (" Client credential is required" )
7676 }
@@ -89,7 +89,7 @@ class Password extends GrantHandler {
8989class ClientCredentials extends GrantHandler {
9090
9191 override def handleRequest [U ](request : AuthorizationRequest , handler : AuthorizationHandler [U ])(implicit ctx : ExecutionContext ): Future [GrantHandlerResult [U ]] = {
92- val clientCredentialsRequest = new ClientCredentialsRequest (request)
92+ val clientCredentialsRequest = ClientCredentialsRequest (request)
9393 val clientCredential = clientCredentialsRequest.clientCredential.getOrElse(throw new InvalidRequest (" Client credential is required" ))
9494 val scope = clientCredentialsRequest.scope
9595
@@ -106,15 +106,15 @@ class ClientCredentials extends GrantHandler {
106106class AuthorizationCode extends GrantHandler {
107107
108108 override def handleRequest [U ](request : AuthorizationRequest , handler : AuthorizationHandler [U ])(implicit ctx : ExecutionContext ): Future [GrantHandlerResult [U ]] = {
109- val authorizationCodeRequest = new AuthorizationCodeRequest (request)
109+ val authorizationCodeRequest = AuthorizationCodeRequest (request)
110110 val clientCredential = authorizationCodeRequest.clientCredential.getOrElse(throw new InvalidRequest (" Client credential is required" ))
111111 val clientId = clientCredential.clientId
112112 val code = authorizationCodeRequest.code
113113 val redirectUri = authorizationCodeRequest.redirectUri
114114
115115 handler.findAuthInfoByCode(code).flatMap { optionalAuthInfo =>
116116 val authInfo = optionalAuthInfo.getOrElse(throw new InvalidGrant (" Authorized information is not found by the code" ))
117- if (authInfo.clientId != Some (clientId)) {
117+ if (! authInfo.clientId.contains (clientId)) {
118118 throw new InvalidClient
119119 }
120120
@@ -135,7 +135,7 @@ class AuthorizationCode extends GrantHandler {
135135class Implicit extends GrantHandler {
136136
137137 override def handleRequest [U ](request : AuthorizationRequest , handler : AuthorizationHandler [U ])(implicit ctx : ExecutionContext ): Future [GrantHandlerResult [U ]] = {
138- val implicitRequest = new ImplicitRequest (request)
138+ val implicitRequest = ImplicitRequest (request)
139139 val clientCredential = implicitRequest.clientCredential.getOrElse(throw new InvalidRequest (" Client credential is required" ))
140140
141141 handler.findUser(implicitRequest).flatMap { maybeUser =>
0 commit comments