Nemcio/Gogs
1
0
Fork 0
mirror of https://github.com/gogs/gogs.git synced 2025-12-21 07:39:59 +01:00
Code Issues Packages Projects Releases Wiki Activity

auth: coding style and glitches fixes for GitHub login source (#5340)

Browse Source
This commit is contained in:
Unknwon
2018-12-18 16:46:50 -05:00
parent 311df9c521
commit 657ea2686f
13 changed files with 77 additions and 62 deletions
Download Patch File Download Diff File Expand all files Collapse all files

41
pkg/auth/github/github.go
View File

@@ -1,9 +1,12 @@
// Copyright 2018 The Gogs Authors. All rights reserved.
// Use of this source code is governed by a MIT-style
// license that can be found in the LICENSE file.
package github
import (
"context"
"crypto/tls"
"errors"
"fmt"
"net/http"
"strings"
@@ -11,35 +14,37 @@ import (
"github.com/google/go-github/github"
)
func GITHUBAuth(apiEndpoint, userName, passwd string) (string, string, string, string, string, error) {
tr := &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
}
func Authenticate(apiEndpoint, login, passwd string) (name string, email string, website string, location string, _ error) {
tp := github.BasicAuthTransport{
Username: strings.TrimSpace(userName),
Password: strings.TrimSpace(passwd),
Transport: tr,
Username: strings.TrimSpace(login),
Password: strings.TrimSpace(passwd),
Transport: &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: true},
},
}
client, err := github.NewEnterpriseClient(apiEndpoint, apiEndpoint, tp.Client())
if err != nil {
return "", "", "", "", "", errors.New("Authentication failure: GitHub Api Endpoint can not be reached")
return "", "", "", "", fmt.Errorf("create new client: %v", err)
}
ctx := context.Background()
user, _, err := client.Users.Get(ctx, "")
if err != nil || user == nil {
fmt.Println(err)
msg := fmt.Sprintf("Authentication failure! Github Api Endpoint authticated failed! User %s", userName)
return "", "", "", "", "", errors.New(msg)
user, _, err := client.Users.Get(context.Background(), "")
if err != nil {
return "", "", "", "", fmt.Errorf("get user info: %v", err)
}
var website = ""
if user.Name != nil {
name = *user.Name
}
if user.Email != nil {
email = *user.Email
} else {
email = login + "+github@local"
}
if user.HTMLURL != nil {
website = strings.ToLower(*user.HTMLURL)
}
var location = ""
if user.Location != nil {
location = strings.ToUpper(*user.Location)
}
return *user.Login, *user.Name, *user.Email, website, location, nil
return name, email, website, location, nil
}