dave/go-eve-pi
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Remove redundant log lines

Browse Source
This commit is contained in:
PhatPhuckDave
2025-10-10 20:44:19 +02:00
parent cdc896c5f0
commit 23253eb06c
3 changed files with 2 additions and 19 deletions
Download Patch File Download Diff File Expand all files Collapse all files

16
esi_sso.go
View File

@@ -112,18 +112,15 @@ func (s *SSO) GetToken(ctx context.Context, characterName string) (string, error
logger.Info("No existing token found for character %s, starting authentication flow", characterName)
// No token exists, need to authenticate
if err := s.startAuthFlow(ctx, characterName); err != nil {
logger.Error("Authentication flow failed for character %s: %v", characterName, err)
return "", err
}
// After authentication, fetch the token from DB
token, err = s.db.GetTokenForCharacter(characterName)
if err != nil {
logger.Error("Failed to fetch token after authentication for character %s: %v", characterName, err)
return "", err
}
logger.Info("Successfully authenticated character %s", characterName)
} else {
logger.Error("Database error when fetching token for character %s: %v", characterName, err)
return "", err
}
} else {
@@ -137,13 +134,11 @@ func (s *SSO) GetToken(ctx context.Context, characterName string) (string, error
logger.Warning("Token refresh failed for character %s, re-authenticating: %v", characterName, err)
// Refresh failed, need to re-authenticate
if err := s.startAuthFlow(ctx, characterName); err != nil {
logger.Error("Re-authentication failed for character %s: %v", characterName, err)
return "", err
}
// After re-authentication, fetch the token from DB
token, err = s.db.GetTokenForCharacter(characterName)
if err != nil {
logger.Error("Failed to fetch token after re-authentication for character %s: %v", characterName, err)
return "", err
}
logger.Info("Successfully re-authenticated character %s", characterName)
@@ -165,7 +160,6 @@ func (s *SSO) startAuthFlow(ctx context.Context, characterName string) error {
logger.Debug("Generating PKCE parameters")
verifier, challenge, err := generatePKCE()
if err != nil {
logger.Error("Failed to generate PKCE parameters: %v", err)
return err
}
@@ -192,7 +186,6 @@ func (s *SSO) startAuthFlow(ctx context.Context, characterName string) error {
logger.Debug("Waiting for authentication callback")
code, receivedState, err := s.waitForCallback()
if err != nil {
logger.Error("Callback wait failed: %v", err)
return err
}
@@ -205,7 +198,6 @@ func (s *SSO) startAuthFlow(ctx context.Context, characterName string) error {
// Exchange code for token
token, err := s.exchangeCodeForToken(ctx, code, verifier)
if err != nil {
logger.Error("Failed to exchange code for token: %v", err)
return err
}
@@ -213,7 +205,6 @@ func (s *SSO) startAuthFlow(ctx context.Context, characterName string) error {
token.CharacterName = characterName
logger.Debug("Saving token to database for character %s", characterName)
if err := s.db.SaveTokenForCharacter(token); err != nil {
logger.Error("Failed to save token to database: %v", err)
return err
}
@@ -322,7 +313,6 @@ func (s *SSO) exchangeCodeForToken(ctx context.Context, code, verifier string) (
req, err := http.NewRequestWithContext(ctx, http.MethodPost, issuerTokenURL, strings.NewReader(form.Encode()))
if err != nil {
logger.Error("Failed to create token exchange request: %v", err)
return nil, err
}
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
@@ -330,7 +320,6 @@ func (s *SSO) exchangeCodeForToken(ctx context.Context, code, verifier string) (
logger.Debug("Sending token exchange request to %s", issuerTokenURL)
resp, err := http.DefaultClient.Do(req)
if err != nil {
logger.Error("Token exchange request failed: %v", err)
return nil, err
}
defer resp.Body.Close()
@@ -343,7 +332,6 @@ func (s *SSO) exchangeCodeForToken(ctx context.Context, code, verifier string) (
var tr tokenResponse
if err := json.NewDecoder(resp.Body).Decode(&tr); err != nil {
logger.Error("Failed to decode token response: %v", err)
return nil, err
}
@@ -368,7 +356,6 @@ func (s *SSO) refreshToken(ctx context.Context, token *Token) error {
req, err := http.NewRequestWithContext(ctx, http.MethodPost, issuerTokenURL, strings.NewReader(form.Encode()))
if err != nil {
logger.Error("Failed to create token refresh request: %v", err)
return err
}
req.Header.Set("Content-Type", "application/x-www-form-urlencoded")
@@ -376,7 +363,6 @@ func (s *SSO) refreshToken(ctx context.Context, token *Token) error {
logger.Debug("Sending token refresh request to %s", issuerTokenURL)
resp, err := http.DefaultClient.Do(req)
if err != nil {
logger.Error("Token refresh request failed: %v", err)
return err
}
defer resp.Body.Close()
@@ -389,7 +375,6 @@ func (s *SSO) refreshToken(ctx context.Context, token *Token) error {
var tr tokenResponse
if err := json.NewDecoder(resp.Body).Decode(&tr); err != nil {
logger.Error("Failed to decode refresh token response: %v", err)
return err
}
@@ -404,7 +389,6 @@ func (s *SSO) refreshToken(ctx context.Context, token *Token) error {
logger.Debug("Saving refreshed token to database for character %s", token.CharacterName)
if err := s.db.SaveTokenForCharacter(token); err != nil {
logger.Error("Failed to save refreshed token: %v", err)
return err
}