From ee02f14efdfd6005d83e6a2392379228743d7d66 Mon Sep 17 00:00:00 2001 From: mtte Date: Sun, 29 Oct 2023 14:43:17 +0100 Subject: [PATCH 1/2] Fix fucking header (tmp) --- .../ch/relievers/relive/controllers/UserController.java | 4 +++- .../java/ch/relievers/relive/dtos/UserControllerDtos.java | 1 + .../java/ch/relievers/relive/services/UserService.java | 2 +- frontend/src/lib/api.ts | 1 - frontend/src/routes/events/join/[eventId]/+page.svelte | 8 ++++++-- 5 files changed, 11 insertions(+), 5 deletions(-) diff --git a/backend/src/main/java/ch/relievers/relive/controllers/UserController.java b/backend/src/main/java/ch/relievers/relive/controllers/UserController.java index 5823e3a..aad14c0 100644 --- a/backend/src/main/java/ch/relievers/relive/controllers/UserController.java +++ b/backend/src/main/java/ch/relievers/relive/controllers/UserController.java @@ -40,9 +40,11 @@ public ResponseEntity requestAutoUser(@RequestBody @Val new UsernamePasswordAuthenticationToken(newUserDto.getId(), defaultPassword)); SecurityContextHolder.getContext().setAuthentication(authentication); String jwt = jwtUtils.generateJwtToken(authentication); + newUserDto.setToken(jwt); return ResponseEntity.status(HttpStatus.CREATED) - .header("Auth", "Bearer " + jwt) + .header("X-Auth", "Bearer " + jwt) + .header("X-bullshit", "aksdjflkasjdflk") .body(newUserDto); } diff --git a/backend/src/main/java/ch/relievers/relive/dtos/UserControllerDtos.java b/backend/src/main/java/ch/relievers/relive/dtos/UserControllerDtos.java index 61f3d76..bab54cf 100644 --- a/backend/src/main/java/ch/relievers/relive/dtos/UserControllerDtos.java +++ b/backend/src/main/java/ch/relievers/relive/dtos/UserControllerDtos.java @@ -25,6 +25,7 @@ public static class RequestAutoUserResponse { private int id; private String name; private String registrationState; + private String token; } @Data diff --git a/backend/src/main/java/ch/relievers/relive/services/UserService.java b/backend/src/main/java/ch/relievers/relive/services/UserService.java index e7a3b6a..718accb 100644 --- a/backend/src/main/java/ch/relievers/relive/services/UserService.java +++ b/backend/src/main/java/ch/relievers/relive/services/UserService.java @@ -28,7 +28,7 @@ public class UserService { public RequestAutoUserResponse createAutoUser(String name) { User newUser = new User(name, User.RegistrationState.AUTO_CREATED, encoder.encode(defaultPassword)); User createdUser = userRepository.save(newUser); - return new RequestAutoUserResponse(createdUser.getId(), createdUser.getName(), createdUser.getRegistrationState().name()); + return new RequestAutoUserResponse(createdUser.getId(), createdUser.getName(), createdUser.getRegistrationState().name(), null); } public RegisterUserResponse registerUser(int userId, RegisterUserRequest request) { diff --git a/frontend/src/lib/api.ts b/frontend/src/lib/api.ts index 4d94a82..96ccfa4 100644 --- a/frontend/src/lib/api.ts +++ b/frontend/src/lib/api.ts @@ -13,7 +13,6 @@ function post(path: string, body) { return fetch(DATABASE_URL + path, { method: 'POST', headers: { 'content-type': 'application/json' }, - credentials: "include", body: JSON.stringify(body) }).then((res) => { if (!res.ok) { diff --git a/frontend/src/routes/events/join/[eventId]/+page.svelte b/frontend/src/routes/events/join/[eventId]/+page.svelte index fe16106..12ee794 100644 --- a/frontend/src/routes/events/join/[eventId]/+page.svelte +++ b/frontend/src/routes/events/join/[eventId]/+page.svelte @@ -19,7 +19,8 @@ const eventId = $page.params.eventId; try { const response = await api.post(`events/${eventId}/participations`, {}); - console.log(response); + const headers = response.headers; + console.log(headers); goto('/'); } catch (e) { alert(e); @@ -30,7 +31,10 @@ try { const response = await api.post('users/', { name: name }); const authorizationHeader = response.headers; - console.log(response); + const json =await response.json(); + console.log(json); + const token = json.token; + // console.log(response); // const bearerToken = authorizationHeader.split(' '); } catch (e) { alert(e); From 42bff85561a6d736659e1d606b032ae8ae5c0129 Mon Sep 17 00:00:00 2001 From: mtte Date: Sun, 29 Oct 2023 14:55:13 +0100 Subject: [PATCH 2/2] star the shit --- frontend/src/lib/ImageScroller.svelte | 5 +++-- frontend/src/lib/Relive.svelte | 12 +++++++++--- 2 files changed, 12 insertions(+), 5 deletions(-) diff --git a/frontend/src/lib/ImageScroller.svelte b/frontend/src/lib/ImageScroller.svelte index 5ef73d4..7e6830f 100644 --- a/frontend/src/lib/ImageScroller.svelte +++ b/frontend/src/lib/ImageScroller.svelte @@ -32,8 +32,9 @@ {#each events as event}