Skip to content
Snippets Groups Projects
Commit a646f85f authored by William Enright's avatar William Enright Committed by Adrien Béraud
Browse files

AJAX calls now use Authorization: Bearer in headers

Change-Id: I67e7147bf89a1432347e5e0b79937f8befdfea19
parent 4a7f88a1
No related branches found
No related tags found
No related merge requests found
...@@ -61,7 +61,7 @@ public class LoginServlet extends HttpServlet { ...@@ -61,7 +61,7 @@ public class LoginServlet extends HttpServlet {
if(req.getHeader("authorization") != null){ if(req.getHeader("authorization") != null){
res = processUsernamePasswordAuth(req.getHeader("authorization")); res = processUsernamePasswordAuth(req.getHeader("authorization"));
} }
//Case 3 SSL Certificate //Case 2 SSL Certificate
else if(req.getAttribute("jakarta.servlet.request.X509Certificate") != null){ else if(req.getAttribute("jakarta.servlet.request.X509Certificate") != null){
res = processX509Auth((X509Certificate[])req.getAttribute("jakarta.servlet.request.X509Certificate")); res = processX509Auth((X509Certificate[])req.getAttribute("jakarta.servlet.request.X509Certificate"));
} }
......
...@@ -58,7 +58,7 @@ public class InstallFilter implements Filter { ...@@ -58,7 +58,7 @@ public class InstallFilter implements Filter {
boolean isLogin = false; boolean isLogin = false;
if(request.getServletPath().contains("start")) isLogin = true; if(request.getServletPath().contains("start")) isLogin = true;
SignedJWT signedJWT = null; SignedJWT signedJWT = null;
if(request.getHeader("authorization").contains("bearer") || request.getHeader("authorization").contains("Bearer")){ if(request.getHeader("authorization") != null && (request.getHeader("authorization").contains("bearer") || request.getHeader("authorization").contains("Bearer"))){
try { try {
JWSVerifier jwsVerifier = new RSASSAVerifier(userAuthenticationModule.getAuthModulePubKey()); JWSVerifier jwsVerifier = new RSASSAVerifier(userAuthenticationModule.getAuthModulePubKey());
signedJWT = SignedJWT.parse(request.getHeader("authorization").replace("bearer","").replace("Bearer","")); signedJWT = SignedJWT.parse(request.getHeader("authorization").replace("bearer","").replace("Bearer",""));
......
...@@ -79,7 +79,7 @@ function ajaxApiCall(api_path, request_type, data, credentials, callBackFunction ...@@ -79,7 +79,7 @@ function ajaxApiCall(api_path, request_type, data, credentials, callBackFunction
var jwt = localStorage.getItem('access_token'); var jwt = localStorage.getItem('access_token');
ajax['headers'] = { ajax['headers'] = {
"Bearer": jwt, "Authorization": "Bearer " + jwt,
} }
} }
...@@ -100,14 +100,15 @@ function ajaxApiCall(api_path, request_type, data, credentials, callBackFunction ...@@ -100,14 +100,15 @@ function ajaxApiCall(api_path, request_type, data, credentials, callBackFunction
var jwt = localStorage.getItem('access_token'); var jwt = localStorage.getItem('access_token');
ajax['headers'] = { ajax['headers'] = {
"Bearer": jwt, "Authorization": "Bearer " + jwt,
} }
} } else {
ajax['headers'] = { ajax['headers'] = {
"Content-type":"application/json", "Content-type":"application/json"
"Bearer": jwt
} }
}
ajax['data'] = JSON.stringify(data); ajax['data'] = JSON.stringify(data);
} }
} }
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Please to comment