Skip to content

Commit 6ed086e

Browse files
committed
format code by scalariform
1 parent 40dfea0 commit 6ed086e

20 files changed

+162
-157
lines changed
Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,5 @@
11
package scalaoauth2.provider
22

3-
import play.api.mvc.{Request, WrappedRequest}
3+
import play.api.mvc.{ Request, WrappedRequest }
44

55
case class AuthInfoRequest[A, U](authInfo: AuthInfo[U], private val request: Request[A]) extends WrappedRequest[A](request)

play2-oauth2-provider/src/main/scala/scalaoauth2/provider/AuthorizedActionFunction.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,9 +2,9 @@ package scalaoauth2.provider
22

33
import play.api.mvc._
44

5-
import scala.concurrent.{Future, ExecutionContext}
5+
import scala.concurrent.{ Future, ExecutionContext }
66

7-
case class AuthorizedActionFunction[U](handler: ProtectedResourceHandler[U])(implicit ctx: ExecutionContext) extends ActionFunction[Request, ({type L[A] = AuthInfoRequest[A, U]})#L] with OAuth2Provider {
7+
case class AuthorizedActionFunction[U](handler: ProtectedResourceHandler[U])(implicit ctx: ExecutionContext) extends ActionFunction[Request, ({ type L[A] = AuthInfoRequest[A, U] })#L] with OAuth2Provider {
88

99
override def invokeBlock[A](request: Request[A], block: AuthInfoRequest[A, U] => Future[Result]): Future[Result] = {
1010
authorize(handler) { authInfo =>

play2-oauth2-provider/src/main/scala/scalaoauth2/provider/OAuth2Provider.scala

Lines changed: 9 additions & 9 deletions
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package scalaoauth2.provider
33
import play.api.libs.json._
44
import play.api.mvc._
55

6-
import scala.concurrent.{ExecutionContext, Future}
6+
import scala.concurrent.{ ExecutionContext, Future }
77
import scala.language.implicitConversions
88

99
/**
@@ -68,12 +68,12 @@ trait OAuth2BaseProvider extends Results {
6868
"token_type" -> JsString(r.tokenType),
6969
"access_token" -> JsString(r.accessToken)
7070
) ++ r.expiresIn.map {
71-
"expires_in" -> JsNumber(_)
72-
} ++ r.refreshToken.map {
73-
"refresh_token" -> JsString(_)
74-
} ++ r.scope.map {
75-
"scope" -> JsString(_)
76-
}
71+
"expires_in" -> JsNumber(_)
72+
} ++ r.refreshToken.map {
73+
"refresh_token" -> JsString(_)
74+
} ++ r.scope.map {
75+
"scope" -> JsString(_)
76+
}
7777
}
7878

7979
protected[scalaoauth2] def responseOAuthErrorJson(e: OAuthError): JsValue = Json.obj(
@@ -136,7 +136,7 @@ trait OAuth2Provider extends OAuth2BaseProvider {
136136
*/
137137
def issueAccessToken[A, U](handler: AuthorizationHandler[U])(implicit request: Request[A], ctx: ExecutionContext): Future[Result] = {
138138
tokenEndpoint.handleRequest(request, handler).map {
139-
case Left(e) => new Status(e.statusCode)(responseOAuthErrorJson(e)).withHeaders(responseOAuthErrorHeader(e))
139+
case Left(e) => new Status(e.statusCode)(responseOAuthErrorJson(e)).withHeaders(responseOAuthErrorHeader(e))
140140
case Right(r) => Ok(Json.toJson(responseAccessToken(r))).withHeaders("Cache-Control" -> "no-store", "Pragma" -> "no-cache")
141141
}
142142
}
@@ -155,7 +155,7 @@ trait OAuth2Provider extends OAuth2BaseProvider {
155155
*/
156156
def authorize[A, U](handler: ProtectedResourceHandler[U])(callback: AuthInfo[U] => Future[Result])(implicit request: Request[A], ctx: ExecutionContext): Future[Result] = {
157157
protectedResource.handleRequest(request, handler).flatMap {
158-
case Left(e) => Future.successful(new Status(e.statusCode).withHeaders(responseOAuthErrorHeader(e)))
158+
case Left(e) => Future.successful(new Status(e.statusCode).withHeaders(responseOAuthErrorHeader(e)))
159159
case Right(authInfo) => callback(authInfo)
160160
}
161161
}

play2-oauth2-provider/src/main/scala/scalaoauth2/provider/OAuth2ProviderActionBuilders.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -2,13 +2,13 @@ package scalaoauth2.provider
22

33
import play.api.mvc._
44

5-
import scala.concurrent.{Future, ExecutionContext}
5+
import scala.concurrent.{ Future, ExecutionContext }
66

77
trait OAuth2ProviderActionBuilders {
88

99
implicit val executionContext: ExecutionContext
1010

11-
def AuthorizedAction[U](handler: ProtectedResourceHandler[U]): ActionBuilder[({type L[A] = AuthInfoRequest[A, U]})#L] = {
11+
def AuthorizedAction[U](handler: ProtectedResourceHandler[U]): ActionBuilder[({ type L[A] = AuthInfoRequest[A, U] })#L] = {
1212
AuthorizedActionFunction(handler) compose Action
1313
}
1414

play2-oauth2-provider/src/main/scala/scalaoauth2/provider/package.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package scalaoauth2
33
import play.api.mvc.Result
44

55
import scala.concurrent.duration._
6-
import scala.concurrent.{Await, Future}
6+
import scala.concurrent.{ Await, Future }
77

88
package object provider {
99

play2-oauth2-provider/src/test/scala/scalaoauth2/provider/OAuth2ProviderActionBuildersSpec.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -17,8 +17,8 @@ class OAuth2ProviderActionBuildersSpec extends FlatSpec {
1717

1818
it should "return BadRequest" in {
1919
val result = action(FakeRequest())
20-
status(result) should be (400)
21-
contentAsString(result) should be ("")
20+
status(result) should be(400)
21+
contentAsString(result) should be("")
2222
}
2323

2424
}

play2-oauth2-provider/src/test/scala/scalaoauth2/provider/OAuth2ProviderSpec.scala

Lines changed: 19 additions & 19 deletions
Original file line numberDiff line numberDiff line change
@@ -3,8 +3,8 @@ package scalaoauth2.provider
33
import org.scalatest.Matchers._
44
import org.scalatest._
55
import play.api.libs.json._
6-
import play.api.mvc.{AnyContentAsFormUrlEncoded, AnyContentAsJson}
7-
import play.api.test.{FakeHeaders, FakeRequest}
6+
import play.api.mvc.{ AnyContentAsFormUrlEncoded, AnyContentAsJson }
7+
import play.api.test.{ FakeHeaders, FakeRequest }
88

99
class OAuth2ProviderSpec extends FlatSpec {
1010

@@ -14,24 +14,24 @@ class OAuth2ProviderSpec extends FlatSpec {
1414

1515
it should "return including access token" in {
1616
val map = TestOAuthProvider.responseAccessToken(GrantHandlerResult(tokenType = "Bearer", accessToken = "access_token", expiresIn = Some(3600), refreshToken = None, scope = None))
17-
map.get("token_type") should contain (JsString("Bearer"))
18-
map.get("access_token") should contain (JsString("access_token"))
19-
map.get("expires_in") should contain (JsNumber(3600))
20-
map.get("refresh_token") should be (None)
21-
map.get("scope") should be (None)
22-
map.get("custom_key") should contain (JsString("custom_value"))
17+
map.get("token_type") should contain(JsString("Bearer"))
18+
map.get("access_token") should contain(JsString("access_token"))
19+
map.get("expires_in") should contain(JsNumber(3600))
20+
map.get("refresh_token") should be(None)
21+
map.get("scope") should be(None)
22+
map.get("custom_key") should contain(JsString("custom_value"))
2323
}
2424

2525
it should "return error message as JSON" in {
2626
val json = TestOAuthProvider.responseOAuthErrorJson(new InvalidRequest("request is invalid"))
27-
(json \ "error").as[String] should be ("invalid_request")
28-
(json \ "error_description").as[String] should be ("request is invalid")
27+
(json \ "error").as[String] should be("invalid_request")
28+
(json \ "error_description").as[String] should be("request is invalid")
2929
}
3030

3131
it should "return error message to header" in {
3232
val (name, value) = TestOAuthProvider.responseOAuthErrorHeader(new InvalidRequest("request is invalid"))
33-
name should be ("WWW-Authenticate")
34-
value should be ("""Bearer error="invalid_request", error_description="request is invalid"""")
33+
name should be("WWW-Authenticate")
34+
value should be("""Bearer error="invalid_request", error_description="request is invalid"""")
3535
}
3636

3737
it should "get parameters from form url encoded body" in {
@@ -41,8 +41,8 @@ class OAuth2ProviderSpec extends FlatSpec {
4141
)
4242
val request = FakeRequest(method = "GET", uri = "/", headers = FakeHeaders(), body = AnyContentAsFormUrlEncoded(values))
4343
val params = TestOAuthProvider.getParam(request)
44-
params.get("id") should contain (List("1000"))
45-
params.get("language") should contain (List("Scala"))
44+
params.get("id") should contain(List("1000"))
45+
params.get("language") should contain(List("Scala"))
4646
}
4747

4848
it should "get parameters from query string" in {
@@ -52,9 +52,9 @@ class OAuth2ProviderSpec extends FlatSpec {
5252
)
5353
val request = FakeRequest(method = "GET", uri = "/?version=2.11", headers = FakeHeaders(), body = AnyContentAsFormUrlEncoded(values))
5454
val params = TestOAuthProvider.getParam(request)
55-
params.get("id") should contain (List("1000"))
56-
params.get("language") should contain (List("Scala"))
57-
params.get("version") should contain (List("2.11"))
55+
params.get("id") should contain(List("1000"))
56+
params.get("language") should contain(List("Scala"))
57+
params.get("version") should contain(List("2.11"))
5858
}
5959

6060
it should "get parameters from JSON body" in {
@@ -64,7 +64,7 @@ class OAuth2ProviderSpec extends FlatSpec {
6464
)
6565
val request = FakeRequest(method = "GET", uri = "/", headers = FakeHeaders(), body = AnyContentAsJson(json))
6666
val params = TestOAuthProvider.getParam(request)
67-
params.get("id") should contain (List("1000"))
68-
params.get("language") should contain (List("Scala"))
67+
params.get("id") should contain(List("1000"))
68+
params.get("language") should contain(List("Scala"))
6969
}
7070
}

project/Build.scala

Lines changed: 16 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
import sbt._
22
import Keys._
3+
import com.typesafe.sbt.SbtScalariform._
34

45
object ScalaOAuth2Build extends Build {
56

@@ -14,18 +15,21 @@ object ScalaOAuth2Build extends Build {
1415
"org.scalatest" %% "scalatest" % "2.2.4" % "test"
1516
)
1617

17-
lazy val scalaOAuth2ProviderSettings = Defaults.coreDefaultSettings ++ Seq(
18-
organization := _organization,
19-
version := _version,
20-
scalaVersion := _scalaVersion,
21-
crossScalaVersions := _crossScalaVersions,
22-
scalacOptions ++= _scalacOptions,
23-
publishTo <<= version { (v: String) => _publishTo(v) },
24-
publishMavenStyle := true,
25-
publishArtifact in Test := false,
26-
pomIncludeRepository := { x => false },
27-
pomExtra := _pomExtra
28-
)
18+
lazy val scalaOAuth2ProviderSettings =
19+
Defaults.coreDefaultSettings ++
20+
scalariformSettings ++
21+
Seq(
22+
organization := _organization,
23+
version := _version,
24+
scalaVersion := _scalaVersion,
25+
crossScalaVersions := _crossScalaVersions,
26+
scalacOptions ++= _scalacOptions,
27+
publishTo <<= version { (v: String) => _publishTo(v) },
28+
publishMavenStyle := true,
29+
publishArtifact in Test := false,
30+
pomIncludeRepository := { x => false },
31+
pomExtra := _pomExtra
32+
)
2933

3034
lazy val root = Project(
3135
id = "scala-oauth2-provider",

project/plugins.sbt

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -0,0 +1 @@
1+
addSbtPlugin("com.typesafe.sbt" % "sbt-scalariform" % "1.3.0")

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

Lines changed: 28 additions & 28 deletions
Original file line numberDiff line numberDiff line change
@@ -8,19 +8,19 @@ class AuthorizationRequest(headers: Map[String, Seq[String]], params: Map[String
88

99
/**
1010
* Returns grant_type.
11-
*
12-
* OAuth defines four grant types:
11+
*
12+
* OAuth defines four grant types:
1313
* authorization code
1414
* implicit
1515
* resource owner password credentials, and client credentials.
16-
*
16+
*
1717
* @return grant_type
1818
*/
1919
def grantType: String = requireParam("grant_type")
2020

2121
/**
2222
* Returns scope.
23-
*
23+
*
2424
* @return scope
2525
*/
2626
def scope: Option[String] = param("scope")
@@ -49,31 +49,31 @@ class AuthorizationRequest(headers: Map[String, Seq[String]], params: Map[String
4949

5050
case class RefreshTokenRequest(request: AuthorizationRequest) extends AuthorizationRequest(request.headers, request.params) {
5151
/**
52-
* returns refresh_token.
53-
*
54-
* @return code.
55-
* @throws InvalidRequest if the parameter is not found
56-
*/
52+
* returns refresh_token.
53+
*
54+
* @return code.
55+
* @throws InvalidRequest if the parameter is not found
56+
*/
5757
def refreshToken: String = requireParam("refresh_token")
5858

5959
override lazy val clientCredential = request.clientCredential
6060
}
6161

6262
case class PasswordRequest(request: AuthorizationRequest) extends AuthorizationRequest(request.headers, request.params) {
6363
/**
64-
* returns username.
65-
*
66-
* @return username.
67-
* @throws InvalidRequest if the parameter is not found
68-
*/
64+
* returns username.
65+
*
66+
* @return username.
67+
* @throws InvalidRequest if the parameter is not found
68+
*/
6969
def username = requireParam("username")
7070

7171
/**
72-
* returns password.
73-
*
74-
* @return password.
75-
* @throws InvalidRequest if the parameter is not found
76-
*/
72+
* returns password.
73+
*
74+
* @return password.
75+
* @throws InvalidRequest if the parameter is not found
76+
*/
7777
def password = requireParam("password")
7878

7979
override lazy val clientCredential = request.clientCredential
@@ -85,18 +85,18 @@ case class ClientCredentialsRequest(request: AuthorizationRequest) extends Autho
8585

8686
case class AuthorizationCodeRequest(request: AuthorizationRequest) extends AuthorizationRequest(request.headers, request.params) {
8787
/**
88-
* returns code.
89-
*
90-
* @return code.
91-
* @throws InvalidRequest if code is not found
92-
*/
88+
* returns code.
89+
*
90+
* @return code.
91+
* @throws InvalidRequest if code is not found
92+
*/
9393
def code: String = requireParam("code")
9494

9595
/**
96-
* Returns redirect_uri.
97-
*
98-
* @return redirect_uri
99-
*/
96+
* Returns redirect_uri.
97+
*
98+
* @return redirect_uri
99+
*/
100100
def redirectUri: Option[String] = param("redirect_uri")
101101

102102
override lazy val clientCredential = request.clientCredential

0 commit comments

Comments
 (0)