Skip to content

CHAT-71: remove rabbitMQ as we will be moving to Kafka soon. #83

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
BravinR wants to merge 4 commits into
base: master
Choose a base branch
from
Open

CHAT-71: remove rabbitMQ as we will be moving to Kafka soon. #83

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
4 commits
Select commit Hold shift + click to select a range
873786a
CHAT-71: remove rabbitMQ as we will be moving to kafka soon.
BravinR Oct 17, 2025
97b600c
CHAT-71: remove unneeded package
BravinR Oct 17, 2025
a677591
CHAT-71: to update tests as we no longer need google auth.
BravinR Oct 17, 2025
de07648
CHAT-71: to update failing tests.
BravinR Oct 17, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
20 changes: 0 additions & 20 deletions backend-service/pom.xml
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -42,11 +42,6 @@
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-web</artifactId>
</dependency>
<dependency>
<groupId>org.springframework.boot</groupId>
<artifactId>spring-boot-starter-websocket</artifactId>
<version>3.2.0</version>
</dependency>
<dependency>
<groupId>com.mysql</groupId>
<artifactId>mysql-connector-j</artifactId>
Expand Down Expand Up @@ -84,21 +79,6 @@
<version>0.11.1</version>
<scope>runtime</scope>
</dependency>
<dependency>
<groupId>com.twilio.sdk</groupId>
<artifactId>twilio</artifactId>
<version>10.0.0</version>
</dependency>
<dependency>
<groupId>me.paulschwarz</groupId>
<artifactId>spring-dotenv</artifactId>
<version>4.0.0</version>
</dependency>
<dependency>
<groupId>org.springframework.amqp</groupId>
<artifactId>spring-amqp</artifactId>
<version>3.0.2</version>
</dependency>
<dependency>
<groupId>io.netty</groupId>
<artifactId>netty-resolver-dns-native-macos</artifactId>
Expand Down
40 changes: 0 additions & 40 deletions backend-service/src/main/java/co/teamsphere/api/config/WebSocketConfig.java
View file
Open in desktop

This file was deleted.

134 changes: 14 additions & 120 deletions backend-service/src/main/java/co/teamsphere/api/controller/AuthController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,50 +1,34 @@
package co.teamsphere.api.controller;

import java.time.Instant;
import java.time.LocalDateTime;
import java.time.ZoneOffset;
import java.util.Optional;
import java.util.UUID;

import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.authentication.UsernamePasswordAuthenticationToken;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.security.crypto.password.PasswordEncoder;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RequestPart;
import org.springframework.web.bind.annotation.RestController;

import co.teamsphere.api.config.JWTTokenProvider;
import co.teamsphere.api.exception.ProfileImageException;
import co.teamsphere.api.exception.RefreshTokenException;
import co.teamsphere.api.exception.UserException;
import co.teamsphere.api.models.RefreshToken;
import co.teamsphere.api.models.User;
import co.teamsphere.api.repository.UserRepository;
import co.teamsphere.api.request.LoginRequest;
import co.teamsphere.api.request.RefreshTokenRequest;
import co.teamsphere.api.request.SignupRequest;
import co.teamsphere.api.response.AuthResponse;
import co.teamsphere.api.services.AuthenticationService;
import co.teamsphere.api.services.RefreshTokenService;
import co.teamsphere.api.utils.GoogleAuthRequest;
import co.teamsphere.api.utils.GoogleUserInfo;
import io.swagger.v3.oas.annotations.Operation;
import io.swagger.v3.oas.annotations.media.Content;
import io.swagger.v3.oas.annotations.media.Schema;
import io.swagger.v3.oas.annotations.responses.ApiResponse;
import io.swagger.v3.oas.annotations.responses.ApiResponses;
import jakarta.transaction.Transactional;
import jakarta.validation.Valid;
import lombok.extern.slf4j.Slf4j;
import org.springframework.http.HttpStatus;
import org.springframework.http.MediaType;
import org.springframework.http.ResponseEntity;
import org.springframework.security.authentication.BadCredentialsException;
import org.springframework.security.core.Authentication;
import org.springframework.security.core.context.SecurityContextHolder;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.ModelAttribute;
import org.springframework.web.bind.annotation.PostMapping;
import org.springframework.web.bind.annotation.RequestBody;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

@RestController
@RequestMapping("/auth")
Expand All @@ -56,21 +40,13 @@ public class AuthController {

private final RefreshTokenService refreshTokenService;

private final UserRepository userRepository;

private final PasswordEncoder passwordEncoder;

public AuthController(JWTTokenProvider jwtTokenProvider,
AuthenticationService authenticationService,
RefreshTokenService refreshTokenService,
UserRepository userRepository,
PasswordEncoder passwordEncoder
RefreshTokenService refreshTokenService
) {
this.jwtTokenProvider = jwtTokenProvider;
this.authenticationService = authenticationService;
this.refreshTokenService = refreshTokenService;
this.userRepository = userRepository;
this.passwordEncoder = passwordEncoder;
}

@GetMapping("/verify")
Expand Down Expand Up @@ -118,7 +94,7 @@ public ResponseEntity<String> verifyJwtToken() {
})
public ResponseEntity<?> refreshTest(@RequestBody RefreshTokenRequest request) throws RefreshTokenException {
try {
// there is a way to do this with just optionals and maps, but you are a funny guy if you think im writing that out (its not readable)
// there is a way to do this with just optionals and maps, but you are a funny guy if you think im writing that out (it's not readable)
log.info("Processing refresh token request");
var refreshToken = refreshTokenService.findRefreshToken(request.getRefreshToken());

Expand Down Expand Up @@ -224,86 +200,4 @@ public ResponseEntity<AuthResponse> userLoginMethod(
throw new UserException("Unexpected error during login process.");
}
}

@PostMapping("/google")
@Transactional // move business logic to service layer
@Operation(summary = "Authenticate via Google", description = "login/signup via Google OAuth.")
@ApiResponses(value = {
@ApiResponse(responseCode = "200",
description = "Authentication successful",
content = @Content(
mediaType = MediaType.APPLICATION_JSON_VALUE,
schema = @Schema(implementation = AuthResponse.class)
)
),
@ApiResponse(responseCode = "500", description = "Google authentication failed")
})
public ResponseEntity<AuthResponse> authenticateWithGoogleMethod(
@Schema(
description = "Google OAuth request body",
implementation = GoogleAuthRequest.class
)
@RequestPart("googleUser")
@RequestBody GoogleAuthRequest request) {
try {
log.info("Processing Google authentication request");

GoogleUserInfo googleUserInfo = request.getGoogleUserInfo();

String email = googleUserInfo.getEmail();
String username = googleUserInfo.getName();
String pictureUrl = googleUserInfo.getPicture();

// Check if user exists
User googleUser = null;
Optional<User> optionalUser = userRepository.findByEmail(email);
if (optionalUser.isPresent()) {
log.info("Existing user found with userId: {}", optionalUser.get().getId());
googleUser = optionalUser.get();
} else {
// Register a new user if not exists
var currentDateTime = LocalDateTime.now().atOffset(ZoneOffset.UTC);
var user = User.builder()
.email(email)
.username(username)
.password(passwordEncoder.encode(UUID.randomUUID().toString())) // consider adding this cause a userpass field should NEVER be null
.profilePicture(pictureUrl)
.createdDate(currentDateTime)
.lastUpdatedDate(currentDateTime)
.build();

googleUser = userRepository.save(user);
log.info("New user created with email: {}", email);
}

// Just incase
if (googleUser == null) {
log.error("Error during Google authentication, user still came out as null!");
throw new Exception("Error during Google authentication!");
}

// Load UserDetails and set authentication context
Authentication authentication = new UsernamePasswordAuthenticationToken(email, null);
SecurityContextHolder.getContext().setAuthentication(authentication);

// Generate JWT token
String token = jwtTokenProvider.generateJwtToken(authentication, googleUser.getId());
RefreshToken refreshToken = createRefreshToken(googleUser.getId().toString(), email);

AuthResponse authResponse = new AuthResponse(token, refreshToken.getRefreshToken(), true);
return new ResponseEntity<>(authResponse, HttpStatus.OK);
} catch (Exception e) {
log.error("Error during Google authentication: ", e);
return new ResponseEntity<>(new AuthResponse("Error during Google authentication!" + e.getMessage(), "", false), HttpStatus.INTERNAL_SERVER_ERROR);
}
}

private RefreshToken createRefreshToken(String userID, String email) throws UserException {
RefreshToken refreshToken = refreshTokenService.findByUserId(userID);
if (refreshToken == null || refreshToken.getExpiredAt().compareTo(Instant.now()) < 0) {
refreshToken = refreshTokenService.createRefreshToken(email);
}

return refreshToken;
}
}
52 changes: 52 additions & 0 deletions backend-service/src/main/java/co/teamsphere/api/controller/MainController.java
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -0,0 +1,52 @@
package co.teamsphere.api.controller;

import org.springframework.beans.factory.annotation.Value;
import org.springframework.context.ApplicationContext;
import org.springframework.http.ResponseEntity;
import org.springframework.web.bind.annotation.GetMapping;
import org.springframework.web.bind.annotation.RequestMapping;
import org.springframework.web.bind.annotation.RestController;

import java.time.LocalDateTime;
import java.util.LinkedHashMap;
import java.util.Map;

@RestController
@RequestMapping("/")
public class MainController {

@Value("${spring.profiles.active:default}")
private String activeProfiles;

private final ApplicationContext applicationContext;

public MainController(ApplicationContext applicationContext) {
this.applicationContext = applicationContext;
}

@GetMapping("/")
public ResponseEntity<Map<String, Object>> home() {
Map<String, Object> status = new LinkedHashMap<>();

// Basic info
status.put("application", "TeamSphere API");
status.put("status", "UP");
status.put("timestamp", LocalDateTime.now().toString());
status.put("activeProfile", activeProfiles);

// Environment info
status.put("environment", applicationContext.getEnvironment().getProperty("spring.application.name"));

return ResponseEntity.ok(status);
}

@GetMapping("/health")
public ResponseEntity<Map<String, Object>> health() {
Map<String, Object> health = new LinkedHashMap<>();
health.put("status", "UP");
health.put("timestamp", LocalDateTime.now().toString());
health.put("profile", activeProfiles);

return ResponseEntity.ok(health);
}
}
Loading