From eabda54b5adeabb86c7509f0165d9ed7af8ae797 Mon Sep 17 00:00:00 2001 From: "randy.pierce" Date: Wed, 11 Feb 2026 11:16:06 -0700 Subject: [PATCH 1/2] move the FERNET_KEY into the credentials file --- forms.go | 4 +++- main.go | 7 +++---- 2 files changed, 6 insertions(+), 5 deletions(-) diff --git a/forms.go b/forms.go index 491d12e..1ef6415 100644 --- a/forms.go +++ b/forms.go @@ -49,6 +49,7 @@ type Credentials struct { CBCollection string `yaml:"cb_collection"` Targets []string `yaml:"targets"` VxFormsUICredentials map[string]string `yaml:"vx_formsui_credentials"` + VxFernetKey string `yaml:"vx_fernet_key_vxformsUI"` } var ( @@ -694,9 +695,10 @@ func handleNamedFunction(vStr string, fields map[string]interface{}, key string) return selectMode } -func GetRole(accessToken, fernetKey string) (UserRoleInfo, error) { +func GetRole(accessToken string) (UserRoleInfo, error) { cluster := GetConnection(GetCBCredentials()) credentials := GetCBCredentials() + fernetKey := credentials.VxFernetKey bucket := cluster.Bucket(credentials.CBBucket) collection := bucket.Collection("COMMON") getResult, err := collection.Get("MD:V01:roles:vxFormsUI", &gocb.GetOptions{}) diff --git a/main.go b/main.go index 5a2b76c..5a57f54 100644 --- a/main.go +++ b/main.go @@ -109,17 +109,16 @@ func main() { api.GET("/", func(c *gin.Context) { accessToken := c.Query("access_token") - fernetKey := os.Getenv("FERNET_KEY") userRoleInfo := UserRoleInfo{} - if accessToken != "" && fernetKey != "" { + if accessToken != "" { var err error - userRoleInfo, err = GetRole(accessToken, fernetKey) + userRoleInfo, err = GetRole(accessToken) if err != nil { fmt.Printf("Error getting user role: %v\n", err) // Continue with empty userRoleInfo, which will indicate no role/user info in the template } } else { - fmt.Println("No access token or fernet key provided. User will not be authenticated.") + fmt.Println("no access token provided. User will not be authenticated.") } templates, err := GetFormTemplates() if err != nil { From d98bc20e29101b4062b7f5d6530cb623f2959434 Mon Sep 17 00:00:00 2001 From: "randy.pierce" Date: Wed, 11 Feb 2026 11:25:06 -0700 Subject: [PATCH 2/2] fix vx_fernet_key_vxformsui --- forms.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/forms.go b/forms.go index 1ef6415..2b909a8 100644 --- a/forms.go +++ b/forms.go @@ -49,7 +49,7 @@ type Credentials struct { CBCollection string `yaml:"cb_collection"` Targets []string `yaml:"targets"` VxFormsUICredentials map[string]string `yaml:"vx_formsui_credentials"` - VxFernetKey string `yaml:"vx_fernet_key_vxformsUI"` + VxFernetKey string `yaml:"vx_fernet_key_vxformsui"` } var (