#119 Native Sublinks API

.editorconfig

@@ -190,7 +190,7 @@ ij_java_message_dd_suffix = EJB
 ij_java_message_eb_prefix =
 ij_java_message_eb_suffix = Bean
 ij_java_method_annotation_wrap = split_into_lines
-ij_java_method_brace_style = end_of_line
+ij_java_method_brace_style = next_line_if_wrapped
 ij_java_method_call_chain_wrap = split_into_lines
 ij_java_method_parameters_new_line_after_left_paren = false
 ij_java_method_parameters_right_paren_on_new_line = false
@@ -200,7 +200,7 @@ ij_java_multi_catch_types_wrap = normal
 ij_java_names_count_to_use_import_on_demand = 999
 ij_java_new_line_after_lparen_in_annotation = false
 ij_java_new_line_after_lparen_in_deconstruction_pattern = true
-ij_java_new_line_after_lparen_in_record_header = false
+ij_java_new_line_after_lparen_in_record_header = true
 ij_java_packages_to_use_import_on_demand =
 ij_java_parameter_annotation_wrap = on_every_item
 ij_java_parameter_name_prefix =

build.gradle

@@ -33,7 +33,8 @@ dependencies {
   implementation 'org.springframework.boot:spring-boot-starter-validation'
   implementation 'org.springframework.boot:spring-boot-starter-security'
   implementation 'org.springframework.boot:spring-boot-starter-amqp'
-  testImplementation 'org.springframework.amqp:spring-rabbit-test'
+    implementation 'org.springframework.boot:spring-boot-starter-actuator'
+    testImplementation 'org.springframework.amqp:spring-rabbit-test'
 
   annotationProcessor "org.hibernate:hibernate-jpamodelgen:6.5.2.Final"
   implementation 'io.hypersistence:hypersistence-utils-hibernate-63:3.8.1'

src/main/java/com/sublinks/sublinksapi/SublinksApiApplication.java

@@ -13,6 +13,8 @@
 import org.springframework.boot.autoconfigure.SpringBootApplication;
 import org.springframework.context.annotation.Bean;
 import org.springframework.scheduling.annotation.EnableScheduling;
+import org.springframework.web.servlet.config.annotation.PathMatchConfigurer;
+import org.springframework.web.util.UrlPathHelper;
 
 /**
  * Application Boot.
@@ -34,13 +36,17 @@ public static void main(String[] args) {
   @Bean
   public OpenAPI customOpenAPI() {
 
-    return new OpenAPI().components(new Components().addSecuritySchemes("bearerAuth",
-        new SecurityScheme().type(SecurityScheme.Type.HTTP).scheme("bearer").bearerFormat("JWT")));
+    return new OpenAPI()
+        .components(new Components()
+            .addSecuritySchemes("bearerAuth",
+                new SecurityScheme()
+                    .type(SecurityScheme.Type.HTTP)
+                    .scheme("bearer")
+                    .bearerFormat("JWT")));
   }
 
   @Bean
-  public GroupedOpenApi v3OpenApi(@Value("${springdoc.version}") String appVersion,
-      @Value("${springdoc.pathsToMatch}") String pathsToMatch,
+  public GroupedOpenApi v3LemmyApi(@Value("${springdoc.version}") String appVersion,
       @Value("#{${springdoc.servers}}") List<String> servers) {
 
     return GroupedOpenApi.builder()
@@ -52,7 +58,30 @@ public GroupedOpenApi v3OpenApi(@Value("${springdoc.version}") String appVersion
         .addOpenApiCustomizer(openApi -> openApi.info(
                 new Info().title("Lemmy OpenAPI Documentation").version(appVersion))
             .servers(servers.stream().map(s -> new Server().url(s)).toList()))
-        .pathsToMatch(pathsToMatch)
+        .pathsToMatch("/api/v3/**")
         .build();
   }
+
+  @Bean
+  public GroupedOpenApi v1SublinksApi(@Value("${springdoc.version}") String appVersion,
+      @Value("#{${springdoc.servers}}") List<String> servers) {
+
+    return GroupedOpenApi.builder().group("v1")
+        .addOperationCustomizer((operation, handlerMethod) -> {
+          operation.addSecurityItem(new SecurityRequirement().addList("bearerAuth"));
+          return operation;
+        })
+        .addOpenApiCustomizer(openApi -> openApi.info(new Info()
+                .title("OpenAPI Documentation")
+                .version(appVersion))
+            .servers(servers.stream().map(s -> new Server().url(s)).toList()))
+        .pathsToMatch("/api/v1/**")
+        .build();
+  }
+
+  public void configurePathMatch(PathMatchConfigurer configurer) {
+    UrlPathHelper urlPathHelper = new UrlPathHelper();
+    urlPathHelper.setUrlDecode(false);
+    configurer.setUrlPathHelper(urlPathHelper);
+  }
 }

src/main/java/com/sublinks/sublinksapi/announcement/entities/Announcement.java

@@ -1,10 +1,13 @@
 package com.sublinks.sublinksapi.announcement.entities;
 
+import com.sublinks.sublinksapi.person.entities.Person;
 import jakarta.persistence.Column;
 import jakarta.persistence.Entity;
 import jakarta.persistence.GeneratedValue;
 import jakarta.persistence.GenerationType;
 import jakarta.persistence.Id;
+import jakarta.persistence.JoinColumn;
+import jakarta.persistence.ManyToOne;
 import jakarta.persistence.Table;
 import java.util.Objects;
 import lombok.AllArgsConstructor;
@@ -29,6 +32,13 @@
 @Table(name = "announcements")
 public class Announcement {
 
+  /**
+   * Relationships.
+   */
+  @ManyToOne
+  @JoinColumn(name = "creator_id")
+  private Person creator;
+
   /**
    * Attributes.
    */
@@ -39,6 +49,9 @@ public class Announcement {
   @Column(name = "content")
   private String content;
 
+  @Column(name = "is_active")
+  private Boolean active;
+
   @Column(name = "local_site_id")
   private Long localSiteId;
 

src/main/java/com/sublinks/sublinksapi/api/lemmy/v3/admin/controllers/AdminController.java

@@ -50,7 +50,9 @@
 import io.swagger.v3.oas.annotations.responses.ApiResponses;
 import io.swagger.v3.oas.annotations.tags.Tag;
 import jakarta.validation.Valid;
+
 import java.util.List;
+
 import lombok.AllArgsConstructor;
 import org.slf4j.Logger;
 import org.slf4j.LoggerFactory;
@@ -144,13 +146,13 @@ AddAdminResponse create(@Valid @RequestBody final AddAdmin addAdminForm, JwtPers
   @GetMapping("registration_application/count")
   GetUnreadRegistrationApplicationCountResponse registrationApplicationCount(
       @Valid GetUnreadRegistrationApplicationCount getUnreadRegistrationApplicationCountForm,
-      JwtPerson principal) {
+      JwtPerson principal)
+  {
 
     final Person person = getPersonOrThrowUnauthorized(principal);
 
     aclService.canPerson(person)
         .performTheAction(RolePermissionInstanceTypes.INSTANCE_REMOVE_ADMIN)
-
         .orElseThrow(() -> new ResponseStatusException(HttpStatus.UNAUTHORIZED, "unauthorized"));
 
     return GetUnreadRegistrationApplicationCountResponse.builder()
@@ -168,7 +170,8 @@ GetUnreadRegistrationApplicationCountResponse registrationApplicationCount(
   @GetMapping("registration_application/list")
   ListRegistrationApplicationsResponse registrationApplicationList(
       @Valid final ListRegistrationApplications listRegistrationApplicationsForm,
-      JwtPerson principal) {
+      JwtPerson principal)
+  {
 
     final Person person = getPersonOrThrowUnauthorized(principal);
 
@@ -194,7 +197,8 @@ ListRegistrationApplicationsResponse registrationApplicationList(
   @PutMapping("registration_application/approve")
   RegistrationApplicationResponse registrationApplicationApprove(
       @Valid final ApproveRegistrationApplication approveRegistrationApplicationForm,
-      final JwtPerson principal) {
+      final JwtPerson principal)
+  {
 
     final Person person = getPersonOrThrowUnauthorized(principal);
 
@@ -231,7 +235,8 @@ RegistrationApplicationResponse registrationApplicationApprove(
           schema = @Schema(implementation = PurgeItemResponse.class))})})
   @PostMapping("purge/person")
   PurgeItemResponse purgePerson(@Valid @RequestBody final PurgePerson purgePersonForm,
-      final JwtPerson principal) {
+      final JwtPerson principal)
+  {
 
     final Person person = getPersonOrThrowUnauthorized(principal);
 
@@ -242,8 +247,6 @@ PurgeItemResponse purgePerson(@Valid @RequestBody final PurgePerson purgePersonF
     final Person personToPurge = personRepository.findById((long) purgePersonForm.person_id())
         .orElseThrow(() -> new ResponseStatusException(HttpStatus.NOT_FOUND, "person_not_found"));
 
-    final int removedPostHistory = postHistoryService.deleteAllByCreator(personToPurge);
-    final int removedCommentHistory = commentHistoryService.deleteAllByCreator(personToPurge);
     // @todo: Log purged history amount?
     // @todo: Implement purging
 
@@ -257,7 +260,8 @@ PurgeItemResponse purgePerson(@Valid @RequestBody final PurgePerson purgePersonF
           schema = @Schema(implementation = PurgeItemResponse.class))})})
   @PostMapping("purge/community")
   PurgeItemResponse purgeCommunity(@Valid @RequestBody final PurgeCommunity purgeCommunityForm,
-      final JwtPerson principal) {
+      final JwtPerson principal)
+  {
 
     final Person person = getPersonOrThrowUnauthorized(principal);
 
@@ -275,7 +279,8 @@ PurgeItemResponse purgeCommunity(@Valid @RequestBody final PurgeCommunity purgeC
           schema = @Schema(implementation = PurgeItemResponse.class))})})
   @PostMapping("purge/post")
   PurgeItemResponse purgePost(@Valid @RequestBody final PurgePost purgePostForm,
-      final JwtPerson principal) {
+      final JwtPerson principal)
+  {
 
     final Person person = getPersonOrThrowUnauthorized(principal);
 
@@ -302,7 +307,8 @@ PurgeItemResponse purgePost(@Valid @RequestBody final PurgePost purgePostForm,
           schema = @Schema(implementation = PurgeItemResponse.class))})})
   @PostMapping("purge/comment")
   PurgeItemResponse purgeComment(@Valid @RequestBody final PurgeComment purgeCommentForm,
-      final JwtPerson principal) {
+      final JwtPerson principal)
+  {
 
     final Person person = getPersonOrThrowUnauthorized(principal);
 

src/main/java/com/sublinks/sublinksapi/api/lemmy/v3/authentication/config/SecurityConfig.java

@@ -4,6 +4,7 @@
 import lombok.RequiredArgsConstructor;
 import org.springframework.context.annotation.Bean;
 import org.springframework.context.annotation.Configuration;
+import org.springframework.core.annotation.Order;
 import org.springframework.security.config.annotation.web.builders.HttpSecurity;
 import org.springframework.security.config.annotation.web.configuration.EnableWebSecurity;
 import org.springframework.security.config.annotation.web.configurers.AbstractHttpConfigurer;
@@ -19,9 +20,10 @@
 @Configuration
 @EnableWebSecurity
 @RequiredArgsConstructor
+@Order(2)
 public class SecurityConfig {
 
-  private final JwtFilter jwtFilter;
+  private final JwtFilter lemmyJwtFilter;
 
   /**
    * Returns a configured SecurityFilterChain object for the application's security.
@@ -33,13 +35,14 @@ public class SecurityConfig {
   @Bean
   public SecurityFilterChain filterChain(final HttpSecurity http) throws Exception {
 
-    http
-        .csrf(AbstractHttpConfigurer::disable)
-        .addFilterBefore(jwtFilter, UsernamePasswordAuthenticationFilter.class)
+    http.csrf(AbstractHttpConfigurer::disable)
+        .securityMatcher("/api/v3/**")
         .authorizeHttpRequests((requests) -> requests.anyRequest()
             .permitAll())
         .sessionManagement((sessionManagement) -> sessionManagement.sessionCreationPolicy(
-            SessionCreationPolicy.STATELESS));
+            SessionCreationPolicy.STATELESS))
+        .addFilterBefore(lemmyJwtFilter, UsernamePasswordAuthenticationFilter.class);
+
     return http.build();
   }
 }

src/main/java/com/sublinks/sublinksapi/api/lemmy/v3/common/controllers/AbstractLemmyApiController.java

@@ -34,7 +34,7 @@ public Person getPersonOrThrowBadRequest(JwtPerson principal) throws ResponseSta
    * @throws ResponseStatusException Exception thrown when Person not present
    */
   public <X extends Throwable> Person getPersonOrThrow(JwtPerson principal,
-      Supplier<? extends X> exceptionSupplier) throws X {
+                                                       Supplier<? extends X> exceptionSupplier) throws X {
 
     return Optional.ofNullable(principal).map(p -> (Person) p.getPrincipal())
         .orElseThrow(exceptionSupplier);