From e28c21a2c93aee9278fd31b1e72039cea528e181 Mon Sep 17 00:00:00 2001 From: grimsi <9295182+grimsi@users.noreply.github.com> Date: Thu, 19 Sep 2024 09:17:22 +0200 Subject: [PATCH] Rename package "meta" to "core" --- .../kotlin/de/grimsi/gameyfin/config/ConfigEndpoint.kt | 2 +- .../kotlin/de/grimsi/gameyfin/{meta => core}/Roles.kt | 2 +- .../grimsi/gameyfin/{meta => core}/SetupDataLoader.kt | 2 +- .../annotations/DynamicAccessInterceptor.kt | 2 +- .../{meta => core}/annotations/DynamicPublicAccess.kt | 2 +- .../{meta => core}/annotations/NullOrNotBlank.kt | 2 +- .../annotations/NullOrNotBlankValidator.kt | 2 +- .../{meta => core}/development/DelayInterceptor.kt | 2 +- .../{meta => core}/security/AuthorityMapperConfig.kt | 2 +- .../{meta => core}/security/PasswordEncoderConfig.kt | 2 +- .../gameyfin/{meta => core}/security/SecurityConfig.kt | 2 +- .../{meta => core}/security/SessionRegistryConfig.kt | 2 +- .../security/SsoAuthenticationSuccessHandler.kt | 2 +- .../{meta => core}/security/SsoEnabledCondition.kt | 2 +- .../gameyfin/{meta => core}/security/WebConfig.kt | 6 +++--- .../de/grimsi/gameyfin/libraries/LibraryEndpoint.kt | 2 +- .../gameyfin/notifications/NotificationEndpoint.kt | 10 +++++----- .../kotlin/de/grimsi/gameyfin/setup/SetupEndpoint.kt | 2 +- .../kotlin/de/grimsi/gameyfin/setup/SetupService.kt | 2 +- .../kotlin/de/grimsi/gameyfin/system/SystemEndpoint.kt | 2 +- .../kotlin/de/grimsi/gameyfin/users/RoleService.kt | 2 +- .../kotlin/de/grimsi/gameyfin/users/UserEndpoint.kt | 2 +- .../kotlin/de/grimsi/gameyfin/users/UserService.kt | 2 +- .../grimsi/gameyfin/users/avatar/AvatarController.kt | 2 +- .../de/grimsi/gameyfin/users/dto/UserUpdateDto.kt | 2 +- .../gameyfin/users/util/UserDetailsExtensions.kt | 2 +- 26 files changed, 32 insertions(+), 32 deletions(-) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/Roles.kt (94%) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/SetupDataLoader.kt (98%) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/annotations/DynamicAccessInterceptor.kt (96%) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/annotations/DynamicPublicAccess.kt (89%) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/annotations/NullOrNotBlank.kt (91%) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/annotations/NullOrNotBlankValidator.kt (88%) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/development/DelayInterceptor.kt (92%) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/security/AuthorityMapperConfig.kt (92%) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/security/PasswordEncoderConfig.kt (90%) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/security/SecurityConfig.kt (99%) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/security/SessionRegistryConfig.kt (90%) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/security/SsoAuthenticationSuccessHandler.kt (98%) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/security/SsoEnabledCondition.kt (97%) rename src/main/kotlin/de/grimsi/gameyfin/{meta => core}/security/WebConfig.kt (80%) diff --git a/src/main/kotlin/de/grimsi/gameyfin/config/ConfigEndpoint.kt b/src/main/kotlin/de/grimsi/gameyfin/config/ConfigEndpoint.kt index d3acb4c..787fb47 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/config/ConfigEndpoint.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/config/ConfigEndpoint.kt @@ -3,7 +3,7 @@ package de.grimsi.gameyfin.config import com.vaadin.hilla.Endpoint import de.grimsi.gameyfin.config.dto.ConfigEntryDto import de.grimsi.gameyfin.config.dto.ConfigValuePairDto -import de.grimsi.gameyfin.meta.Roles +import de.grimsi.gameyfin.core.Roles import jakarta.annotation.security.PermitAll import jakarta.annotation.security.RolesAllowed diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/Roles.kt b/src/main/kotlin/de/grimsi/gameyfin/core/Roles.kt similarity index 94% rename from src/main/kotlin/de/grimsi/gameyfin/meta/Roles.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/Roles.kt index 9eacefc..6d8872e 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/Roles.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/Roles.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.meta +package de.grimsi.gameyfin.core import de.grimsi.gameyfin.users.RoleService.Companion.INTERNAL_ROLE_PREFIX diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/SetupDataLoader.kt b/src/main/kotlin/de/grimsi/gameyfin/core/SetupDataLoader.kt similarity index 98% rename from src/main/kotlin/de/grimsi/gameyfin/meta/SetupDataLoader.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/SetupDataLoader.kt index 23c6550..44e010c 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/SetupDataLoader.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/SetupDataLoader.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.meta +package de.grimsi.gameyfin.core import de.grimsi.gameyfin.users.UserService import de.grimsi.gameyfin.users.entities.Role diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/annotations/DynamicAccessInterceptor.kt b/src/main/kotlin/de/grimsi/gameyfin/core/annotations/DynamicAccessInterceptor.kt similarity index 96% rename from src/main/kotlin/de/grimsi/gameyfin/meta/annotations/DynamicAccessInterceptor.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/annotations/DynamicAccessInterceptor.kt index 712b8b1..53fa020 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/annotations/DynamicAccessInterceptor.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/annotations/DynamicAccessInterceptor.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.meta.annotations +package de.grimsi.gameyfin.core.annotations import de.grimsi.gameyfin.config.ConfigProperties import de.grimsi.gameyfin.config.ConfigService diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/annotations/DynamicPublicAccess.kt b/src/main/kotlin/de/grimsi/gameyfin/core/annotations/DynamicPublicAccess.kt similarity index 89% rename from src/main/kotlin/de/grimsi/gameyfin/meta/annotations/DynamicPublicAccess.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/annotations/DynamicPublicAccess.kt index ff88cb4..2c4b6b7 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/annotations/DynamicPublicAccess.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/annotations/DynamicPublicAccess.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.meta.annotations +package de.grimsi.gameyfin.core.annotations import kotlin.annotation.AnnotationRetention.RUNTIME import kotlin.annotation.AnnotationTarget.FUNCTION diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/annotations/NullOrNotBlank.kt b/src/main/kotlin/de/grimsi/gameyfin/core/annotations/NullOrNotBlank.kt similarity index 91% rename from src/main/kotlin/de/grimsi/gameyfin/meta/annotations/NullOrNotBlank.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/annotations/NullOrNotBlank.kt index 120553f..006683f 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/annotations/NullOrNotBlank.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/annotations/NullOrNotBlank.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.meta.annotations +package de.grimsi.gameyfin.core.annotations import jakarta.validation.Constraint import jakarta.validation.Payload diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/annotations/NullOrNotBlankValidator.kt b/src/main/kotlin/de/grimsi/gameyfin/core/annotations/NullOrNotBlankValidator.kt similarity index 88% rename from src/main/kotlin/de/grimsi/gameyfin/meta/annotations/NullOrNotBlankValidator.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/annotations/NullOrNotBlankValidator.kt index dca84e3..fcd2d1d 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/annotations/NullOrNotBlankValidator.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/annotations/NullOrNotBlankValidator.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.meta.annotations +package de.grimsi.gameyfin.core.annotations import jakarta.validation.ConstraintValidator import jakarta.validation.ConstraintValidatorContext diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/development/DelayInterceptor.kt b/src/main/kotlin/de/grimsi/gameyfin/core/development/DelayInterceptor.kt similarity index 92% rename from src/main/kotlin/de/grimsi/gameyfin/meta/development/DelayInterceptor.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/development/DelayInterceptor.kt index 42064d5..eb87e43 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/development/DelayInterceptor.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/development/DelayInterceptor.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.meta.development +package de.grimsi.gameyfin.core.development import jakarta.servlet.http.HttpServletRequest import jakarta.servlet.http.HttpServletResponse diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/security/AuthorityMapperConfig.kt b/src/main/kotlin/de/grimsi/gameyfin/core/security/AuthorityMapperConfig.kt similarity index 92% rename from src/main/kotlin/de/grimsi/gameyfin/meta/security/AuthorityMapperConfig.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/security/AuthorityMapperConfig.kt index bc80f37..f2ee79c 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/security/AuthorityMapperConfig.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/security/AuthorityMapperConfig.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.meta.security +package de.grimsi.gameyfin.core.security import de.grimsi.gameyfin.users.RoleService import org.springframework.context.annotation.Bean diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/security/PasswordEncoderConfig.kt b/src/main/kotlin/de/grimsi/gameyfin/core/security/PasswordEncoderConfig.kt similarity index 90% rename from src/main/kotlin/de/grimsi/gameyfin/meta/security/PasswordEncoderConfig.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/security/PasswordEncoderConfig.kt index c3352a7..7e132a8 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/security/PasswordEncoderConfig.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/security/PasswordEncoderConfig.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.meta.security +package de.grimsi.gameyfin.core.security import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/security/SecurityConfig.kt b/src/main/kotlin/de/grimsi/gameyfin/core/security/SecurityConfig.kt similarity index 99% rename from src/main/kotlin/de/grimsi/gameyfin/meta/security/SecurityConfig.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/security/SecurityConfig.kt index 140e697..1553fcc 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/security/SecurityConfig.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/security/SecurityConfig.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.meta.security +package de.grimsi.gameyfin.core.security import com.vaadin.flow.spring.security.VaadinWebSecurity import de.grimsi.gameyfin.config.ConfigProperties diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/security/SessionRegistryConfig.kt b/src/main/kotlin/de/grimsi/gameyfin/core/security/SessionRegistryConfig.kt similarity index 90% rename from src/main/kotlin/de/grimsi/gameyfin/meta/security/SessionRegistryConfig.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/security/SessionRegistryConfig.kt index 2a85c93..d878b2d 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/security/SessionRegistryConfig.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/security/SessionRegistryConfig.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.meta.security +package de.grimsi.gameyfin.core.security import org.springframework.context.annotation.Bean import org.springframework.context.annotation.Configuration diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/security/SsoAuthenticationSuccessHandler.kt b/src/main/kotlin/de/grimsi/gameyfin/core/security/SsoAuthenticationSuccessHandler.kt similarity index 98% rename from src/main/kotlin/de/grimsi/gameyfin/meta/security/SsoAuthenticationSuccessHandler.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/security/SsoAuthenticationSuccessHandler.kt index 45163a1..22bc04b 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/security/SsoAuthenticationSuccessHandler.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/security/SsoAuthenticationSuccessHandler.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.meta.security +package de.grimsi.gameyfin.core.security import de.grimsi.gameyfin.config.ConfigProperties import de.grimsi.gameyfin.config.ConfigService diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/security/SsoEnabledCondition.kt b/src/main/kotlin/de/grimsi/gameyfin/core/security/SsoEnabledCondition.kt similarity index 97% rename from src/main/kotlin/de/grimsi/gameyfin/meta/security/SsoEnabledCondition.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/security/SsoEnabledCondition.kt index 3c99a69..fb622f9 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/security/SsoEnabledCondition.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/security/SsoEnabledCondition.kt @@ -1,4 +1,4 @@ -package de.grimsi.gameyfin.meta.security +package de.grimsi.gameyfin.core.security import de.grimsi.gameyfin.config.ConfigProperties import org.springframework.context.annotation.Condition diff --git a/src/main/kotlin/de/grimsi/gameyfin/meta/security/WebConfig.kt b/src/main/kotlin/de/grimsi/gameyfin/core/security/WebConfig.kt similarity index 80% rename from src/main/kotlin/de/grimsi/gameyfin/meta/security/WebConfig.kt rename to src/main/kotlin/de/grimsi/gameyfin/core/security/WebConfig.kt index d47a4bb..a152ed6 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/meta/security/WebConfig.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/core/security/WebConfig.kt @@ -1,7 +1,7 @@ -package de.grimsi.gameyfin.meta.security +package de.grimsi.gameyfin.core.security -import de.grimsi.gameyfin.meta.annotations.DynamicAccessInterceptor -import de.grimsi.gameyfin.meta.development.DelayInterceptor +import de.grimsi.gameyfin.core.annotations.DynamicAccessInterceptor +import de.grimsi.gameyfin.core.development.DelayInterceptor import org.springframework.beans.factory.annotation.Autowired import org.springframework.context.annotation.Configuration import org.springframework.web.servlet.config.annotation.InterceptorRegistry diff --git a/src/main/kotlin/de/grimsi/gameyfin/libraries/LibraryEndpoint.kt b/src/main/kotlin/de/grimsi/gameyfin/libraries/LibraryEndpoint.kt index 36eeab3..8103db0 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/libraries/LibraryEndpoint.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/libraries/LibraryEndpoint.kt @@ -2,7 +2,7 @@ package de.grimsi.gameyfin.libraries import com.vaadin.hilla.Endpoint import de.grimsi.gameyfin.libraries.entities.Library -import de.grimsi.gameyfin.meta.Roles +import de.grimsi.gameyfin.core.Roles import jakarta.annotation.security.RolesAllowed @Endpoint diff --git a/src/main/kotlin/de/grimsi/gameyfin/notifications/NotificationEndpoint.kt b/src/main/kotlin/de/grimsi/gameyfin/notifications/NotificationEndpoint.kt index 83c71ce..d53ddae 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/notifications/NotificationEndpoint.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/notifications/NotificationEndpoint.kt @@ -1,7 +1,7 @@ package de.grimsi.gameyfin.notifications import com.vaadin.hilla.Endpoint -import de.grimsi.gameyfin.meta.Roles +import de.grimsi.gameyfin.core.Roles import de.grimsi.gameyfin.notifications.dto.EmailCredentialsDto import jakarta.annotation.security.RolesAllowed import jakarta.mail.MessagingException @@ -14,19 +14,19 @@ class NotificationEndpoint { fun verifyEmailCredentials(credentials: EmailCredentialsDto): Boolean { val properties = Properties() - properties["mail.smtp.auth"] = "true" - properties["mail.smtp.starttls.enable"] = "true" + properties["mail.smtp.auth"] = true + properties["mail.smtp.starttls.enable"] = true properties["mail.smtp.host"] = credentials.host properties["mail.smtp.port"] = credentials.port - val session = Session.getInstance(properties, null) + val session = Session.getInstance(properties) try { val transport = session.getTransport("smtp") transport.connect(credentials.host, credentials.port, credentials.username, credentials.password) transport.close() return true - } catch (ex: MessagingException) { + } catch (_: MessagingException) { return false } } diff --git a/src/main/kotlin/de/grimsi/gameyfin/setup/SetupEndpoint.kt b/src/main/kotlin/de/grimsi/gameyfin/setup/SetupEndpoint.kt index e9536bc..46a72c2 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/setup/SetupEndpoint.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/setup/SetupEndpoint.kt @@ -3,7 +3,7 @@ package de.grimsi.gameyfin.setup import com.vaadin.flow.server.auth.AnonymousAllowed import com.vaadin.hilla.Endpoint import com.vaadin.hilla.exception.EndpointException -import de.grimsi.gameyfin.meta.Roles +import de.grimsi.gameyfin.core.Roles import de.grimsi.gameyfin.users.RoleService import de.grimsi.gameyfin.users.UserService import de.grimsi.gameyfin.users.dto.UserInfoDto diff --git a/src/main/kotlin/de/grimsi/gameyfin/setup/SetupService.kt b/src/main/kotlin/de/grimsi/gameyfin/setup/SetupService.kt index b73f9e5..94fba9e 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/setup/SetupService.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/setup/SetupService.kt @@ -1,6 +1,6 @@ package de.grimsi.gameyfin.setup -import de.grimsi.gameyfin.meta.Roles +import de.grimsi.gameyfin.core.Roles import de.grimsi.gameyfin.users.RoleService import de.grimsi.gameyfin.users.UserService import de.grimsi.gameyfin.users.entities.User diff --git a/src/main/kotlin/de/grimsi/gameyfin/system/SystemEndpoint.kt b/src/main/kotlin/de/grimsi/gameyfin/system/SystemEndpoint.kt index 69061f4..b3d53c1 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/system/SystemEndpoint.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/system/SystemEndpoint.kt @@ -1,7 +1,7 @@ package de.grimsi.gameyfin.system import com.vaadin.hilla.Endpoint -import de.grimsi.gameyfin.meta.Roles +import de.grimsi.gameyfin.core.Roles import jakarta.annotation.security.RolesAllowed @Endpoint diff --git a/src/main/kotlin/de/grimsi/gameyfin/users/RoleService.kt b/src/main/kotlin/de/grimsi/gameyfin/users/RoleService.kt index 97a253c..3a8784d 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/users/RoleService.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/users/RoleService.kt @@ -1,6 +1,6 @@ package de.grimsi.gameyfin.users -import de.grimsi.gameyfin.meta.Roles +import de.grimsi.gameyfin.core.Roles import de.grimsi.gameyfin.users.entities.Role import de.grimsi.gameyfin.users.persistence.RoleRepository import jakarta.transaction.Transactional diff --git a/src/main/kotlin/de/grimsi/gameyfin/users/UserEndpoint.kt b/src/main/kotlin/de/grimsi/gameyfin/users/UserEndpoint.kt index 6e1b439..35ef36e 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/users/UserEndpoint.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/users/UserEndpoint.kt @@ -1,7 +1,7 @@ package de.grimsi.gameyfin.users import com.vaadin.hilla.Endpoint -import de.grimsi.gameyfin.meta.Roles +import de.grimsi.gameyfin.core.Roles import de.grimsi.gameyfin.users.dto.UserInfoDto import de.grimsi.gameyfin.users.dto.UserRegistrationDto import de.grimsi.gameyfin.users.dto.UserUpdateDto diff --git a/src/main/kotlin/de/grimsi/gameyfin/users/UserService.kt b/src/main/kotlin/de/grimsi/gameyfin/users/UserService.kt index ced9c5a..7b05e4d 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/users/UserService.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/users/UserService.kt @@ -1,6 +1,6 @@ package de.grimsi.gameyfin.users -import de.grimsi.gameyfin.meta.Roles +import de.grimsi.gameyfin.core.Roles import de.grimsi.gameyfin.users.dto.UserInfoDto import de.grimsi.gameyfin.users.dto.UserUpdateDto import de.grimsi.gameyfin.users.entities.Avatar diff --git a/src/main/kotlin/de/grimsi/gameyfin/users/avatar/AvatarController.kt b/src/main/kotlin/de/grimsi/gameyfin/users/avatar/AvatarController.kt index e11f158..052d572 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/users/avatar/AvatarController.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/users/avatar/AvatarController.kt @@ -1,6 +1,6 @@ package de.grimsi.gameyfin.users.avatar -import de.grimsi.gameyfin.meta.Roles +import de.grimsi.gameyfin.core.Roles import de.grimsi.gameyfin.users.UserService import jakarta.annotation.security.PermitAll import jakarta.annotation.security.RolesAllowed diff --git a/src/main/kotlin/de/grimsi/gameyfin/users/dto/UserUpdateDto.kt b/src/main/kotlin/de/grimsi/gameyfin/users/dto/UserUpdateDto.kt index 996f8c1..511429e 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/users/dto/UserUpdateDto.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/users/dto/UserUpdateDto.kt @@ -1,6 +1,6 @@ package de.grimsi.gameyfin.users.dto -import de.grimsi.gameyfin.meta.annotations.NullOrNotBlank +import de.grimsi.gameyfin.core.annotations.NullOrNotBlank data class UserUpdateDto( @field:NullOrNotBlank diff --git a/src/main/kotlin/de/grimsi/gameyfin/users/util/UserDetailsExtensions.kt b/src/main/kotlin/de/grimsi/gameyfin/users/util/UserDetailsExtensions.kt index 2fb3bbe..6158c61 100644 --- a/src/main/kotlin/de/grimsi/gameyfin/users/util/UserDetailsExtensions.kt +++ b/src/main/kotlin/de/grimsi/gameyfin/users/util/UserDetailsExtensions.kt @@ -3,7 +3,7 @@ package de.grimsi.gameyfin.users.util -import de.grimsi.gameyfin.meta.Roles +import de.grimsi.gameyfin.core.Roles import org.springframework.security.core.userdetails.UserDetails fun UserDetails.hasRole(role: Roles): Boolean {