This is an automated email from the ASF dual-hosted git repository.
dockerzhang pushed a commit to branch master
in repository https://gitbox.apache.org/repos/asf/inlong.git
The following commit(s) were added to refs/heads/master by this push:
new 8e1f73553a [INLONG-8278][Manager] Add tenant into the login user info
(#8280)
8e1f73553a is described below
commit 8e1f73553a79d636bc8b44be40bdd64d3982fc56
Author: vernedeng <[email protected]>
AuthorDate: Mon Jun 19 21:33:21 2023 +0800
[INLONG-8278][Manager] Add tenant into the login user info (#8280)
---
.../src/main/java/org/apache/inlong/manager/pojo/user/UserInfo.java | 3 +++
.../inlong/manager/web/auth/tenant/TenantAuthenticatingRealm.java | 1 +
2 files changed, 4 insertions(+)
diff --git
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/UserInfo.java
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/UserInfo.java
index 8b32e9c2c1..73892b2c8e 100644
---
a/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/UserInfo.java
+++
b/inlong-manager/manager-pojo/src/main/java/org/apache/inlong/manager/pojo/user/UserInfo.java
@@ -47,6 +47,9 @@ public class UserInfo {
@ApiModelProperty(value = "Username")
private String name;
+ @ApiModelProperty(value = "Login Tenant")
+ private String tenant;
+
@ApiModelProperty(value = "User password")
private String password;
diff --git
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/tenant/TenantAuthenticatingRealm.java
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/tenant/TenantAuthenticatingRealm.java
index cffd642e2a..439050902d 100644
---
a/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/tenant/TenantAuthenticatingRealm.java
+++
b/inlong-manager/manager-web/src/main/java/org/apache/inlong/manager/web/auth/tenant/TenantAuthenticatingRealm.java
@@ -91,6 +91,7 @@ public class TenantAuthenticatingRealm extends
AuthenticatingRealm {
addRole(userInfo, tenantRoleInfo.getRoleCode());
}
+ userInfo.setTenant(tenant);
return new SimpleAuthenticationInfo(userInfo, tenant, getName());
}