- Перенесён OAuth2UserInfo.kt из adapters/security/ в application/ports/input/security/; обновлены импорты во всех зависимых файла

- В UserPrincipal.kt заменён star import java.util.* на явный java.util.UUID.

- В YandexOAuth2UserInfo.kt и VkOAuth2UserInfo.kt убрана аннотация @Suppress("UNCHECKED_CAST")

- В build.gradle.kts хардкод версии заменён на version catalog

- Из CustomOAuth2UserService.kt удалены комментарии на русском языке
This commit is contained in:
skettiks
2026-04-23 23:59:16 +03:00
parent d50e2e640c
commit 312c18645b
8 changed files with 27 additions and 19 deletions
@@ -1,22 +1,26 @@
package com.project.movienight.adapters.security
@Suppress("UNCHECKED_CAST")
import com.project.movienight.application.ports.input.security.OAuth2UserInfo
class VkOAuth2UserInfo(
private val attributes: Map<String, Any>
) : OAuth2UserInfo {
override fun getProviderId(): String {
val response = attributes["response"] as? List<Map<String, Any>>
return response?.firstOrNull()?.get("id")?.toString() ?: ""
return (attributes["response"] as? List<*>)
?.firstOrNull()
?.let { it as? Map<*, *> }
?.get("id")
?.toString() ?: ""
}
override fun getEmail(): String = attributes["email"] as? String ?: ""
override fun getEmail(): String = attributes["email"]?.toString() ?: ""
override fun getName(): String {
val response = attributes["response"] as? List<Map<String, Any>>
val first = response?.firstOrNull()
val firstName = first?.get("first_name") as? String ?: ""
val lastName = first?.get("last_name") as? String ?: ""
val response = attributes["response"] as? List<*>
val first = response?.firstOrNull() as? Map<*, *>
val firstName = first?.get("first_name")?.toString() ?: ""
val lastName = first?.get("last_name")?.toString() ?: ""
return "$firstName $lastName".trim()
}