Use [T,t]eamID instead of [T,t]eamId

cmd/empire/server.go

@@ -109,12 +109,12 @@ func newAuthenticator(c *cli.Context, e *empire.Empire) auth.Authenticator {
 	}
 
 	// After the user is authenticated, check their GitHub Team membership.
-	if teamId := c.String(FlagGithubTeam); teamId != "" {
+	if teamID := c.String(FlagGithubTeam); teamID != "" {
 		authorizer := githubauth.NewTeamAuthorizer(client)
-		authorizer.TeamId = teamId
+		authorizer.TeamID = teamID
 
 		log.Println("Adding GitHub Team authorizer with the following configuration:")
-		log.Println(fmt.Sprintf("  Team ID: %v ", teamId))
+		log.Println(fmt.Sprintf("  Team ID: %v ", teamID))
 
 		return auth.WithAuthorization(
 			authenticator,

server/auth/github/client.go

@@ -178,8 +178,8 @@ func (c *Client) IsOrganizationMember(organization, token string) (bool, error)
 }
 
 // IsTeamMember returns true if the given user is a member of the team.
-func (c *Client) IsTeamMember(teamId, name string, token string) (bool, error) {
-	req, err := c.NewRequest("GET", fmt.Sprintf("/teams/%s/memberships/%s", teamId, name), nil)
+func (c *Client) IsTeamMember(teamID, name string, token string) (bool, error) {
+	req, err := c.NewRequest("GET", fmt.Sprintf("/teams/%s/memberships/%s", teamID, name), nil)
 	if err != nil {
 		return false, err
 	}

server/auth/github/github.go

@@ -92,10 +92,10 @@ func (a *OrganizationAuthorizer) Authorize(user *empire.User) error {
 // TeamAuthorizer is an implementation of the auth.Authorizer interface that
 // checks that the user is a member of the given GitHub team.
 type TeamAuthorizer struct {
-	TeamId string
+	TeamID string
 
 	client interface {
-		IsTeamMember(teamId, name string, token string) (bool, error)
+		IsTeamMember(teamID, name string, token string) (bool, error)
 	}
 }
 
@@ -104,18 +104,18 @@ func NewTeamAuthorizer(c *Client) *TeamAuthorizer {
 }
 
 func (a *TeamAuthorizer) Authorize(user *empire.User) error {
-	if a.TeamId == "" {
+	if a.TeamID == "" {
 		panic("no team id set")
 	}
 
-	ok, err := a.client.IsTeamMember(a.TeamId, user.Name, user.GitHubToken)
+	ok, err := a.client.IsTeamMember(a.TeamID, user.Name, user.GitHubToken)
 	if err != nil {
 		return err
 	}
 
 	if !ok {
 		return &auth.UnauthorizedError{
-			Reason: fmt.Sprintf("%s is not a member of team %s.", user.Name, a.TeamId),
+			Reason: fmt.Sprintf("%s is not a member of team %s.", user.Name, a.TeamID),
 		}
 	}
 

server/auth/github/github_test.go

@@ -92,7 +92,7 @@ func TestOrganizationAuthorizer_Unauthorized(t *testing.T) {
 func TestTeamAuthorizer(t *testing.T) {
 	c := new(mockClient)
 	a := &TeamAuthorizer{
-		TeamId: "123",
+		TeamID: "123",
 		client: c,
 	}
 
@@ -108,7 +108,7 @@ func TestTeamAuthorizer(t *testing.T) {
 func TestTeamAuthorizer_Unauthorized(t *testing.T) {
 	c := new(mockClient)
 	a := &TeamAuthorizer{
-		TeamId: "123",
+		TeamID: "123",
 		client: c,
 	}
 
@@ -149,7 +149,7 @@ func (m *mockClient) IsOrganizationMember(organization, token string) (bool, err
 	return args.Bool(0), args.Error(1)
 }
 
-func (m *mockClient) IsTeamMember(teamId, name string, token string) (bool, error) {
-	args := m.Called(teamId, name, token)
+func (m *mockClient) IsTeamMember(teamID, name string, token string) (bool, error) {
+	args := m.Called(teamID, name, token)
 	return args.Bool(0), args.Error(1)
 }