okay it works thank the lord
All checks were successful
Deploy API / deploy (ubuntu-latest, 2.44.0) (push) Successful in 43s
All checks were successful
Deploy API / deploy (ubuntu-latest, 2.44.0) (push) Successful in 43s
This commit is contained in:
parent
5d5de61150
commit
dca15516db
@ -6,23 +6,17 @@ import lombok.extern.log4j.Log4j2;
|
||||
import org.springframework.boot.SpringApplication;
|
||||
import org.springframework.boot.autoconfigure.SpringBootApplication;
|
||||
import org.springframework.boot.autoconfigure.security.servlet.UserDetailsServiceAutoConfiguration;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.http.HttpMethod;
|
||||
import org.springframework.web.servlet.config.annotation.CorsRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.EnableWebMvc;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
|
||||
import java.io.File;
|
||||
import java.nio.file.Files;
|
||||
import java.nio.file.StandardCopyOption;
|
||||
import java.util.Arrays;
|
||||
import java.util.Objects;
|
||||
|
||||
/**
|
||||
* @author Braydon
|
||||
*/
|
||||
@SpringBootApplication(exclude = UserDetailsServiceAutoConfiguration.class)
|
||||
@Log4j2(topic = "PulseApp") @EnableWebMvc
|
||||
@Log4j2(topic = "PulseApp")
|
||||
public class PulseAPI {
|
||||
@SneakyThrows
|
||||
public static void main(@NonNull String[] args) {
|
||||
@ -38,23 +32,4 @@ public class PulseAPI {
|
||||
log.info("Found configuration at '{}'", config.getAbsolutePath());
|
||||
SpringApplication.run(PulseAPI.class, args); // Start the app
|
||||
}
|
||||
|
||||
/**
|
||||
* Configures CORS for the API.
|
||||
*
|
||||
* @return the WebMvc config
|
||||
*/
|
||||
@Bean
|
||||
public WebMvcConfigurer corsConfigurer() {
|
||||
return new WebMvcConfigurer() {
|
||||
@Override
|
||||
public void addCorsMappings(@NonNull CorsRegistry registry) {
|
||||
// Allow all origins to access the API
|
||||
registry.addMapping("/**")
|
||||
.allowedOrigins("*") // Allow all origins
|
||||
.allowedMethods("*") // Allow all methods
|
||||
.allowedHeaders("*"); // Allow all headers
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
27
src/main/java/cc/pulseapp/api/config/AppConfig.java
Normal file
27
src/main/java/cc/pulseapp/api/config/AppConfig.java
Normal file
@ -0,0 +1,27 @@
|
||||
package cc.pulseapp.api.config;
|
||||
|
||||
import lombok.NonNull;
|
||||
import org.springframework.context.annotation.Bean;
|
||||
import org.springframework.context.annotation.Configuration;
|
||||
import org.springframework.web.servlet.config.annotation.CorsRegistry;
|
||||
import org.springframework.web.servlet.config.annotation.WebMvcConfigurer;
|
||||
|
||||
/**
|
||||
* @author Braydon
|
||||
*/
|
||||
@Configuration
|
||||
public class AppConfig {
|
||||
@Bean
|
||||
public WebMvcConfigurer configureCors() {
|
||||
return new WebMvcConfigurer() {
|
||||
@Override
|
||||
public void addCorsMappings(@NonNull CorsRegistry registry) {
|
||||
// Allow all origins to access the API
|
||||
registry.addMapping("/**")
|
||||
.allowedOrigins("*") // Allow all origins
|
||||
.allowedMethods("*") // Allow all methods
|
||||
.allowedHeaders("*"); // Allow all headers
|
||||
}
|
||||
};
|
||||
}
|
||||
}
|
@ -56,7 +56,7 @@ public class WebSecurityConfig {
|
||||
.securityMatcher("/**") // Require auth for all routes
|
||||
.addFilterBefore(filter, UsernamePasswordAuthenticationFilter.class) // Add the auth token filter
|
||||
.authorizeHttpRequests(registry -> registry // Except for the following routes
|
||||
.requestMatchers(HttpMethod.OPTIONS,"/**").permitAll()
|
||||
.requestMatchers(HttpMethod.OPTIONS, "/**").permitAll()
|
||||
.requestMatchers(AntPathRequestMatcher.antMatcher("/")).permitAll()
|
||||
.requestMatchers(AntPathRequestMatcher.antMatcher("/error")).permitAll()
|
||||
.requestMatchers(AntPathRequestMatcher.antMatcher("/v*/auth/register")).permitAll()
|
||||
|
Loading…
Reference in New Issue
Block a user