Skip to content

Commit ddebff6

Browse files
author
Haiping Chen
committed
Add UserName
1 parent 71e2c17 commit ddebff6

15 files changed

Lines changed: 32 additions & 7 deletions

File tree

‎src/Infrastructure/BotSharp.Abstraction/Users/IUserIdentity.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -4,6 +4,7 @@ public interface IUserIdentity
44
{
55
string Id { get; }
66
string Email { get; }
7+
string UserName { get; }
78
string FirstName { get; }
89
string LastName { get; }
910
}

‎src/Infrastructure/BotSharp.Abstraction/Users/Models/User.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -5,6 +5,7 @@ namespace BotSharp.Abstraction.Users.Models;
55
public class User
66
{
77
public string Id { get; set; } = string.Empty;
8+
public string UserName { get; set; } = string.Empty;
89
public string FirstName { get; set; } = string.Empty;
910
public string LastName { get; set; } = string.Empty;
1011
public string Email { get; set; } = string.Empty;

‎src/Infrastructure/BotSharp.Core/Infrastructures/Utilities.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -23,6 +23,9 @@ public static (string, string) SplitAsTuple(this string str, string sep)
2323
return (splits[0], splits[1]);
2424
}
2525

26+
/// <summary>
27+
/// Flush cache
28+
/// </summary>
2629
public static void ClearCache()
2730
{
2831
// Clear whole cache.

‎src/Infrastructure/BotSharp.Core/Users/Services/UserIdentity.cs‎

Lines changed: 3 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -17,6 +17,9 @@ public UserIdentity(IHttpContextAccessor contextAccessor)
1717
public string Id
1818
=> _claims?.FirstOrDefault(x => x.Type == ClaimTypes.NameIdentifier)?.Value!;
1919

20+
public string UserName
21+
=> _claims?.FirstOrDefault(x => x.Type == ClaimTypes.Name)?.Value!;
22+
2023
public string Email
2124
=> _claims?.FirstOrDefault(x => x.Type == ClaimTypes.Email)?.Value!;
2225

‎src/Infrastructure/BotSharp.Core/Users/Services/UserService.cs‎

Lines changed: 4 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,4 @@
11
using BotSharp.Abstraction.Repositories;
2-
using BotSharp.Abstraction.Repositories.Records;
32
using BotSharp.Abstraction.Users.Models;
43
using Microsoft.Extensions.Configuration;
54
using Microsoft.IdentityModel.Tokens;
@@ -29,12 +28,15 @@ public async Task<User> CreateUser(User user)
2928
}
3029

3130
record = user;
31+
record.UserName = user.UserName.ToLower();
3232
record.Email = user.Email.ToLower();
3333
record.Salt = Guid.NewGuid().ToString("N");
3434
record.Password = Utilities.HashText(user.Password, record.Salt);
35-
record.ExternalId = _user.Id;
3635

3736
db.CreateUser(record);
37+
38+
Utilities.ClearCache();
39+
3840
return record;
3941
}
4042

‎src/Infrastructure/BotSharp.OpenAPI/ViewModels/Users/UserCreationModel.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,10 +1,10 @@
11
using BotSharp.Abstraction.Users.Enums;
2-
using BotSharp.Abstraction.Users.Models;
32

43
namespace BotSharp.OpenAPI.ViewModels.Users;
54

65
public class UserCreationModel
76
{
7+
public string UserName { get; set; } = string.Empty;
88
public string FirstName { get; set; } = string.Empty;
99
public string LastName { get; set; } = string.Empty;
1010
public string Email { get; set; } = string.Empty;
@@ -15,6 +15,7 @@ public User ToUser()
1515
{
1616
return new User
1717
{
18+
UserName = UserName,
1819
FirstName = FirstName,
1920
LastName = LastName,
2021
Email = Email,

‎src/Infrastructure/BotSharp.OpenAPI/ViewModels/Users/UserViewModel.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -1,13 +1,13 @@
1-
using BotSharp.Abstraction.Agents.Enums;
21
using BotSharp.Abstraction.Users.Enums;
3-
using BotSharp.Abstraction.Users.Models;
42
using System.Text.Json.Serialization;
53

64
namespace BotSharp.OpenAPI.ViewModels.Users;
75

86
public class UserViewModel
97
{
108
public string Id { get; set; }
9+
[JsonPropertyName("user_name")]
10+
public string UserName { get; set; }
1111
[JsonPropertyName("first_name")]
1212
public string FirstName { get; set; }
1313
[JsonPropertyName("last_name")]
@@ -32,6 +32,7 @@ public static UserViewModel FromUser(User user)
3232
return new UserViewModel
3333
{
3434
Id = user.Id,
35+
UserName = user.UserName,
3536
FirstName = user.FirstName,
3637
LastName = user.LastName,
3738
Email = user.Email,

‎src/Plugins/BotSharp.Plugin.ChatHub/SignalRHub.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -24,14 +24,15 @@ public SignalRHub(IServiceProvider services,
2424

2525
public override async Task OnConnectedAsync()
2626
{
27-
_logger.LogInformation($"SignalR Hub: {_user.FirstName} {_user.LastName} ({Context.UserIdentifier}) connected in {Context.ConnectionId} [{DateTime.Now}]");
27+
_logger.LogInformation($"SignalR Hub: {_user.FirstName} {_user.LastName} ({Context.User.Identity.Name}) connected in {Context.ConnectionId}");
2828

2929
var hooks = _services.GetServices<IConversationHook>();
3030
var convService = _services.GetRequiredService<IConversationService>();
3131
_context.HttpContext.Request.Query.TryGetValue("conversationId", out var conversationId);
3232

3333
if (!string.IsNullOrEmpty(conversationId))
3434
{
35+
_logger.LogInformation($"Connection {Context.ConnectionId} is with conversation {conversationId}");
3536
var conv = await convService.GetConversation(conversationId);
3637
if (conv != null)
3738
{

‎src/Plugins/BotSharp.Plugin.MongoStorage/Collections/UserDocument.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -2,6 +2,7 @@ namespace BotSharp.Plugin.MongoStorage.Collections;
22

33
public class UserDocument : MongoBase
44
{
5+
public string UserName { get; set; }
56
public string FirstName { get; set; }
67
public string LastName { get; set; }
78
public string Email { get; set; }

‎src/Plugins/BotSharp.Plugin.MongoStorage/Repository/MongoRepository.cs‎

Lines changed: 5 additions & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -117,6 +117,7 @@ public int Transaction<TTableInterface>(Action action)
117117
var users = _users.Select(x => new UserDocument
118118
{
119119
Id = !string.IsNullOrEmpty(x.Id) ? x.Id : Guid.NewGuid().ToString(),
120+
UserName = x.UserName,
120121
FirstName = x.FirstName,
121122
LastName = x.LastName,
122123
Salt = x.Salt,
@@ -132,6 +133,7 @@ public int Transaction<TTableInterface>(Action action)
132133
{
133134
var filter = Builders<UserDocument>.Filter.Eq(x => x.Id, user.Id);
134135
var update = Builders<UserDocument>.Update
136+
.Set(x => x.UserName, user.UserName)
135137
.Set(x => x.FirstName, user.FirstName)
136138
.Set(x => x.LastName, user.LastName)
137139
.Set(x => x.Email, user.Email)
@@ -868,6 +870,7 @@ public List<Conversation> GetLastConversations()
868870
return user != null ? new User
869871
{
870872
Id = user.Id,
873+
UserName = user.UserName,
871874
FirstName = user.FirstName,
872875
LastName = user.LastName,
873876
Email = user.Email,
@@ -884,6 +887,7 @@ public List<Conversation> GetLastConversations()
884887
return user != null ? new User
885888
{
886889
Id = user.Id,
890+
UserName = user.UserName,
887891
FirstName = user.FirstName,
888892
LastName = user.LastName,
889893
Email = user.Email,
@@ -901,6 +905,7 @@ public void CreateUser(User user)
901905
var userCollection = new UserDocument
902906
{
903907
Id = Guid.NewGuid().ToString(),
908+
UserName = user.UserName,
904909
FirstName = user.FirstName,
905910
LastName = user.LastName,
906911
Salt = user.Salt,

0 commit comments

Comments
 (0)