kasun/Vaessl
1
0
Fork 0
Code Issues 8 Pull Requests Actions Packages Projects 3 Releases Wiki Activity

changed formatter

Browse Source
This commit is contained in:
Kasun Jayatilaka
2026-05-17 00:26:46 +02:00
parent 4d96524adb
commit a8ecf65180
17 changed files with 180 additions and 191 deletions
Download Patch File Download Diff File Expand all files Collapse all files
backend/src/main/java/com/vaessl/app/config/CorsConfig.java
+2 -4
View File
@@ -13,10 +13,8 @@ public class CorsConfig implements WebMvcConfigurer {
@Override
public void addCorsMappings(CorsRegistry registry) {
registry.addMapping("/**")
.allowedOrigins(allowedOrigins)
registry.addMapping("/**").allowedOrigins(allowedOrigins)
.allowedMethods("GET", "POST", "DELETE", "OPTIONS")
.allowedHeaders("Content-Type", "Accept")
.allowCredentials(true);
.allowedHeaders("Content-Type", "Accept").allowCredentials(true);
}
}
backend/src/main/java/com/vaessl/app/connection/AuthResponse.java
+2 -1
View File
@@ -2,4 +2,5 @@ package com.vaessl.app.connection;
import java.time.Instant;
public record AuthResponse(String serviceType, Instant expiresAt) {}
public record AuthResponse(String serviceType, Instant expiresAt) {
}
backend/src/main/java/com/vaessl/app/connection/ConnectionController.java
+7 -8
View File
@@ -28,8 +28,7 @@ public class ConnectionController {
private final ConnectionService connectionService;
@PostMapping("/login")
public ResponseEntity<AuthResponse> login(
@Valid @RequestBody ConnectionRequest request,
public ResponseEntity<AuthResponse> login(@Valid @RequestBody ConnectionRequest request,
HttpServletRequest httpReq) {
LoginResult result = connectionService.login(request);
@@ -53,21 +52,21 @@ public class ConnectionController {
}
List<ConnectionStatusResponse> statuses = new ArrayList<>();
Collections.list(session.getAttributeNames()).stream()
.filter(k -> k.endsWith(SUFFIX))
Collections.list(session.getAttributeNames()).stream().filter(k -> k.endsWith(SUFFIX))
.forEach(k -> {
String serviceType = k.replace(SUFFIX, "");
Long id = (Long) session.getAttribute(k);
ConnectionStatusResponse status = connectionService.getConnectionStatus(serviceType, id);
if (status != null) statuses.add(status);
ConnectionStatusResponse status =
connectionService.getConnectionStatus(serviceType, id);
if (status != null)
statuses.add(status);
});
return ResponseEntity.ok(statuses);
}
@DeleteMapping("/connections/{serviceType}")
public ResponseEntity<Void> logout(
@PathVariable("serviceType") String serviceType,
public ResponseEntity<Void> logout(@PathVariable("serviceType") String serviceType,
HttpServletRequest httpReq) {
HttpSession session = httpReq.getSession(false);
backend/src/main/java/com/vaessl/app/connection/ConnectionEntity.java
+2 -1
View File
@@ -14,7 +14,8 @@ import lombok.NoArgsConstructor;
import lombok.Setter;
@Entity
@Table(name = "connections", uniqueConstraints = { @UniqueConstraint(columnNames = { "appUrl", "username" }) })
@Table(name = "connections",
uniqueConstraints = {@UniqueConstraint(columnNames = {"appUrl", "username"})})
@Inheritance(strategy = InheritanceType.SINGLE_TABLE)
@DiscriminatorColumn(name = "service_type")
@Getter
backend/src/main/java/com/vaessl/app/connection/ConnectionRequest.java
+4 -7
View File
@@ -4,12 +4,9 @@ import com.fasterxml.jackson.annotation.JsonProperty;
import jakarta.validation.constraints.NotBlank;
public record ConnectionRequest(
@NotBlank(message = "App URL is mandatory") String appUrl,
public record ConnectionRequest(@NotBlank(message = "App URL is mandatory") String appUrl,
@NotBlank(message = "Service type is mandatory") String serviceType,
String username,
String password,
String apiKey,
String username, String password, String apiKey,
@JsonProperty(defaultValue = "false") Boolean stayLoggedIn) {
public ConnectionRequest {
@@ -18,8 +15,8 @@ public record ConnectionRequest(
}
}
public ConnectionRequest(String appUrl, String serviceType, String username, String password,
Boolean stayLoggedIn) {
public ConnectionRequest(String appUrl, String serviceType, String username,
String password, Boolean stayLoggedIn) {
this(appUrl, serviceType, username, password, null, stayLoggedIn);
}
}
backend/src/main/java/com/vaessl/app/connection/ConnectionResponse.java
+4 -3
View File
@@ -3,10 +3,11 @@ package com.vaessl.app.connection;
import java.time.Instant;
import java.util.Map;
public record ConnectionResponse(String token, Instant expiresAt, Map<String, Object> extraResponseData) {
public record ConnectionResponse(String token, Instant expiresAt,
Map<String, Object> extraResponseData) {
public String getExtraVar(String key) {
if(extraResponseData == null) {
if (extraResponseData == null) {
return null;
} else {
Object value = extraResponseData.get(key);
backend/src/main/java/com/vaessl/app/connection/ConnectionService.java
+4 -3
View File
@@ -50,13 +50,14 @@ public class ConnectionService {
public ConnectionStatusResponse getConnectionStatus(String serviceType, Long connectionId) {
ConnectionEntity entity = cRepository.findById(connectionId).orElse(null);
if (entity == null) return null;
if (entity == null)
return null;
ConnectionProvider provider = providerRegistry.get(serviceType);
Instant expiresAt = (provider != null) ? provider.getTokenExpiry(entity) : null;
boolean connected = expiresAt == null || expiresAt.isAfter(Instant.now());
return new ConnectionStatusResponse(serviceType, entity.getAppUrl(),
entity.getUsername(), expiresAt, connected);
return new ConnectionStatusResponse(serviceType, entity.getAppUrl(), entity.getUsername(),
expiresAt, connected);
}
}
backend/src/main/java/com/vaessl/app/connection/ConnectionStatusResponse.java
+3 -6
View File
@@ -2,9 +2,6 @@ package com.vaessl.app.connection;
import java.time.Instant;
public record ConnectionStatusResponse(
String serviceType,
String appUrl,
String username,
Instant expiresAt,
boolean connected) {}
public record ConnectionStatusResponse(String serviceType, String appUrl, String username,
Instant expiresAt, boolean connected) {
}
backend/src/main/java/com/vaessl/app/connection/Endpoint.java
+1 -3
View File
@@ -1,9 +1,7 @@
package com.vaessl.app.connection;
public enum Endpoint {
HOMEBOX_LOGIN("/api/v1/users/login"),
LOGIN("/login"),
CONNECTION_STATUS("/connections/status");
HOMEBOX_LOGIN("/api/v1/users/login"), LOGIN("/login"), CONNECTION_STATUS("/connections/status");
private final String value;
backend/src/main/java/com/vaessl/app/connection/LoginResult.java
+2 -1
View File
@@ -2,4 +2,5 @@ package com.vaessl.app.connection;
import java.time.Instant;
public record LoginResult(Long connectionId, Instant expiresAt) {}
public record LoginResult(Long connectionId, Instant expiresAt) {
}
backend/src/main/java/com/vaessl/app/connection/ServiceType.java
+1 -1
View File
@@ -8,7 +8,7 @@ public enum ServiceType {
private final String value;
private ServiceType(String value){
private ServiceType(String value) {
this.value = value;
}
}
backend/src/main/java/com/vaessl/app/exception/ErrorMessage.java
+7 -5
View File
@@ -5,11 +5,13 @@ import org.springframework.http.HttpStatus;
import com.fasterxml.jackson.annotation.JsonValue;
public enum ErrorMessage {
BAD_REQUEST_EMPTY_FIELDS(HttpStatus.BAD_REQUEST, "Fields must not be empty."), UNAUTHORIZED_WRONG_LOGIN(
HttpStatus.UNAUTHORIZED, "Invalid username or password."), SERVICE_UNAVAILABLE_UNREACHABLE_URL(
HttpStatus.SERVICE_UNAVAILABLE, "The target URL is unreachable."), SERVER_ERROR_GENERAL(
"The external app returned a server error: "), WRONG_SERVICE_TYPE(HttpStatus.NOT_FOUND,
"No such service type.");
BAD_REQUEST_EMPTY_FIELDS(HttpStatus.BAD_REQUEST,
"Fields must not be empty."), UNAUTHORIZED_WRONG_LOGIN(HttpStatus.UNAUTHORIZED,
"Invalid username or password."), SERVICE_UNAVAILABLE_UNREACHABLE_URL(
HttpStatus.SERVICE_UNAVAILABLE,
"The target URL is unreachable."), SERVER_ERROR_GENERAL(
"The external app returned a server error: "), WRONG_SERVICE_TYPE(
HttpStatus.NOT_FOUND, "No such service type.");
private final HttpStatus status;
private final String message;
backend/src/main/java/com/vaessl/app/exception/GlobalExceptionHandler.java
+6 -6
View File
@@ -19,8 +19,8 @@ public class GlobalExceptionHandler {
@ExceptionHandler(MethodArgumentNotValidException.class)
public ProblemDetail handleEmptyCredentialInput(MethodArgumentNotValidException e) {
String defaultMessages = e.getBindingResult().getFieldErrors().stream().map(FieldError::getDefaultMessage)
.collect(Collectors.joining(", "));
String defaultMessages = e.getBindingResult().getFieldErrors().stream()
.map(FieldError::getDefaultMessage).collect(Collectors.joining(", "));
return ProblemDetail.forStatusAndDetail(BAD_REQUEST_EMPTY_FIELDS.getStatus(),
BAD_REQUEST_EMPTY_FIELDS.getMessage() + " [" + defaultMessages + "]");
@@ -43,14 +43,14 @@ public class GlobalExceptionHandler {
@ExceptionHandler(HttpServerErrorException.class)
public ProblemDetail handleTimeoutOrNotFound(HttpServerErrorException e) {
return ProblemDetail
.forStatusAndDetail(e.getStatusCode(),
SERVER_ERROR_GENERAL.getMessage() + e.getStatusText());
return ProblemDetail.forStatusAndDetail(e.getStatusCode(),
SERVER_ERROR_GENERAL.getMessage() + e.getStatusText());
}
@ExceptionHandler(WrongServiceTypeException.class)
public ProblemDetail handleWrongServiceType(WrongServiceTypeException e) {
return ProblemDetail.forStatusAndDetail(WRONG_SERVICE_TYPE.getStatus(), WRONG_SERVICE_TYPE.getMessage());
return ProblemDetail.forStatusAndDetail(WRONG_SERVICE_TYPE.getStatus(),
WRONG_SERVICE_TYPE.getMessage());
}
@ExceptionHandler(EmptyCredentialsException.class)