Skip to content

[WIP] Added AuthorityFactory #119

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
gakuzzzz wants to merge 1 commit into
base: master
Choose a base branch
from
Open

[WIP] Added AuthorityFactory #119

Changes from all commits
Commits
Show all changes
1 commit
Select commit
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
14 changes: 10 additions & 4 deletions module/src/main/scala/jp/t2v/lab/play2/auth/AuthElement.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,12 +10,18 @@ trait AuthElement extends StackableController with AsyncAuth {
private[auth] case object AuthKey extends RequestAttributeKey[User]
case object AuthorityKey extends RequestAttributeKey[Authority]

private[auth] final case class AuthorityFactoryKey[A]() extends RequestAttributeKey[RequestWithAttributes[A] => Either[Result, Authority]]
def authorityFactoryKey[A]: RequestAttributeKey[RequestWithAttributes[A] => Either[Result, Authority]] = AuthorityFactoryKey()

override def proceed[A](req: RequestWithAttributes[A])(f: RequestWithAttributes[A] => Future[Result]): Future[Result] = {
implicit val (r, ctx) = (req, StackActionExecutionContext(req))
req.get(AuthorityKey) map { authority =>
authorized(authority) flatMap {
case Right((user, resultUpdater)) => super.proceed(req.set(AuthKey, user))(f).map(resultUpdater)
case Left(result) => Future.successful(result)
(req.get(AuthorityKey).map(a => (_: RequestWithAttributes[A]) => Right[Result, Authority](a)) orElse req.get(authorityFactoryKey[A])) map { authorityFactory =>
authorityFactory(req) match {
case Right(authority) => authorized(authority) flatMap {
case Right((user, resultUpdater)) => super.proceed(req.set(AuthKey, user))(f).map(resultUpdater)
case Left(result) => Future.successful(result)
}
case Left(result) => Future.successful(result)
}
} getOrElse {
restoreUser collect {
Expand Down