UserDetailsServiceImpl -> Scala

src/main/scala/ru/org/linux/auth/UserDetailsServiceImpl.scala

@@ -0,0 +1,74 @@
+/*
+ * Copyright 1998-2024 Linux.org.ru
+ *    Licensed under the Apache License, Version 2.0 (the "License");
+ *    you may not use this file except in compliance with the License.
+ *    You may obtain a copy of the License at
+ *
+ *        http://www.apache.org/licenses/LICENSE-2.0
+ *
+ *    Unless required by applicable law or agreed to in writing, software
+ *    distributed under the License is distributed on an "AS IS" BASIS,
+ *    WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied.
+ *    See the License for the specific language governing permissions and
+ *    limitations under the License.
+ */
+package ru.org.linux.auth
+
+import org.springframework.dao.DataAccessException
+import org.springframework.security.core.GrantedAuthority
+import org.springframework.security.core.authority.SimpleGrantedAuthority
+import org.springframework.security.core.userdetails.UserDetails
+import org.springframework.security.core.userdetails.UserDetailsService
+import org.springframework.security.core.userdetails.UsernameNotFoundException
+import org.springframework.stereotype.Component
+import ru.org.linux.user.*
+
+import scala.jdk.CollectionConverters.SeqHasAsJava
+
+object UserDetailsServiceImpl {
+  private def retrieveUserAuthorities(user: User) = {
+    val results = Vector.newBuilder[GrantedAuthority]
+
+    if (user.isActivated) {
+      results.addOne(new SimpleGrantedAuthority("ROLE_ANONYMOUS"))
+
+      if (user.canCorrect) {
+        results.addOne(new SimpleGrantedAuthority("ROLE_CORRECTOR"))
+      }
+
+      if (user.isModerator) {
+        results.addOne(new SimpleGrantedAuthority("ROLE_MODERATOR"))
+      }
+
+      if (user.isAdministrator) {
+        results.addOne(new SimpleGrantedAuthority("ROLE_ADMIN"))
+      }
+    }
+
+    results.result()
+  }
+}
+
+@Component
+class UserDetailsServiceImpl(userDao: UserDao, userService: UserService, profileDao: ProfileDao) extends UserDetailsService {
+  @throws[UsernameNotFoundException]
+  @throws[DataAccessException]
+  override def loadUserByUsername(username: String): UserDetails = {
+    val user: User = if (username.contains("@")) {
+      userDao.getByEmail(username, true)
+    } else {
+      try {
+        userService.getUser(username)
+      } catch {
+        case _: UserNotFoundException =>
+          throw new UsernameNotFoundException(username)
+      }
+    }
+
+    if (user == null) {
+      throw new UsernameNotFoundException(username)
+    }
+
+    new UserDetailsImpl(user, UserDetailsServiceImpl.retrieveUserAuthorities(user).asJava, profileDao.readProfile(user.getId))
+  }
+}

src/main/scala/ru/org/linux/user/UserService.scala

@@ -35,12 +35,10 @@ import java.util.Optional
 import javax.annotation.Nullable
 import javax.mail.internet.InternetAddress
 import scala.collection.mutable
-import scala.compat.java8.OptionConverters.RichOptionalGeneric
 import scala.jdk.CollectionConverters.*
-import scala.jdk.OptionConverters.RichOption
+import scala.jdk.OptionConverters.*
 import scala.util.{Failure, Success, Try}
 
-@Service
 object UserService {
   val MaxFileSize: Int = 100 * 1024
   val MinImageSize = 50
@@ -182,7 +180,7 @@ class UserService(siteConfig: SiteConfig, userDao: UserDao, ignoreListDao: Ignor
 
     users.asScala.map { case (userId, lastlogin) =>
       val user = getUserCached(userId)
-      (user, lastlogin.asScala.exists(_.isAfter(recentSeenDate)))
+      (user, lastlogin.toScala.exists(_.isAfter(recentSeenDate)))
     }
   }