tonitch/Clyde
1
0
Fork 0
forked from PGL/Clyde
Code Pull Requests Activity

Merge pull request 'Fixing the cross origine on the frontend side + request in json' (#79) from tonitch/front/fix/crossOrigine into master

Browse Source 
Reviewed-on: PGL/Clyde#79
Reviewed-by: Maxime <231026@umons.ac.be>
This commit is contained in:
Debucquoy Anthony 2024-03-09 18:18:15 +01:00
commit 31159ebb5c
3 changed files with 9 additions and 6 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
backend/src/main/java/ovh/herisson/Clyde/EndPoints/LoginController.java
View File

@ -9,7 +9,7 @@ import ovh.herisson.Clyde.Services.AuthenticatorService;
import java.util.Date; import java.util.Date;
@RestController @RestController
@CrossOrigin(origins = "http://localhost:5173") @CrossOrigin(origins = "http://localhost:5173", allowCredentials = "true")
public class LoginController { public class LoginController {
private final AuthenticatorService authServ; private final AuthenticatorService authServ;

2
frontend/src/rest/Users.js
View File

@ -1,7 +1,7 @@
import { restGet, restPost } from './restConsumer.js' import { restGet, restPost } from './restConsumer.js'
export async function login(user, pass, exp){ export async function login(user, pass, exp){
return restPost("/login", {login: user, password: pass, expiration: exp}); return restPost("/login", {identifier: user, password: pass, expirationDate: exp});
} }
export async function register(user, pass, mail){ export async function register(user, pass, mail){

11
frontend/src/rest/restConsumer.js
View File

@ -8,15 +8,15 @@ export async function restGet(endPoint) {
} }
export async function restPost(endPoint, data) { export async function restPost(endPoint, data) {
return await _rest(endPoint, {method: "POST", body: data}); return await _rest(endPoint, {method: "POST", credentials: 'include', body: JSON.stringify(data)});
} }
export async function restDelete(endPoint, data) { export async function restDelete(endPoint, data) {
return await _rest(endPoint, {method: "DELETE", body: data}); return await _rest(endPoint, {method: "DELETE", credentials: 'include', body: JSON.stringify(data)});
} }
export async function restPatch(endPoint, data) { export async function restPatch(endPoint, data) {
return await _rest(endPoint, {method: "PATCH", body: data}); return await _rest(endPoint, {method: "PATCH", credentials: 'include', body: JSON.stringify(data)});
} }
/** /**
@ -31,7 +31,10 @@ export async function restPatch(endPoint, data) {
async function _rest(endPoint, config){ async function _rest(endPoint, config){
endPoint.at(0) != "/" ? console.error("Carefull, you certainly should put a / at the begenning of your endPoint ") : true; endPoint.at(0) != "/" ? console.error("Carefull, you certainly should put a / at the begenning of your endPoint ") : true;
let session_token = getCookie("session_token"); let session_token = getCookie("session_token");
let headers = new Headers({'Authorization': session_token}); let headers = new Headers({
'Authorization': session_token,
'Content-Type': 'application/json',
});
config['headers'] = headers; config['headers'] = headers;
return toast.promise(fetch(restURL + endPoint, config), return toast.promise(fetch(restURL + endPoint, config),
{ {