Merge pull request #1521 from adpi2/fix-1445

Fix timeout on getUserState
scalacenter · Jan 3, 2025 · 03783bf · 03783bf
2 parents 3b6724c + 0aaa1b1
commit 03783bf
Show file tree

Hide file tree

Showing 3 changed files with 18 additions and 4 deletions.
diff --git a/modules/core/shared/src/main/scala/scaladex/core/util/ScalaExtensions.scala b/modules/core/shared/src/main/scala/scaladex/core/util/ScalaExtensions.scala
@@ -50,6 +50,18 @@ object ScalaExtensions {
           } yield builder.addOne(b)
         }
         .map(_.result())
+
+    def flatMapSync[B](
+        f: A => Future[IterableOnce[B]]
+    )(implicit ec: ExecutionContext, bf: BuildFrom[CC[A], B, CC[B]]): Future[CC[B]] =
+      in.iterator
+        .foldLeft(Future.successful(bf.newBuilder(in))) { (builderF, a) =>
+          for {
+            builder <- builderF
+            bs <- f(a)
+          } yield builder.addAll(bs)
+        }
+        .map(_.result())
   }
 
   implicit class IteratorExtension[A](iterator: Iterator[A]) {

diff --git a/modules/infra/src/main/scala/scaladex/infra/GithubClientImpl.scala b/modules/infra/src/main/scala/scaladex/infra/GithubClientImpl.scala
@@ -6,7 +6,6 @@ import scala.concurrent.Promise
 import scala.concurrent.duration.DurationInt
 import scala.util.Try
 
-import cats.implicits.toTraverseOps
 import com.typesafe.scalalogging.LazyLogging
 import io.circe.Json
 import io.circe.syntax._
@@ -335,9 +334,7 @@ class GithubClientImpl(token: Secret)(implicit val system: ActorSystem)
     val permissions = Seq("WRITE", "MAINTAIN", "ADMIN")
     for {
       organizations <- getUserOrganizations(userInfo.login)
-      organizationRepos <- organizations.flatTraverse { org =>
-        getOrganizationRepositories(userInfo.login, org, permissions)
-      }
+      organizationRepos <- organizations.flatMapSync(getOrganizationRepositories(userInfo.login, _, permissions))
       userRepos <- getUserRepositories(userInfo.login, permissions)
     } yield UserState(repos = organizationRepos.toSet ++ userRepos, orgs = organizations.toSet, info = userInfo)
   }

diff --git a/modules/server/src/main/scala/scaladex/server/route/AuthenticationApi.scala b/modules/server/src/main/scala/scaladex/server/route/AuthenticationApi.scala
@@ -2,6 +2,7 @@ package scaladex.server.route
 
 import java.util.UUID
 
+import scala.util.Failure
 import scala.util.Success
 import scala.util.Try
 
@@ -92,6 +93,10 @@ class AuthenticationApi(clientId: String, sessionConfig: SessionConfig, githubAu
                   // Update user state lazily
                   githubAuth.getUserState(token).andThen {
                     case Success(Some(userState)) => database.updateUser(userId, userState)
+                    case Failure(cause) =>
+                      logger.warn(
+                        s"Failed to update user state of ${user.login} ($userId) because of: ${cause.getMessage}"
+                      )
                   }
 
                   setSession(refreshable, usingCookies, userId)(