Skip to content

Add mobile scope to more challenge api endpoints #15494

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

Merged
merged 2 commits into from
Jun 14, 2024
Merged

Add mobile scope to more challenge api endpoints #15494

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
5321ff3
Add mobile scope to more challenge api endpoints
veloce Jun 14, 2024
6dd7dff
Fix format
veloce Jun 14, 2024
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
116 changes: 59 additions & 57 deletions app/controllers/Challenge.scala
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -26,7 +26,7 @@ final class Challenge(
api.allFor(me).map(env.challenge.jsonView.apply).map(JsonOk)
}

def apiList = ScopedBody(_.Challenge.Read) { ctx ?=> me ?=>
def apiList = ScopedBody(_.Challenge.Read, _.Web.Mobile) { ctx ?=> me ?=>
api.allFor(me, 300).map { all =>
JsonOk:
Json.obj(
Expand All @@ -39,7 +39,7 @@ final class Challenge(
def show(id: ChallengeId, _color: Option[Color]) = Open:
showId(id)

def apiShow(id: ChallengeId) = Scoped(_.Challenge.Read) { ctx ?=> _ ?=>
def apiShow(id: ChallengeId) = Scoped(_.Challenge.Read, _.Web.Mobile) { ctx ?=> _ ?=>
Found(api.byId(id)): c =>
val direction: Option[Direction] =
if isMine(c) then Direction.Out.some
Expand Down Expand Up @@ -125,7 +125,7 @@ final class Challenge(
)

def apiAccept(id: ChallengeId) =
Scoped(_.Challenge.Write, _.Bot.Play, _.Board.Play) { _ ?=> me ?=>
Scoped(_.Challenge.Write, _.Bot.Play, _.Board.Play, _.Web.Mobile) { _ ?=> me ?=>
def tryRematch =
env.bot.player.rematchAccept(id.into(GameId)).flatMap {
if _ then jsonOkResult
Expand Down Expand Up @@ -173,19 +173,20 @@ final class Challenge(
)
.inject(NoContent)
}
def apiDecline(id: ChallengeId) = ScopedBody(_.Challenge.Write, _.Bot.Play, _.Board.Play) { ctx ?=> me ?=>
api.activeByIdFor(id, me).flatMap {
case None =>
env.bot.player.rematchDecline(id.into(GameId)).flatMap {
if _ then jsonOkResult
else notFoundJson()
}
case Some(c) =>
bindForm(env.challenge.forms.decline)(
jsonFormError,
data => api.decline(c, data.realReason).inject(jsonOkResult)
)
}
def apiDecline(id: ChallengeId) = ScopedBody(_.Challenge.Write, _.Bot.Play, _.Board.Play, _.Web.Mobile) {
ctx ?=> me ?=>
api.activeByIdFor(id, me).flatMap {
case None =>
env.bot.player.rematchDecline(id.into(GameId)).flatMap {
if _ then jsonOkResult
else notFoundJson()
}
case Some(c) =>
bindForm(env.challenge.forms.decline)(
jsonFormError,
data => api.decline(c, data.realReason).inject(jsonOkResult)
)
}
}

def cancel(id: ChallengeId) =
Expand All @@ -195,49 +196,50 @@ final class Challenge(
then api.cancel(c).inject(NoContent)
else notFound

def apiCancel(id: ChallengeId) = Scoped(_.Challenge.Write, _.Bot.Play, _.Board.Play) { ctx ?=> me ?=>
api.activeByIdBy(id, me).flatMap {
case Some(c) => api.cancel(c).inject(jsonOkResult)
case None =>
api.activeByIdFor(id, me).flatMap {
case Some(c) => api.decline(c, ChallengeModel.DeclineReason.default).inject(jsonOkResult)
case None =>
import lila.core.misc.map.Tell
import lila.core.round.Abort
import lila.core.round.AbortForce
env.game.gameRepo
.game(id.into(GameId))
.dmap {
_.flatMap { Pov(_, me) }
}
.flatMapz { p =>
env.round.proxyRepo.upgradeIfPresent(p).dmap(some)
}
.flatMap {
case Some(pov) if pov.game.abortableByUser =>
lila.common.Bus.publish(Tell(id.value, Abort(pov.playerId)), "roundSocket")
jsonOkResult
case Some(pov) if pov.game.playable =>
Bearer.from(get("opponentToken")) match
case Some(bearer) =>
val required = OAuthScope.select(_.Challenge.Write).into(EndpointScopes)
env.oAuth.server.auth(bearer, required, ctx.req.some).map {
case Right(access) if pov.opponent.isUser(access.me) =>
def apiCancel(id: ChallengeId) = Scoped(_.Challenge.Write, _.Bot.Play, _.Board.Play, _.Web.Mobile) {
ctx ?=> me ?=>
api.activeByIdBy(id, me).flatMap {
case Some(c) => api.cancel(c).inject(jsonOkResult)
case None =>
api.activeByIdFor(id, me).flatMap {
case Some(c) => api.decline(c, ChallengeModel.DeclineReason.default).inject(jsonOkResult)
case None =>
import lila.core.misc.map.Tell
import lila.core.round.Abort
import lila.core.round.AbortForce
env.game.gameRepo
.game(id.into(GameId))
.dmap {
_.flatMap { Pov(_, me) }
}
.flatMapz { p =>
env.round.proxyRepo.upgradeIfPresent(p).dmap(some)
}
.flatMap {
case Some(pov) if pov.game.abortableByUser =>
lila.common.Bus.publish(Tell(id.value, Abort(pov.playerId)), "roundSocket")
jsonOkResult
case Some(pov) if pov.game.playable =>
Bearer.from(get("opponentToken")) match
case Some(bearer) =>
val required = OAuthScope.select(_.Challenge.Write).into(EndpointScopes)
env.oAuth.server.auth(bearer, required, ctx.req.some).map {
case Right(access) if pov.opponent.isUser(access.me) =>
lila.common.Bus.publish(Tell(id.value, AbortForce), "roundSocket")
jsonOkResult
case Right(_) => BadRequest(jsonError("Not the opponent token"))
case Left(err) => BadRequest(jsonError(err.message))
}
case None if api.isOpenBy(id, me) =>
if pov.game.abortable then
lila.common.Bus.publish(Tell(id.value, AbortForce), "roundSocket")
jsonOkResult
case Right(_) => BadRequest(jsonError("Not the opponent token"))
case Left(err) => BadRequest(jsonError(err.message))
}
case None if api.isOpenBy(id, me) =>
if pov.game.abortable then
lila.common.Bus.publish(Tell(id.value, AbortForce), "roundSocket")
jsonOkResult
else BadRequest(jsonError("The game can no longer be aborted"))
case None => BadRequest(jsonError("Missing opponentToken"))
case _ => notFoundJson()
}
}
}
else BadRequest(jsonError("The game can no longer be aborted"))
case None => BadRequest(jsonError("Missing opponentToken"))
case _ => notFoundJson()
}
}
}
}

def apiStartClocks(id: GameId) = Anon:
Expand Down