From 7e448d7b1fc36ff06c55b6684bbc574a73222bf1 Mon Sep 17 00:00:00 2001
From: =?UTF-8?q?=E3=81=AD=E3=82=89=E3=81=B2=E3=81=8B=E3=81=A0?=
 <hkshirorom@yahoo.co.jp>
Date: Wed, 24 Jan 2024 01:33:56 +0900
Subject: [PATCH] fix: change to use default configuration values

---
 cmd/config.go | 20 ++++++++++++++++++--
 1 file changed, 18 insertions(+), 2 deletions(-)

diff --git a/cmd/config.go b/cmd/config.go
index c4a59d88..d2fd8ca0 100644
--- a/cmd/config.go
+++ b/cmd/config.go
@@ -68,13 +68,29 @@ func initProxyAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) a
 	return &auth.ProxyAuth{Header: header}
 }
 
-func initJWTAuth(flags *pflag.FlagSet) auth.Auther {
+func initJWTAuth(flags *pflag.FlagSet, defaultAuther map[string]interface{}) auth.Auther {
 	header := mustGetString(flags, "auth.jwt-header.header")
 	aud := mustGetString(flags, "auth.jwt-header.aud")
 	iss := mustGetString(flags, "auth.jwt-header.iss")
 	certsurl := mustGetString(flags, "auth.jwt-header.certsurl")
 	usernameClaim := mustGetString(flags, "auth.jwt-header.usernameClaim")
 
+	if header == "" {
+		header = defaultAuther["header"].(string)
+	}
+	if aud == "" {
+		aud = defaultAuther["aud"].(string)
+	}
+	if iss == "" {
+		iss = defaultAuther["iss"].(string)
+	}
+	if certsurl == "" {
+		certsurl = defaultAuther["certsurl"].(string)
+	}
+	if usernameClaim == "" {
+		usernameClaim = defaultAuther["usernameClaim"].(string)
+	}
+
 	if header == "" {
 		checkErr(nerrors.New("you must set the flag 'auth.jwt-header.header' for method 'jwt-header'"))
 	}
@@ -167,7 +183,7 @@ func getAuthentication(flags *pflag.FlagSet, defaults ...interface{}) (settings.
 	case auth.MethodProxyAuth:
 		auther = initProxyAuth(flags, defaultAuther)
 	case auth.MethodJWTAuth:
-		auther = initJWTAuth(flags)
+		auther = initJWTAuth(flags, defaultAuther)
 	case auth.MethodNoAuth:
 		auther = &auth.NoAuth{}
 	case auth.MethodJSONAuth: