byte/expensetracker
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Merge branch 'master' of https://github.com/lumijiez/ExpenseTrackerFAF into front-v2

Browse Source
This commit is contained in:
Daniel
2023-10-26 14:29:28 +03:00
parent 163aee19e5 34903cd287
commit 1f92fddd04
2 changed files with 13 additions and 14 deletions
Download Patch File Download Diff File Expand all files Collapse all files

4
.gitignore vendored
View File

@@ -4,6 +4,8 @@ target/
!**/src/main/**/target/ !**/src/main/**/target/
!**/src/test/**/target/ !**/src/test/**/target/
/src/main/resources/application.properties /src/main/resources/application.properties
/src/main/java/web/src/package.json
/src/main/java/web/src/package-lock.json
### STS ### ### STS ###
.apt_generated .apt_generated
@@ -32,5 +34,3 @@ build/
### VS Code ### ### VS Code ###
.vscode/ .vscode/
/src/main/resources/application.properties

23
src/main/java/com/faf223/expensetrackerfaf/config/CorsFilter.java
View File

@@ -17,21 +17,20 @@ public class CorsFilter implements Filter {
public void destroy() { public void destroy() {
} }
@Override @Override
public void doFilter(ServletRequest req, ServletResponse res, FilterChain chain) public void doFilter(ServletRequest servletRequest, ServletResponse servletResponse, FilterChain filterChain) throws IOException, ServletException {
throws IOException, ServletException { HttpServletResponse response = (HttpServletResponse) servletResponse;
HttpServletResponse response = (HttpServletResponse) res; response.setHeader("Access-Control-Allow-Origin", "*");
HttpServletRequest request = (HttpServletRequest) req;
response.setHeader("Access-Control-Allow-Origin", "http://localhost:5173");
response.setHeader("Access-Control-Allow-Methods", "POST, PUT, GET, OPTIONS, DELETE");
response.setHeader("Access-Control-Max-Age", "3600");
response.setHeader("Access-Control-Allow-Headers", "X-Requested-With, X-Auth-Token");
response.setHeader("Access-Control-Allow-Credentials", "true"); response.setHeader("Access-Control-Allow-Credentials", "true");
response.setHeader("Access-Control-Allow-Methods", "POST, GET, HEAD, OPTIONS");
if (!"OPTIONS".equalsIgnoreCase(request.getMethod())) { response.setHeader("Access-Control-Allow-Headers", "Origin, Accept, X-Requested-With, Content-Type, Access-Control-Request-Method, Access-Control-Request-Headers");
chain.doFilter(req, res); if ("OPTIONS".equalsIgnoreCase(((HttpServletRequest) servletRequest).getMethod())) {
response.setStatus(HttpServletResponse.SC_OK);
} else {
filterChain.doFilter(servletRequest, response);
} }
} }
@Override @Override