-
Notifications
You must be signed in to change notification settings - Fork 0
Commit
This commit does not belong to any branch on this repository, and may belong to a fork outside of the repository.
refactor(jwt): add more value objects, do not use raw strings and mov…
…e infrastructure code for working with JWT from Business Logic to infra package
- Loading branch information
1 parent
9d65403
commit f0c4eb6
Showing
24 changed files
with
253 additions
and
179 deletions.
There are no files selected for viewing
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
27 changes: 27 additions & 0 deletions
27
server/app/src/main/kotlin/mu/muse/application/jwt/JwtGenerator.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,27 @@ | ||
package mu.muse.application.jwt | ||
|
||
import io.jsonwebtoken.Jwts | ||
import io.jsonwebtoken.SignatureAlgorithm | ||
import mu.muse.domain.Jwt | ||
import mu.muse.domain.User | ||
import java.util.Date | ||
|
||
class JwtGenerator( | ||
private val jwtSecretKey: String, | ||
private val jwtExpirationMillis: Long, | ||
) { | ||
|
||
fun execute(user: User): Jwt { | ||
val claims = Jwts.claims().setSubject(user.id.toStringValue()) | ||
claims["role"] = user.role.toStringValue() | ||
|
||
return Jwt.from( | ||
Jwts.builder() | ||
.setClaims(claims) | ||
.setIssuedAt(Date(System.currentTimeMillis())) | ||
.setExpiration(Date(System.currentTimeMillis() + jwtExpirationMillis)) | ||
.signWith(SignatureAlgorithm.HS512, jwtSecretKey) | ||
.compact(), | ||
) | ||
} | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
18 changes: 18 additions & 0 deletions
18
server/app/src/main/kotlin/mu/muse/application/jwt/JwtUsernameExtractor.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,18 @@ | ||
package mu.muse.application.jwt | ||
|
||
import io.jsonwebtoken.Jwts | ||
import mu.muse.domain.Jwt | ||
import mu.muse.domain.Username | ||
|
||
class JwtUsernameExtractor(private val jwtSecretKey: String) { | ||
|
||
fun execute(jwt: Jwt): Username { | ||
return Username.from( | ||
Jwts.parser() | ||
.setSigningKey(jwtSecretKey) | ||
.parseClaimsJws(jwt.toStringValue()) | ||
.body | ||
.subject, | ||
) | ||
} | ||
} |
20 changes: 11 additions & 9 deletions
20
...e/usecase/scenario/JwtValidatorUseCase.kt → ...n/mu/muse/application/jwt/JwtValidator.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,26 +1,28 @@ | ||
package mu.muse.usecase.scenario | ||
package mu.muse.application.jwt | ||
|
||
import io.jsonwebtoken.Jwts | ||
import mu.muse.domain.Jwt | ||
import mu.muse.domain.Username | ||
import mu.muse.usecase.JwtValidator | ||
import mu.muse.usecase.access.UserExtractor | ||
import org.springframework.security.core.userdetails.UserDetails | ||
import java.util.* | ||
import java.util.Date | ||
|
||
class JwtValidatorUseCase( | ||
class JwtValidator( | ||
private val jwtSecretKey: String, | ||
private val userRepository: UserExtractor | ||
) : JwtValidator { | ||
private val userRepository: UserExtractor, | ||
) { | ||
|
||
override fun execute(jwtRaw: String): Boolean { | ||
fun execute(jwt: Jwt): Boolean { | ||
val claims = Jwts.parser() | ||
.setSigningKey(jwtSecretKey) | ||
.parseClaimsJws(jwtRaw) | ||
.parseClaimsJws(jwt.toStringValue()) | ||
.body | ||
|
||
val username: Username = Username.from(claims.subject) | ||
val user: UserDetails = userRepository.findByUsername(username) ?: return false | ||
|
||
val today = Date() | ||
val expiration = claims.expiration | ||
return (username.toStringValue() == user.username) && (Date().before(expiration)) | ||
return (username.toStringValue() == user.username) && (today.before(expiration)) | ||
} | ||
} |
18 changes: 11 additions & 7 deletions
18
server/app/src/main/kotlin/mu/muse/application/muse/PersistenceConfiguration.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
38 changes: 4 additions & 34 deletions
38
server/app/src/main/kotlin/mu/muse/application/muse/UseCaseConfiguration.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -1,49 +1,19 @@ | ||
package mu.muse.application.muse | ||
|
||
import mu.muse.usecase.JwtGenerator | ||
import mu.muse.usecase.JwtUsernameExtractor | ||
import mu.muse.usecase.JwtValidator | ||
import mu.muse.usecase.BasicLogin | ||
import mu.muse.application.jwt.JwtGenerator | ||
import mu.muse.usecase.access.UserExtractor | ||
import mu.muse.usecase.scenario.JwtGeneratorUseCase | ||
import mu.muse.usecase.scenario.JwtUsernameExtractorUseCase | ||
import mu.muse.usecase.scenario.JwtValidatorUseCase | ||
import mu.muse.usecase.scenario.BasicLoginUseCase | ||
import org.springframework.beans.factory.annotation.Value | ||
import org.springframework.context.annotation.Bean | ||
import org.springframework.context.annotation.Configuration | ||
import org.springframework.security.authentication.AuthenticationManager | ||
|
||
@Configuration | ||
class UseCaseConfiguration { | ||
|
||
@Bean | ||
fun jwtValidator( | ||
@Value("\${security.jwt.secret-key}") jwtSecretKey: String, | ||
userExtractor: UserExtractor, | ||
): JwtValidator { | ||
return JwtValidatorUseCase(jwtSecretKey, userExtractor) | ||
} | ||
|
||
@Bean | ||
fun jwtUsernameExtractor(@Value("\${security.jwt.secret-key}") jwtSecretKey: String): JwtUsernameExtractor { | ||
return JwtUsernameExtractorUseCase(jwtSecretKey) | ||
} | ||
|
||
@Bean | ||
fun jwtGenerator( | ||
@Value("\${security.jwt.secret-key}") jwtSecretKey: String, | ||
@Value("\${security.jwt.expiration-time}") expiration: Long, | ||
): JwtGenerator { | ||
return JwtGeneratorUseCase(jwtSecretKey, expiration) | ||
} | ||
|
||
@Bean | ||
fun login( | ||
userRepository: UserExtractor, | ||
authenticationManager: AuthenticationManager, | ||
jwtGenerator: JwtGenerator | ||
): BasicLogin { | ||
return BasicLoginUseCase(userRepository, authenticationManager, jwtGenerator) | ||
} | ||
userRepository: UserExtractor, | ||
jwtGenerator: JwtGenerator, | ||
) = BasicLoginUseCase(authenticationManager, userRepository, jwtGenerator) | ||
} |
3 changes: 3 additions & 0 deletions
3
server/app/src/main/kotlin/mu/muse/common/types/BusinessError.kt
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,3 @@ | ||
package mu.muse.common.types | ||
|
||
interface BusinessError |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,13 @@ | ||
package mu.muse.domain | ||
|
||
data class Jwt internal constructor(private val value: String) { | ||
|
||
companion object { | ||
fun from(value: String): Jwt { | ||
require(value.isNotBlank()) { "JWT cannot be blank" } | ||
return Jwt(value) | ||
} | ||
} | ||
|
||
fun toStringValue() = value | ||
} |
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
This file contains bidirectional Unicode text that may be interpreted or compiled differently than what appears below. To review, open the file in an editor that reveals hidden Unicode characters.
Learn more about bidirectional Unicode characters
Original file line number | Diff line number | Diff line change |
---|---|---|
@@ -0,0 +1,25 @@ | ||
package mu.muse.domain | ||
|
||
import mu.muse.common.types.ValueObject | ||
|
||
// used `class` instead of `enum`, because `@RolesAllowed` requires compile-time constants | ||
data class Role internal constructor(private val value: String) : ValueObject { | ||
|
||
companion object { | ||
fun from(value: String): Role { | ||
when (value) { | ||
USER -> Role(USER) | ||
EDITOR -> Role(EDITOR) | ||
} | ||
throw IllegalArgumentException("Unknown role: $value") | ||
} | ||
|
||
const val USER = "USER" | ||
const val EDITOR = "EDITOR" | ||
fun user() = Role(USER) | ||
fun editor() = Role(EDITOR) | ||
} | ||
|
||
fun toStringValue() = value | ||
fun toAuthority() = "ROLE_$value" | ||
} |
Oops, something went wrong.