Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 3 additions & 1 deletion forms.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 (
Expand Down Expand Up @@ -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{})
Expand Down
7 changes: 3 additions & 4 deletions main.go
Original file line number Diff line number Diff line change
Expand Up @@ -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 {
Expand Down