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

Merge pull request #724 from Qtoss-AI/master

Browse source 
Remove AffiliateId
This commit is contained in:
Haiping 2024-11-05 03:06:02 +00:00 committed by GitHub
parent 63ab82676c d2f6b3794d
commit d1ec74fab4
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
3 changed files with 7 additions and 12 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
src/Infrastructure/BotSharp.Abstraction/Users/IUserIdentity.cs
View file

@ -13,8 +13,6 @@ public interface IUserIdentity
/// </summary>
string UserLanguage { get; }
string? Phone { get; }
string? AffiliateId { get; }
string? EmployeeId { get; }
string Type { get; }
string Role { get; }
string? RegionCode { get; }

4
src/Infrastructure/BotSharp.Core/Infrastructures/DistributedLocker.cs
View file

@ -31,7 +31,7 @@ public class DistributedLocker
}
}
public async Task<T> Lock<T>(string resource, Func<T> action, int timeoutInSeconds = 30)
public async Task Lock(string resource, Action action, int timeoutInSeconds = 30)
{
await ConnectToRedis();
@ -45,7 +45,7 @@ public class DistributedLocker
Serilog.Log.Logger.Error($"Acquire lock for {resource} failed due to after {timeout}s timeout.");
}
return action();
action();
}
}

13
src/Infrastructure/BotSharp.Core/Users/Services/UserIdentity.cs
View file

@ -70,18 +70,15 @@ public class UserIdentity : IUserIdentity
[JsonPropertyName("phone")]
public string? Phone => _claims?.FirstOrDefault(x => x.Type == "phone")?.Value;
[JsonPropertyName("affiliateId")]
public string? AffiliateId => _claims?.FirstOrDefault(x => x.Type == "affiliateId")?.Value;
[JsonPropertyName("employeeId")]
public string? EmployeeId => _claims?.FirstOrDefault(x => x.Type == "employeeId")?.Value;
[JsonPropertyName("type")]
public string? Type => _claims?.FirstOrDefault(x => x.Type == "type")?.Value;
[JsonPropertyName("role")]
public string? Role => _claims?.FirstOrDefault(x => x.Type == ClaimTypes.Role)?.Value;
[JsonPropertyName("regionCode")]
public string? RegionCode => _claims?.FirstOrDefault(x => x.Type == "regionCode")?.Value;
/// <summary>
/// US, CA, etc.
/// </summary>
[JsonPropertyName("region_code")]
public string? RegionCode => _claims?.FirstOrDefault(x => x.Type == "region_code")?.Value;
}