Remove jwks from auth storage (#461)

* Remove jwks from auth storage * Remove jwks endpoint from storage
stackitcloud · Aug 26, 2024 · 0c732f9 · 0c732f9
1 parent dcad93e
commit 0c732f9
Show file tree

Hide file tree

Showing 3 changed files with 0 additions and 14 deletions.
diff --git a/internal/pkg/auth/auth_test.go b/internal/pkg/auth/auth_test.go
@@ -70,7 +70,6 @@ func TestAuthenticationConfig(t *testing.T) {
 		saKey                         string
 		privateKeySet                 bool
 		tokenEndpoint                 string
-		jwksEndpoint                  string
 		isValid                       bool
 		expectedCustomAuthSet         bool
 		expectedTokenSet              bool
@@ -102,7 +101,6 @@ func TestAuthenticationConfig(t *testing.T) {
 			saKey:                 testServiceAccountKey,
 			privateKeySet:         true,
 			tokenEndpoint:         "token_url",
-			jwksEndpoint:          "jwks_url",
 			isValid:               true,
 			expectedCustomAuthSet: true,
 		},
@@ -115,7 +113,6 @@ func TestAuthenticationConfig(t *testing.T) {
 			saKey:            testServiceAccountKey,
 			privateKeySet:    true,
 			tokenEndpoint:    "token_url",
-			jwksEndpoint:     "jwks_url",
 			isValid:          false,
 		},
 		{
@@ -180,7 +177,6 @@ func TestAuthenticationConfig(t *testing.T) {
 			authFields[REFRESH_TOKEN] = tt.refreshToken
 			authFields[SERVICE_ACCOUNT_KEY] = tt.saKey
 			authFields[TOKEN_CUSTOM_ENDPOINT] = tt.tokenEndpoint
-			authFields[JWKS_CUSTOM_ENDPOINT] = tt.jwksEndpoint
 
 			err = SetAuthFlow(tt.flow)
 			if err != nil {
@@ -245,7 +241,6 @@ func TestInitKeyFlow(t *testing.T) {
 		saKey          string
 		privateKeySet  bool
 		tokenEndpoint  string
-		jwksEndpoint   string
 		isValid        bool
 	}{
 		{
@@ -255,7 +250,6 @@ func TestInitKeyFlow(t *testing.T) {
 			saKey:          testServiceAccountKey,
 			privateKeySet:  true,
 			tokenEndpoint:  "token_url",
-			jwksEndpoint:   "jwks_url",
 			isValid:        true,
 		},
 		{
@@ -265,7 +259,6 @@ func TestInitKeyFlow(t *testing.T) {
 			saKey:          "",
 			privateKeySet:  true,
 			tokenEndpoint:  "token_url",
-			jwksEndpoint:   "jwks_url",
 			isValid:        false,
 		},
 		{
@@ -275,7 +268,6 @@ func TestInitKeyFlow(t *testing.T) {
 			saKey:          testServiceAccountKey,
 			privateKeySet:  false,
 			tokenEndpoint:  "token_url",
-			jwksEndpoint:   "jwks_url",
 			isValid:        false,
 		},
 		{
@@ -285,7 +277,6 @@ func TestInitKeyFlow(t *testing.T) {
 			saKey:          testServiceAccountKey,
 			privateKeySet:  true,
 			tokenEndpoint:  "token_url",
-			jwksEndpoint:   "jwks_url",
 			isValid:        false,
 		},
 		{
@@ -295,7 +286,6 @@ func TestInitKeyFlow(t *testing.T) {
 			saKey:          testServiceAccountKey,
 			privateKeySet:  true,
 			tokenEndpoint:  "token_url",
-			jwksEndpoint:   "jwks_url",
 			isValid:        false,
 		},
 	}
@@ -326,7 +316,6 @@ func TestInitKeyFlow(t *testing.T) {
 			authFields[REFRESH_TOKEN] = tt.refreshToken
 			authFields[SERVICE_ACCOUNT_KEY] = tt.saKey
 			authFields[TOKEN_CUSTOM_ENDPOINT] = tt.tokenEndpoint
-			authFields[JWKS_CUSTOM_ENDPOINT] = tt.jwksEndpoint
 			err = SetAuthFieldMap(authFields)
 			if err != nil {
 				t.Fatalf("Failed to set in auth storage: %v", err)

diff --git a/internal/pkg/auth/service_account.go b/internal/pkg/auth/service_account.go
@@ -102,7 +102,6 @@ func initKeyFlowWithStorage() (*keyFlowWithStorage, error) {
 		SERVICE_ACCOUNT_KEY:   "",
 		PRIVATE_KEY:           "",
 		TOKEN_CUSTOM_ENDPOINT: "",
-		JWKS_CUSTOM_ENDPOINT:  "",
 	}
 	err := GetAuthFieldMap(authFields)
 	if err != nil {

diff --git a/internal/pkg/auth/storage.go b/internal/pkg/auth/storage.go
@@ -37,7 +37,6 @@ const (
 	SERVICE_ACCOUNT_KEY     authFieldKey = "service_account_key"
 	PRIVATE_KEY             authFieldKey = "private_key"
 	TOKEN_CUSTOM_ENDPOINT   authFieldKey = "token_custom_endpoint"
-	JWKS_CUSTOM_ENDPOINT    authFieldKey = "jwks_custom_endpoint"
 )
 
 const (
@@ -58,7 +57,6 @@ var authFieldKeys = []authFieldKey{
 	SERVICE_ACCOUNT_KEY,
 	PRIVATE_KEY,
 	TOKEN_CUSTOM_ENDPOINT,
-	JWKS_CUSTOM_ENDPOINT,
 	authFlowType,
 }