Skip to content

Commit c55329b

Browse files
psycofdjbenjaminguttmann-avtq
authored andcommitted
grafana: permit id_token_attribute_name configuration in generic oauth
1 parent b934211 commit c55329b

File tree

2 files changed

+6
-0
lines changed

2 files changed

+6
-0
lines changed

jobs/grafana/spec

+2
Original file line numberDiff line numberDiff line change
@@ -432,6 +432,8 @@ properties:
432432
description: "Generic OAuth name attribute path"
433433
grafana.auth.generic_oauth.role_attribute_path:
434434
description: "Generic OAuth role attribute path"
435+
grafana.auth.generic_oauth.id_token_attribute_name:
436+
description: "Attribute name to read token from token authorization response"
435437
grafana.auth.generic_oauth.auth_url:
436438
description: "Generic OAuth url"
437439
grafana.auth.generic_oauth.token_url:

jobs/grafana/templates/config/grafana.ini

+4
Original file line numberDiff line numberDiff line change
@@ -840,6 +840,10 @@ name_attribute_path = <%= name_attribute_path %>
840840
role_attribute_path = <%= role_attribute_path %>
841841
<% end %>
842842

843+
<% if_p('grafana.auth.generic_oauth.id_token_attribute_name') do |id_token_attribute_name| %>
844+
id_token_attribute_name = <%= id_token_attribute_name %>
845+
<% end %>
846+
843847
<% if_p('grafana.auth.generic_oauth.auth_url') do |auth_url| %>
844848
auth_url = <%= auth_url %>
845849
<% end %>

0 commit comments

Comments
 (0)