Skip to content

Commit 5e925aa

Browse files
committed
another small change commit prod check
1 parent 97f2977 commit 5e925aa

File tree

2 files changed

+51
-13
lines changed

2 files changed

+51
-13
lines changed

backend/src/main/java/filters/CorsFilter.java

Lines changed: 17 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -27,18 +27,27 @@ public void destroy() {
2727

2828
public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain)
2929
throws IOException, ServletException {
30-
// TODO Auto-generated method stub
31-
// place your code here
3230
HttpServletResponse response = (HttpServletResponse) resp;
3331
HttpServletRequest request = (HttpServletRequest) req;
3432
System.out.println("CorsFilter hit for: " + request.getRequestURI());
35-
// String origin = req.getHeader("Origin");
36-
37-
// response.setHeader("Access-Control-Allow-Origin","https://issues-deployment-tracker.vercel.app");
38-
response.setHeader("Access-Control-Allow-Origin","http://localhost:3000");
39-
response.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT,PATCH, DELETE, OPTIONS");
33+
34+
// Dynamic CORS: Allow both development and production origins
35+
String origin = request.getHeader("Origin");
36+
String[] allowedOrigins = {
37+
"http://localhost:3000",
38+
"https://issues-deployment-tracker.vercel.app"
39+
};
40+
41+
for (String allowed : allowedOrigins) {
42+
if (allowed.equals(origin)) {
43+
response.setHeader("Access-Control-Allow-Origin", origin);
44+
break;
45+
}
46+
}
47+
48+
response.setHeader("Access-Control-Allow-Methods", "GET, POST, PUT, PATCH, DELETE, OPTIONS");
4049
response.setHeader("Access-Control-Allow-Headers", "Content-Type, Authorization");
41-
response.setHeader("Access-Control-Allow-Credentials", "true"); // if using cookies/auth
50+
response.setHeader("Access-Control-Allow-Credentials", "true");
4251
response.setHeader("Cache-Control", "no-cache, no-store, must-revalidate");
4352
response.setHeader("Pragma", "no-cache");
4453
response.setHeader("Expires", "0");

backend/src/main/webapp/WEB-INF/web.xml

Lines changed: 34 additions & 5 deletions
Original file line numberDiff line numberDiff line change
@@ -9,15 +9,44 @@
99
<welcome-file>default.htm</welcome-file>
1010
<welcome-file>default.jsp</welcome-file>
1111
</welcome-file-list>
12+
<filter>
13+
<display-name>CorsFilter</display-name>
14+
<filter-name>CorsFilter</filter-name>
15+
<filter-class>filters.CorsFilter</filter-class>
16+
</filter>
17+
<filter-mapping>
18+
<filter-name>CorsFilter</filter-name>
19+
<url-pattern>/*</url-pattern>
20+
</filter-mapping>
1221
<filter>
1322
<display-name>AuthFilter</display-name>
1423
<filter-name>AuthFilter</filter-name>
1524
<filter-class>filters.AuthFilter</filter-class>
1625
</filter>
1726
<filter-mapping>
1827
<filter-name>AuthFilter</filter-name>
19-
<url-pattern>/AuthFilter</url-pattern>
28+
<url-pattern>/*</url-pattern>
2029
</filter-mapping>
30+
<servlet>
31+
<description></description>
32+
<display-name>RegisterServlet</display-name>
33+
<servlet-name>RegisterServlet</servlet-name>
34+
<servlet-class>servlets.RegisterServlet</servlet-class>
35+
</servlet>
36+
<servlet-mapping>
37+
<servlet-name>RegisterServlet</servlet-name>
38+
<url-pattern>/api/auth/register</url-pattern>
39+
</servlet-mapping>
40+
<servlet>
41+
<description></description>
42+
<display-name>LoginServlet</display-name>
43+
<servlet-name>LoginServlet</servlet-name>
44+
<servlet-class>servlets.LoginServlet</servlet-class>
45+
</servlet>
46+
<servlet-mapping>
47+
<servlet-name>LoginServlet</servlet-name>
48+
<url-pattern>/api/auth/login</url-pattern>
49+
</servlet-mapping>
2150
<servlet>
2251
<description></description>
2352
<display-name>SessionValidateServlet</display-name>
@@ -26,7 +55,7 @@
2655
</servlet>
2756
<servlet-mapping>
2857
<servlet-name>SessionValidateServlet</servlet-name>
29-
<url-pattern>/SessionValidateServlet</url-pattern>
58+
<url-pattern>/api/auth/validate</url-pattern>
3059
</servlet-mapping>
3160
<servlet>
3261
<description></description>
@@ -36,7 +65,7 @@
3665
</servlet>
3766
<servlet-mapping>
3867
<servlet-name>LogoutServlet</servlet-name>
39-
<url-pattern>/LogoutServlet</url-pattern>
68+
<url-pattern>/api/auth/logout</url-pattern>
4069
</servlet-mapping>
4170
<servlet>
4271
<description></description>
@@ -46,7 +75,7 @@
4675
</servlet>
4776
<servlet-mapping>
4877
<servlet-name>UserServlet</servlet-name>
49-
<url-pattern>/UserServlet</url-pattern>
78+
<url-pattern>/api/users/*</url-pattern>
5079
</servlet-mapping>
5180
<servlet>
5281
<description></description>
@@ -56,6 +85,6 @@
5685
</servlet>
5786
<servlet-mapping>
5887
<servlet-name>ProjectServlet</servlet-name>
59-
<url-pattern>/ProjectServlet</url-pattern>
88+
<url-pattern>/api/projects/*</url-pattern>
6089
</servlet-mapping>
6190
</web-app>

0 commit comments

Comments
 (0)