From b21a02609d14282a0ea67503368a4dbfc61c8cdc Mon Sep 17 00:00:00 2001 From: usbharu <64310155+usbharu@users.noreply.github.com> Date: Sat, 23 Sep 2023 00:00:19 +0900 Subject: [PATCH] =?UTF-8?q?style:=20=E3=82=B9=E3=82=BF=E3=82=A4=E3=83=AB?= =?UTF-8?q?=E3=82=92=E8=AA=BF=E6=95=B4?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit --- .../kotlin/dev/usbharu/hideout/config/SecurityConfig.kt | 3 --- .../controller/mastodon/MastodonAppsApiController.kt | 1 - .../dev/usbharu/hideout/domain/model/UserDetailsImpl.kt | 6 ------ .../hideout/repository/RegisteredClientRepositoryImpl.kt | 1 - .../hideout/service/api/mastodon/AccountApiService.kt | 2 -- .../hideout/service/api/mastodon/StatusesApiService.kt | 3 --- .../auth/ExposedOAuth2AuthorizationConsentService.kt | 3 --- .../service/auth/ExposedOAuth2AuthorizationService.kt | 2 -- .../hideout/service/auth/SecureTokenGeneratorImpl.kt | 2 -- 9 files changed, 23 deletions(-) diff --git a/src/main/kotlin/dev/usbharu/hideout/config/SecurityConfig.kt b/src/main/kotlin/dev/usbharu/hideout/config/SecurityConfig.kt index 8dc456bc..589dc701 100644 --- a/src/main/kotlin/dev/usbharu/hideout/config/SecurityConfig.kt +++ b/src/main/kotlin/dev/usbharu/hideout/config/SecurityConfig.kt @@ -35,7 +35,6 @@ import java.security.interfaces.RSAPrivateKey import java.security.interfaces.RSAPublicKey import java.util.* - @EnableWebSecurity(debug = true) @Configuration class SecurityConfig { @@ -152,8 +151,6 @@ class SecurityConfig { if (OAuth2TokenType.ACCESS_TOKEN == context.tokenType) { val userDetailsImpl = context.getPrincipal().principal as UserDetailsImpl context.claims.claim("uid", userDetailsImpl.id.toString()) - - } } } diff --git a/src/main/kotlin/dev/usbharu/hideout/controller/mastodon/MastodonAppsApiController.kt b/src/main/kotlin/dev/usbharu/hideout/controller/mastodon/MastodonAppsApiController.kt index 9d538ce6..934b7d79 100644 --- a/src/main/kotlin/dev/usbharu/hideout/controller/mastodon/MastodonAppsApiController.kt +++ b/src/main/kotlin/dev/usbharu/hideout/controller/mastodon/MastodonAppsApiController.kt @@ -35,5 +35,4 @@ class MastodonAppsApiController(private val appApiService: AppApiService) : AppA HttpStatus.OK ) } - } diff --git a/src/main/kotlin/dev/usbharu/hideout/domain/model/UserDetailsImpl.kt b/src/main/kotlin/dev/usbharu/hideout/domain/model/UserDetailsImpl.kt index b666c5e8..a94547ba 100644 --- a/src/main/kotlin/dev/usbharu/hideout/domain/model/UserDetailsImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/domain/model/UserDetailsImpl.kt @@ -30,8 +30,6 @@ class UserDetailsImpl( @Serial private const val serialVersionUID: Long = -899168205656607781L } - - } @JsonTypeInfo(use = JsonTypeInfo.Id.CLASS, include = JsonTypeInfo.As.PROPERTY) @@ -46,11 +44,9 @@ class UserDetailsImpl( @JsonSubTypes abstract class UserDetailsMixin - class UserDetailsDeserializer : JsonDeserializer() { val SIMPLE_GRANTED_AUTHORITY_SET = object : TypeReference>() {} override fun deserialize(p: JsonParser, ctxt: DeserializationContext): UserDetailsImpl { - val mapper = p.codec as ObjectMapper val jsonNode: JsonNode = mapper.readTree(p) println(jsonNode) @@ -70,7 +66,6 @@ class UserDetailsDeserializer : JsonDeserializer() { true, authorities.toMutableList(), ) - } fun JsonNode.readText(field: String, defaultValue: String = ""): String { @@ -79,5 +74,4 @@ class UserDetailsDeserializer : JsonDeserializer() { else -> defaultValue } } - } diff --git a/src/main/kotlin/dev/usbharu/hideout/repository/RegisteredClientRepositoryImpl.kt b/src/main/kotlin/dev/usbharu/hideout/repository/RegisteredClientRepositoryImpl.kt index c451639b..d03b302e 100644 --- a/src/main/kotlin/dev/usbharu/hideout/repository/RegisteredClientRepositoryImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/repository/RegisteredClientRepositoryImpl.kt @@ -175,7 +175,6 @@ class RegisteredClientRepositoryImpl(private val database: Database) : Registere return builder.build() } - } // org/springframework/security/oauth2/server/authorization/client/oauth2-registered-client-schema.sql diff --git a/src/main/kotlin/dev/usbharu/hideout/service/api/mastodon/AccountApiService.kt b/src/main/kotlin/dev/usbharu/hideout/service/api/mastodon/AccountApiService.kt index 1e5cab0b..0a18609f 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/api/mastodon/AccountApiService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/api/mastodon/AccountApiService.kt @@ -13,7 +13,6 @@ interface AccountApiService { suspend fun verifyCredentials(userid: Long): CredentialAccount } - @Service class AccountApiServiceImpl(private val accountService: AccountService, private val transaction: Transaction) : AccountApiService { @@ -59,5 +58,4 @@ class AccountApiServiceImpl(private val accountService: AccountService, private role = Role(0, "Admin", "", 32) ) } - } diff --git a/src/main/kotlin/dev/usbharu/hideout/service/api/mastodon/StatusesApiService.kt b/src/main/kotlin/dev/usbharu/hideout/service/api/mastodon/StatusesApiService.kt index 17c8c794..4f0b8dc2 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/api/mastodon/StatusesApiService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/api/mastodon/StatusesApiService.kt @@ -18,7 +18,6 @@ interface StatusesApiService { suspend fun postStatus(statusesRequest: StatusesRequest, user: UserDetailsImpl): Status } - @Service class StatsesApiServiceImpl( private val postService: PostService, @@ -28,7 +27,6 @@ class StatsesApiServiceImpl( ) : StatusesApiService { override suspend fun postStatus(statusesRequest: StatusesRequest, user: UserDetailsImpl): Status { - val visibility = when (statusesRequest.visibility) { StatusesRequest.Visibility.public -> Visibility.PUBLIC StatusesRequest.Visibility.unlisted -> Visibility.UNLISTED @@ -67,7 +65,6 @@ class StatsesApiServiceImpl( null } - return Status( id = post.id.toString(), uri = post.apId, diff --git a/src/main/kotlin/dev/usbharu/hideout/service/auth/ExposedOAuth2AuthorizationConsentService.kt b/src/main/kotlin/dev/usbharu/hideout/service/auth/ExposedOAuth2AuthorizationConsentService.kt index 9fb968e0..b3b0d420 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/auth/ExposedOAuth2AuthorizationConsentService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/auth/ExposedOAuth2AuthorizationConsentService.kt @@ -26,11 +26,9 @@ class ExposedOAuth2AuthorizationConsentService( } } - override fun save(authorizationConsent: AuthorizationConsent?) = runBlocking { requireNotNull(authorizationConsent) transaction.transaction { - val singleOrNull = OAuth2AuthorizationConsent.select { OAuth2AuthorizationConsent.registeredClientId @@ -61,7 +59,6 @@ class ExposedOAuth2AuthorizationConsentService( requireNotNull(registeredClientId) requireNotNull(principalName) transaction.transaction { - OAuth2AuthorizationConsent.select { (OAuth2AuthorizationConsent.registeredClientId eq registeredClientId) .and(OAuth2AuthorizationConsent.principalName eq principalName) diff --git a/src/main/kotlin/dev/usbharu/hideout/service/auth/ExposedOAuth2AuthorizationService.kt b/src/main/kotlin/dev/usbharu/hideout/service/auth/ExposedOAuth2AuthorizationService.kt index c1d4b287..65d0b675 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/auth/ExposedOAuth2AuthorizationService.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/auth/ExposedOAuth2AuthorizationService.kt @@ -151,8 +151,6 @@ class ExposedOAuth2AuthorizationService( override fun findByToken(token: String?, tokenType: OAuth2TokenType?): OAuth2Authorization? = runBlocking { requireNotNull(token) transaction.transaction { - - when (tokenType?.value) { null -> { Authorization.select { diff --git a/src/main/kotlin/dev/usbharu/hideout/service/auth/SecureTokenGeneratorImpl.kt b/src/main/kotlin/dev/usbharu/hideout/service/auth/SecureTokenGeneratorImpl.kt index 9a36f5e7..4015dfed 100644 --- a/src/main/kotlin/dev/usbharu/hideout/service/auth/SecureTokenGeneratorImpl.kt +++ b/src/main/kotlin/dev/usbharu/hideout/service/auth/SecureTokenGeneratorImpl.kt @@ -7,12 +7,10 @@ import java.util.* @Component class SecureTokenGeneratorImpl : SecureTokenGenerator { override fun generate(): String { - val byteArray = ByteArray(16) val secureRandom = SecureRandom() secureRandom.nextBytes(byteArray) - return Base64.getUrlEncoder().encodeToString(byteArray) } }