Merge pull request #892 from modelix/fix/jwk-key-id-from-envvar

benedekh · web-flow · commit 0998984efe55 · 2024-07-11T13:33:03.000+02:00
fix(model-server): set jwkKeyId from system envvar
diff --git a/authorization/src/main/kotlin/org/modelix/authorization/AuthorizationConfig.kt b/authorization/src/main/kotlin/org/modelix/authorization/AuthorizationConfig.kt
@@ -106,7 +106,7 @@ class ModelixAuthorizationConfig : IModelixAuthorizationConfig {
                 URI("${keycloakBaseUrl}realms/$keycloakRealm/protocol/openid-connect/certs")
             }
         }
-    override var jwkKeyId: String? = null
+    override var jwkKeyId: String? = System.getenv("MODELIX_JWK_KEY_ID")
     override var permissionSchema: Schema = buildPermissionSchema { }
 
     private val hmac512KeyFromEnv by lazy {

Original file line number	Diff line number	Diff line change
`@@ -106,7 +106,7 @@ class ModelixAuthorizationConfig : IModelixAuthorizationConfig {`
`106`	`106`	`URI("${keycloakBaseUrl}realms/$keycloakRealm/protocol/openid-connect/certs")`
`107`	`107`	`}`
`108`	`108`	`}`
`109`		`- override var jwkKeyId: String? = null`
	`109`	`+ override var jwkKeyId: String? = System.getenv("MODELIX_JWK_KEY_ID")`
`110`	`110`	`override var permissionSchema: Schema = buildPermissionSchema { }`
`111`	`111`
`112`	`112`	`private val hmac512KeyFromEnv by lazy {`