From e18df74d5ab57adca36177356d0080307766ede4 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?Bernard=20Crnkovi=C4=87?=
 <34215978+macabrus@users.noreply.github.com>
Date: Tue, 10 Jan 2023 23:29:31 +0100
Subject: [PATCH] extract hardcoded jwt claim names into config (#97)

* extract hardcoded jwt field names into config

* Update config.go

Co-authored-by: James Read <contact@jread.com>
---
 internal/config/config.go       | 4 ++++
 internal/httpservers/restapi.go | 4 ++--
 2 files changed, 6 insertions(+), 2 deletions(-)

diff --git a/internal/config/config.go b/internal/config/config.go
index 5fd61ad..b154d9b 100644
--- a/internal/config/config.go
+++ b/internal/config/config.go
@@ -72,6 +72,8 @@ type Config struct {
 	ShowNewVersions                 bool
 	AuthJwtCookieName               string
 	AuthJwtSecret                   string
+	AuthJwtClaimUsername            string
+	AuthJwtClaimUserGroup           string
 	DefaultPermissions              PermissionsList
 	AccessControlLists              []AccessControlList
 }
@@ -93,6 +95,8 @@ func DefaultConfig() *Config {
 	config.CheckForUpdates = true
 	config.DefaultPermissions.Exec = true
 	config.DefaultPermissions.View = true
+	config.AuthJwtClaimUsername = "name"
+	config.AuthJwtClaimUserGroup = "group"
 
 	return &config
 }
diff --git a/internal/httpservers/restapi.go b/internal/httpservers/restapi.go
index b314b15..fa3cf78 100644
--- a/internal/httpservers/restapi.go
+++ b/internal/httpservers/restapi.go
@@ -88,8 +88,8 @@ func startRestAPIServer(globalConfig *config.Config) error {
 				return nil
 			}
 
-			username := lookupClaimValueOrDefault(claims, "name", "none")
-			usergroup := lookupClaimValueOrDefault(claims, "group", "none")
+			username := lookupClaimValueOrDefault(claims, cfg.AuthJwtClaimUsername, "none")
+			usergroup := lookupClaimValueOrDefault(claims, cfg.AuthJwtClaimUserGroup, "none")
 
 			md := metadata.Pairs(
 				"username", username,