Merge pull request #3132 from booklore-app/develop

Merge develop into master for release

Author: acx10

.github/workflows/develop-pipeline.yml

@@ -54,7 +54,7 @@ jobs:
           check_name: Backend Test Results
 
       - name: Upload Backend Test Reports
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         if: always()
         with:
           name: backend-test-reports
@@ -120,7 +120,7 @@ jobs:
           check_name: Frontend Test Results
 
       - name: Upload Frontend Test Reports
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         if: always()
         with:
           name: frontend-test-reports

.github/workflows/master-pipeline.yml

@@ -66,7 +66,7 @@ jobs:
           check_name: Backend Test Results
 
       - name: Upload Backend Test Reports
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         if: always()
         with:
           name: backend-test-reports
@@ -132,7 +132,7 @@ jobs:
           check_name: Frontend Test Results
 
       - name: Upload Frontend Test Reports
-        uses: actions/upload-artifact@b7c566a772e6b6bfb58ed0dc250532a479d7789f # v6
+        uses: actions/upload-artifact@bbbca2ddaa5d8feaa63e36b76fdaad77386f024f # v7.0.0
         if: always()
         with:
           name: frontend-test-reports

booklore-api/src/main/java/org/booklore/BookloreApplication.java

@@ -14,10 +14,6 @@
 @SpringBootApplication
 public class BookloreApplication {
 
-    static {
-        System.setProperty("sun.net.http.allowRestrictedHeaders", "true");
-    }
-
     public static void main(String[] args) {
         SpringApplication.run(BookloreApplication.class, args);
     }

booklore-api/src/main/java/org/booklore/config/security/SecurityConfig.java

@@ -5,7 +5,7 @@
 import jakarta.servlet.DispatcherType;
 import jakarta.servlet.http.HttpServletResponse;
 import lombok.AllArgsConstructor;
-import org.booklore.util.FileService;
+
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
 import org.springframework.core.annotation.Order;
@@ -26,26 +26,16 @@
 import org.springframework.web.cors.CorsConfigurationSource;
 import org.springframework.web.cors.UrlBasedCorsConfigurationSource;
 import org.springframework.web.client.RestTemplate;
-import org.springframework.http.client.SimpleClientHttpRequestFactory;
+import org.springframework.http.client.JdkClientHttpRequestFactory;
 
-import java.io.IOException;
-import java.net.HttpURLConnection;
+import java.net.http.HttpClient;
 import java.util.ArrayList;
 import java.util.Arrays;
 import java.util.List;
 import java.util.regex.Pattern;
 
 import lombok.extern.slf4j.Slf4j;
 
-import javax.net.ssl.HttpsURLConnection;
-import javax.net.ssl.SNIHostName;
-import javax.net.ssl.SSLParameters;
-import javax.net.ssl.SSLSocket;
-import javax.net.ssl.SSLSocketFactory;
-import java.net.InetAddress;
-import java.net.Socket;
-import java.util.Collections;
-
 @Slf4j
 @AllArgsConstructor
 @EnableMethodSecurity
@@ -258,71 +248,10 @@ public AuthenticationManager authenticationManager(HttpSecurity http) throws Exc
 
     @Bean("noRedirectRestTemplate")
     public RestTemplate noRedirectRestTemplate() {
-        return new RestTemplate(
-                new SimpleClientHttpRequestFactory() {
-                    @Override
-                    protected void prepareConnection(HttpURLConnection connection, String httpMethod) throws IOException {
-                        super.prepareConnection(connection, httpMethod);
-                        connection.setInstanceFollowRedirects(false);
-                        String targetHost = FileService.getTargetHost();
-                        if (targetHost != null) {
-                            connection.setRequestProperty("Host", targetHost);
-                        }
-                        if (connection instanceof HttpsURLConnection httpsConnection) {
-                            if (targetHost != null) {
-                                // Set original host for SNI (even if connecting to IP)
-                                SSLSocketFactory defaultFactory = httpsConnection.getSSLSocketFactory();
-                                httpsConnection.setSSLSocketFactory(new SniSSLSocketFactory(defaultFactory, targetHost));
-
-                                httpsConnection.setHostnameVerifier((hostname, session) -> {
-                                    String expectedHost = FileService.getTargetHost();
-                                    if (expectedHost != null) {
-                                        // Verify certificate against the original expected hostname, even if connecting via IP
-                                        return HttpsURLConnection.getDefaultHostnameVerifier().verify(expectedHost, session);
-                                    }
-                                    // Fallback: use default verifier for the hostname we connected to
-                                    return HttpsURLConnection.getDefaultHostnameVerifier().verify(hostname, session);
-                                });
-                            }
-                        }
-                    }
-                }
-        );
-    }
-
-    private static class SniSSLSocketFactory extends SSLSocketFactory {
-        private final SSLSocketFactory delegate;
-        private final String targetHost;
-
-        public SniSSLSocketFactory(SSLSocketFactory delegate, String targetHost) {
-            this.delegate = delegate;
-            this.targetHost = targetHost;
-        }
-
-        @Override
-        public String[] getDefaultCipherSuites() { return delegate.getDefaultCipherSuites(); }
-        @Override
-        public String[] getSupportedCipherSuites() { return delegate.getSupportedCipherSuites(); }
-
-        @Override
-        public Socket createSocket(Socket s, String host, int port, boolean autoClose) throws IOException {
-            // Pass targetHost instead of host (which is the IP) so the internal SSLSession gets the correct peer host
-            Socket socket = delegate.createSocket(s, targetHost, port, autoClose);
-            if (socket instanceof SSLSocket sslSocket) {
-                SNIHostName serverName = new SNIHostName(targetHost);
-                SSLParameters params = sslSocket.getSSLParameters();
-                params.setServerNames(Collections.singletonList(serverName));
-                // Explicitly set EndpointIdentificationAlgorithm so Java verifies the certificate against targetHost
-                params.setEndpointIdentificationAlgorithm("HTTPS");
-                sslSocket.setSSLParameters(params);
-            }
-            return socket;
-        }
-
-        @Override public Socket createSocket(String host, int port) throws IOException { return delegate.createSocket(host, port); }
-        @Override public Socket createSocket(String host, int port, InetAddress localHost, int localPort) throws IOException { return delegate.createSocket(host, port, localHost, localPort); }
-        @Override public Socket createSocket(InetAddress host, int port) throws IOException { return delegate.createSocket(host, port); }
-        @Override public Socket createSocket(InetAddress address, int port, InetAddress localAddress, int localPort) throws IOException { return delegate.createSocket(address, port, localAddress, localPort); }
+        HttpClient httpClient = HttpClient.newBuilder()
+                .followRedirects(HttpClient.Redirect.NEVER)
+                .build();
+        return new RestTemplate(new JdkClientHttpRequestFactory(httpClient));
     }
 
     @Bean

booklore-api/src/main/java/org/booklore/mobile/controller/MobileAuthorController.java

@@ -0,0 +1,56 @@
+package org.booklore.mobile.controller;
+
+import org.booklore.mobile.dto.MobileAuthorDetail;
+import org.booklore.mobile.dto.MobileAuthorSummary;
+import org.booklore.mobile.dto.MobilePageResponse;
+import org.booklore.mobile.service.MobileAuthorService;
+import io.swagger.v3.oas.annotations.Operation;
+import io.swagger.v3.oas.annotations.Parameter;
+import io.swagger.v3.oas.annotations.responses.ApiResponse;
+import io.swagger.v3.oas.annotations.responses.ApiResponses;
+import io.swagger.v3.oas.annotations.tags.Tag;
+import lombok.AllArgsConstructor;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/api/mobile/v1/authors")
+@Tag(name = "Mobile Authors", description = "Mobile-optimized endpoints for browsing authors")
+public class MobileAuthorController {
+
+    private final MobileAuthorService mobileAuthorService;
+
+    @Operation(summary = "Get paginated author list",
+            description = "Retrieve a paginated list of authors with optional filtering by library, search text, and photo availability.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "Authors retrieved successfully"),
+            @ApiResponse(responseCode = "403", description = "Access denied")
+    })
+    @GetMapping
+    public ResponseEntity<MobilePageResponse<MobileAuthorSummary>> getAuthors(
+            @Parameter(description = "Page number (0-indexed)") @RequestParam(required = false, defaultValue = "0") Integer page,
+            @Parameter(description = "Page size (max 50)") @RequestParam(required = false, defaultValue = "30") Integer size,
+            @Parameter(description = "Sort field (name, bookCount, recent)") @RequestParam(required = false, defaultValue = "name") String sort,
+            @Parameter(description = "Sort direction (asc, desc)") @RequestParam(required = false, defaultValue = "asc") String dir,
+            @Parameter(description = "Filter by library ID") @RequestParam(required = false) Long libraryId,
+            @Parameter(description = "Search by author name") @RequestParam(required = false) String search,
+            @Parameter(description = "Filter by photo availability") @RequestParam(required = false) Boolean hasPhoto) {
+
+        return ResponseEntity.ok(mobileAuthorService.getAuthors(page, size, sort, dir, libraryId, search, hasPhoto));
+    }
+
+    @Operation(summary = "Get author details",
+            description = "Retrieve full details for a specific author including description and book count.")
+    @ApiResponses({
+            @ApiResponse(responseCode = "200", description = "Author details retrieved successfully"),
+            @ApiResponse(responseCode = "403", description = "Access denied"),
+            @ApiResponse(responseCode = "404", description = "Author not found")
+    })
+    @GetMapping("/{authorId}")
+    public ResponseEntity<MobileAuthorDetail> getAuthorDetail(
+            @Parameter(description = "Author ID") @PathVariable Long authorId) {
+
+        return ResponseEntity.ok(mobileAuthorService.getAuthorDetail(authorId));
+    }
+}

booklore-api/src/main/java/org/booklore/mobile/controller/MobileSeriesController.java

@@ -0,0 +1,50 @@
+package org.booklore.mobile.controller;
+
+import lombok.AllArgsConstructor;
+import org.booklore.mobile.dto.MobileBookSummary;
+import org.booklore.mobile.dto.MobilePageResponse;
+import org.booklore.mobile.dto.MobileSeriesSummary;
+import org.booklore.mobile.service.MobileSeriesService;
+import org.springframework.http.ResponseEntity;
+import org.springframework.web.bind.annotation.*;
+
+@AllArgsConstructor
+@RestController
+@RequestMapping("/api/mobile/v1/series")
+public class MobileSeriesController {
+
+    private final MobileSeriesService mobileSeriesService;
+
+    @GetMapping
+    public ResponseEntity<MobilePageResponse<MobileSeriesSummary>> getSeries(
+            @RequestParam(required = false, defaultValue = "0") Integer page,
+            @RequestParam(required = false, defaultValue = "20") Integer size,
+            @RequestParam(required = false, defaultValue = "recentlyAdded") String sort,
+            @RequestParam(required = false, defaultValue = "desc") String dir,
+            @RequestParam(required = false) Long libraryId,
+            @RequestParam(required = false) String search,
+            @RequestParam(required = false) String status) {
+
+        boolean inProgressOnly = "in-progress".equalsIgnoreCase(status);
+
+        MobilePageResponse<MobileSeriesSummary> response = mobileSeriesService.getSeries(
+                page, size, sort, dir, libraryId, search, inProgressOnly);
+
+        return ResponseEntity.ok(response);
+    }
+
+    @GetMapping("/{seriesName}/books")
+    public ResponseEntity<MobilePageResponse<MobileBookSummary>> getSeriesBooks(
+            @PathVariable String seriesName,
+            @RequestParam(required = false, defaultValue = "0") Integer page,
+            @RequestParam(required = false, defaultValue = "20") Integer size,
+            @RequestParam(required = false, defaultValue = "seriesNumber") String sort,
+            @RequestParam(required = false, defaultValue = "asc") String dir,
+            @RequestParam(required = false) Long libraryId) {
+
+        MobilePageResponse<MobileBookSummary> response = mobileSeriesService.getSeriesBooks(
+                seriesName, page, size, sort, dir, libraryId);
+
+        return ResponseEntity.ok(response);
+    }
+}

booklore-api/src/main/java/org/booklore/mobile/dto/MobileAuthorDetail.java

@@ -0,0 +1,21 @@
+package org.booklore.mobile.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class MobileAuthorDetail {
+    private Long id;
+    private String name;
+    private String description;
+    private String asin;
+    private int bookCount;
+    private boolean hasPhoto;
+}

booklore-api/src/main/java/org/booklore/mobile/dto/MobileAuthorSummary.java

@@ -0,0 +1,20 @@
+package org.booklore.mobile.dto;
+
+import com.fasterxml.jackson.annotation.JsonInclude;
+import lombok.AllArgsConstructor;
+import lombok.Builder;
+import lombok.Data;
+import lombok.NoArgsConstructor;
+
+@Data
+@Builder
+@NoArgsConstructor
+@AllArgsConstructor
+@JsonInclude(JsonInclude.Include.NON_NULL)
+public class MobileAuthorSummary {
+    private Long id;
+    private String name;
+    private String asin;
+    private int bookCount;
+    private boolean hasPhoto;
+}

booklore-api/src/main/java/org/booklore/mobile/dto/MobileBookDetail.java

@@ -45,6 +45,8 @@ public class MobileBookDetail {
     private String primaryFileType;
     private List<String> fileTypes;
     private List<MobileBookFile> files;
+    private Instant coverUpdatedOn;
+    private Instant audiobookCoverUpdatedOn;
 
     private EpubProgress epubProgress;
     private PdfProgress pdfProgress;

booklore-api/src/main/java/org/booklore/mobile/dto/MobileBookSummary.java

@@ -28,4 +28,6 @@ public class MobileBookSummary {
     private Instant lastReadTime;
     private Float readProgress;
     private String primaryFileType;
+    private Instant coverUpdatedOn;
+    private Instant audiobookCoverUpdatedOn;
 }