Merge remote-tracking branch 'hongwei/develop' into develop

This commit is contained in:
Marko Milić 2023-01-27 11:35:58 +01:00
commit d3329a2b2b

View File

@ -166,9 +166,7 @@ object OAuth2Login extends RestHelper with MdcLoggable {
}
}
//check the method, code.api.OAuth2Login.OAuth2Util.getOrCreateResourceUserFuture, we create user there.
val provider = JwtUtil.getIssuer(value).getOrElse("")
val user = Users.users.vend.getUserByUserName(provider, introspectOAuth2Token.getSub)
val user = Users.users.vend.getUserByUserName(hydraPublicUrl, introspectOAuth2Token.getSub)
user match {
case Full(u) =>
LoginAttempt.userIsLocked(u.provider, u.name) match {