TheAnachronism/docspell
1
0
Fork 0
mirror of https://github.com/TheAnachronism/docspell.git synced 2025-10-31 17:50:11 +00:00
Code Issues Packages Projects Releases Wiki Activity

Create external accounts independent from signup config

Browse Source 
Refs: #1619, #1621
This commit is contained in:
eikek
2022-07-07 15:25:04 +02:00
parent 2c9e012c96
commit 508ad5bc03
2 changed files with 26 additions and 31 deletions
Download Patch File Download Diff File Expand all files Collapse all files

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

@@ -20,8 +20,10 @@ trait OSignup[F[_]] {
def register(cfg: Config)(data: RegisterData): F[SignupResult]
/** Creates the given account if it doesn't exist. */
def setupExternal(cfg: Config)(data: ExternalAccount): F[SignupResult]
/** Creates the given account if it doesn't exist. This is independent from signup
* configuration.
*/
def setupExternal(data: ExternalAccount): F[SignupResult]
def newInvite(cfg: Config)(password: Password): F[NewInviteResult]
}
@@ -77,36 +79,31 @@ object OSignup {
}
}
def setupExternal(cfg: Config)(data: ExternalAccount): F[SignupResult] =
cfg.mode match {
case Config.Mode.Closed =>
SignupResult.signupClosed.pure[F]
case _ =>
if (data.source == AccountSource.Local)
SignupResult
.failure(new Exception("Account source must not be LOCAL!"))
.pure[F]
else
for {
recs <- makeRecords(data.collName, data.login, Password(""), data.source)
cres <- store.add(
RCollective.insert(recs._1),
RCollective.existsById(data.collName)
)
ures <- store.add(RUser.insert(recs._2), RUser.exists(data.login))
res = cres match {
def setupExternal(data: ExternalAccount): F[SignupResult] =
if (data.source == AccountSource.Local)
SignupResult
.failure(new Exception("Account source must not be LOCAL!"))
.pure[F]
else
for {
recs <- makeRecords(data.collName, data.login, Password(""), data.source)
cres <- store.add(
RCollective.insert(recs._1),
RCollective.existsById(data.collName)
)
ures <- store.add(RUser.insert(recs._2), RUser.exists(data.login))
res = cres match {
case AddResult.Failure(ex) =>
SignupResult.failure(ex)
case _ =>
ures match {
case AddResult.Failure(ex) =>
SignupResult.failure(ex)
case _ =>
ures match {
case AddResult.Failure(ex) =>
SignupResult.failure(ex)
case _ =>
SignupResult.success
}
SignupResult.success
}
} yield res
}
}
} yield res
private def retryInvite(res: SignupResult): Boolean =
res match {

4
modules/restserver/src/main/scala/docspell/restserver/auth/OpenId.scala
View File

@@ -105,9 +105,7 @@ object OpenId {
import dsl._
for {
setup <- backend.signup.setupExternal(cfg.backend.signup)(
ExternalAccount(accountId)
)
setup <- backend.signup.setupExternal(ExternalAccount(accountId))
res <- setup match {
case SignupResult.Failure(ex) =>
logger.error(ex)(s"Error when creating external account!") *>