Give all employees access to arena

NDLANO · Jan 30, 2025 · efe5eeb · efe5eeb
1 parent e82b57e
commit efe5eeb
Show file tree

Hide file tree

Showing 9 changed files with 47 additions and 47 deletions.
diff --git a/myndla-api/src/main/scala/no/ndla/myndlaapi/MyNDLAAuthHelpers.scala b/myndla-api/src/main/scala/no/ndla/myndlaapi/MyNDLAAuthHelpers.scala
@@ -18,12 +18,13 @@ import sttp.tapir.*
 import sttp.tapir.server.PartialServerEndpoint
 
 trait MyNDLAAuthHelpers {
-  this: UserService with TapirErrorHandling =>
+  this: UserService & TapirErrorHandling =>
 
   object MyNDLAAuthHelpers {
     implicit class authlessEndpointFeideExtension[A, I, E, O, R](self: Endpoint[Unit, I, AllErrors, O, R]) {
-      type MaybeFeideToken            = Option[FeideAccessToken]
-      type PartialFeideEndpoint[F[_]] = PartialServerEndpoint[MaybeFeideToken, MyNDLAUser, I, AllErrors, O, R, F]
+      private type MaybeFeideToken = Option[FeideAccessToken]
+      private type PartialFeideEndpoint[F[_]] =
+        PartialServerEndpoint[MaybeFeideToken, MyNDLAUser, I, AllErrors, O, R, F]
       def requireMyNDLAUser[F[_]](
           requireArena: Boolean = false,
           requireArenaAdmin: Boolean = false
@@ -37,7 +38,7 @@ trait MyNDLAAuthHelpers {
               case Left(err)                                                  => Left(err)
             }
           } else if (requireArena) userService.getArenaEnabledUser(maybeToken).handleErrorsOrOk
-          else userService.getMyNdlaUserDataDomain(maybeToken, List.empty).handleErrorsOrOk
+          else userService.getMyNdlaUserDataDomain(maybeToken).handleErrorsOrOk
         }
         val securityLogic = (m: MonadError[F]) => (a: Option[FeideAccessToken]) => m.unit(authFunc(a))
         PartialServerEndpoint(newEndpoint, securityLogic)

diff --git a/myndla-api/src/main/scala/no/ndla/myndlaapi/service/ArenaReadService.scala b/myndla-api/src/main/scala/no/ndla/myndlaapi/service/ArenaReadService.scala
@@ -593,7 +593,7 @@ trait ArenaReadService {
         for {
           feideToken   <- feideApiClient.getFeideAccessTokenOrFail(feideAccessToken)
           feideId      <- feideApiClient.getFeideID(feideAccessToken)
-          user         <- userService.getOrCreateMyNDLAUserIfNotExist(feideId, feideAccessToken, List.empty)(session)
+          user         <- userService.getOrCreateMyNDLAUserIfNotExist(feideId, feideAccessToken)(session)
           nodebbUserId <- nodebb.getUserId(feideToken)
           _            <- arenaRepository.disconnectPostsByUser(user.id)(session)
           _            <- arenaRepository.disconnectTopicsByUser(user.id)(session)

diff --git a/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderConverterService.scala b/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderConverterService.scala
@@ -180,7 +180,7 @@ trait FolderConverterService {
     }
 
     def toApiUserData(
-        domainUserData: DomainMyNDLAUser,
+        domainUserData: DomainMyNDLAUser
     ): model.api.myndla.MyNDLAUserDTO = {
       model.api.myndla.MyNDLAUserDTO(
         id = domainUserData.id,

diff --git a/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderReadService.scala b/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderReadService.scala
@@ -271,12 +271,10 @@ trait FolderReadService {
         feideAccessToken: Option[FeideAccessToken]
     ): Try[MyNDLAUserDTO] =
       for {
-        users <- configService.getMyNDLAEnabledUsers
         user <- userRepository.rollbackOnFailure(session =>
-          userService.getOrCreateMyNDLAUserIfNotExist(feideId, feideAccessToken, users)(session)
+          userService.getOrCreateMyNDLAUserIfNotExist(feideId, feideAccessToken)(session)
         )
-        orgs <- configService.getMyNDLAEnabledOrgs
-      } yield folderConverterService.toApiUserData(user, orgs)
+      } yield folderConverterService.toApiUserData(user)
 
     def getStats: Option[api.StatsDTO] = {
       implicit val session: DBSession = folderRepository.getSession(true)

diff --git a/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderWriteService.scala b/myndla-api/src/main/scala/no/ndla/myndlaapi/service/FolderWriteService.scala
@@ -60,7 +60,7 @@ trait FolderWriteService {
 
     private def getMyNDLAUser(feideId: FeideID, feideAccessToken: Option[FeideAccessToken]): Try[MyNDLAUser] = {
       userRepository.rollbackOnFailure(session =>
-        userService.getOrCreateMyNDLAUserIfNotExist(feideId, feideAccessToken, List.empty)(session)
+        userService.getOrCreateMyNDLAUserIfNotExist(feideId, feideAccessToken)(session)
       )
     }
 

diff --git a/myndla-api/src/main/scala/no/ndla/myndlaapi/service/UserService.scala b/myndla-api/src/main/scala/no/ndla/myndlaapi/service/UserService.scala
@@ -57,7 +57,7 @@ trait UserService {
     }
 
     def getMyNdlaUserDataDomain(
-        feideAccessToken: Option[FeideAccessToken],
+        feideAccessToken: Option[FeideAccessToken]
     ): Try[MyNDLAUser] = {
       for {
         feideId <- feideApiClient.getFeideID(feideAccessToken)
@@ -70,7 +70,8 @@ trait UserService {
     def getArenaEnabledUser(feideAccessToken: Option[FeideAccessToken]): Try[MyNDLAUser] = {
       for {
         userData <- getMyNdlaUserDataDomain(feideAccessToken)
-        user <- if (userData.arenaEnabled) Success(userData) else Failure(AccessDeniedException("User is not arena enabled"))
+        user <-
+          if (userData.arenaEnabled) Success(userData) else Failure(AccessDeniedException("User is not arena enabled"))
       } yield user
     }
 
@@ -83,7 +84,7 @@ trait UserService {
 
     def getOrCreateMyNDLAUserIfNotExist(
         feideId: FeideID,
-        feideAccessToken: Option[FeideAccessToken],
+        feideAccessToken: Option[FeideAccessToken]
     )(implicit session: DBSession): Try[MyNDLAUser] = {
       userRepository.reserveFeideIdIfNotExists(feideId)(session).flatMap {
         case false => createMyNDLAUser(feideId, feideAccessToken)(session)
@@ -148,7 +149,7 @@ trait UserService {
         updaterMyNdla: Option[MyNDLAUser]
     )(session: DBSession = AutoSession): Try[myndla.MyNDLAUserDTO] = {
       for {
-        existing     <- userService.getUserById(userId)(session)
+        existing <- userService.getUserById(userId)(session)
         converted <- folderConverterService.mergeUserData(
           existing,
           updatedUser,
@@ -191,7 +192,7 @@ trait UserService {
 
     private def createMyNDLAUser(
         feideId: FeideID,
-        feideAccessToken: Option[FeideAccessToken],
+        feideAccessToken: Option[FeideAccessToken]
     )(implicit
         session: DBSession
     ): Try[MyNDLAUser] = {
@@ -220,14 +221,14 @@ trait UserService {
     private def fetchDataAndUpdateMyNDLAUser(
         feideId: FeideID,
         feideAccessToken: Option[FeideAccessToken],
-        userData: MyNDLAUser,
+        userData: MyNDLAUser
     )(implicit
         session: DBSession
     ): Try[MyNDLAUser] = {
       val feideUser    = feideApiClient.getFeideExtendedUser(feideAccessToken).?
       val organization = feideApiClient.getOrganization(feideAccessToken).?
       val feideGroups  = feideApiClient.getFeideGroups(feideAccessToken).?
-      val userRole    = if (feideUser.isTeacher) UserRole.EMPLOYEE else UserRole.STUDENT
+      val userRole     = if (feideUser.isTeacher) UserRole.EMPLOYEE else UserRole.STUDENT
       val updatedMyNDLAUser = MyNDLAUser(
         id = userData.id,
         feideId = userData.feideId,

diff --git a/myndla-api/src/test/scala/no/ndla/myndlaapi/service/FolderConverterServiceTest.scala b/myndla-api/src/test/scala/no/ndla/myndlaapi/service/FolderConverterServiceTest.scala
@@ -448,7 +448,7 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment {
         arenaGroups = List.empty
       )
 
-    service.toApiUserData(domainUserData, List.empty) should be(expectedUserData)
+    service.toApiUserData(domainUserData) should be(expectedUserData)
   }
 
   test("That mergeUserData works correctly") {
@@ -563,13 +563,13 @@ class FolderConverterServiceTest extends UnitTestSuite with TestEnvironment {
       arenaAccepted = true
     )
 
-    service.mergeUserData(domainUserData, updatedUserData1, None, None, List.empty, List.empty, None).get should be(
+    service.mergeUserData(domainUserData, updatedUserData1, None, None, None).get should be(
       expectedUserData1
     )
-    service.mergeUserData(domainUserData, updatedUserData2, None, None, List.empty, List.empty, None).get should be(
+    service.mergeUserData(domainUserData, updatedUserData2, None, None, None).get should be(
       expectedUserData2
     )
-    service.mergeUserData(domainUserData, updatedUserData3, None, None, List.empty, List.empty, None).get should be(
+    service.mergeUserData(domainUserData, updatedUserData3, None, None, None).get should be(
       expectedUserData3
     )
   }