Skip to content

Commit 9095366

Browse files
committed
well... user fetching now... just twice.
1 parent 1a36d30 commit 9095366

File tree

4 files changed

+22
-29
lines changed

4 files changed

+22
-29
lines changed

backend/src/main/java/filters/AuthFilter.java

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -40,9 +40,10 @@ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain
4040

4141
String path = request.getRequestURI();
4242
System.out.println("AuthFilter hit for: " + request.getRequestURI());
43+
System.out.println(path);
4344

4445
// whitelist login & register
45-
if (path.endsWith("/auth/login") || path.endsWith("/auth/register")) {
46+
if (path.endsWith("/api/auth/login") || path.endsWith("/api/auth/register")) {
4647
chain.doFilter(request, response);
4748
return;
4849
}
@@ -70,18 +71,24 @@ public void doFilter(ServletRequest req, ServletResponse resp, FilterChain chain
7071
}
7172
String SECRET_KEY = properties.getProperty("jwt.SECRET_KEY");
7273

74+
System.out.println(">>> Path: " + path);
75+
System.out.println(">>> Token (first 20 chars): " + token.substring(0, 20));
76+
System.out.println(">>> SECRET_KEY (length): " + (SECRET_KEY == null ? "null" : SECRET_KEY.length()));
77+
System.out.println(">>> SECRET_KEY (raw): '" + SECRET_KEY + "'");
78+
7379
Claims claims = Jwts.parser().setSigningKey(Keys.hmacShaKeyFor(SECRET_KEY.getBytes(StandardCharsets.UTF_8)))
7480
.build().parseClaimsJws(token).getBody();
7581

7682
request.setAttribute("id", claims.getSubject());
77-
request.setAttribute("fullName", claims.get("fullName"));
78-
request.setAttribute("email", claims.get("email"));
79-
request.setAttribute("role", claims.get("role"));
83+
request.setAttribute("fullName", (String) claims.get("fullName"));
84+
request.setAttribute("email", (String) claims.get("email"));
85+
request.setAttribute("role", (String) claims.get("role"));
8086

8187
// pass the request along the filter chain
8288
chain.doFilter(req, resp);
8389

8490
} catch (Exception e) {
91+
System.out.print(e);
8592
response.setStatus(HttpServletResponse.SC_UNAUTHORIZED);
8693
response.getWriter().write("{\"message\":\"Invalid token\"}");
8794
}

backend/src/main/java/servlets/UserServlet.java

Lines changed: 9 additions & 8 deletions
Original file line numberDiff line numberDiff line change
@@ -40,25 +40,26 @@ public UserServlet() {
4040
protected void doGet(HttpServletRequest request, HttpServletResponse response)
4141
throws ServletException, IOException {
4242
// TODO Auto-generated method stub
43-
String path = request.getPathInfo();
43+
String path = request.getRequestURI();
4444
System.out.println("UserServlet hit for: " + request.getRequestURI());
45+
System.out.println(path);
4546
ObjectMapper mapper = new ObjectMapper();
4647

47-
if ( path == null || path.equals("/") ) {
48+
if (path == null || path.equals("/IssuesandDeploymentTracker/api/users")) {
4849
List<User> users = userdao.findAll();
4950
List<UserDTO> userDtos = users.stream()
50-
.map(u -> new UserDTO(u.getId(), u.getFullName(), u.getEmail(), u.getRole().toString()))
51+
.map(u -> new UserDTO(u.getId(), u.getFullName(), u.getEmail(),
52+
(u.getRole() != null) ? u.getRole().toString() : "NONE"))
5153
.collect(Collectors.toList());
5254
response.setContentType("application/json");
5355
mapper.writeValue(response.getWriter(), userDtos);
5456
return;
5557

58+
} else {
59+
5660
}
57-
else {
58-
59-
}
60-
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
61-
response.getWriter().write("{\"message\":\"Endpoint not found\"}");
61+
response.setStatus(HttpServletResponse.SC_NOT_FOUND);
62+
response.getWriter().write("{\"message\":\"Endpoint not found\"}");
6263
}
6364

6465
/**

frontend/issue-tracker-ui/src/app/admin/page.tsx

Lines changed: 1 addition & 16 deletions
Original file line numberDiff line numberDiff line change
@@ -70,22 +70,7 @@ export function AdminDashboard({ user }: AdminDashboardProps) {
7070
createdAt: new Date().toISOString(),
7171
updatedAt: new Date().toISOString(),
7272
},
73-
{
74-
id: 4,
75-
email: "tester@company.com",
76-
fullName: "Tester",
77-
role: UserRole.TESTER,
78-
createdAt: new Date().toISOString(),
79-
updatedAt: new Date().toISOString(),
80-
},
81-
{
82-
id: 5,
83-
email: "newuser@company.com",
84-
fullName: "New User",
85-
role: UserRole.NONE,
86-
createdAt: new Date().toISOString(),
87-
updatedAt: new Date().toISOString(),
88-
},
73+
8974
]);
9075

9176
const [successMessage, setSuccessMessage] = useState("");

frontend/issue-tracker-ui/src/lib/api/users.ts

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -5,7 +5,7 @@ const BASE_URL = process.env.NEXT_PUBLIC_BACKEND_URL;
55
export async function fetchUsers() {
66
const res = await fetch(`${BASE_URL}/api/users`, {
77
method: "GET",
8-
credentials: "include",
8+
credentials: "include"
99
});
1010

1111
if (!res.ok) {

0 commit comments

Comments
 (0)