refactor(GitHubService): remove unnecessary logging statements
This commit is contained in:
parent
2b29ef81b2
commit
0e150e9ded
1 changed files with 2 additions and 17 deletions
|
@ -25,8 +25,6 @@ import java.util.*;
|
||||||
|
|
||||||
@Service
|
@Service
|
||||||
public class GitHubService {
|
public class GitHubService {
|
||||||
private static final Logger logger = LoggerFactory.getLogger(GitHubService.class);
|
|
||||||
|
|
||||||
@Value("${spring.security.oauth2.client.registration.github.client-id}")
|
@Value("${spring.security.oauth2.client.registration.github.client-id}")
|
||||||
private String clientId;
|
private String clientId;
|
||||||
|
|
||||||
|
@ -71,32 +69,27 @@ public class GitHubService {
|
||||||
);
|
);
|
||||||
|
|
||||||
Map<String, Object> responseBody = response.getBody();
|
Map<String, Object> responseBody = response.getBody();
|
||||||
logger.info("GitHub token response: {}", responseBody);
|
|
||||||
|
|
||||||
// Check if there's an error in the response
|
// Check if there's an error in the response
|
||||||
if (responseBody.containsKey("error")) {
|
if (responseBody.containsKey("error")) {
|
||||||
String error = (String) responseBody.get("error");
|
String error = (String) responseBody.get("error");
|
||||||
String errorDescription = (String) responseBody.get("error_description");
|
String errorDescription = (String) responseBody.get("error_description");
|
||||||
logger.error("GitHub OAuth error: {} - {}", error, errorDescription);
|
|
||||||
throw new RuntimeException("GitHub OAuth error: " + errorDescription);
|
throw new RuntimeException("GitHub OAuth error: " + errorDescription);
|
||||||
}
|
}
|
||||||
|
|
||||||
String accessToken = (String) responseBody.get("access_token");
|
String accessToken = (String) responseBody.get("access_token");
|
||||||
if (accessToken == null || accessToken.isEmpty()) {
|
if (accessToken == null || accessToken.isEmpty()) {
|
||||||
logger.error("No access token received from GitHub");
|
|
||||||
throw new RuntimeException("Failed to receive access token from GitHub");
|
throw new RuntimeException("Failed to receive access token from GitHub");
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.info("Received access token from GitHub");
|
|
||||||
|
|
||||||
// Get user info
|
// Get user info
|
||||||
HttpHeaders userInfoHeaders = new HttpHeaders();
|
HttpHeaders userInfoHeaders = new HttpHeaders();
|
||||||
userInfoHeaders.set("Authorization", "Bearer " + accessToken);
|
userInfoHeaders.set("Authorization", "Bearer " + accessToken);
|
||||||
|
|
||||||
HttpEntity<String> userInfoRequestEntity = new HttpEntity<>(null, userInfoHeaders);
|
HttpEntity<String> userInfoRequestEntity = new HttpEntity<>(null, userInfoHeaders);
|
||||||
|
|
||||||
logger.info("Making request to GitHub API with token: {}", accessToken.substring(0, 5) + "...");
|
|
||||||
|
|
||||||
ResponseEntity<Map> userResponse = restTemplate.exchange(
|
ResponseEntity<Map> userResponse = restTemplate.exchange(
|
||||||
"https://api.github.com/user",
|
"https://api.github.com/user",
|
||||||
HttpMethod.GET,
|
HttpMethod.GET,
|
||||||
|
@ -105,7 +98,6 @@ public class GitHubService {
|
||||||
);
|
);
|
||||||
|
|
||||||
Map<String, Object> userAttributes = userResponse.getBody();
|
Map<String, Object> userAttributes = userResponse.getBody();
|
||||||
logger.info("Retrieved user info from GitHub: {}", userAttributes.get("login"));
|
|
||||||
|
|
||||||
// Get user emails
|
// Get user emails
|
||||||
HttpHeaders emailsHeaders = new HttpHeaders();
|
HttpHeaders emailsHeaders = new HttpHeaders();
|
||||||
|
@ -137,8 +129,6 @@ public class GitHubService {
|
||||||
email = (String) emails.get(0).get("email");
|
email = (String) emails.get(0).get("email");
|
||||||
}
|
}
|
||||||
|
|
||||||
logger.info("Using email: {}", email);
|
|
||||||
|
|
||||||
// Process user data
|
// Process user data
|
||||||
String githubId = userAttributes.get("id").toString();
|
String githubId = userAttributes.get("id").toString();
|
||||||
String username = (String) userAttributes.get("login");
|
String username = (String) userAttributes.get("login");
|
||||||
|
@ -150,7 +140,6 @@ public class GitHubService {
|
||||||
if (userOptional.isPresent()) {
|
if (userOptional.isPresent()) {
|
||||||
// Update existing user
|
// Update existing user
|
||||||
user = userOptional.get();
|
user = userOptional.get();
|
||||||
logger.info("Found existing user with providerId: {}", githubId);
|
|
||||||
} else {
|
} else {
|
||||||
// Check if email exists
|
// Check if email exists
|
||||||
userOptional = userRepository.findByEmail(email);
|
userOptional = userRepository.findByEmail(email);
|
||||||
|
@ -159,7 +148,6 @@ public class GitHubService {
|
||||||
user = userOptional.get();
|
user = userOptional.get();
|
||||||
user.setProvider(AuthProvider.GITHUB);
|
user.setProvider(AuthProvider.GITHUB);
|
||||||
user.setProviderId(githubId);
|
user.setProviderId(githubId);
|
||||||
logger.info("Updating existing user with email: {}", email);
|
|
||||||
} else {
|
} else {
|
||||||
// Create new user
|
// Create new user
|
||||||
user = new UserEntity();
|
user = new UserEntity();
|
||||||
|
@ -170,7 +158,6 @@ public class GitHubService {
|
||||||
user.setEmailVerified(true);
|
user.setEmailVerified(true);
|
||||||
|
|
||||||
user.setBalance(new BigDecimal("1000.00"));
|
user.setBalance(new BigDecimal("1000.00"));
|
||||||
logger.info("Creating new user for: {}", username);
|
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
@ -183,12 +170,10 @@ public class GitHubService {
|
||||||
|
|
||||||
// Generate JWT token
|
// Generate JWT token
|
||||||
String token = jwtUtils.generateToken(authentication);
|
String token = jwtUtils.generateToken(authentication);
|
||||||
logger.info("Generated JWT token");
|
|
||||||
|
|
||||||
return new AuthResponseDto(token);
|
return new AuthResponseDto(token);
|
||||||
|
|
||||||
} catch (Exception e) {
|
} catch (Exception e) {
|
||||||
logger.error("Error processing GitHub code", e);
|
|
||||||
throw new RuntimeException("Failed to process GitHub authentication", e);
|
throw new RuntimeException("Failed to process GitHub authentication", e);
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
Reference in a new issue