Skip to content

Commit 1192c85

Browse files
committed
refactor(auth): from KeyPair to KeyPairRepository
1 parent 2287faf commit 1192c85

6 files changed

Lines changed: 9 additions & 9 deletions

File tree

src/main/scala/net/yoshinorin/qualtet/Modules.scala

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -10,7 +10,7 @@ import org.typelevel.log4cats.LoggerFactory as Log4CatsLoggerFactory
1010
import org.typelevel.log4cats.slf4j.Slf4jFactory as Log4CatsSlf4jFactory
1111
import org.typelevel.otel4s.trace.Tracer
1212
import com.github.benmanes.caffeine.cache.{Cache as CaffeineCache, Caffeine}
13-
import net.yoshinorin.qualtet.auth.{AuthService, Jwt, KeyPair}
13+
import net.yoshinorin.qualtet.auth.{AuthService, Jwt, KeyPairRepository}
1414
import net.yoshinorin.qualtet.cache.CacheRepository
1515
import net.yoshinorin.qualtet.config.ApplicationConfig
1616
import net.yoshinorin.qualtet.domains.{ArticlesPagination, FeedsPagination, Limit, Page, PaginationOps, PaginationRequestModel, TagsPagination}
@@ -83,7 +83,7 @@ class Modules(tx: Transactor[IO], maybeTracer: Option[Tracer[IO]] = None) {
8383
val v218Migrator: VersionMigrator[IO, ConnectionIO] = summon[VersionMigrator[IO, ConnectionIO]](using V218Migrator.V218)
8484

8585
// NOTE: for generate JWT. They are reset when re-boot application.
86-
val keyPair: KeyPair = new KeyPair("RSA", 2048, SecureRandom.getInstanceStrong)
86+
val keyPair: KeyPairRepository = new KeyPairRepository("RSA", 2048, SecureRandom.getInstanceStrong)
8787
val message: Array[Byte] = SecureRandom.getInstanceStrong.toString.getBytes("UTF-8")
8888
val signature: Signature = new net.yoshinorin.qualtet.auth.Signature("SHA256withRSA", message, keyPair)
8989
val jwtInstance: Jwt[IO] = new Jwt[IO](config.jwt, JwtAlgorithm.RS256, keyPair, signature)

src/main/scala/net/yoshinorin/qualtet/auth/Jwt.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -14,7 +14,7 @@ import org.typelevel.log4cats.{LoggerFactory as Log4CatsLoggerFactory, SelfAware
1414
import java.time.Instant
1515
import scala.util.Try
1616

17-
class Jwt[F[_]: Monad](config: JwtConfig, algorithm: JwtAsymmetricAlgorithm, keyPair: KeyPair, signature: Signature)(using
17+
class Jwt[F[_]: Monad](config: JwtConfig, algorithm: JwtAsymmetricAlgorithm, keyPair: KeyPairRepository, signature: Signature)(using
1818
loggerFactory: Log4CatsLoggerFactory[F]
1919
) {
2020

src/main/scala/net/yoshinorin/qualtet/auth/KeyPair.scala renamed to src/main/scala/net/yoshinorin/qualtet/auth/KeyPairRepository.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ import org.slf4j.LoggerFactory
55
import java.security
66
import java.security.{KeyPairGenerator, PrivateKey, PublicKey, SecureRandom}
77

8-
class KeyPair(algorithm: String, length: Int, secureRandom: SecureRandom) {
8+
class KeyPairRepository(algorithm: String, length: Int, secureRandom: SecureRandom) {
99

1010
// NOTE: DO NOT USE `log4cats`
1111
private val logger = LoggerFactory.getLogger(this.getClass)

src/main/scala/net/yoshinorin/qualtet/auth/Signature.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -3,7 +3,7 @@ package net.yoshinorin.qualtet.auth
33
import org.slf4j.LoggerFactory
44
import java.security.{PrivateKey, Signature as JavaSignature}
55

6-
class Signature(algorithm: String, message: Array[Byte], key: KeyPair) {
6+
class Signature(algorithm: String, message: Array[Byte], key: KeyPairRepository) {
77

88
// NOTE: DO NOT USE `log4cats`
99
private val logger = LoggerFactory.getLogger(this.getClass)

src/test/scala/net/yoshinorin/qualtet/auth/KeyPairSpec.scala

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -3,14 +3,14 @@ package net.yoshinorin.qualtet.auth
33
import org.scalatest.wordspec.AnyWordSpec
44
import java.security.SecureRandom
55

6-
// testOnly net.yoshinorin.qualtet.auth.KeyPairSpec
7-
class KeyPairSpec extends AnyWordSpec {
6+
// testOnly net.yoshinorin.qualtet.auth.KeyPairRepositorySpec
7+
class KeyPairRepositorySpec extends AnyWordSpec {
88

99
"KeyPair" should {
1010

1111
"generate keypair" in {
1212

13-
val keyPair = new KeyPair("RSA", 2048, SecureRandom.getInstanceStrong)
13+
val keyPair = new KeyPairRepository("RSA", 2048, SecureRandom.getInstanceStrong)
1414
assert(keyPair.publicKey.getAlgorithm === "RSA")
1515
assert(keyPair.publicKey.getFormat === "X.509")
1616
assert(keyPair.privateKey.getAlgorithm === "RSA")

src/test/scala/net/yoshinorin/qualtet/auth/SignatureSpec.scala

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -8,7 +8,7 @@ class SignatureSpec extends AnyWordSpec {
88

99
"Signature" should {
1010

11-
val keyPair = new KeyPair("RSA", 2048, SecureRandom.getInstanceStrong)
11+
val keyPair = new KeyPairRepository("RSA", 2048, SecureRandom.getInstanceStrong)
1212
val message = SecureRandom.getInstanceStrong.toString.getBytes
1313
val signature = new net.yoshinorin.qualtet.auth.Signature("SHA256withRSA", message, keyPair)
1414

0 commit comments

Comments
 (0)