Fixes #21801: Bad init order for the token generator used for system …

…api token
Normation · Sep 21, 2022 · 91d57d2 · 91d57d2
1 parent d7ba0c9
commit 91d57d2
Show file tree

Hide file tree

Showing 2 changed files with 2 additions and 3 deletions.
diff --git a/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala b/webapp/sources/rudder/rudder-web/src/main/scala/bootstrap/liftweb/RudderConfig.scala
@@ -1011,7 +1011,7 @@ object RudderConfig extends Loggable {
 
   val zioJsonExtractor = new ZioJsonExtractor(queryParser)
 
-  val tokenGenerator = new TokenGeneratorImpl(32)
+  lazy val tokenGenerator = new TokenGeneratorImpl(32)
 
   implicit val userService = new UserService {
     def getCurrentUser = CurrentUser

diff --git a/...rces/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala b/...rces/rudder/rudder-web/src/main/scala/com/normation/rudder/web/services/DisplayNode.scala
@@ -65,8 +65,7 @@ import com.normation.rudder.domain.reports.{ComplianceLevel, ComplianceLevelSeri
 import com.normation.rudder.services.reports.{NoReportInInterval, Pending}
 import com.normation.utils.DateFormaterService
 import com.normation.zio._
-import org.joda.time.format.ISODateTimeFormat
-import xml.Utility.escape
+import scala.xml.Utility.escape
 
 /**
  * A service used to display details about a server