From 86dc389fb2a45d99e82c601f27bcd813dcf8be12 Mon Sep 17 00:00:00 2001
From: irinaschubert <irina.schubert@dasch.swiss>
Date: Tue, 29 Nov 2022 18:02:46 +0100
Subject: [PATCH] fix: Deprecation warnings for SCryptPasswordEncoder (#2308)

---
 dsp-shared/src/main/scala/dsp/valueobjects/User.scala           | 2 +-
 .../admin/responder/usersmessages/UsersMessagesADM.scala        | 2 +-
 .../messages/v1/responder/usermessages/UserMessagesV1.scala     | 2 +-
 .../admin/responder/usersmessages/UsersMessagesADMSpec.scala    | 2 +-
 .../messages/v1/responder/usermessages/UserMessagesV1Spec.scala | 2 +-
 5 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/dsp-shared/src/main/scala/dsp/valueobjects/User.scala b/dsp-shared/src/main/scala/dsp/valueobjects/User.scala
index cd78d74453..241bdf671b 100644
--- a/dsp-shared/src/main/scala/dsp/valueobjects/User.scala
+++ b/dsp-shared/src/main/scala/dsp/valueobjects/User.scala
@@ -177,7 +177,7 @@ object User {
       // check which type of hash we have
       if (self.value.startsWith("$e0801$")) {
         // SCrypt
-        val encoder = new SCryptPasswordEncoder()
+        val encoder = new SCryptPasswordEncoder(16384, 8, 1, 32, 64)
         encoder.matches(passwordString, self.value)
       } else if (self.value.startsWith("$2a$")) {
         // BCrypt
diff --git a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala
index f8eeb1e9b9..9d546e0677 100644
--- a/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala
+++ b/webapi/src/main/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADM.scala
@@ -482,7 +482,7 @@ final case class UserADM(
       if (hashedPassword.startsWith("$e0801$")) {
         // SCrypt
         import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder
-        val encoder = new SCryptPasswordEncoder()
+        val encoder = new SCryptPasswordEncoder(16384, 8, 1, 32, 64)
         encoder.matches(password, hashedPassword)
       } else if (hashedPassword.startsWith("$2a$")) {
         // BCrypt
diff --git a/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1.scala b/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1.scala
index 6c1f6c18c1..9043a26b7b 100644
--- a/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1.scala
+++ b/webapi/src/main/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1.scala
@@ -214,7 +214,7 @@ case class UserProfileV1(
       if (hashedPassword.startsWith("$e0801$")) {
         // SCrypt
         import org.springframework.security.crypto.scrypt.SCryptPasswordEncoder
-        val encoder = new SCryptPasswordEncoder()
+        val encoder = new SCryptPasswordEncoder(16384, 8, 1, 32, 64)
         encoder.matches(password, hashedPassword.toString)
       } else if (hashedPassword.startsWith("$2a$")) {
         // BCrypt
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala
index a787078c1a..9b30bf8ed7 100644
--- a/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/messages/admin/responder/usersmessages/UsersMessagesADMSpec.scala
@@ -87,7 +87,7 @@ class UsersMessagesADMSpec extends CoreSpec {
     }
 
     "allow checking the SCrypt passwords" in {
-      val encoder = new SCryptPasswordEncoder()
+      val encoder = new SCryptPasswordEncoder(16384, 8, 1, 32, 64)
       val hp      = encoder.encode("123456")
       val up = UserADM(
         id = "something",
diff --git a/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1Spec.scala b/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1Spec.scala
index 30b84bd9a7..c9f6881bff 100644
--- a/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1Spec.scala
+++ b/webapi/src/test/scala/org/knora/webapi/messages/v1/responder/usermessages/UserMessagesV1Spec.scala
@@ -69,7 +69,7 @@ class UserMessagesV1Spec extends AnyWordSpecLike with Matchers {
 
     "allow checking SCrypt passwords" in {
       // hashedPassword =  encoder.encode(createRequest.password);
-      val encoder = new SCryptPasswordEncoder
+      val encoder = new SCryptPasswordEncoder(16384, 8, 1, 32, 64)
       val hp      = encoder.encode("123456")
       val up = UserProfileV1(
         userData = UserDataV1(