yujunjun/OpenMetadata
1
0
Fork 0
mirror of https://github.com/open-metadata/OpenMetadata.git synced 2025-09-26 09:22:14 +00:00
Code Issues Packages Projects Releases Wiki Activity

Fixed#8354: Support Login For User from multiple devices with different refresh tokens (#8454)

Browse Source 
* Fixed#8354: Support Login For User from multiple devices with different refresh tokens

* Fixed#8354: Support Login For User from multiple devices with different refresh tokens
This commit is contained in:
Parth Panchal 2022-10-31 19:17:26 +05:30 committed by GitHub
parent 953932c176
commit ca9c571179
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
1 changed files with 2 additions and 4 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

6
openmetadata-service/src/main/java/org/openmetadata/service/security/auth/BasicAuthenticator.java
View File

@ -9,7 +9,6 @@ import static org.openmetadata.schema.auth.ChangePasswordRequest.RequestType.SEL
import static org.openmetadata.schema.auth.ChangePasswordRequest.RequestType.USER; import static org.openmetadata.schema.auth.ChangePasswordRequest.RequestType.USER;
import static org.openmetadata.schema.auth.TokenType.EMAIL_VERIFICATION; import static org.openmetadata.schema.auth.TokenType.EMAIL_VERIFICATION;
import static org.openmetadata.schema.auth.TokenType.PASSWORD_RESET; import static org.openmetadata.schema.auth.TokenType.PASSWORD_RESET;
import static org.openmetadata.schema.auth.TokenType.REFRESH_TOKEN;
import static org.openmetadata.schema.entity.teams.AuthenticationMechanism.AuthType.BASIC; import static org.openmetadata.schema.entity.teams.AuthenticationMechanism.AuthType.BASIC;
import static org.openmetadata.service.exception.CatalogExceptionMessage.EMAIL_SENDING_ISSUE; import static org.openmetadata.service.exception.CatalogExceptionMessage.EMAIL_SENDING_ISSUE;
import static org.openmetadata.service.exception.CatalogExceptionMessage.INVALID_USERNAME_PASSWORD; import static org.openmetadata.service.exception.CatalogExceptionMessage.INVALID_USERNAME_PASSWORD;
@ -313,7 +312,6 @@ public class BasicAuthenticator implements AuthenticatorHandler {
@Override @Override
public RefreshToken createRefreshTokenForLogin(UUID currentUserId) throws JsonProcessingException { public RefreshToken createRefreshTokenForLogin(UUID currentUserId) throws JsonProcessingException {
// just delete the existing token // just delete the existing token
tokenRepository.deleteTokenByUserAndType(currentUserId.toString(), REFRESH_TOKEN.toString());
RefreshToken newRefreshToken = TokenUtil.getRefreshToken(currentUserId, UUID.randomUUID()); RefreshToken newRefreshToken = TokenUtil.getRefreshToken(currentUserId, UUID.randomUUID());
// save Refresh Token in Database // save Refresh Token in Database
tokenRepository.insertToken(newRefreshToken); tokenRepository.insertToken(newRefreshToken);
@ -323,7 +321,7 @@ public class BasicAuthenticator implements AuthenticatorHandler {
@Override @Override
public JwtResponse getNewAccessToken(String userName, TokenRefreshRequest request) throws IOException { public JwtResponse getNewAccessToken(String userName, TokenRefreshRequest request) throws IOException {
User storedUser = userRepository.getByName(null, userName, userRepository.getFields("*")); User storedUser = userRepository.getByName(null, userName, userRepository.getFieldsWithUserAuth("*"));
if (storedUser.getIsBot() != null && storedUser.getIsBot()) { if (storedUser.getIsBot() != null && storedUser.getIsBot()) {
throw new IllegalArgumentException("User are only allowed to login"); throw new IllegalArgumentException("User are only allowed to login");
} }
@ -364,7 +362,7 @@ public class BasicAuthenticator implements AuthenticatorHandler {
} }
// TODO: currently allow single login from a place, later multiple login can be added // TODO: currently allow single login from a place, later multiple login can be added
// just delete the existing token // just delete the existing token
tokenRepository.deleteTokenByUserAndType(currentUserId.toString(), REFRESH_TOKEN.toString()); tokenRepository.deleteToken(requestRefreshToken);
// we use rotating refresh token , generate new token // we use rotating refresh token , generate new token
RefreshToken newRefreshToken = TokenUtil.getRefreshToken(currentUserId, UUID.randomUUID()); RefreshToken newRefreshToken = TokenUtil.getRefreshToken(currentUserId, UUID.randomUUID());
// save Refresh Token in Database // save Refresh Token in Database