TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-06-05 06:35:59 +00:00
Code Issues Packages Projects Releases Wiki Activity

Allow to reuse invitation keys on error

Browse Source
This commit is contained in:
Eike Kettner 2019-11-17 17:13:39 +01:00
parent 0d8f39c431
commit 2b10652082
1 changed files with 24 additions and 0 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

24
modules/backend/src/main/scala/docspell/backend/signup/OSignup.scala
View File

@ -4,10 +4,12 @@ import cats.implicits._
import cats.effect.{Effect, Resource} import cats.effect.{Effect, Resource}
import docspell.backend.PasswordCrypt import docspell.backend.PasswordCrypt
import docspell.backend.ops.OCollective.RegisterData import docspell.backend.ops.OCollective.RegisterData
import docspell.common.syntax.all._
import docspell.common._ import docspell.common._
import docspell.store.{AddResult, Store} import docspell.store.{AddResult, Store}
import docspell.store.records.{RCollective, RInvitation, RUser} import docspell.store.records.{RCollective, RInvitation, RUser}
import doobie.free.connection.ConnectionIO import doobie.free.connection.ConnectionIO
import org.log4s.getLogger
trait OSignup[F[_]] { trait OSignup[F[_]] {
@ -17,6 +19,7 @@ trait OSignup[F[_]] {
} }
object OSignup { object OSignup {
private[this] val logger = getLogger
def apply[F[_]:Effect](store: Store[F]): Resource[F, OSignup[F]] = def apply[F[_]:Effect](store: Store[F]): Resource[F, OSignup[F]] =
Resource.pure(new OSignup[F] { Resource.pure(new OSignup[F] {
@ -47,6 +50,12 @@ object OSignup {
ok <- store.transact(RInvitation.useInvite(inv, min)) ok <- store.transact(RInvitation.useInvite(inv, min))
res <- if (ok) addUser(data).map(SignupResult.fromAddResult) res <- if (ok) addUser(data).map(SignupResult.fromAddResult)
else SignupResult.invalidInvitationKey.pure[F] else SignupResult.invalidInvitationKey.pure[F]
_ <- if (retryInvite(res))
logger.fdebug(s"Adding account failed ($res). Allow retry with invite.") *> store
.transact(
RInvitation.insert(RInvitation(inv, now))
)
else 0.pure[F]
} yield res } yield res
case None => case None =>
SignupResult.invalidInvitationKey.pure[F] SignupResult.invalidInvitationKey.pure[F]
@ -54,6 +63,21 @@ object OSignup {
} }
} }
private def retryInvite(res: SignupResult): Boolean =
res match {
case SignupResult.CollectiveExists =>
true
case SignupResult.InvalidInvitationKey =>
false
case SignupResult.SignupClosed =>
true
case SignupResult.Failure(_) =>
true
case SignupResult.Success =>
false
}
private def addUser(data: RegisterData): F[AddResult] = { private def addUser(data: RegisterData): F[AddResult] = {
def toRecords: F[(RCollective, RUser)] = def toRecords: F[(RCollective, RUser)] =
for { for {