medlogic
/
olivetin
3
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

fmt: code style (#518)

This commit is contained in:
James Read 2025-02-19 23:18:02 +00:00 committed by GitHub
parent 39368d511a
commit 6550223ee4
No known key found for this signature in database
GPG Key ID: B5690EEEBB952194
3 changed files with 10 additions and 10 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
internal/config/config.go
View File

@ -147,9 +147,9 @@ type AuthLocalUsersConfig struct {
} }
type LocalUser struct { type LocalUser struct {
Username string Username string
Usergroup string Usergroup string
Password string Password string
} }
type OAuth2Provider struct { type OAuth2Provider struct {

2
internal/httpservers/restapi_auth_local.go
View File

@ -4,8 +4,8 @@ import (
"google.golang.org/grpc/metadata" "google.golang.org/grpc/metadata"
"net/http" "net/http"
"github.com/google/uuid"
"github.com/OliveTin/OliveTin/internal/config" "github.com/OliveTin/OliveTin/internal/config"
"github.com/google/uuid"
log "github.com/sirupsen/logrus" log "github.com/sirupsen/logrus"
) )

14
internal/httpservers/restapi_auth_oauth2.go
View File

@ -13,8 +13,8 @@ import (
"golang.org/x/oauth2" "golang.org/x/oauth2"
"io" "io"
"net/http" "net/http"
"time"
"os" "os"
"time"
) )
var ( var (
@ -169,8 +169,8 @@ func checkOAuthCallbackCookie(w http.ResponseWriter, r *http.Request) (*oauth2St
} }
type HttpClientSettings struct { type HttpClientSettings struct {
Transport *http.Transport Transport *http.Transport
Timeout time.Duration Timeout time.Duration
} }
func getOAuth2HttpClient(providerConfig *config.OAuth2Provider) *HttpClientSettings { func getOAuth2HttpClient(providerConfig *config.OAuth2Provider) *HttpClientSettings {
@ -178,7 +178,7 @@ func getOAuth2HttpClient(providerConfig *config.OAuth2Provider) *HttpClientSetti
Transport: &http.Transport{ Transport: &http.Transport{
TLSClientConfig: &tls.Config{InsecureSkipVerify: providerConfig.InsecureSkipVerify}, TLSClientConfig: &tls.Config{InsecureSkipVerify: providerConfig.InsecureSkipVerify},
}, },
Timeout: time.Duration(min(3, providerConfig.CallbackTimeout)) * time.Second, Timeout: time.Duration(min(3, providerConfig.CallbackTimeout)) * time.Second,
} }
if providerConfig.CertBundlePath != "" { if providerConfig.CertBundlePath != "" {
@ -228,7 +228,7 @@ func handleOAuthCallback(w http.ResponseWriter, r *http.Request) {
exchangeClient := &http.Client{ exchangeClient := &http.Client{
Transport: clientSettings.Transport, Transport: clientSettings.Transport,
Timeout: clientSettings.Timeout, Timeout: clientSettings.Timeout,
} }
ctx := context.Background() ctx := context.Background()
@ -245,7 +245,7 @@ func handleOAuthCallback(w http.ResponseWriter, r *http.Request) {
userInfoClient := &http.Client{ userInfoClient := &http.Client{
Transport: &oauth2.Transport{ Transport: &oauth2.Transport{
Source: registeredState.providerConfig.TokenSource(ctx, tok), Source: registeredState.providerConfig.TokenSource(ctx, tok),
Base: clientSettings.Transport, Base: clientSettings.Transport,
}, },
Timeout: clientSettings.Timeout, Timeout: clientSettings.Timeout,
} }
@ -270,7 +270,7 @@ func handleOAuthCallback(w http.ResponseWriter, r *http.Request) {
} }
type UserInfo struct { type UserInfo struct {
Username string Username string
Usergroup string Usergroup string
} }