From fd7d905be255de650a6e5fd2bdb9129913d5b68b Mon Sep 17 00:00:00 2001
From: Samir Patel <48686912+54mir@users.noreply.github.com>
Date: Tue, 21 Dec 2021 15:49:51 -0600
Subject: [PATCH] fix formatting issues

---
 authz/authorization_test.go | 21 ++++++++++++---------
 server/server.go            |  2 +-
 2 files changed, 13 insertions(+), 10 deletions(-)

diff --git a/authz/authorization_test.go b/authz/authorization_test.go
index 45718fe29..bfda894a9 100644
--- a/authz/authorization_test.go
+++ b/authz/authorization_test.go
@@ -109,12 +109,15 @@ admin: "ac97c9e2-346b-42a2-b6da-18bcb61a32fe"`
 	groupName := "name"
 	userId := "user-id"
 	groupsList1 := []authn.Group{}
-	groupsList2 := []authn.Group{{userId, "fake-group", groupName}}
+	groupsList2 := []authn.Group{{
+		UserID:    userId,
+		GroupID:   "fake-group",
+		GroupName: groupName}}
 	groupsList3 := []authn.Group{
-		{userId, "dca35310-ecda-4f23-86cd-876aee55906b", groupName},
-		{userId, "dca35310-ecda-4f23-86cd-876aee559900", groupName},
+		{UserID: userId, GroupID: "dca35310-ecda-4f23-86cd-876aee55906b", GroupName: groupName},
+		{UserID: userId, GroupID: "dca35310-ecda-4f23-86cd-876aee559900", GroupName: groupName},
 	}
-	groupsList4 := []authn.Group{{userId, "ac97c9e2-346b-42a2-b6da-18bcb61a32fe", groupName}}
+	groupsList4 := []authn.Group{{UserID: userId, GroupID: "ac97c9e2-346b-42a2-b6da-18bcb61a32fe", GroupName: groupName}}
 
 	tests := []struct {
 		yamlData   string
@@ -203,11 +206,11 @@ admin: "ac97c9e2-346b-42a2-b6da-18bcb61a32fe"`
 func TestAuth_IsAdmin(t *testing.T) {
 
 	group1 := []authn.Group{
-		{"admin-user-id", "ac97c9e2-346b-42a2-b6da-18bcb61a32fe", "admin-group"},
+		{UserID: "admin-user-id", GroupID: "ac97c9e2-346b-42a2-b6da-18bcb61a32fe", GroupName: "admin-group"},
 	}
 
 	group2 := []authn.Group{
-		{"user-id", "dca35310-ecda-4f23-86cd-876aee55906b", "group-name"},
+		{UserID: "user-id", GroupID: "dca35310-ecda-4f23-86cd-876aee55906b", GroupName: "group-name"},
 	}
 
 	groupPermissions := authz.GroupPermissions{
@@ -244,15 +247,15 @@ func TestAuth_IsAdmin(t *testing.T) {
 func TestAuth_GetAuthorizedIndexList(t *testing.T) {
 
 	group1 := []authn.Group{
-		{"user-id", "dca35310-ecda-4f23-86cd-876aee55906b", "group-name"},
+		{UserID: "user-id", GroupID: "dca35310-ecda-4f23-86cd-876aee55906b", GroupName: "group-name"},
 	}
 
 	group2 := []authn.Group{
-		{"admin-user-id", "ac97c9e2-346b-42a2-b6da-18bcb61a32fe", "admin-group"},
+		{UserID: "admin-user-id", GroupID: "ac97c9e2-346b-42a2-b6da-18bcb61a32fe", GroupName: "admin-group"},
 	}
 
 	group3 := []authn.Group{
-		{"user-id", "dca35310-ecda-4f23-86cd-876aee559900", "group-name"},
+		{UserID: "user-id", GroupID: "dca35310-ecda-4f23-86cd-876aee559900", GroupName: "group-name"},
 	}
 
 	p := authz.GroupPermissions{
diff --git a/server/server.go b/server/server.go
index 911f82177..a2b963398 100644
--- a/server/server.go
+++ b/server/server.go
@@ -535,7 +535,7 @@ func (m *Command) SetupServer() error {
 		if err = p.ReadPermissionsFile(permsFile); err != nil {
 			return err
 		}
-    
+
 		ac := m.Config.Auth
 		m.auth, err = authn.NewAuth(m.logger, m.listenURI.String(), ac.Scopes, ac.AuthorizeURL, ac.TokenURL, ac.GroupEndpointURL, ac.LogoutURL, ac.ClientId, ac.ClientSecret, ac.HashKey, ac.BlockKey)
 		if err != nil {