From e7a6f54ff9f692da7669eddd7d6849d6a373b0a2 Mon Sep 17 00:00:00 2001
From: Ethan Knowlton <ethan@dubtown.dev>
Date: Tue, 14 Nov 2023 03:46:03 -0500
Subject: [PATCH] chore(jwt): cleaning up JWT tests and checks

---
 cmd/echoip/main.go | 2 +-
 http/jwt_test.go   | 8 ++++----
 2 files changed, 5 insertions(+), 5 deletions(-)

diff --git a/cmd/echoip/main.go b/cmd/echoip/main.go
index 195e518..9d3790c 100644
--- a/cmd/echoip/main.go
+++ b/cmd/echoip/main.go
@@ -108,7 +108,7 @@ func main() {
 		serverCache = &cache.Null{}
 	}
 
-	if len(runConfig.Jwt.PublicKey) != 0 {
+	if runConfig.Jwt.Enabled && len(runConfig.Jwt.PublicKey) != 0 {
 		log.Printf("Loading public key from %s", runConfig.Jwt.PublicKey)
 
 		pubKey, err := os.ReadFile(runConfig.Jwt.PublicKey)
diff --git a/http/jwt_test.go b/http/jwt_test.go
index 1d287ea..c96e32e 100644
--- a/http/jwt_test.go
+++ b/http/jwt_test.go
@@ -7,11 +7,11 @@ import (
 	"github.com/stretchr/testify/assert"
 )
 
-const ecdsaPublicKey = `-----BEGIN PUBLIC KEY-----
+const EcdsaPublicKey = `-----BEGIN PUBLIC KEY-----
 MFkwEwYHKoZIzj0CAQYIKoZIzj0DAQcDQgAEEVs/o5+uQbTjL3chynL4wXgUg2R9
 q9UU8I5mEovUf86QZ7kOBIjJwqnzD1omageEHWwHdBO6B+dFabmdT9POxg==
 -----END PUBLIC KEY-----`
-const ecdsaToken = `eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MTUxNjIzOTAyMn0.tyh-VfuzIxCyGYDlkBA7DfyjrqmSHu6pQ2hoZuFqUSLPNY2N0mpHb3nk5K17HWP_3cYHBw7AhHale5wky6-sVA`
+const EcdsaToken = `eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJzdWIiOiIxMjM0NTY3ODkwIiwibmFtZSI6IkpvaG4gRG9lIiwiYWRtaW4iOnRydWUsImlhdCI6MTUxNjIzOTAyMn0.tyh-VfuzIxCyGYDlkBA7DfyjrqmSHu6pQ2hoZuFqUSLPNY2N0mpHb3nk5K17HWP_3cYHBw7AhHale5wky6-sVA`
 
 const rsaPublicKey = `-----BEGIN PUBLIC KEY-----
 MIIBIjANBgkqhkiG9w0BAQEFAAOCAQ8AMIIBCgKCAQEAu1SU1LfVLPHCozMxH2Mo
@@ -32,9 +32,9 @@ func TestGetTokenKeyWithECDSAKey(t *testing.T) {
 		Debug: true,
 		Jwt: config.Jwt{
 			SigningMethod: "ES256",
-			PublicKeyData: []byte(ecdsaPublicKey),
+			PublicKeyData: []byte(EcdsaPublicKey),
 		},
-	}, ecdsaToken)
+	}, EcdsaToken)
 
 	assert.Nil(t, err)
 }