usbharu
/
Hideout
mirror of https://github.com/usbharu/Hideout.git
1
0
Fork 0
Code Issues Actions Packages Projects Releases Wiki Activity

feat: 新規アカウント作成エンドポイントを分離

This commit is contained in:
usbharu 2024-04-04 12:57:24 +09:00
parent f49e824f86
commit a02c995b6a
7 changed files with 60 additions and 9 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

12
src/main/kotlin/dev/usbharu/hideout/activitypub/infrastructure/exposedquery/NoteQueryServiceImpl.kt
View File

@ -43,9 +43,9 @@ class NoteQueryServiceImpl(private val postRepository: PostRepository, private v
.selectAll().where { Posts.id eq id } .selectAll().where { Posts.id eq id }
.let { .let {
(it.toNote() ?: return null) to ( (it.toNote() ?: return null) to (
postQueryMapper.map(it) postQueryMapper.map(it)
.singleOrNull() ?: return null .singleOrNull() ?: return null
) )
} }
} }
@ -57,9 +57,9 @@ class NoteQueryServiceImpl(private val postRepository: PostRepository, private v
.selectAll().where { Posts.apId eq apId } .selectAll().where { Posts.apId eq apId }
.let { .let {
(it.toNote() ?: return null) to ( (it.toNote() ?: return null) to (
postQueryMapper.map(it) postQueryMapper.map(it)
.singleOrNull() ?: return null .singleOrNull() ?: return null
) )
} }
} }

21
src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/auth/AuthController.kt
View File

@ -16,12 +16,31 @@
package dev.usbharu.hideout.core.interfaces.api.auth package dev.usbharu.hideout.core.interfaces.api.auth
import dev.usbharu.hideout.core.service.auth.AuthApiService
import dev.usbharu.hideout.core.service.auth.RegisterAccountDto
import org.springframework.stereotype.Controller import org.springframework.stereotype.Controller
import org.springframework.ui.Model
import org.springframework.validation.annotation.Validated
import org.springframework.web.bind.annotation.GetMapping import org.springframework.web.bind.annotation.GetMapping
import org.springframework.web.bind.annotation.ModelAttribute
import org.springframework.web.bind.annotation.PostMapping
@Controller @Controller
class AuthController { class AuthController(private val authApiService: AuthApiService) {
@GetMapping("/auth/sign_up") @GetMapping("/auth/sign_up")
@Suppress("FunctionOnlyReturningConstant") @Suppress("FunctionOnlyReturningConstant")
fun signUp(): String = "sign_up" fun signUp(): String = "sign_up"
@PostMapping("/auth/sign_up")
suspend fun signUp(@Validated @ModelAttribute signUpForm: SignUpForm, model: Model): String {
val registerAccount = authApiService.registerAccount(
RegisterAccountDto(
signUpForm.username,
signUpForm.password,
signUpForm.recaptchaResponse
)
)
return "redirect:"+registerAccount.first.url
}
} }

7
src/main/kotlin/dev/usbharu/hideout/core/interfaces/api/auth/SignUpForm.kt Normal file
View File

@ -0,0 +1,7 @@
package dev.usbharu.hideout.core.interfaces.api.auth
data class SignUpForm(
val username: String,
val password: String,
val recaptchaResponse: String
)

8
src/main/kotlin/dev/usbharu/hideout/core/service/auth/AuthApiService.kt Normal file
View File

@ -0,0 +1,8 @@
package dev.usbharu.hideout.core.service.auth
import dev.usbharu.hideout.core.domain.model.actor.Actor
import dev.usbharu.hideout.core.domain.model.userdetails.UserDetail
interface AuthApiService {
suspend fun registerAccount(registerAccountDto: RegisterAccountDto): Pair<Actor, UserDetail>
}

7
src/main/kotlin/dev/usbharu/hideout/core/service/auth/RegisterAccountDto.kt Normal file
View File

@ -0,0 +1,7 @@
package dev.usbharu.hideout.core.service.auth
data class RegisterAccountDto(
val username:String,
val password:String,
val recaptchaResponse:String
)

2
src/main/kotlin/dev/usbharu/hideout/mastodon/config/MastodonApiSecurityConfig.kt
View File

@ -41,7 +41,7 @@ class MastodonApiSecurityConfig {
authorizeHttpRequests { authorizeHttpRequests {
authorize(POST, "/api/v1/apps", permitAll) authorize(POST, "/api/v1/apps", permitAll)
authorize(GET, "/api/v1/instance/**", permitAll) authorize(GET, "/api/v1/instance/**", permitAll)
authorize(POST, "/api/v1/accounts", permitAll) authorize(POST, "/api/v1/accounts", authenticated)
authorize(GET, "/api/v1/accounts/verify_credentials", rf.hasScope("read:accounts")) authorize(GET, "/api/v1/accounts/verify_credentials", rf.hasScope("read:accounts"))
authorize(GET, "/api/v1/accounts/relationships", rf.hasScope("read:follows")) authorize(GET, "/api/v1/accounts/relationships", rf.hasScope("read:follows"))

12
src/main/resources/templates/sign_up.html
View File

@ -3,12 +3,22 @@
<head> <head>
<meta charset="UTF-8"> <meta charset="UTF-8">
<title>SignUp</title> <title>SignUp</title>
<script th:src="https://www.google.com/recaptcha/api.js?render=${siteKey}"></script>
<script th:inline="javascript">
grecaptcha.ready(function () {
grecaptcha.execute( /*[[${siteKey}]]*/ '', {action: 'homepage'}).then(function (token) {
var recaptchaResponse = document.getElementById('recaptchaResponse');
recaptchaResponse.value = token;
});
});
</script>
</head> </head>
<body> <body>
<form method='post' th:action="@{/api/v1/accounts}"> <form method='post' th:action="@{/auth/sign_up}">
<input name='username' type='text' value=''> <input name='username' type='text' value=''>
<input name='password' type='password'> <input name='password' type='password'>
<input type="hidden" name="recaptchaResponse" id="recaptchaResponse">
<input type="submit"> <input type="submit">
</form> </form>
</body> </body>