Fixes #24757: Unable to log in - Server error

Normation · Apr 19, 2024 · 8ae5414 · 8ae5414
1 parent a16969f
commit 8ae5414
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 2 deletions.
diff --git a/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/users/User.scala b/webapp/sources/rudder/rudder-core/src/main/scala/com/normation/rudder/users/User.scala
@@ -117,7 +117,7 @@ case class UserSession(
     authMethod:   String,
     permissions:  List[String],
     authz:        List[String],
-    tenants:      String,
+    tenants:      Option[String],
     endDate:      Option[DateTime],
     endCause:     Option[String]
 )

diff --git a/...sources/rudder/rudder-core/src/main/scala/com/normation/rudder/users/UserRepository.scala b/...sources/rudder/rudder-core/src/main/scala/com/normation/rudder/users/UserRepository.scala
@@ -312,7 +312,7 @@ class InMemoryUserRepository(userBase: Ref[Map[String, UserInfo]], sessionBase:
       date:              DateTime
   ): IOResult[Unit] = {
     sessionBase.update(
-      UserSession(userId, sessionId, date, authenticatorName, permissions.sorted, authz.sorted, tenants, None, None) :: _
+      UserSession(userId, sessionId, date, authenticatorName, permissions.sorted, authz.sorted, Some(tenants), None, None) :: _
     ) *>
     userBase.update(_.map { case (k, v) => if (k == userId) (k, v.modify(_.lastLogin).setTo(Some(date))) else (k, v) })
   }