Skip to content

Commit 4b9102b

Browse files
gbrayhangbrayhan
committed
fix all test
1 parent 48f1b86 commit 4b9102b

File tree

6 files changed

+56
-56
lines changed

6 files changed

+56
-56
lines changed

‎README.md‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -308,7 +308,7 @@ docker build -t microservices-go .
308308
docker run -p 8080:8080 \
309309
-e DB_HOST=postgres \
310310
-e DB_PORT=5432 \
311-
-e JWT_ACCESS_SECRET=your_secret \
311+
-e JWT_ACCESS_SECRET_KEY=your_secret \
312312
microservices-go
313313
```
314314

@@ -327,8 +327,8 @@ DB_PASSWORD=password
327327
DB_NAME=microservices_go
328328

329329
# JWT Configuration
330-
JWT_ACCESS_SECRET=your_access_secret
331-
JWT_REFRESH_SECRET=your_refresh_secret
330+
JWT_ACCESS_SECRET_KEY=your_access_secret
331+
JWT_REFRESH_SECRET_KEY=your_refresh_secret
332332
JWT_ACCESS_TIME_MINUTE=60
333333
JWT_REFRESH_TIME_HOUR=24
334334
```

‎docs/DEPLOYMENT_GUIDE.md‎

Lines changed: 12 additions & 12 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ DB_PASSWORD=secure_password
3030
DB_NAME=microservices_go
3131

3232
# JWT Configuration
33-
JWT_ACCESS_SECRET=your_very_secure_access_secret_key
34-
JWT_REFRESH_SECRET=your_very_secure_refresh_secret_key
33+
JWT_ACCESS_SECRET_KEY=your_very_secure_access_secret_key
34+
JWT_REFRESH_SECRET_KEY=your_very_secure_refresh_secret_key
3535
JWT_ACCESS_TIME_MINUTE=60
3636
JWT_REFRESH_TIME_HOUR=24
3737
```
@@ -104,8 +104,8 @@ services:
104104
- DB_USER=${DB_USER}
105105
- DB_PASSWORD=${DB_PASSWORD}
106106
- DB_NAME=${DB_NAME}
107-
- JWT_ACCESS_SECRET=${JWT_ACCESS_SECRET}
108-
- JWT_REFRESH_SECRET=${JWT_REFRESH_SECRET}
107+
- JWT_ACCESS_SECRET_KEY=${JWT_ACCESS_SECRET_KEY}
108+
- JWT_REFRESH_SECRET_KEY=${JWT_REFRESH_SECRET_KEY}
109109
depends_on:
110110
- postgres
111111
restart: unless-stopped
@@ -190,8 +190,8 @@ http {
190190
export DB_USER=postgres
191191
export DB_PASSWORD=secure_password
192192
export DB_NAME=microservices_go
193-
export JWT_ACCESS_SECRET=your_very_secure_access_secret_key
194-
export JWT_REFRESH_SECRET=your_very_secure_refresh_secret_key
193+
export JWT_ACCESS_SECRET_KEY=your_very_secure_access_secret_key
194+
export JWT_REFRESH_SECRET_KEY=your_very_secure_refresh_secret_key
195195

196196
# Deploy with production compose
197197
docker-compose -f docker-compose.prod.yml up --build -d
@@ -241,8 +241,8 @@ type: Opaque
241241
data:
242242
DB_USER: cG9zdGdyZXM= # postgres
243243
DB_PASSWORD: c2VjdXJlX3Bhc3N3b3Jk # secure_password
244-
JWT_ACCESS_SECRET: eW91cl92ZXJ5X3NlY3VyZV9hY2Nlc3Nfc2VjcmV0X2tleQ==
245-
JWT_REFRESH_SECRET: eW91cl92ZXJ5X3NlY3VyZV9yZWZyZXNoX3NlY3JldF9rZXk=
244+
JWT_ACCESS_SECRET_KEY: eW91cl92ZXJ5X3NlY3VyZV9hY2Nlc3Nfc2VjcmV0X2tleQ==
245+
JWT_REFRESH_SECRET_KEY: eW91cl92ZXJ5X3NlY3VyZV9yZWZyZXNoX3NlY3JldF9rZXk=
246246
```
247247
248248
### PostgreSQL Deployment
@@ -379,16 +379,16 @@ spec:
379379
secretKeyRef:
380380
name: app-secrets
381381
key: DB_PASSWORD
382-
- name: JWT_ACCESS_SECRET
382+
- name: JWT_ACCESS_SECRET_KEY
383383
valueFrom:
384384
secretKeyRef:
385385
name: app-secrets
386-
key: JWT_ACCESS_SECRET
387-
- name: JWT_REFRESH_SECRET
386+
key: JWT_ACCESS_SECRET_KEY
387+
- name: JWT_REFRESH_SECRET_KEY
388388
valueFrom:
389389
secretKeyRef:
390390
name: app-secrets
391-
key: JWT_REFRESH_SECRET
391+
key: JWT_REFRESH_SECRET_KEY
392392
livenessProbe:
393393
httpGet:
394394
path: /v1/health

‎src/infrastructure/rest/middlewares/RequiresLogin.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -18,9 +18,9 @@ func AuthJWTMiddleware() gin.HandlerFunc {
1818
return
1919
}
2020

21-
accessSecret := os.Getenv("JWT_ACCESS_SECRET")
21+
accessSecret := os.Getenv("JWT_ACCESS_SECRET_KEY")
2222
if accessSecret == "" {
23-
c.JSON(http.StatusUnauthorized, gin.H{"error": "JWT_ACCESS_SECRET not configured"})
23+
c.JSON(http.StatusUnauthorized, gin.H{"error": "JWT_ACCESS_SECRET_KEY not configured"})
2424
c.Abort()
2525
return
2626
}

‎src/infrastructure/rest/middlewares/RequiresLogin_test.go‎

Lines changed: 33 additions & 33 deletions
Original file line numberDiff line numberDiff line change
@@ -36,10 +36,10 @@ func TestAuthJWTMiddleware_NoToken(t *testing.T) {
3636
}
3737

3838
func TestAuthJWTMiddleware_NoJWTSecret(t *testing.T) {
39-
// Clear JWT_ACCESS_SECRET
40-
originalSecret := os.Getenv("JWT_ACCESS_SECRET")
41-
os.Unsetenv("JWT_ACCESS_SECRET")
42-
defer os.Setenv("JWT_ACCESS_SECRET", originalSecret)
39+
// Clear JWT_ACCESS_SECRET_KEY
40+
originalSecret := os.Getenv("JWT_ACCESS_SECRET_KEY")
41+
os.Unsetenv("JWT_ACCESS_SECRET_KEY")
42+
defer os.Setenv("JWT_ACCESS_SECRET_KEY", originalSecret)
4343

4444
c, w := setupGinContext()
4545
c.Request = httptest.NewRequest("GET", "/protected", nil)
@@ -53,14 +53,14 @@ func TestAuthJWTMiddleware_NoJWTSecret(t *testing.T) {
5353
var response map[string]interface{}
5454
err := json.Unmarshal(w.Body.Bytes(), &response)
5555
assert.NoError(t, err)
56-
assert.Equal(t, "JWT_ACCESS_SECRET not configured", response["error"])
56+
assert.Equal(t, "JWT_ACCESS_SECRET_KEY not configured", response["error"])
5757
}
5858

5959
func TestAuthJWTMiddleware_InvalidToken(t *testing.T) {
60-
// Set JWT_ACCESS_SECRET
61-
originalSecret := os.Getenv("JWT_ACCESS_SECRET")
62-
os.Setenv("JWT_ACCESS_SECRET", "test-secret")
63-
defer os.Setenv("JWT_ACCESS_SECRET", originalSecret)
60+
// Set JWT_ACCESS_SECRET_KEY
61+
originalSecret := os.Getenv("JWT_ACCESS_SECRET_KEY")
62+
os.Setenv("JWT_ACCESS_SECRET_KEY", "test-secret")
63+
defer os.Setenv("JWT_ACCESS_SECRET_KEY", originalSecret)
6464

6565
c, w := setupGinContext()
6666
c.Request = httptest.NewRequest("GET", "/protected", nil)
@@ -78,10 +78,10 @@ func TestAuthJWTMiddleware_InvalidToken(t *testing.T) {
7878
}
7979

8080
func TestAuthJWTMiddleware_ExpiredToken(t *testing.T) {
81-
// Set JWT_ACCESS_SECRET
82-
originalSecret := os.Getenv("JWT_ACCESS_SECRET")
83-
os.Setenv("JWT_ACCESS_SECRET", "test-secret")
84-
defer os.Setenv("JWT_ACCESS_SECRET", originalSecret)
81+
// Set JWT_ACCESS_SECRET_KEY
82+
originalSecret := os.Getenv("JWT_ACCESS_SECRET_KEY")
83+
os.Setenv("JWT_ACCESS_SECRET_KEY", "test-secret")
84+
defer os.Setenv("JWT_ACCESS_SECRET_KEY", originalSecret)
8585

8686
// Create expired token
8787
claims := jwt.MapClaims{
@@ -108,10 +108,10 @@ func TestAuthJWTMiddleware_ExpiredToken(t *testing.T) {
108108
}
109109

110110
func TestAuthJWTMiddleware_InvalidTokenClaims(t *testing.T) {
111-
// Set JWT_ACCESS_SECRET
112-
originalSecret := os.Getenv("JWT_ACCESS_SECRET")
113-
os.Setenv("JWT_ACCESS_SECRET", "test-secret")
114-
defer os.Setenv("JWT_ACCESS_SECRET", originalSecret)
111+
// Set JWT_ACCESS_SECRET_KEY
112+
originalSecret := os.Getenv("JWT_ACCESS_SECRET_KEY")
113+
os.Setenv("JWT_ACCESS_SECRET_KEY", "test-secret")
114+
defer os.Setenv("JWT_ACCESS_SECRET_KEY", originalSecret)
115115

116116
// Create token without exp claim
117117
claims := jwt.MapClaims{
@@ -136,10 +136,10 @@ func TestAuthJWTMiddleware_InvalidTokenClaims(t *testing.T) {
136136
}
137137

138138
func TestAuthJWTMiddleware_WrongTokenType(t *testing.T) {
139-
// Set JWT_ACCESS_SECRET
140-
originalSecret := os.Getenv("JWT_ACCESS_SECRET")
141-
os.Setenv("JWT_ACCESS_SECRET", "test-secret")
142-
defer os.Setenv("JWT_ACCESS_SECRET", originalSecret)
139+
// Set JWT_ACCESS_SECRET_KEY
140+
originalSecret := os.Getenv("JWT_ACCESS_SECRET_KEY")
141+
os.Setenv("JWT_ACCESS_SECRET_KEY", "test-secret")
142+
defer os.Setenv("JWT_ACCESS_SECRET_KEY", originalSecret)
143143

144144
// Create token with wrong type
145145
claims := jwt.MapClaims{
@@ -165,10 +165,10 @@ func TestAuthJWTMiddleware_WrongTokenType(t *testing.T) {
165165
}
166166

167167
func TestAuthJWTMiddleware_MissingTokenType(t *testing.T) {
168-
// Set JWT_ACCESS_SECRET
169-
originalSecret := os.Getenv("JWT_ACCESS_SECRET")
170-
os.Setenv("JWT_ACCESS_SECRET", "test-secret")
171-
defer os.Setenv("JWT_ACCESS_SECRET", originalSecret)
168+
// Set JWT_ACCESS_SECRET_KEY
169+
originalSecret := os.Getenv("JWT_ACCESS_SECRET_KEY")
170+
os.Setenv("JWT_ACCESS_SECRET_KEY", "test-secret")
171+
defer os.Setenv("JWT_ACCESS_SECRET_KEY", originalSecret)
172172

173173
// Create token without type claim
174174
claims := jwt.MapClaims{
@@ -193,10 +193,10 @@ func TestAuthJWTMiddleware_MissingTokenType(t *testing.T) {
193193
}
194194

195195
func TestAuthJWTMiddleware_ValidToken(t *testing.T) {
196-
// Set JWT_ACCESS_SECRET
197-
originalSecret := os.Getenv("JWT_ACCESS_SECRET")
198-
os.Setenv("JWT_ACCESS_SECRET", "test-secret")
199-
defer os.Setenv("JWT_ACCESS_SECRET", originalSecret)
196+
// Set JWT_ACCESS_SECRET_KEY
197+
originalSecret := os.Getenv("JWT_ACCESS_SECRET_KEY")
198+
os.Setenv("JWT_ACCESS_SECRET_KEY", "test-secret")
199+
defer os.Setenv("JWT_ACCESS_SECRET_KEY", originalSecret)
200200

201201
// Create valid token
202202
claims := jwt.MapClaims{
@@ -218,10 +218,10 @@ func TestAuthJWTMiddleware_ValidToken(t *testing.T) {
218218
}
219219

220220
func TestAuthJWTMiddleware_TokenWithoutBearer(t *testing.T) {
221-
// Set JWT_ACCESS_SECRET
222-
originalSecret := os.Getenv("JWT_ACCESS_SECRET")
223-
os.Setenv("JWT_ACCESS_SECRET", "test-secret")
224-
defer os.Setenv("JWT_ACCESS_SECRET", originalSecret)
221+
// Set JWT_ACCESS_SECRET_KEY
222+
originalSecret := os.Getenv("JWT_ACCESS_SECRET_KEY")
223+
os.Setenv("JWT_ACCESS_SECRET_KEY", "test-secret")
224+
defer os.Setenv("JWT_ACCESS_SECRET_KEY", originalSecret)
225225

226226
// Create valid token
227227
claims := jwt.MapClaims{

‎src/infrastructure/security/jwt_service.go‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -65,8 +65,8 @@ func NewJWTServiceWithConfig(config JWTConfig) IJWTService {
6565
// loadJWTConfig loads JWT configuration from environment variables
6666
func loadJWTConfig() JWTConfig {
6767
return JWTConfig{
68-
AccessSecret: getEnvOrDefault("JWT_ACCESS_SECRET", "default_access_secret"),
69-
RefreshSecret: getEnvOrDefault("JWT_REFRESH_SECRET", "default_refresh_secret"),
68+
AccessSecret: getEnvOrDefault("JWT_ACCESS_SECRET_KEY", "default_access_secret"),
69+
RefreshSecret: getEnvOrDefault("JWT_REFRESH_SECRET_KEY", "default_refresh_secret"),
7070
AccessTime: getEnvAsInt64OrDefault("JWT_ACCESS_TIME_MINUTE", 60),
7171
RefreshTime: getEnvAsInt64OrDefault("JWT_REFRESH_TIME_HOUR", 24),
7272
}

‎src/infrastructure/security/jwt_test.go‎

Lines changed: 4 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@ func TestNewJWTServiceWithConfig(t *testing.T) {
3030

3131
func TestLoadJWTConfig(t *testing.T) {
3232
// Test with environment variables set
33-
os.Setenv("JWT_ACCESS_SECRET", "custom_access_secret")
34-
os.Setenv("JWT_REFRESH_SECRET", "custom_refresh_secret")
33+
os.Setenv("JWT_ACCESS_SECRET_KEY", "custom_access_secret")
34+
os.Setenv("JWT_REFRESH_SECRET_KEY", "custom_refresh_secret")
3535
os.Setenv("JWT_ACCESS_TIME_MINUTE", "45")
3636
os.Setenv("JWT_REFRESH_TIME_HOUR", "48")
3737

@@ -42,8 +42,8 @@ func TestLoadJWTConfig(t *testing.T) {
4242
assert.Equal(t, int64(48), config.RefreshTime)
4343

4444
// Clean up
45-
os.Unsetenv("JWT_ACCESS_SECRET")
46-
os.Unsetenv("JWT_REFRESH_SECRET")
45+
os.Unsetenv("JWT_ACCESS_SECRET_KEY")
46+
os.Unsetenv("JWT_REFRESH_SECRET_KEY")
4747
os.Unsetenv("JWT_ACCESS_TIME_MINUTE")
4848
os.Unsetenv("JWT_REFRESH_TIME_HOUR")
4949
}

0 commit comments

Comments
 (0)