Compare commits
2 Commits
7108aff54d
...
main
| Author | SHA1 | Date | |
|---|---|---|---|
| 2e2e75fe87 | |||
| 8f508034d5 |
@@ -14,8 +14,10 @@ import java.util.Date
|
||||
@Service
|
||||
class JwtService(
|
||||
@Value("\${app.jwt.secret}") val secret: String,
|
||||
@Value("\${app.jwt.expiration-ms}") val expirationMs: Long
|
||||
@Value("\${app.jwt.expiration-ms:86400000}") expirationMsRaw: String
|
||||
) {
|
||||
private val expirationMs: Long = expirationMsRaw.toLongOrNull() ?: 86400000L
|
||||
|
||||
private val signingKey by lazy {
|
||||
Keys.hmacShaKeyFor(secret.toByteArray(Charsets.UTF_8))
|
||||
}
|
||||
|
||||
@@ -40,7 +40,7 @@ class AuthServiceTest {
|
||||
fun should_returnValidClaims_when_jwtTokenParsed() {
|
||||
val realJwtService = JwtService(
|
||||
secret = "test-secret-key-for-testing-only-must-be-at-least-32-characters",
|
||||
expirationMs = 86400000L
|
||||
expirationMsRaw = "86400000"
|
||||
)
|
||||
val token = realJwtService.generateToken()
|
||||
|
||||
@@ -51,7 +51,7 @@ class AuthServiceTest {
|
||||
fun should_returnFalse_when_expiredTokenValidated() {
|
||||
val realJwtService = JwtService(
|
||||
secret = "test-secret-key-for-testing-only-must-be-at-least-32-characters",
|
||||
expirationMs = 1L
|
||||
expirationMsRaw = "1"
|
||||
)
|
||||
val token = realJwtService.generateToken()
|
||||
|
||||
|
||||
@@ -0,0 +1,26 @@
|
||||
package com.condado.newsletter.service
|
||||
|
||||
import io.jsonwebtoken.Jwts
|
||||
import io.jsonwebtoken.security.Keys
|
||||
import org.junit.jupiter.api.Assertions.assertTrue
|
||||
import org.junit.jupiter.api.Test
|
||||
|
||||
class JwtServiceTest {
|
||||
|
||||
private val secret = "12345678901234567890123456789012"
|
||||
|
||||
@Test
|
||||
fun should_generate_token_when_expiration_is_empty() {
|
||||
val jwtService = JwtService(secret, "")
|
||||
|
||||
val token = jwtService.generateToken()
|
||||
|
||||
val claims = Jwts.parser()
|
||||
.verifyWith(Keys.hmacShaKeyFor(secret.toByteArray(Charsets.UTF_8)))
|
||||
.build()
|
||||
.parseSignedClaims(token)
|
||||
.payload
|
||||
|
||||
assertTrue(claims.expiration.after(claims.issuedAt))
|
||||
}
|
||||
}
|
||||
@@ -1,6 +1,6 @@
|
||||
services:
|
||||
condado-newsletter:
|
||||
image: sancho41/condado-newsletter:latest
|
||||
image: gitea.lab:80/sancho41/condado-newsletter:latest
|
||||
container_name: condado-newsletter
|
||||
restart: unless-stopped
|
||||
environment:
|
||||
@@ -9,7 +9,7 @@ services:
|
||||
SPRING_DATASOURCE_PASSWORD: ${SPRING_DATASOURCE_PASSWORD}
|
||||
APP_PASSWORD: ${APP_PASSWORD}
|
||||
JWT_SECRET: ${JWT_SECRET}
|
||||
JWT_EXPIRATION_MS: ${JWT_EXPIRATION_MS}
|
||||
JWT_EXPIRATION_MS: ${JWT_EXPIRATION_MS:-86400000}
|
||||
MAIL_HOST: ${MAIL_HOST}
|
||||
MAIL_PORT: ${MAIL_PORT}
|
||||
MAIL_USERNAME: ${MAIL_USERNAME}
|
||||
|
||||
@@ -27,6 +27,22 @@ mkdir -p /var/log/supervisor
|
||||
export SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL:-jdbc:postgresql://localhost:5432/${APP_DB_NAME}}
|
||||
export SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME:-${APP_DB_USER}}
|
||||
export SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD:-${APP_DB_PASSWORD}}
|
||||
export JWT_EXPIRATION_MS=${JWT_EXPIRATION_MS:-86400000}
|
||||
|
||||
# ── Log all Spring Boot environment variables for debugging ──────────────────
|
||||
echo "========================================"
|
||||
echo "Spring Boot Configuration:"
|
||||
echo "========================================"
|
||||
echo "SPRING_DATASOURCE_URL=${SPRING_DATASOURCE_URL}"
|
||||
echo "SPRING_DATASOURCE_USERNAME=${SPRING_DATASOURCE_USERNAME}"
|
||||
echo "SPRING_DATASOURCE_PASSWORD=${SPRING_DATASOURCE_PASSWORD}"
|
||||
echo "JWT_EXPIRATION_MS=${JWT_EXPIRATION_MS}"
|
||||
echo "JAVA_OPTS=${JAVA_OPTS:-not set}"
|
||||
echo "OPENAI_API_KEY=${OPENAI_API_KEY:-not set}"
|
||||
echo "========================================"
|
||||
|
||||
# ── Start all services via supervisord ───────────────────────────────────────
|
||||
# Export unbuffered output for both Python and Java
|
||||
export PYTHONUNBUFFERED=1
|
||||
export JAVA_OPTS="${JAVA_OPTS} -Dfile.encoding=UTF-8 -Djava.awt.headless=true"
|
||||
exec /usr/bin/supervisord -c /etc/supervisor/conf.d/supervisord.conf
|
||||
|
||||
@@ -1,8 +1,10 @@
|
||||
[supervisord]
|
||||
nodaemon=true
|
||||
silent=false
|
||||
logfile=/dev/stdout
|
||||
logfile_maxbytes=0
|
||||
pidfile=/var/run/supervisord.pid
|
||||
loglevel=info
|
||||
|
||||
[program:postgres]
|
||||
command=/usr/lib/postgresql/16/bin/postgres -D /var/lib/postgresql/data
|
||||
@@ -15,7 +17,7 @@ stderr_logfile=/dev/stderr
|
||||
stderr_logfile_maxbytes=0
|
||||
|
||||
[program:backend]
|
||||
command=java -jar /app/app.jar
|
||||
command=java -Dspring.output.ansi.enabled=always -Dlogging.level.root=DEBUG -jar /app/app.jar
|
||||
autostart=true
|
||||
autorestart=true
|
||||
startsecs=15
|
||||
|
||||
Reference in New Issue
Block a user