From 435c3e59682795fddaa9663e2f1e8401b90896e9 Mon Sep 17 00:00:00 2001
From: guoshilong <123456>
Date: Sat, 23 Sep 2023 15:29:00 +0800
Subject: [PATCH] Merge remote-tracking branch 'origin/main'
---
src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java | 7 ++++++-
1 files changed, 6 insertions(+), 1 deletions(-)
diff --git a/src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java b/src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java
index 05fbd2d..e444d6f 100644
--- a/src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java
+++ b/src/main/java/com/dji/sample/component/websocket/config/AuthPrincipalHandler.java
@@ -31,6 +31,7 @@
if (request instanceof ServletServerHttpRequest) {
HttpServletRequest servletRequest = ((ServletServerHttpRequest) request).getServletRequest();
String token = servletRequest.getParameter(AuthInterceptor.PARAM_TOKEN);
+ String workspaceId = servletRequest.getParameter(AuthInterceptor.WORKSPACE_ID);
if (!StringUtils.hasText(token)) {
return false;
@@ -42,6 +43,7 @@
}
servletRequest.setAttribute(AuthInterceptor.TOKEN_CLAIM, customClaim.get());
+ servletRequest.setAttribute(AuthInterceptor.WORKSPACE_ID, workspaceId);
return true;
}
return false;
@@ -63,7 +65,10 @@
CustomClaim claim = (CustomClaim) ((ServletServerHttpRequest) request).getServletRequest()
.getAttribute(AuthInterceptor.TOKEN_CLAIM);
- return () -> claim.getWorkspaceId() + "/" + claim.getUserType() + "/" + claim.getId();
+ String workspaceId = (String) ((ServletServerHttpRequest) request).getServletRequest()
+ .getAttribute(AuthInterceptor.WORKSPACE_ID);
+
+ return () -> workspaceId + "/" + claim.getUserType() + "/" + claim.getId();
}
return () -> null;
}
--
Gitblit v1.9.3