Skip to content

Commit 1c32ed9

Browse files
committed
second login check md5 support for jhcis
1 parent c045dac commit 1c32ed9

1 file changed

Lines changed: 2 additions & 1 deletion

File tree

src/main/kotlin/ffc.airsync.api/services/user/UserResource.kt

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,6 +24,7 @@ import ffc.airsync.api.security.otp.OrgTimebaseOtp
2424
import ffc.airsync.api.security.token.TokenDao
2525
import ffc.airsync.api.security.token.tokens
2626
import ffc.airsync.api.services.ORGIDTYPE
27+
import ffc.airsync.api.services.user.jhcis.JHCISutil
2728
import ffc.entity.Token
2829
import ffc.entity.User
2930
import javax.annotation.security.RolesAllowed
@@ -100,7 +101,7 @@ class UserResource(
100101
if (UserDao.isBlockUser(username))
101102
throw BlacklistUserException()
102103

103-
return usersDao.findThat(orgId, username, pass)
104+
return usersDao.findThat(orgId, username, pass) ?: usersDao.findThat(orgId, username, JHCISutil().md5pass(pass))
104105
}
105106

106107
class LoginBody(val username: String, val password: String)

0 commit comments

Comments
 (0)