Browse Source

go fmt and golint

pull/46/head
vx3r 4 months ago
parent
commit
6049ba8089
10 changed files with 14 additions and 4 deletions
  1. +1
    -0
      api/api.go
  2. +4
    -4
      api/v1/auth/auth.go
  3. +1
    -0
      api/v1/v1.go
  4. +2
    -0
      auth/auth.go
  5. +1
    -0
      auth/fake/fake.go
  6. +1
    -0
      auth/github/github.go
  7. +1
    -0
      auth/oauth2oidc/oauth2oidc.go
  8. +1
    -0
      model/auth.go
  9. +1
    -0
      model/user.go
  10. +1
    -0
      util/util.go

+ 1
- 0
api/api.go View File

@@ -5,6 +5,7 @@ import (
"gitlab.127-0-0-1.fr/vx3r/wg-gen-web/api/v1"
)

// ApplyRoutes apply routes to gin engine
func ApplyRoutes(r *gin.Engine, private bool) {
api := r.Group("/api")
{


+ 4
- 4
api/v1/auth/auth.go View File

@@ -16,8 +16,8 @@ import (
func ApplyRoutes(r *gin.RouterGroup) {
g := r.Group("/auth")
{
g.GET("/oauth2_url", oauth2_url)
g.POST("/oauth2_exchange", oauth2_exchange)
g.GET("/oauth2_url", oauth2URL)
g.POST("/oauth2_exchange", oauth2Exchange)
g.GET("/user", user)
g.GET("/logout", logout)
}
@@ -26,7 +26,7 @@ func ApplyRoutes(r *gin.RouterGroup) {
/*
* generate redirect url to get OAuth2 code or let client know that OAuth2 is disabled
*/
func oauth2_url(c *gin.Context) {
func oauth2URL(c *gin.Context) {
cacheDb := c.MustGet("cache").(*cache.Cache)

state, err := util.GenerateRandomString(32)
@@ -62,7 +62,7 @@ func oauth2_url(c *gin.Context) {
/*
* exchange code and get user infos, if OAuth2 is disable just send fake data
*/
func oauth2_exchange(c *gin.Context) {
func oauth2Exchange(c *gin.Context) {
var loginVals model.Auth
if err := c.ShouldBind(&loginVals); err != nil {
log.WithFields(log.Fields{


+ 1
- 0
api/v1/v1.go View File

@@ -7,6 +7,7 @@ import (
"gitlab.127-0-0-1.fr/vx3r/wg-gen-web/api/v1/server"
)

// ApplyRoutes apply routes to gin router
func ApplyRoutes(r *gin.RouterGroup, private bool) {
v1 := r.Group("/v1.0")
{


+ 2
- 0
auth/auth.go View File

@@ -11,6 +11,7 @@ import (
"os"
)

// Auth interface to implement as auth provider
type Auth interface {
Setup() error
CodeUrl(state string) string
@@ -18,6 +19,7 @@ type Auth interface {
UserInfo(oauth2Token *oauth2.Token) (*model.User, error)
}

// GetAuthProvider get an instance of auth provider based on config
func GetAuthProvider() (Auth, error) {
var oauth2Client Auth
var err error


+ 1
- 0
auth/fake/fake.go View File

@@ -7,6 +7,7 @@ import (
"time"
)

// Fake in order to implement interface, struct is required
type Fake struct{}

// Setup validate provider


+ 1
- 0
auth/github/github.go View File

@@ -13,6 +13,7 @@ import (
"time"
)

// Github in order to implement interface, struct is required
type Github struct{}

var (


+ 1
- 0
auth/oauth2oidc/oauth2oidc.go View File

@@ -10,6 +10,7 @@ import (
"os"
)

// Oauth2idc in order to implement interface, struct is required
type Oauth2idc struct{}

var (


+ 1
- 0
model/auth.go View File

@@ -1,5 +1,6 @@
package model

// Auth structure
type Auth struct {
Oauth2 bool `json:"oauth2"`
ClientId string `json:"clientId"`


+ 1
- 0
model/user.go View File

@@ -2,6 +2,7 @@ package model

import "time"

// User structure
type User struct {
Sub string `json:"sub"`
Name string `json:"name"`


+ 1
- 0
util/util.go View File

@@ -11,6 +11,7 @@ import (
)

var (
// AuthTokenHeaderName http header for token transport
AuthTokenHeaderName = "x-wg-gen-web-auth"
// RegexpEmail check valid email
RegexpEmail = regexp.MustCompile("^[a-zA-Z0-9.!#$%&'*+/=?^_`{|}~-]+@[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?(?:\\.[a-zA-Z0-9](?:[a-zA-Z0-9-]{0,61}[a-zA-Z0-9])?)*$")


Loading…
Cancel
Save