From 52fd6db133bdff01ad0495b12411e352e580a988 Mon Sep 17 00:00:00 2001 From: aidar Date: Thu, 18 Feb 2021 13:02:07 +0300 Subject: [PATCH] minor fix --- demo-client-app/src/App.js | 2 +- .../demoresourceserver/config/WebSocketConfig.java | 11 +++-------- 2 files changed, 4 insertions(+), 9 deletions(-) diff --git a/demo-client-app/src/App.js b/demo-client-app/src/App.js index bef8f74..23ce39c 100644 --- a/demo-client-app/src/App.js +++ b/demo-client-app/src/App.js @@ -32,7 +32,7 @@ const connect = async (token) => { stomp.connect( // { "X-Authorization": token.split(".").slice(0, 2).join(".") + ".alkdjalskdjals" }, - { "X-Authorization": token }, + { "Authorization": `Bearer ${token}` }, (frame) => { console.log("Connected", frame); diff --git a/demo-resource-server/src/main/java/ru/digitalbanana/demoresourceserver/config/WebSocketConfig.java b/demo-resource-server/src/main/java/ru/digitalbanana/demoresourceserver/config/WebSocketConfig.java index 8a37ccc..de0c3cf 100644 --- a/demo-resource-server/src/main/java/ru/digitalbanana/demoresourceserver/config/WebSocketConfig.java +++ b/demo-resource-server/src/main/java/ru/digitalbanana/demoresourceserver/config/WebSocketConfig.java @@ -41,14 +41,9 @@ public class WebSocketConfig implements WebSocketMessageBrokerConfigurer { public Message preSend(Message message, MessageChannel channel) { StompHeaderAccessor accessor = MessageHeaderAccessor.getAccessor(message, StompHeaderAccessor.class); - if (StompCommand.CONNECT.equals(accessor.getCommand())) { - List authorization = accessor.getNativeHeader("X-Authorization"); - - if (authorization == null || authorization.isEmpty()) { - return null; - } - - String accessToken = authorization.get(0); + if (accessor!=null && StompCommand.CONNECT.equals(accessor.getCommand())) { + List authorization = accessor.getNativeHeader("Authorization"); + String accessToken = authorization != null ? authorization.get(0).split(" ")[1] : ""; Jwt jwt = jwtDecoder.decode(accessToken); JwtAuthenticationConverter converter = new JwtAuthenticationConverter(); Authentication authentication = converter.convert(jwt);