Move packages

src/main/kotlin/com/faforever/config/AppMessages.kt → 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

src/main/kotlin/com/faforever/config/FafProperties.kt → 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

src/main/kotlin/com/faforever/domain/Ban.kt → 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

src/main/kotlin/com/faforever/domain/IpAddress.kt → src/main/kotlin/com/faforever/userservice/domain/IpAddress.kt

@@ -1,4 +1,4 @@
-package com.faforever.domain
+package com.faforever.userservice.domain
 
 
 @JvmInline

src/main/kotlin/com/faforever/domain/LoginLog.kt → 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

src/main/kotlin/com/faforever/domain/LoginService.kt → 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

src/main/kotlin/com/faforever/domain/User.kt → 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

src/main/kotlin/com/faforever/hydra/HydraClient.kt → 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

src/main/kotlin/com/faforever/hydra/HydraService.kt → 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,
 ) {

src/main/kotlin/com/faforever/hydra/RedirectResponse.kt → 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
 

src/main/kotlin/com/faforever/security/OAuthScope.kt → 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

src/main/kotlin/com/faforever/userservice/security/OAuthService.kt

@@ -0,0 +1,4 @@
+package com.faforever.userservice.security
+
+class OAuthService {
+}

src/main/kotlin/com/faforever/security/PasswordEncoder.kt → 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

src/main/kotlin/com/faforever/web/OAuthController.kt → 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")

src/main/kotlin/com/faforever/web/QuteHelper.kt → 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

src/main/kotlin/com/faforever/web/Templates.kt → 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