Skip to content

Commit 40dfea0

Browse files
committed
Disabled all grants by default #77
1 parent d5a4733 commit 40dfea0

File tree

2 files changed

+19
-14
lines changed

2 files changed

+19
-14
lines changed

scala-oauth2-core/src/main/scala/scalaoauth2/provider/TokenEndpoint.scala

Lines changed: 1 addition & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,7 @@ import scala.concurrent.ExecutionContext.Implicits.global
66
import scalaoauth2.provider.OAuthGrantType._
77

88
trait TokenEndpoint {
9-
val handlers = Map(
10-
AUTHORIZATION_CODE -> new AuthorizationCode(),
11-
REFRESH_TOKEN -> new RefreshToken(),
12-
CLIENT_CREDENTIALS -> new ClientCredentials(),
13-
PASSWORD -> new Password(),
14-
IMPLICIT -> new Implicit()
15-
)
9+
val handlers = Map.empty[String, GrantHandler]
1610

1711
def handleRequest[U](request: AuthorizationRequest, handler: AuthorizationHandler[U]): Future[Either[OAuthError, GrantHandlerResult]] = try {
1812
val grantType = request.grantType

scala-oauth2-core/src/test/scala/scalaoauth2/provider/TokenEndPointSpec.scala

Lines changed: 18 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,11 @@ class TokenEndPointSpec extends FlatSpec with ScalaFutures {
2828
)
2929

3030
val dataHandler = successfulDataHandler()
31-
val f = TokenEndpoint.handleRequest(request, dataHandler)
31+
val f = new TokenEndpoint {
32+
override val handlers = Map(
33+
"password" -> new Password()
34+
)
35+
}.handleRequest(request, dataHandler)
3236

3337
whenReady(f) { result => result should be ('right)}
3438
}
@@ -80,7 +84,11 @@ class TokenEndPointSpec extends FlatSpec with ScalaFutures {
8084
)
8185

8286
val dataHandler = successfulDataHandler()
83-
val f = TokenEndpoint.handleRequest(request, dataHandler)
87+
val f = new TokenEndpoint {
88+
override val handlers = Map(
89+
"password" -> new Password()
90+
)
91+
}.handleRequest(request, dataHandler)
8492

8593
whenReady(f) {result =>
8694
val e = intercept[InvalidRequest] {
@@ -103,13 +111,12 @@ class TokenEndPointSpec extends FlatSpec with ScalaFutures {
103111
val passwordNoCred = new Password() {
104112
override def clientCredentialRequired = false
105113
}
106-
class MyTokenEndpoint extends TokenEndpoint {
114+
115+
val f = new TokenEndpoint {
107116
override val handlers = Map(
108117
"password" -> passwordNoCred
109118
)
110-
}
111-
112-
val f = (new MyTokenEndpoint().handleRequest(request, dataHandler))
119+
}.handleRequest(request, dataHandler)
113120

114121
whenReady(f) { result => result should be ('right)}
115122
}
@@ -126,7 +133,11 @@ class TokenEndPointSpec extends FlatSpec with ScalaFutures {
126133

127134
}
128135

129-
val f = TokenEndpoint.handleRequest(request, dataHandler)
136+
val f = new TokenEndpoint {
137+
override val handlers = Map(
138+
"password" -> new Password()
139+
)
140+
}.handleRequest(request, dataHandler)
130141

131142
whenReady(f) { result =>
132143
intercept[InvalidClient] {

0 commit comments

Comments
 (0)