From bf746b759bc8c3015bd4431286a10f4121feec58 Mon Sep 17 00:00:00 2001 From: Allan Brighton Date: Thu, 30 May 2024 19:26:08 +0200 Subject: [PATCH] Updated dependencies and syntax for scala-3.4.x --- .../csw/aas/http/AuthServerIntegration.scala | 24 +++++++++++++++---- .../csw/config/cli/ConfigCliAuthTest.scala | 3 +++ 2 files changed, 23 insertions(+), 4 deletions(-) diff --git a/integration/src/multi-jvm/scala/csw/aas/http/AuthServerIntegration.scala b/integration/src/multi-jvm/scala/csw/aas/http/AuthServerIntegration.scala index c2215bc60a..1dd0a6067a 100644 --- a/integration/src/multi-jvm/scala/csw/aas/http/AuthServerIntegration.scala +++ b/integration/src/multi-jvm/scala/csw/aas/http/AuthServerIntegration.scala @@ -99,9 +99,17 @@ class AuthIntegrationTest realms = Set( Realm( "TMT", - clients = Set( - Client("tmt-frontend-app", "public", passwordGrantEnabled = true, authorizationEnabled = false)), - users = Set(ApplicationUser("john", "secret", realmRoles = Set("admin"))), + clients = Set(Client("tmt-frontend-app", "public", passwordGrantEnabled = true, authorizationEnabled = false)), + users = Set( + ApplicationUser( + "john", + "secret", + firstName = "john", + lastName = "secret", + email = "john@tmt.org", + realmRoles = Set("admin") + ) + ), realmRoles = Set("admin") ) ) @@ -173,7 +181,15 @@ class AuthIntegrationTest clients = Set( Client("tmt-frontend-app", "public", passwordGrantEnabled = true, authorizationEnabled = false) ), - users = Set(ApplicationUser("john", "secret")), + users = Set( + ApplicationUser( + "john", + "secret", + firstName = "john", + lastName = "secret", + email = "john@tmt.org" + ) + ), realmRoles = Set("admin") ) ) diff --git a/integration/src/multi-jvm/scala/csw/config/cli/ConfigCliAuthTest.scala b/integration/src/multi-jvm/scala/csw/config/cli/ConfigCliAuthTest.scala index 23418ca37b..580d5fa6e7 100644 --- a/integration/src/multi-jvm/scala/csw/config/cli/ConfigCliAuthTest.scala +++ b/integration/src/multi-jvm/scala/csw/config/cli/ConfigCliAuthTest.scala @@ -85,6 +85,9 @@ class ConfigCliAuthTest(ignore: Int) ApplicationUser( adminUser, adminPassword, + firstName = adminUser, + lastName = adminUser, + email = s"$adminUser@tmt.org", realmRoles = Set(configAdmin) ) ),