Always try to remove Web Push subscription instead of checking if the

revoke is for the mobile scope. This allow to simplify code and move
code from app to modules and simplify it in exchange of more calls to
the db.

Author: julien4215

app/controllers/OAuth.scala

@@ -9,7 +9,7 @@ import lila.app.*
 import lila.common.HTTPRequest
 import lila.common.Json.given
 import lila.core.net.Bearer
-import lila.oauth.{ AccessToken, AccessTokenRequest, AuthorizationRequest, OAuthScopes }
+import lila.oauth.{ AccessTokenRequest, AuthorizationRequest, OAuthScopes }
 
 import Api.ApiResult
 
@@ -100,23 +100,14 @@ final class OAuth(env: Env, apiC: => Api) extends LilaController(env):
 
   def tokenRevoke = Scoped() { ctx ?=> _ ?=>
     HTTPRequest.bearer(ctx.req).so { token =>
-      for
-        _ <- env.oAuth.tokenApi.revoke(token)
-        _ <- ctx.isMobileOauth.soFu:
-          env.push.webSubscriptionApi.unsubscribeBySession(AccessToken.Id.from(token).value)
-      yield NoContent
+      env.oAuth.tokenApi.revoke(token).inject(NoContent)
     }
   }
 
   def revokeClient = AuthBody { ctx ?=> _ ?=>
     bindForm(lila.oauth.AccessTokenRequest.revokeClientForm)(
       _ => BadRequest,
-      origin =>
-        for
-          tokens <- env.oAuth.tokenApi.revokeByClientOrigin(origin)
-          _      <- (origin == "org.lichess.mobile://").soFu:
-            tokens.traverse(token => env.push.webSubscriptionApi.unsubscribeBySession(token.value))
-        yield NoContent
+      origin => env.oAuth.tokenApi.revokeByClientOrigin(origin).inject(NoContent)
     )
   }
 

modules/oauth/src/main/AccessTokenApi.scala

@@ -176,29 +176,26 @@ final class AccessTokenApi(
       .runWith(Sink.ignore)
       .void
 
-  def revokeByClientOrigin(clientOrigin: String)(using me: MyId): Fu[List[AccessToken.Id]] =
-    for
-      tokens <- coll
-        .find(
-          $doc(
-            F.userId       -> me,
-            F.clientOrigin -> clientOrigin
-          ),
-          $doc(F.id -> 1).some
-        )
-        .sort($sort.desc(F.usedAt))
-        .cursor[Bdoc]()
-        .list(100)
-        .flatMap: invalidate =>
-          coll.delete
-            .one:
-              $doc(
-                F.userId       -> me,
-                F.clientOrigin -> clientOrigin
-              )
-            .map(_ => invalidate.flatMap(_.getAsOpt[AccessToken.Id](F.id)))
-      _ = tokens.foreach(onRevoke(_))
-    yield tokens
+  def revokeByClientOrigin(clientOrigin: String)(using me: MyId): Funit =
+    coll
+      .find(
+        $doc(
+          F.userId       -> me,
+          F.clientOrigin -> clientOrigin
+        ),
+        $doc(F.id -> 1).some
+      )
+      .sort($sort.desc(F.usedAt))
+      .cursor[Bdoc]()
+      .list(100)
+      .flatMap: invalidate =>
+        coll.delete
+          .one:
+            $doc(
+              F.userId       -> me,
+              F.clientOrigin -> clientOrigin
+            )
+          .map(_ => invalidate.flatMap(_.getAsOpt[AccessToken.Id](F.id)).foreach(onRevoke))
 
   def revoke(bearer: Bearer) =
     val id = AccessToken.Id.from(bearer)

modules/push/src/main/Env.scala

@@ -50,6 +50,9 @@ final class Env(
     f.logFailure(logger)
     ()
 
+  Bus.sub[lila.core.misc.oauth.TokenRevoke]: token =>
+    webSubscriptionApi.unsubscribeBySession(token.id)
+
   Bus.sub[lila.core.game.FinishGame]: f =>
     logUnit { pushApi.finish(f.game) }