From 508ad5bc03ab0a03974c79483fbe4b0d585e7f33 Mon Sep 17 00:00:00 2001
From: eikek <eike.kettner@posteo.de>
Date: Thu, 7 Jul 2022 15:25:04 +0200
Subject: [PATCH] Create external accounts independent from signup config

Refs: #1619, #1621
---
 .../docspell/backend/signup/OSignup.scala     | 53 +++++++++----------
 .../docspell/restserver/auth/OpenId.scala     |  4 +-
 2 files changed, 26 insertions(+), 31 deletions(-)

diff --git a/modules/backend/src/main/scala/docspell/backend/signup/OSignup.scala b/modules/backend/src/main/scala/docspell/backend/signup/OSignup.scala
index c59bc773..92314b8c 100644
--- a/modules/backend/src/main/scala/docspell/backend/signup/OSignup.scala
+++ b/modules/backend/src/main/scala/docspell/backend/signup/OSignup.scala
@@ -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 {
diff --git a/modules/restserver/src/main/scala/docspell/restserver/auth/OpenId.scala b/modules/restserver/src/main/scala/docspell/restserver/auth/OpenId.scala
index e57fe256..b65841ef 100644
--- a/modules/restserver/src/main/scala/docspell/restserver/auth/OpenId.scala
+++ b/modules/restserver/src/main/scala/docspell/restserver/auth/OpenId.scala
@@ -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!") *>