|
|
|
@ -10,12 +10,15 @@ import org.springframework.web.client.RestTemplate;
|
|
|
|
|
|
|
|
|
|
import javax.servlet.http.Cookie;
|
|
|
|
|
import javax.servlet.http.HttpServletRequest;
|
|
|
|
|
import java.util.Arrays;
|
|
|
|
|
import java.util.Collections;
|
|
|
|
|
|
|
|
|
|
@Component
|
|
|
|
|
public class AuthorizationUtils {
|
|
|
|
|
private final Logger log = Logger.getLogger(this.getClass());
|
|
|
|
|
private final SecurityConfig securityConfig;
|
|
|
|
|
private final static String TOKEN = "AccessToken";
|
|
|
|
|
private final static String SESSION = "OpenAIRESession";
|
|
|
|
|
|
|
|
|
|
@Autowired
|
|
|
|
|
AuthorizationUtils(SecurityConfig securityConfig) {
|
|
|
|
@ -27,10 +30,9 @@ public class AuthorizationUtils {
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
for (Cookie c : request.getCookies()) {
|
|
|
|
|
if (c.getName().equals("AccessToken")) {
|
|
|
|
|
if (c.getName().equals(TOKEN)) {
|
|
|
|
|
return c.getValue();
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
}
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
@ -39,14 +41,26 @@ public class AuthorizationUtils {
|
|
|
|
|
String url = securityConfig.getUserInfoUrl() + (securityConfig.isDeprecated()?getToken(request):"");
|
|
|
|
|
RestTemplate restTemplate = new RestTemplate();
|
|
|
|
|
try {
|
|
|
|
|
ResponseEntity<UserInfo> response = restTemplate.exchange(url, HttpMethod.GET, createHeaders(request), UserInfo.class);
|
|
|
|
|
return response.getBody();
|
|
|
|
|
if(hasCookie(request)) {
|
|
|
|
|
ResponseEntity<UserInfo> response = restTemplate.exchange(url, HttpMethod.GET, createHeaders(request), UserInfo.class);
|
|
|
|
|
return response.getBody();
|
|
|
|
|
}
|
|
|
|
|
return null;
|
|
|
|
|
} catch (RestClientException e) {
|
|
|
|
|
log.error(e.getMessage());
|
|
|
|
|
log.error(url + ":" + e.getMessage());
|
|
|
|
|
return null;
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private boolean hasCookie(HttpServletRequest request) {
|
|
|
|
|
Cookie[] cookies = request.getCookies();
|
|
|
|
|
if(securityConfig.isDeprecated()) {
|
|
|
|
|
return Arrays.stream(cookies).anyMatch(cookie -> cookie.getName().equalsIgnoreCase(TOKEN));
|
|
|
|
|
} else {
|
|
|
|
|
return Arrays.stream(cookies).anyMatch(cookie -> cookie.getName().equalsIgnoreCase(SESSION));
|
|
|
|
|
}
|
|
|
|
|
}
|
|
|
|
|
|
|
|
|
|
private HttpEntity<HttpHeaders> createHeaders(HttpServletRequest request) {
|
|
|
|
|
HttpHeaders headers = new HttpHeaders();
|
|
|
|
|
headers.setAccept(Collections.singletonList(MediaType.APPLICATION_JSON));
|
|
|
|
|