Skip to content
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
Original file line number Diff line number Diff line change
Expand Up @@ -16,8 +16,7 @@
import java.util.List;
import java.util.stream.Collectors;

import static com.example.spring.utils.HeadersUtil.parseUserIdFromHeader;

import static com.example.spring.common.utils.JwtUtil.extractUserIdFromToken;

@CrossOrigin
@RestController
Expand All @@ -33,7 +32,7 @@ public class CompanyController {
// Example: http://localhost:8080/api/v1/company/get-by-id/123
@GetMapping("/get-by-id/{id}")
public CompanyDtoWithStatusDTO getCompanyById(@PathVariable("id") Integer id) {
String userId = parseUserIdFromHeader();
String userId = extractUserIdFromToken();
CompanyDTO companyDto = companyService.getCompanyById(id).toCompanyDTO();
UserCompanyStatusModel userCompanyStatus = userCompanyStatusService
.getOneUserCompanyStatusByUserIdAndCompanyId(userId, id);
Expand All @@ -46,7 +45,7 @@ public CompanyDtoWithStatusDTO getCompanyById(@PathVariable("id") Integer id) {
public Page<CompanyDtoWithStatusDTO> getCompaniesSeenByUser(@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "10") int size) {
Pageable pageable = PageRequest.of(page, size);
String userId = parseUserIdFromHeader();
String userId = extractUserIdFromToken();
Page<CompanyModel> companies = companyService.getCompaniesSeenByUser(userId, pageable);

List<UserCompanyStatusModel> userCompanyStatuses = userCompanyStatusService
Expand All @@ -71,7 +70,7 @@ public Page<CompanyDetails> searchCompaniesByName(@RequestParam("companyName") S
@PostMapping("/filter-by-parameters")
public Page<CompanyDtoWithStatusDTO> getCompaniesByFilters(
@RequestBody(required = false) CompanyFilterRequest filterRequest) {
String userId = parseUserIdFromHeader();
String userId = extractUserIdFromToken();
Pageable pageable = PageRequest.of(filterRequest.getPage(), filterRequest.getSize());

Page<CompanyModel> companies = companyService.findCompaniesByFilters(
Expand Down Expand Up @@ -101,7 +100,7 @@ public Page<CompanyDtoWithStatusDTO> getCompaniesByFilters(
public Page<CompanyDtoWithStatusDTO> getRandomUnseenCompanies(@RequestParam(defaultValue = "0") int page,
@RequestParam(defaultValue = "10") int size) {
Pageable pageable = PageRequest.of(page, size);
String userId = parseUserIdFromHeader();
String userId = extractUserIdFromToken();
Page<CompanyModel> companies = companyService.findRandomUnseenCompanies(userId, pageable);
List<UserCompanyStatusModel> userCompanyStatuses = userCompanyStatusService
.getMultipleUserCompanyStatusByUserIdAndCompanyIds(userId, companies.getContent()
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@
import com.example.spring.app.company.dto.NumberOfEmployeeFilterDTO;
import com.example.spring.app.company.objects.ContactDTO;
import com.example.spring.app.company.objects.SocialMediaDTO;
import com.example.spring.utils.LogUtil;
import com.example.spring.common.utils.LogUtil;
import com.fasterxml.jackson.core.type.TypeReference;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;
Expand Down
10 changes: 10 additions & 0 deletions src/main/java/com/example/spring/app/llm/LLMAnswerDTO.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,10 @@
package com.example.spring.app.llm;

import lombok.Getter;
import lombok.Setter;

@Getter
@Setter
public class LLMAnswerDTO {
private String answer;
}
21 changes: 18 additions & 3 deletions src/main/java/com/example/spring/app/llm/LLMController.java
Original file line number Diff line number Diff line change
@@ -1,7 +1,10 @@
package com.example.spring.app.llm;

import org.springframework.ai.chat.client.ChatClient;
import org.springframework.ai.chat.model.ChatResponse;
import org.springframework.http.MediaType;
import org.springframework.web.bind.annotation.*;
import reactor.core.publisher.Flux;

@CrossOrigin
@RestController
Expand All @@ -14,11 +17,23 @@ public LLMController(ChatClient.Builder chatClientBuilder) {
this.chatClient = chatClientBuilder.build();
}

@GetMapping("/ai")
String generation(String userInput) {
return this.chatClient.prompt()
@GetMapping("/ask-ai")
LLMAnswerDTO generation(String userInput) {
LLMAnswerDTO llmAnswerDTO = new LLMAnswerDTO();
String response = this.chatClient.prompt()
.user(userInput)
.call()
.content();

llmAnswerDTO.setAnswer(response);
return llmAnswerDTO;
}

@GetMapping(value = "/stream-ai", produces = MediaType.TEXT_EVENT_STREAM_VALUE)
public Flux<ChatResponse> streamGeneration(@RequestParam String userInput) {
return chatClient.prompt()
.user(userInput)
.stream()
.chatResponse();
}
}
Original file line number Diff line number Diff line change
@@ -1,7 +1,7 @@
package com.example.spring.app.stripe;

import com.example.spring.app.user.UserDTO;
import com.example.spring.utils.LogUtil;
import com.example.spring.common.utils.LogUtil;
import com.stripe.exception.StripeException;
import com.stripe.model.Customer;
import com.stripe.model.CustomerSearchResult;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.example.spring.app.user.UserDTO;
import com.example.spring.core.keycloakClient.UserResource;
import com.example.spring.utils.LogUtil;
import com.example.spring.common.utils.LogUtil;
import com.stripe.Stripe;
import com.stripe.exception.StripeException;
import com.stripe.model.Customer;
Expand All @@ -18,7 +18,7 @@
import java.util.Map;
import java.util.Objects;

import static com.example.spring.utils.HeadersUtil.parseUserIdFromHeader;
import static com.example.spring.common.utils.JwtUtil.extractUserIdFromToken;

// https://kinsta.com/blog/stripe-java-api/

Expand All @@ -44,7 +44,7 @@ public ResponseEntity<String> newSubscriptionWithTrial(@RequestHeader("X-priceId
Stripe.apiKey = STRIPE_API_KEY;

String clientBaseURL = "https://" + HOSTNAME + "/ui";
String userId = parseUserIdFromHeader();
String userId = extractUserIdFromToken();

// Find the user record from the database
UserDTO user = userResource.getUserById(userId);
Expand Down
15 changes: 4 additions & 11 deletions src/main/java/com/example/spring/app/user/UserController.java
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.web.bind.annotation.*;

import static com.example.spring.utils.HeadersUtil.parseUserIdFromHeader;
import static com.example.spring.common.utils.JwtUtil.extractUserIdFromToken;

@CrossOrigin
@RestController
Expand All @@ -18,20 +18,20 @@ public class UserController {

@GetMapping("/user")
public UserDTO getUser() {
String userId = parseUserIdFromHeader();
String userId = extractUserIdFromToken();
return userResource.getUserById(userId);
}

@PostMapping("/completeOnboarding")
public Response completeOnboarding() {
String userId = parseUserIdFromHeader();
String userId = extractUserIdFromToken();
userResource.completeOnboarding(userId);
return Response.ok().build();
}

@PutMapping("/update-user")
public Response updateUser(@RequestParam UserDTO user) {
String id = parseUserIdFromHeader();
String id = extractUserIdFromToken();
UserDTO existingUser = userResource.getUserById(id);

if (existingUser != null) {
Expand All @@ -46,11 +46,4 @@ public Response updateUser(@RequestParam UserDTO user) {

return Response.status(Response.Status.BAD_REQUEST).build();
}

/*
@GetMapping("/register")
public String registerEndpoint() {
return userResource.returnRegistrationEndpoint();
}
*/
}
2 changes: 1 addition & 1 deletion src/main/java/com/example/spring/app/user/UserService.java
Original file line number Diff line number Diff line change
Expand Up @@ -3,7 +3,7 @@
import com.example.spring.core.keycloakClient.UserResource;
import com.example.spring.core.userQuota.UserQuotaModel;
import com.example.spring.core.userQuota.UserQuotaRepository;
import com.example.spring.utils.LogUtil;
import com.example.spring.common.utils.LogUtil;
import org.springframework.beans.factory.annotation.Autowired;
import org.springframework.scheduling.annotation.EnableScheduling;
import org.springframework.scheduling.annotation.Scheduled;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@
import org.springframework.web.bind.annotation.RequestParam;
import org.springframework.web.bind.annotation.RestController;

import static com.example.spring.utils.HeadersUtil.parseUserIdFromHeader;
import static com.example.spring.common.utils.JwtUtil.extractUserIdFromToken;

@RestController
@RequestMapping("/v1/companies-status")
Expand All @@ -20,7 +20,7 @@ public class UserCompanyStatusController {
@PostMapping("/update-status")
public ResponseEntity<UserCompanyStatusModel> updateStatus(@RequestParam Integer companyId,
@RequestParam Status status) {
String userId = parseUserIdFromHeader();
String userId = extractUserIdFromToken();
UserCompanyStatusModel updated = userCompanyStatusService.updateCompanyStatus(userId, companyId, status);

if (updated == null) {
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
import com.example.spring.core.keycloakClient.RoleResource;
import com.example.spring.core.keycloakClient.UserResource;
import com.example.spring.core.userQuota.UserQuotaService;
import com.example.spring.utils.LogUtil;
import com.example.spring.common.utils.LogUtil;
import com.google.gson.JsonSyntaxException;
import com.stripe.exception.SignatureVerificationException;
import com.stripe.exception.StripeException;
Expand Down Expand Up @@ -81,7 +81,7 @@ private void handleChargeSucceeded(Event event) {

private void handleSubscriptionCreated(Event event) throws StripeException {
EventDataObjectDeserializer dataObjectDeserializer = event.getDataObjectDeserializer();
StripeObject stripeObject = null;
StripeObject stripeObject;
if (dataObjectDeserializer.getObject().isPresent()) {
stripeObject = dataObjectDeserializer.getObject().get();
Subscription subscription = (Subscription) stripeObject;
Expand Down
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spring.utils;
package com.example.spring.common.utils;

import jakarta.servlet.http.HttpServletRequest;
import org.springframework.web.context.request.RequestContextHolder;
Expand All @@ -11,20 +11,6 @@
public class HeadersUtil {

// Find the corresponding header of nginx: proxy_set_header X-User $user;
public static String parseEmailFromHeader() {
ServletRequestAttributes sra = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
assert sra != null;
HttpServletRequest request = sra.getRequest();
return request.getHeader("X-Auth-Request-Email");
}

public static String parseUserIdFromHeader() {
ServletRequestAttributes sra = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
assert sra != null;
HttpServletRequest request = sra.getRequest();
return request.getHeader("X-Auth-Request-User");
}

public static String parseTokenFromHeader() {
ServletRequestAttributes sra = (ServletRequestAttributes) RequestContextHolder.getRequestAttributes();
assert sra != null;
Expand Down
35 changes: 35 additions & 0 deletions src/main/java/com/example/spring/common/utils/JwtUtil.java
Original file line number Diff line number Diff line change
@@ -0,0 +1,35 @@
package com.example.spring.common.utils;

import com.fasterxml.jackson.core.JsonProcessingException;
import com.fasterxml.jackson.databind.JsonNode;
import com.fasterxml.jackson.databind.ObjectMapper;

import java.util.Base64;

import static com.example.spring.common.utils.HeadersUtil.parseTokenFromHeader;

public class JwtUtil {
public static String[] splitToken(String token) {
return token.split("\\.");
}

public static String decodePayload(String token) {
String[] parts = splitToken(token);
return new String(Base64.getDecoder().decode(parts[1]));
}

public static String extractUserIdFromToken() {
String token = parseTokenFromHeader();
String payload = decodePayload(token);

ObjectMapper objectMapper = new ObjectMapper();
JsonNode jsonNode;
try {
jsonNode = objectMapper.readTree(payload);
} catch (JsonProcessingException e) {
throw new RuntimeException(e);
}
JsonNode node = jsonNode.path("sub");
return node.asText();
}
}
Original file line number Diff line number Diff line change
@@ -1,4 +1,4 @@
package com.example.spring.utils;
package com.example.spring.common.utils;

import org.slf4j.Logger;
import org.slf4j.LoggerFactory;
Expand All @@ -23,10 +23,6 @@ public static void error(String message, Throwable throwable) {
logger.error(message, throwable);
}

public static void debug(String message) {
logger.debug(message);
}

private static String formatContext(Map<String, Object> context) {
return context.entrySet().stream()
.map(entry -> entry.getKey() + "=" + entry.getValue())
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -17,7 +17,7 @@
import java.util.concurrent.TimeUnit;
import java.util.concurrent.locks.ReentrantLock;

import static com.example.spring.utils.HeadersUtil.parseUserIdFromHeader;
import static com.example.spring.common.utils.JwtUtil.extractUserIdFromToken;

@Aspect
@Component
Expand Down Expand Up @@ -68,7 +68,7 @@ private void cleanupUnusedLocks() {

@Around("allMethodsExceptExcluded()")
public Object checkQuota(ProceedingJoinPoint joinPoint) throws Throwable {
String userId = parseUserIdFromHeader();
String userId = extractUserIdFromToken();

// Get or create lock for this specific user
ReentrantLock userLock = userLocks.computeIfAbsent(userId, k -> new ReentrantLock());
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -2,7 +2,7 @@

import com.example.spring.core.appSettings.AppSettings;
import com.example.spring.core.appSettings.AppSettingsRepository;
import com.example.spring.utils.LogUtil;
import com.example.spring.common.utils.LogUtil;
import com.github.benmanes.caffeine.cache.Cache;
import com.github.benmanes.caffeine.cache.Caffeine;
import jakarta.annotation.PostConstruct;
Expand Down
Original file line number Diff line number Diff line change
Expand Up @@ -18,11 +18,12 @@
import org.springframework.web.filter.OncePerRequestFilter;

import java.io.IOException;
import java.util.Base64;
import java.util.List;
import java.util.stream.Collectors;

import static com.example.spring.utils.HeadersUtil.parseTokenFromHeader;
import static com.example.spring.common.utils.HeadersUtil.parseTokenFromHeader;
import static com.example.spring.common.utils.JwtUtil.decodePayload;
import static com.example.spring.common.utils.JwtUtil.splitToken;

public class JwtAuthenticationFilter extends OncePerRequestFilter {

Expand All @@ -31,11 +32,11 @@ protected void doFilterInternal(HttpServletRequest request, HttpServletResponse
throws ServletException, IOException {
String token = parseTokenFromHeader();

if (token != null && StringUtils.hasText(token)) {
if (StringUtils.hasText(token)) {
// Decode the JWT token
String[] parts = token.split("\\.");
String[] parts = splitToken(token);
if (parts.length == 3) {
String payload = new String(Base64.getDecoder().decode(parts[1]));
String payload = decodePayload(token);

// Extract roles from the decoded payload
List<String> roles = getRolesFromToken(payload);
Expand Down