Skip to content
Snippets Groups Projects
Commit 973e8f04 authored by Kevin Lyda's avatar Kevin Lyda :speech_balloon:
Browse files

Remove debugging.

parent 28f10c79
No related branches found
No related tags found
No related merge requests found
Pipeline #
...@@ -2,7 +2,6 @@ package gitlab ...@@ -2,7 +2,6 @@ package gitlab
import ( import (
"errors" "errors"
"fmt"
"net/http" "net/http"
"time" "time"
...@@ -34,8 +33,6 @@ func New(c *config.Auth) (auth.Provider, error) { ...@@ -34,8 +33,6 @@ func New(c *config.Auth) (auth.Provider, error) {
uw[u] = true uw[u] = true
} }
allUsers := false allUsers := false
fmt.Printf("Config: c.ProviderOpts[\"allusers\"] == \"%s\"\n",
c.ProviderOpts["allusers"])
if c.ProviderOpts["allusers"] == "true" { if c.ProviderOpts["allusers"] == "true" {
allUsers = true allUsers = true
} }
...@@ -86,15 +83,12 @@ func (c *Config) Name() string { ...@@ -86,15 +83,12 @@ func (c *Config) Name() string {
// Valid validates the oauth token. // Valid validates the oauth token.
func (c *Config) Valid(token *oauth2.Token) bool { func (c *Config) Valid(token *oauth2.Token) bool {
fmt.Printf("In func Valid(%+v)\n", token)
if !token.Valid() { if !token.Valid() {
fmt.Printf("Token not valid.\n")
return false return false
} }
if c.allusers { if c.allusers {
return true return true
} }
fmt.Printf(" allusers == false\n")
if len(c.whitelist) > 0 && !c.whitelist[c.Username(token)] { if len(c.whitelist) > 0 && !c.whitelist[c.Username(token)] {
return false return false
} }
...@@ -103,17 +97,14 @@ func (c *Config) Valid(token *oauth2.Token) bool { ...@@ -103,17 +97,14 @@ func (c *Config) Valid(token *oauth2.Token) bool {
// here if user whitelist is set and user is in whitelist. // here if user whitelist is set and user is in whitelist.
return true return true
} }
fmt.Printf(" group == ''\n")
client := gitlabapi.NewOAuthClient(nil, token.AccessToken) client := gitlabapi.NewOAuthClient(nil, token.AccessToken)
client.SetBaseURL(c.baseurl) client.SetBaseURL(c.baseurl)
fmt.Printf(" client == '%+v'\n", client)
groups, _, err := client.Groups.ListGroups(nil) groups, _, err := client.Groups.ListGroups(nil)
if err != nil { if err != nil {
return false return false
} }
fmt.Printf(" groups == '%+v'\n", groups)
for _, g := range groups { for _, g := range groups {
if g.Name == c.group { if g.Path == c.group {
return true return true
} }
} }
...@@ -150,15 +141,11 @@ func (c *Config) Exchange(code string) (*oauth2.Token, error) { ...@@ -150,15 +141,11 @@ func (c *Config) Exchange(code string) (*oauth2.Token, error) {
// Username retrieves the username portion of the user's email address. // Username retrieves the username portion of the user's email address.
func (c *Config) Username(token *oauth2.Token) string { func (c *Config) Username(token *oauth2.Token) string {
fmt.Printf("Username AccessToken = '%s'\n", token.AccessToken)
client := gitlabapi.NewOAuthClient(nil, token.AccessToken) client := gitlabapi.NewOAuthClient(nil, token.AccessToken)
client.SetBaseURL(c.baseurl) client.SetBaseURL(c.baseurl)
fmt.Printf("Username client = '%+v'\n", client)
u, _, err := client.Users.CurrentUser() u, _, err := client.Users.CurrentUser()
if err != nil { if err != nil {
fmt.Printf("Username err = '%+v'\n", err)
return "" return ""
} }
fmt.Printf("Username u = '%+v'\n", u)
return u.Username return u.Username
} }
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please register or to comment