From b9e93d105d93f55d3035199508cedc90f7432533 Mon Sep 17 00:00:00 2001 From: Christian Schmidt Date: Sun, 16 Jul 2023 21:12:43 +0200 Subject: [PATCH] Move packages --- .../kotlin/com/faforever/security/OAuthService.kt | 4 ---- .../{ => userservice}/config/AppMessages.kt | 2 +- .../{ => userservice}/config/FafProperties.kt | 2 +- .../com/faforever/{ => userservice}/domain/Ban.kt | 2 +- .../faforever/{ => userservice}/domain/IpAddress.kt | 2 +- .../faforever/{ => userservice}/domain/LoginLog.kt | 2 +- .../{ => userservice}/domain/LoginService.kt | 4 ++-- .../com/faforever/{ => userservice}/domain/User.kt | 2 +- .../faforever/{ => userservice}/hydra/HydraClient.kt | 2 +- .../{ => userservice}/hydra/HydraService.kt | 12 ++++++------ .../{ => userservice}/hydra/RedirectResponse.kt | 2 +- .../{ => userservice}/security/OAuthScope.kt | 2 +- .../faforever/userservice/security/OAuthService.kt | 4 ++++ .../{ => userservice}/security/PasswordEncoder.kt | 2 +- .../{ => userservice}/web/OAuthController.kt | 12 ++++++------ .../faforever/{ => userservice}/web/QuteHelper.kt | 4 ++-- .../com/faforever/{ => userservice}/web/Templates.kt | 2 +- 17 files changed, 31 insertions(+), 31 deletions(-) delete mode 100644 src/main/kotlin/com/faforever/security/OAuthService.kt rename src/main/kotlin/com/faforever/{ => userservice}/config/AppMessages.kt (98%) rename src/main/kotlin/com/faforever/{ => userservice}/config/FafProperties.kt (94%) rename src/main/kotlin/com/faforever/{ => userservice}/domain/Ban.kt (95%) rename src/main/kotlin/com/faforever/{ => userservice}/domain/IpAddress.kt (56%) rename src/main/kotlin/com/faforever/{ => userservice}/domain/LoginLog.kt (97%) rename src/main/kotlin/com/faforever/{ => userservice}/domain/LoginService.kt (98%) rename src/main/kotlin/com/faforever/{ => userservice}/domain/User.kt (98%) rename src/main/kotlin/com/faforever/{ => userservice}/hydra/HydraClient.kt (98%) rename src/main/kotlin/com/faforever/{ => userservice}/hydra/HydraService.kt (90%) rename src/main/kotlin/com/faforever/{ => userservice}/hydra/RedirectResponse.kt (78%) rename src/main/kotlin/com/faforever/{ => userservice}/security/OAuthScope.kt (93%) create mode 100644 src/main/kotlin/com/faforever/userservice/security/OAuthService.kt rename src/main/kotlin/com/faforever/{ => userservice}/security/PasswordEncoder.kt (95%) rename src/main/kotlin/com/faforever/{ => userservice}/web/OAuthController.kt (91%) rename src/main/kotlin/com/faforever/{ => userservice}/web/QuteHelper.kt (80%) rename src/main/kotlin/com/faforever/{ => userservice}/web/Templates.kt (92%) diff --git a/src/main/kotlin/com/faforever/security/OAuthService.kt b/src/main/kotlin/com/faforever/security/OAuthService.kt deleted file mode 100644 index 966b252a..00000000 --- a/src/main/kotlin/com/faforever/security/OAuthService.kt +++ /dev/null @@ -1,4 +0,0 @@ -package com.faforever.security - -class OAuthService { -} \ No newline at end of file diff --git a/src/main/kotlin/com/faforever/config/AppMessages.kt b/src/main/kotlin/com/faforever/userservice/config/AppMessages.kt similarity index 98% rename from src/main/kotlin/com/faforever/config/AppMessages.kt rename to src/main/kotlin/com/faforever/userservice/config/AppMessages.kt index a27bdb16..a9898834 100644 --- a/src/main/kotlin/com/faforever/config/AppMessages.kt +++ b/src/main/kotlin/com/faforever/userservice/config/AppMessages.kt @@ -1,4 +1,4 @@ -package com.faforever.config +package com.faforever.userservice.config import io.quarkus.qute.i18n.Message import io.quarkus.qute.i18n.MessageBundle diff --git a/src/main/kotlin/com/faforever/config/FafProperties.kt b/src/main/kotlin/com/faforever/userservice/config/FafProperties.kt similarity index 94% rename from src/main/kotlin/com/faforever/config/FafProperties.kt rename to src/main/kotlin/com/faforever/userservice/config/FafProperties.kt index a5861142..819eb75b 100644 --- a/src/main/kotlin/com/faforever/config/FafProperties.kt +++ b/src/main/kotlin/com/faforever/userservice/config/FafProperties.kt @@ -1,4 +1,4 @@ -package com.faforever.config +package com.faforever.userservice.config import io.smallrye.config.ConfigMapping import jakarta.inject.Singleton diff --git a/src/main/kotlin/com/faforever/domain/Ban.kt b/src/main/kotlin/com/faforever/userservice/domain/Ban.kt similarity index 95% rename from src/main/kotlin/com/faforever/domain/Ban.kt rename to src/main/kotlin/com/faforever/userservice/domain/Ban.kt index 4a5c94e1..ac06ced5 100644 --- a/src/main/kotlin/com/faforever/domain/Ban.kt +++ b/src/main/kotlin/com/faforever/userservice/domain/Ban.kt @@ -1,4 +1,4 @@ -package com.faforever.domain +package com.faforever.userservice.domain import io.quarkus.hibernate.orm.panache.kotlin.PanacheRepository import jakarta.enterprise.context.ApplicationScoped diff --git a/src/main/kotlin/com/faforever/domain/IpAddress.kt b/src/main/kotlin/com/faforever/userservice/domain/IpAddress.kt similarity index 56% rename from src/main/kotlin/com/faforever/domain/IpAddress.kt rename to src/main/kotlin/com/faforever/userservice/domain/IpAddress.kt index 785c2159..a8ebb005 100644 --- a/src/main/kotlin/com/faforever/domain/IpAddress.kt +++ b/src/main/kotlin/com/faforever/userservice/domain/IpAddress.kt @@ -1,4 +1,4 @@ -package com.faforever.domain +package com.faforever.userservice.domain @JvmInline diff --git a/src/main/kotlin/com/faforever/domain/LoginLog.kt b/src/main/kotlin/com/faforever/userservice/domain/LoginLog.kt similarity index 97% rename from src/main/kotlin/com/faforever/domain/LoginLog.kt rename to src/main/kotlin/com/faforever/userservice/domain/LoginLog.kt index 5cbaf6f1..93f9463a 100644 --- a/src/main/kotlin/com/faforever/domain/LoginLog.kt +++ b/src/main/kotlin/com/faforever/userservice/domain/LoginLog.kt @@ -1,4 +1,4 @@ -package com.faforever.domain +package com.faforever.userservice.domain import io.quarkus.hibernate.orm.panache.kotlin.PanacheRepository import io.quarkus.runtime.annotations.RegisterForReflection diff --git a/src/main/kotlin/com/faforever/domain/LoginService.kt b/src/main/kotlin/com/faforever/userservice/domain/LoginService.kt similarity index 98% rename from src/main/kotlin/com/faforever/domain/LoginService.kt rename to src/main/kotlin/com/faforever/userservice/domain/LoginService.kt index f5b6a059..4e4a9199 100644 --- a/src/main/kotlin/com/faforever/domain/LoginService.kt +++ b/src/main/kotlin/com/faforever/userservice/domain/LoginService.kt @@ -1,6 +1,6 @@ -package com.faforever.domain +package com.faforever.userservice.domain -import com.faforever.security.PasswordEncoder +import com.faforever.userservice.security.PasswordEncoder import io.smallrye.config.ConfigMapping import jakarta.enterprise.context.ApplicationScoped import jakarta.validation.constraints.NotNull diff --git a/src/main/kotlin/com/faforever/domain/User.kt b/src/main/kotlin/com/faforever/userservice/domain/User.kt similarity index 98% rename from src/main/kotlin/com/faforever/domain/User.kt rename to src/main/kotlin/com/faforever/userservice/domain/User.kt index 7cd12f0f..46f798a7 100644 --- a/src/main/kotlin/com/faforever/domain/User.kt +++ b/src/main/kotlin/com/faforever/userservice/domain/User.kt @@ -1,4 +1,4 @@ -package com.faforever.domain +package com.faforever.userservice.domain import io.quarkus.hibernate.orm.panache.kotlin.PanacheRepository import io.quarkus.hibernate.orm.panache.kotlin.PanacheRepositoryBase diff --git a/src/main/kotlin/com/faforever/hydra/HydraClient.kt b/src/main/kotlin/com/faforever/userservice/hydra/HydraClient.kt similarity index 98% rename from src/main/kotlin/com/faforever/hydra/HydraClient.kt rename to src/main/kotlin/com/faforever/userservice/hydra/HydraClient.kt index 13c1a35e..f5428929 100644 --- a/src/main/kotlin/com/faforever/hydra/HydraClient.kt +++ b/src/main/kotlin/com/faforever/userservice/hydra/HydraClient.kt @@ -1,4 +1,4 @@ -package com.faforever.hydra +package com.faforever.userservice.hydra import io.smallrye.mutiny.Uni import jakarta.validation.constraints.NotBlank diff --git a/src/main/kotlin/com/faforever/hydra/HydraService.kt b/src/main/kotlin/com/faforever/userservice/hydra/HydraService.kt similarity index 90% rename from src/main/kotlin/com/faforever/hydra/HydraService.kt rename to src/main/kotlin/com/faforever/userservice/hydra/HydraService.kt index 02bbd9c8..54e0aa57 100644 --- a/src/main/kotlin/com/faforever/hydra/HydraService.kt +++ b/src/main/kotlin/com/faforever/userservice/hydra/HydraService.kt @@ -1,9 +1,9 @@ -package com.faforever.hydra +package com.faforever.userservice.hydra -import com.faforever.domain.IpAddress -import com.faforever.domain.LoginResult -import com.faforever.domain.LoginService -import com.faforever.security.OAuthScope +import com.faforever.userservice.domain.IpAddress +import com.faforever.userservice.domain.LoginResult +import com.faforever.userservice.domain.LoginService +import com.faforever.userservice.security.OAuthScope import jakarta.inject.Singleton import org.eclipse.microprofile.rest.client.inject.RestClient import sh.ory.hydra.model.AcceptLoginRequest @@ -24,7 +24,7 @@ value class RedirectTo(val url: String) { @Singleton class HydraService( - @RestClient + @RestClient private val hydraClient: HydraClient, private val loginService: LoginService, ) { diff --git a/src/main/kotlin/com/faforever/hydra/RedirectResponse.kt b/src/main/kotlin/com/faforever/userservice/hydra/RedirectResponse.kt similarity index 78% rename from src/main/kotlin/com/faforever/hydra/RedirectResponse.kt rename to src/main/kotlin/com/faforever/userservice/hydra/RedirectResponse.kt index 804f01aa..07441197 100644 --- a/src/main/kotlin/com/faforever/hydra/RedirectResponse.kt +++ b/src/main/kotlin/com/faforever/userservice/hydra/RedirectResponse.kt @@ -1,4 +1,4 @@ -package com.faforever.hydra +package com.faforever.userservice.hydra import com.fasterxml.jackson.annotation.JsonProperty diff --git a/src/main/kotlin/com/faforever/security/OAuthScope.kt b/src/main/kotlin/com/faforever/userservice/security/OAuthScope.kt similarity index 93% rename from src/main/kotlin/com/faforever/security/OAuthScope.kt rename to src/main/kotlin/com/faforever/userservice/security/OAuthScope.kt index d0065e86..180152cf 100644 --- a/src/main/kotlin/com/faforever/security/OAuthScope.kt +++ b/src/main/kotlin/com/faforever/userservice/security/OAuthScope.kt @@ -1,4 +1,4 @@ -package com.faforever.security +package com.faforever.userservice.security /** * Contains pre-defined FAF scopes diff --git a/src/main/kotlin/com/faforever/userservice/security/OAuthService.kt b/src/main/kotlin/com/faforever/userservice/security/OAuthService.kt new file mode 100644 index 00000000..81efe85c --- /dev/null +++ b/src/main/kotlin/com/faforever/userservice/security/OAuthService.kt @@ -0,0 +1,4 @@ +package com.faforever.userservice.security + +class OAuthService { +} \ No newline at end of file diff --git a/src/main/kotlin/com/faforever/security/PasswordEncoder.kt b/src/main/kotlin/com/faforever/userservice/security/PasswordEncoder.kt similarity index 95% rename from src/main/kotlin/com/faforever/security/PasswordEncoder.kt rename to src/main/kotlin/com/faforever/userservice/security/PasswordEncoder.kt index a939bce6..a8162fe5 100644 --- a/src/main/kotlin/com/faforever/security/PasswordEncoder.kt +++ b/src/main/kotlin/com/faforever/userservice/security/PasswordEncoder.kt @@ -1,4 +1,4 @@ -package com.faforever.security +package com.faforever.userservice.security import jakarta.inject.Singleton import java.security.MessageDigest diff --git a/src/main/kotlin/com/faforever/web/OAuthController.kt b/src/main/kotlin/com/faforever/userservice/web/OAuthController.kt similarity index 91% rename from src/main/kotlin/com/faforever/web/OAuthController.kt rename to src/main/kotlin/com/faforever/userservice/web/OAuthController.kt index 31b3d7f4..6038216f 100644 --- a/src/main/kotlin/com/faforever/web/OAuthController.kt +++ b/src/main/kotlin/com/faforever/userservice/web/OAuthController.kt @@ -1,9 +1,9 @@ -package com.faforever.web +package com.faforever.userservice.web -import com.faforever.config.FafProperties -import com.faforever.domain.IpAddress -import com.faforever.domain.LoginResult -import com.faforever.hydra.HydraService +import com.faforever.userservice.config.FafProperties +import com.faforever.userservice.domain.IpAddress +import com.faforever.userservice.domain.LoginResult +import com.faforever.userservice.hydra.HydraService import io.quarkus.qute.TemplateData import io.quarkus.qute.TemplateInstance import io.vertx.core.http.HttpServerRequest @@ -86,7 +86,7 @@ class OAuthController( is LoginResult.UserBanned -> ok(Templates.banned(BanData(loginResult.reason, loginResult.expiresAt == null, loginResult.expiresAt))) is LoginResult.UserNoGameOwnership -> ok(Templates.gameVerificationFailed(properties.accountLinkUrl())) is LoginResult.LoginThrottlingActive -> ok(Templates.login(LoginData(challenge, false, true))) - is LoginResult.UserOrCredentialsMismatch -> ok(Templates.login(LoginData(challenge, true, false))) + is LoginResult.UserOrCredentialsMismatch -> ok(Templates.login(LoginData(challenge, true, false))) is LoginResult.TechnicalError -> { val traceId = UUID.randomUUID().toString() LOG.warn("Technical error encountered. TraceId: $traceId") diff --git a/src/main/kotlin/com/faforever/web/QuteHelper.kt b/src/main/kotlin/com/faforever/userservice/web/QuteHelper.kt similarity index 80% rename from src/main/kotlin/com/faforever/web/QuteHelper.kt rename to src/main/kotlin/com/faforever/userservice/web/QuteHelper.kt index 4b990b2e..c5787296 100644 --- a/src/main/kotlin/com/faforever/web/QuteHelper.kt +++ b/src/main/kotlin/com/faforever/userservice/web/QuteHelper.kt @@ -1,6 +1,6 @@ -package com.faforever.web +package com.faforever.userservice.web -import com.faforever.config.FafProperties +import com.faforever.userservice.config.FafProperties import jakarta.enterprise.context.ApplicationScoped import jakarta.inject.Inject import jakarta.inject.Named diff --git a/src/main/kotlin/com/faforever/web/Templates.kt b/src/main/kotlin/com/faforever/userservice/web/Templates.kt similarity index 92% rename from src/main/kotlin/com/faforever/web/Templates.kt rename to src/main/kotlin/com/faforever/userservice/web/Templates.kt index 2996c13a..ce1e25af 100644 --- a/src/main/kotlin/com/faforever/web/Templates.kt +++ b/src/main/kotlin/com/faforever/userservice/web/Templates.kt @@ -1,4 +1,4 @@ -package com.faforever.web +package com.faforever.userservice.web import io.quarkus.qute.CheckedTemplate import io.quarkus.qute.TemplateInstance