SemianiakaVY/BotSharp
1
0
Fork 0
Code Issues Pull requests Actions Packages Projects Releases Wiki Activity

Merge pull request #534 from iceljc/bugfix/fix-new-user-login

Browse source 
fix user log in
This commit is contained in:
C. Oceania 2024-07-10 19:50:39 -05:00 committed by GitHub
parent a0dcf80705 3062df4700
commit e7a7211f4d
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 3 additions and 3 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

6
src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs
View file

@ -88,6 +88,7 @@ public class UserService : IUserService
var base64 = Encoding.UTF8.GetString(Convert.FromBase64String(authorization));
var (id, password) = base64.SplitAsTuple(":");
var hooks = _services.GetServices<IAuthenticationHook>();
var db = _services.GetRequiredService<IBotSharpRepository>();
var record = id.Contains("@") ? db.GetUserByEmail(id) : db.GetUserByUserName(id);
if (record == null)
@ -96,7 +97,7 @@ public class UserService : IUserService
}
//verify password is correct or not.
if (record != null)
if (record != null && !hooks.Any())
{
var hashPassword = Utilities.HashTextMd5($"{password}{record.Salt}");
if (hashPassword != record.Password)
@ -107,7 +108,6 @@ public class UserService : IUserService
User? user = record;
var isAuthenticatedByHook = false;
var hooks = _services.GetServices<IAuthenticationHook>();
if (record == null || record.Source != "internal")
{
// check 3rd party user
@ -146,7 +146,7 @@ public class UserService : IUserService
}
}
if ((hooks != null && hooks.Any() && user == null) || record == null)
if ((hooks.Any() && user == null) || record == null)
{
return default;
}