diff --git a/.env.example b/.env.example index cfa7be3..832aa96 100644 --- a/.env.example +++ b/.env.example @@ -1,8 +1,9 @@ DB_PATH=db.sqlite +HTTP_SERVER_PORT=3000 + ESI_CLIENT_ID=your-client-id ESI_REDIRECT_URI=http://localhost:3000/callback ESI_SCOPES=esi-planets.manage_planets.v1 -HTTP_SERVER_PORT=3000 ESI_REFRESH_INTERVAL=P10M WEBHOOK_URL=https://your-webhook-url.com diff --git a/db.go b/db.go index e4036a9..e769c6d 100644 --- a/db.go +++ b/db.go @@ -72,7 +72,6 @@ func (db *DBWrapper) SaveTokenForCharacter(token *Token) error { logger.Debug("Saving token for character %s to database", token.CharacterName) err := db.db.Save(token).Error if err != nil { - logger.Error("Failed to save token for character %s: %v", token.CharacterName, err) return err } logger.Debug("Token saved successfully for character %s", token.CharacterName) @@ -83,7 +82,6 @@ func (db *DBWrapper) AutoMigrate(dst ...interface{}) error { logger.Debug("Running database auto-migration") err := db.db.AutoMigrate(dst...) if err != nil { - logger.Error("Database auto-migration failed: %v", err) return err } logger.Debug("Database auto-migration completed successfully") diff --git a/esi_sso.go b/esi_sso.go index 9495973..77b3e87 100644 --- a/esi_sso.go +++ b/esi_sso.go @@ -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 }