Marmelator/llm-service
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases 44 Wiki Activity

Merge branch 'reformat' into 'main'

Browse Source 
reformat

See merge request fforesight/llm-service!15
This commit is contained in:
Kilian Schüttler 2024-08-26 18:56:01 +02:00
commit 84a6d290e6
2 changed files with 11 additions and 11 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

16
llm-service/llm-service-server/src/main/java/com/knecon/fforesight/llm/service/websocket/WebSocketConfiguration.java
View File

@ -50,7 +50,6 @@ public class WebSocketConfiguration implements WebSocketMessageBrokerConfigurer
@Override
public void registerStompEndpoints(StompEndpointRegistry registry) {
registry.addEndpoint("/api/llm/llm-websocket").setAllowedOrigins("*");
}
@ -65,14 +64,13 @@ public class WebSocketConfiguration implements WebSocketMessageBrokerConfigurer
StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class);
if (StompCommand.CONNECT.equals(accessor.getCommand())) {
Optional.ofNullable(accessor.getNativeHeader("Authorization"))
.ifPresent(ah -> {
String bearerToken = ah.get(0).replace("Bearer ", "");
log.debug("Received bearer token {}", bearerToken);
AuthenticationManager authenticationManager = tenantAuthenticationManagerResolver.resolve(bearerToken);
JwtAuthenticationToken token = (JwtAuthenticationToken) authenticationManager.authenticate(new BearerTokenAuthenticationToken(bearerToken));
accessor.setUser(token);
});
Optional.ofNullable(accessor.getNativeHeader("Authorization")).ifPresent(ah -> {
String bearerToken = ah.get(0).replace("Bearer ", "");
log.debug("Received bearer token {}", bearerToken);
AuthenticationManager authenticationManager = tenantAuthenticationManagerResolver.resolve(bearerToken);
JwtAuthenticationToken token = (JwtAuthenticationToken) authenticationManager.authenticate(new BearerTokenAuthenticationToken(bearerToken));
accessor.setUser(token);
});
}
return message;
}

6
llm-service/llm-service-server/src/main/java/com/knecon/fforesight/llm/service/websocket/WebSocketSecurityConfig.java
View File

@ -63,9 +63,10 @@ public class WebSocketSecurityConfig extends AbstractSecurityWebSocketMessageBro
}
public boolean checkAuthAndSetTenant(JwtAuthenticationToken authentication, Message<?> message){
public boolean checkAuthAndSetTenant(JwtAuthenticationToken authentication, Message<?> message) {
Optional<String> tenantId = getCurrentTenant(authentication);
if (tenantId.isPresent()){
if (tenantId.isPresent()) {
TenantContext.setTenantId(tenantId.get());
return true;
}
@ -84,6 +85,7 @@ public class WebSocketSecurityConfig extends AbstractSecurityWebSocketMessageBro
}
private Optional<String> extractTenantId(Message<?> message) {
StompHeaderAccessor sha = StompHeaderAccessor.wrap(message);