holy! the server app is finished & model is nice now

OwnChar/Api/Clients/CharactersApiClient.cs

@@ -0,0 +1,5 @@
+namespace OwnChar.Api.Clients;
+
+internal class CharactersApiClient(OwnCharApiClient client) : ICharactersApiClient
+{
+}

OwnChar/Api/Clients/GroupsApiClient.cs

@@ -0,0 +1,43 @@
+using OwnChar.Api.Packets.General;
+using OwnChar.Api.Packets.Groups;
+using OwnChar.Data.Model.Client;
+
+namespace OwnChar.Api.Clients;
+
+internal class GroupsApiClient(IOwnCharApiClient client) : IGroupsApiClient
+{
+    public async Task<Group?> GetGroup(long id)
+    {
+        var result = await client.SendRequest<GetSingleObjectResponse<Group>>("/groups/get/byid", new GetSinlgeObjectRequest(id));
+        result.EnsureOk();
+        return result.Message.Result;
+    }
+
+    public async Task<IEnumerable<Group>> GetGroupsForProfile(long userProfileId)
+    {
+        var result = await client.SendRequest<GetGroupsResponse>("/groups/get", new GetGroupsRequest
+        {
+            ProfileId = userProfileId,
+            UseProfileId = true,
+        });
+        result.EnsureOk();
+        return result.Message.Groups;
+    }
+
+    public async Task<IEnumerable<Group>> GetPublicGroups()
+    {
+        var result = await client.SendRequest<GetGroupsResponse>("/groups/get", new GetGroupsRequest());
+        result.EnsureOk();
+        return result.Message.Groups;
+    }
+
+    public async Task<IEnumerable<Group>> GetAllGroups()
+    {
+        var result = await client.SendRequest<GetGroupsResponse>("/groups/get", new GetGroupsRequest
+        {
+            IncludeNonPublic = true,
+        });
+        result.EnsureOk();
+        return result.Message.Groups;
+    }
+}

OwnChar/Api/Clients/ICharactersApiClient.cs

@@ -0,0 +1,5 @@
+namespace OwnChar.Api.Clients;
+
+public interface ICharactersApiClient
+{
+}

OwnChar/Api/Clients/IGroupsApiClient.cs

@@ -0,0 +1,10 @@
+using OwnChar.Data.Model.Client;
+
+namespace OwnChar.Api.Clients;
+public interface IGroupsApiClient
+{
+    Task<IEnumerable<Group>> GetAllGroups();
+    Task<Group?> GetGroup(long id);
+    Task<IEnumerable<Group>> GetGroupsForProfile(long userProfileId);
+    Task<IEnumerable<Group>> GetPublicGroups();
+}

OwnChar/Api/Clients/ILoginApiClient.cs

@@ -0,0 +1,9 @@
+using OwnChar.Data.Model.Client;
+using Pilz.Cryptography;
+
+namespace OwnChar.Api.Clients;
+public interface ILoginApiClient
+{
+    Task<UserProfile?> Login(string username, SecureString password);
+    Task<bool> Logout();
+}

OwnChar/Api/Clients/IUsersApiClient.cs

@@ -0,0 +1,11 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace OwnChar.Api.Clients;
+
+public interface IUsersApiClient
+{
+}

OwnChar/Api/Clients/LoginApiClient.cs

@@ -0,0 +1,30 @@
+using OwnChar.Api.Packets.General;
+using OwnChar.Data.Model.Client;
+using Pilz.Cryptography;
+
+namespace OwnChar.Api.Clients;
+
+internal class LoginApiClient(OwnCharApiClient client) : ILoginApiClient
+{
+    public async Task<UserProfile?> Login(string username, SecureString password)
+    {
+        var result = await client.SendRequest<LoginResponse>("/auth/login", new LoginRequest(username, password));
+        result.EnsureOk();
+
+        if (!string.IsNullOrEmpty(result.Message.Secret) && result.Message.Profile != null && result.Message.Account != null)
+        {
+            client.AuthKey = result.Message.Secret;
+            client.CurrentUser = result.Message.Account;
+            return result.Message.Profile;
+        }
+
+        return null;
+    }
+
+    public async Task<bool> Logout()
+    {
+        var res = await client.SendRequest("/auth/logout");
+        client.AuthKey = null;
+        return res.IsOk;
+    }
+}

OwnChar/Api/Clients/UsersApiClient.cs

@@ -0,0 +1,5 @@
+namespace OwnChar.Api.Clients;
+
+internal class UsersApiClient(IOwnCharApiClient client) : IUsersApiClient
+{
+}

OwnChar/Api/Endpoint/CharactersApi.cs

@@ -0,0 +1,29 @@
+namespace OwnChar.Api.Endpoint;
+
+internal class CharactersApi(IOwnCharApiServer server)
+{
+    private IResult GetCharacter(long characterId)
+    {
+
+    }
+
+    private IResult CreateGroupCharacter(string name, long groupId)
+    {
+
+    }
+
+    private IResult CreateUserCharacter(string name, long userId)
+    {
+
+    }
+
+    private IResult UpdateCharacter(long characterId)
+    {
+
+    }
+
+    private IResult DeleteCharacter(long characterId)
+    {
+
+    }
+}

OwnChar/Api/Endpoint/GroupsApi.cs

@@ -0,0 +1,184 @@
+using OwnChar.Api.Packets.General;
+using OwnChar.Api.Packets.Groups;
+using OwnChar.Api.Updates;
+using OwnChar.Data;
+using OwnChar.Data.Model.Client;
+using OwnChar.Data.Model.Server;
+using OwnChar.Server.Extensions;
+using Pilz.Net.Api;
+
+namespace OwnChar.Api.Endpoint;
+
+internal class GroupsApi(IOwnCharApiServer server)
+{
+    [MessageHandler("/group/get/byid")]
+    public ApiResult GetById(GetSinlgeObjectRequest request, ApiRequestInfo info)
+    {
+        if (!server.CheckLogin(info, UserType.Guest, out UserAccountDb? user))
+            return ApiResult.Unauthorized();
+
+        if (server.Data?.Set<GroupDb>().FirstOrDefault(n => n.Id == request.ObjectId && n.Members.Any(m => m.User != null && m.User.Id == user.Id)) is not GroupDb group)
+            return ApiResult.NotFound();
+
+        return ApiResult.Ok(new GetSingleObjectResponse<Group>(group.ToClient()));
+    }
+
+    [MessageHandler("/group/get", RequiesAuth = true)]
+    public ApiResult Get(GetGroupsRequest request, ApiRequestInfo info)
+    {
+        if (!server.CheckLogin(info, UserType.Guest, out UserAccountDb? user))
+            return ApiResult.Unauthorized();
+
+        IQueryable<GroupDb> groups;
+
+        if (request.UseProfileId && server.Data!.Set<UserProfileDb>().FirstOrDefault(p => p.Id == request.ProfileId) is UserProfileDb profile)
+            groups = server.Data!.Set<GroupDb>().Where(group => group.Members.Any(m => m.User != null && m.User.Id == profile.Id));
+        else if (request.IncludeNonPublic && user.Is(UserType.Admin))
+            groups = server.Data!.Set<GroupDb>();
+        else
+            groups = Array.Empty<GroupDb>().AsQueryable(); // Currently not supported.
+
+        return ApiResult.Ok(new GetGroupsResponse([.. groups.Select(g => g.ToClient())]));
+    }
+
+    [MessageHandler("/group/create", RequiesAuth = true)]
+    public ApiResult Create(CreateGroupRequest request, ApiRequestInfo info)
+    {
+        if (!server.CheckLogin(info, UserType.User, out UserAccountDb? user))
+            return ApiResult.Unauthorized();
+
+        var group = new GroupDb();
+
+        if (!string.IsNullOrWhiteSpace(request.Name))
+            group.Name = request.Name;
+
+        group.Members.Add(new()
+        {
+            User = user.Profile,
+            Level = MemberLevel.Owner,
+        });
+
+        server.Data!.Update(group);
+        server.Data.SaveChanges();
+
+        return ApiResult.Ok(new CreateGroupResponse(group.ToClient()));
+    }
+
+    [MessageHandler("/group/update", RequiesAuth = true)]
+    public ApiResult Update(UpdateRequest request, ApiRequestInfo info)
+    {
+        if (!server.CheckLogin(info, UserType.User, out UserAccountDb? user)
+            || server.Data?.Set<GroupDb>().FirstOrDefault(n => n.Id == request.Update.Id) is not GroupDb group
+            || !group.Members.Any(m => m.Id == user.Profile!.Id && m.Level >= MemberLevel.Admin
+            || user.IsNot(UserType.Admin)))
+            return ApiResult.Unauthorized();
+
+        if (request.Update is not GroupUpdate update)
+            return ApiResult.NotFound();
+
+        group.Name = update.Name;
+        group.Fandom = update.Fandom;
+
+        server.Data.Update(group);
+        server.Data.SaveChanges();
+
+        return ApiResult.Ok();
+    }
+
+    [MessageHandler("/group/delete", RequiesAuth = true)]
+    public ApiResult Delete(DeleteObjectRequest request, ApiRequestInfo info)
+    {
+        if (!server.CheckLogin(info, UserType.User, out UserAccountDb? user)
+            || server.Data?.Set<GroupDb>().FirstOrDefault(n => n.Id == request.ObjectId) is not GroupDb group
+            || !group.Members.Any(m => m.Id == user.Profile!.Id && m.Level >= MemberLevel.Owner)
+            || user.IsNot(UserType.Admin))
+            return ApiResult.Unauthorized();
+
+        server.Data.Remove(group);
+        server.Data.SaveChanges();
+
+        return ApiResult.Ok();
+    }
+
+    [MessageHandler("/group/members/get", RequiesAuth = true)]
+    public ApiResult GetMembers(GetGroupMembersRequest request, ApiRequestInfo info)
+    {
+        if (!server.CheckLogin(info, UserType.User, out UserAccountDb? user)
+            || server.Data?.Set<GroupDb>().FirstOrDefault(n => n.Id == request.GroupId) is not GroupDb group
+            || !group.Members.Any(m => m.Id == user.Profile!.Id && m.Level >= MemberLevel.Member)
+            || user.IsNot(UserType.Admin))
+            return ApiResult.Unauthorized();
+
+        var members = group.Members.Select(n => n.ToClient());
+        return ApiResult.Ok(new GetGroupMembersResponse(members.ToList()));
+    }
+
+    [MessageHandler("/group/members/add", RequiesAuth = true)]
+    public ApiResult AddMembers(GroupMemberAddRequest request, ApiRequestInfo info)
+    {
+        if (!server.CheckLogin(info, UserType.User, out UserAccountDb? user)
+            || server.Data?.Set<GroupDb>().FirstOrDefault(n => n.Id == request.GroupId) is not GroupDb group
+            || !group.Members.Any(m => m.Id == user.Profile!.Id && m.Level >= MemberLevel.Admin)
+            || user.IsNot(UserType.Admin))
+            return ApiResult.Unauthorized();
+
+        var addedMembers = new List<MemberEntryDb>();
+
+        foreach (var kvp in request.Members)
+        {
+            if (group.Members.FirstOrDefault(m => m.User != null && m.User.Id == kvp.Key) is not MemberEntryDb member
+                && server.Data.Set<UserProfileDb>().FirstOrDefault(u => u.Id == kvp.Key) is UserProfileDb mu)
+            {
+                member = new()
+                {
+                    User = mu,
+                    Level = kvp.Value,
+                };
+                server.Data.Update(member);
+                server.Data.Update(group);
+                server.Data.SaveChanges();
+            }
+        }
+
+        return ApiResult.Ok(new GroupMemberAddResponse(addedMembers.Select(m => m.ToClient()).ToList()));
+    }
+
+    [MessageHandler("/group/members/update", RequiesAuth = true)]
+    public ApiResult UpdateMember(UpdateRequest request, ApiRequestInfo info)
+    {
+        if (!server.CheckLogin(info, UserType.User, out UserAccountDb? user)
+            || server.Data?.Set<GroupDb>().FirstOrDefault(n => n.Id == request.Update.Id) is not GroupDb group
+            || group.Members.FirstOrDefault(m => m.Id == request.Update.Id) is not MemberEntryDb member
+            || !group.Members.Any(m => m.Id == user.Profile!.Id && m.Level >= MemberLevel.Admin
+            || user.IsNot(UserType.Admin)))
+            return ApiResult.Unauthorized();
+
+        if (request.Update is not MemberUpdate update)
+            return ApiResult.NotFound();
+
+        member.Level = update.Level;
+
+        server.Data.Update(member);
+        server.Data.SaveChanges();
+
+        return ApiResult.Ok();
+    }
+
+    [MessageHandler("/group/members/remove", RequiesAuth = true)]
+    public ApiResult RemoveMembers(DeleteObjectRequest request, ApiRequestInfo info)
+    {
+        if (!server.CheckLogin(info, UserType.User, out UserAccountDb? user)
+            || server.Data?.Set<MemberEntryDb>().FirstOrDefault(m => m.Id == request.ObjectId) is not MemberEntryDb member
+            || server.Data?.Set<GroupDb>().FirstOrDefault(n => n.Members.Contains(member)) is not GroupDb group
+            || !group.Members.Any(m => m.Id == user.Profile!.Id && m.Level >= MemberLevel.Admin
+            || user.IsNot(UserType.Admin)))
+            return ApiResult.Unauthorized();
+
+        group.Members.Remove(member);
+        server.Data.Remove(member);
+        server.Data.Update(group);
+        server.Data.SaveChanges();
+
+        return ApiResult.Ok();
+    }
+}

OwnChar/Api/Endpoint/LoginApi.cs

@@ -0,0 +1,30 @@
+using OwnChar.Api.Packets;
+using OwnChar.Api.Packets.General;
+using OwnChar.Data.Model.Server;
+using OwnChar.Server.Extensions;
+using Pilz.Net.Api;
+
+namespace OwnChar.Api.Endpoint;
+
+internal class LoginApi(OwnCharApiServer server)
+{
+    [MessageHandler("/auth/login")]
+    public ApiResult Login(LoginRequest request, ApiRequestInfo info)
+    {
+        if (server.Data?.Set<UserAccountDb>()?.FirstOrDefault(n => n.Username == request.Username && n.Password == request.Password) is UserAccountDb acc && acc.Profile != null)
+        {
+            if (info.IsAuthenticated)
+                server.Logout(info.AuthKey);
+            return ApiResult.Ok(new LoginResponse(acc.ToClient(), acc.Profile.ToClient(), server.Login(acc)));
+        }
+        return ApiResult.NotFound();
+    }
+
+    [MessageHandler("/auth/logout")]
+    public ApiResult Logout(ApiRequestInfo info)
+    {
+        if (info.IsAuthenticated)
+            server.Logout(info.AuthKey);
+        return ApiResult.Ok();
+    }
+}

OwnChar/Api/Endpoint/UsersApi.cs

@@ -0,0 +1,39 @@
+namespace OwnChar.Api.Endpoint;
+
+internal class UsersApi(IOwnCharApiServer server)
+{
+    private IResult GetUsers()
+    {
+
+    }
+
+    private IResult GetUser(long userId)
+    {
+
+    }
+
+    private IResult GetUserProfile(long userId)
+    {
+
+    }
+
+    private IResult CreateUser(string username, string password)
+    {
+
+    }
+
+    private IResult DeleteUser(long userId)
+    {
+
+    }
+
+    private IResult UpdateUserPassword(long userId, string username, string password)
+    {
+
+    }
+
+    private IResult UpdateUserProfile(long profileId, string displayName)
+    {
+
+    }
+}

OwnChar/Api/Exceptions/ApiException.cs

@@ -0,0 +1,5 @@
+namespace OwnChar.Api.Exceptions;
+
+public class ApiException(string message) : Exception(message)
+{
+}

OwnChar/Api/IOwnCharApiClient.cs

@@ -0,0 +1,21 @@
+using OwnChar.Api.Clients;
+using OwnChar.Data.Model.Client;
+using Pilz.Net.Api;
+using System.Diagnostics.CodeAnalysis;
+
+namespace OwnChar.Api;
+public interface IOwnCharApiClient : IApiClient
+{
+    UserAccount? CurrentUser { get; }
+
+    [MemberNotNullWhen(true, nameof(AuthKey), nameof(CurrentUser))]
+    bool IsLoggedIn { get; }
+
+    ILoginApiClient Auth { get; }
+    
+    IGroupsApiClient Groups { get; }
+    
+    ICharactersApiClient Characters { get; }
+    
+    IUsersApiClient Users { get; }
+}

OwnChar/Api/IOwnCharApiServer.cs

@@ -0,0 +1,20 @@
+using Microsoft.EntityFrameworkCore;
+using OwnChar.Data.Model.Base;
+using Pilz.Net.Api;
+using System.Diagnostics.CodeAnalysis;
+
+namespace OwnChar.Api;
+
+public interface IOwnCharApiServer : IApiServer
+{
+    DbContext? Data { get; }
+
+    [MemberNotNull(nameof(Data))]
+    void CheckLogin(string secret);
+
+    [MemberNotNullWhen(true, nameof(Data))]
+    bool IsLoggedIn(string secret);
+
+    [MemberNotNullWhen(true, nameof(Data))]
+    UserAccountBase? GetUser(string secret);
+}

OwnChar/Api/OwnCharApiClient.cs

@@ -0,0 +1,38 @@
+using OwnChar.Api.Clients;
+using OwnChar.Data.Model.Client;
+using Pilz.Cryptography;
+using Pilz.Net.Api;
+using System.Diagnostics.CodeAnalysis;
+
+namespace OwnChar.Api;
+
+internal class OwnCharApiClient : ApiClient, IOwnCharApiClient
+{
+    public UserAccount? CurrentUser { get; internal set; }
+
+    [MemberNotNullWhen(true, nameof(AuthKey), nameof(CurrentUser))]
+    public bool IsLoggedIn => CurrentUser != null && !string.IsNullOrWhiteSpace(AuthKey);
+
+    public ILoginApiClient Auth { get; }
+
+    public IGroupsApiClient Groups { get; }
+
+    public ICharactersApiClient Characters { get; }
+
+    public IUsersApiClient Users { get; }
+
+    public OwnCharApiClient(string apiUrl) : base(apiUrl)
+    {
+        Auth = new LoginApiClient(this);
+        Groups = new GroupsApiClient(this);
+        Characters = new CharactersApiClient(this);
+        Users = new UsersApiClient(this);
+    }
+
+    protected override string? EncodeAuthKey()
+    {
+        if (IsLoggedIn && !string.IsNullOrWhiteSpace(CurrentUser.Username))
+            return new SecureString($"{CurrentUser}:{AuthKey}", false).EncryptedValue;
+        return AuthKey;
+    }
+}

OwnChar/Api/OwnCharApiServer.cs

@@ -0,0 +1,89 @@
+using Microsoft.EntityFrameworkCore;
+using OwnChar.Api;
+using OwnChar.Api.Endpoint;
+using OwnChar.Data.Model.Base;
+using OwnChar.Server.Data;
+using Pilz.Cryptography;
+using Pilz.Extensions.Collections;
+using Pilz.Net.Api;
+
+namespace OwnChar.Api;
+
+internal class OwnCharApiServer(string apiUrl, string dbServer, string dbDatabase, string dbUser, SecureString dbPassword) : ApiServer(apiUrl), IOwnCharApiServer
+{
+    private readonly Dictionary<string, UserAccountBase> users = [];
+
+    public DbContext? Data { get; private set; }
+
+    public override void Start()
+    {
+        Log.Info("Prepairing server");
+
+        // Load database
+        Log.Debug("Loading database");
+        Data = new DatabaseContext(dbServer, dbDatabase, dbUser, dbPassword);
+
+        // Built-in endpoints
+        Log.Debug("Loading internal api endpoints");
+        RegisterHandler(new LoginApi(this));
+        RegisterHandler(new UsersApi(this));
+        RegisterHandler(new GroupsApi(this));
+        RegisterHandler(new CharactersApi(this));
+
+        // Run server
+        Log.Info("Starting webserver");
+        base.Start();
+    }
+
+    protected override string? DecodeAuthKey(string authKey)
+    {
+        if (!string.IsNullOrWhiteSpace(authKey))
+            return new SecureString(authKey, true).Value;
+        return authKey;
+    }
+
+    protected override bool CheckAuthentication(string authKey)
+    {
+        return string.IsNullOrWhiteSpace(authKey)
+            || authKey.Split(":") is not string[] authKeyParts
+            || authKey.Length != 2
+            || string.IsNullOrWhiteSpace(authKeyParts[0])
+            || string.IsNullOrWhiteSpace(authKeyParts[1])
+            || !IsLoggedIn(authKeyParts[1]);
+    }
+
+    public string Login(UserAccountBase account)
+    {
+        var secret = new UniquieID(UniquieIDGenerationMode.GenerateOnInit).ID;
+        users.Add(secret, account);
+        Log.DebugFormat("Logged-in out user with secret {0}", secret);
+        return secret;
+    }
+
+    public void Logout(string secret)
+    {
+        users.Remove(secret);
+        Log.DebugFormat("Logged-out user with secret {0}", secret);
+    }
+
+    public bool IsLoggedIn(string secret)
+    {
+        Log.DebugFormat("Deleting user with secret {0}", secret);
+        return users.ContainsKey(secret);
+    }
+
+    public void CheckLogin(string secret)
+    {
+        Log.DebugFormat("Checking login for user with secret {0}", secret);
+        if (!IsLoggedIn(secret))
+            throw new UnauthorizedAccessException();
+    }
+
+    public UserAccountBase? GetUser(string secret)
+    {
+        Log.DebugFormat("Getting user with secret {0}", secret);
+        if (users.TryGetValue(secret, out UserAccountBase? value))
+            return value;
+        return null;
+    }
+}

OwnChar/Api/Packets/General/DeleteObjectRequest.cs

@@ -0,0 +1,8 @@
+using OwnChar.Api.Packets;
+
+namespace OwnChar.Api.Packets.General;
+
+public class DeleteObjectRequest(long objectId) : OwnCharRequest
+{
+    public long ObjectId { get; } = objectId;
+}

OwnChar/Api/Packets/General/GetSingleObjectResponse.cs

@@ -0,0 +1,9 @@
+using OwnChar.Api.Packets;
+using OwnChar.Data;
+
+namespace OwnChar.Api.Packets.General;
+
+public class GetSingleObjectResponse<T>(T? result) : OwnCharResponse where T : OwnCharObject
+{
+    public T? Result { get; } = result;
+}

OwnChar/Api/Packets/General/GetSinlgeObjectRequest.cs

@@ -0,0 +1,8 @@
+using OwnChar.Api.Packets;
+
+namespace OwnChar.Api.Packets.General;
+
+public class GetSinlgeObjectRequest(long objectId) : OwnCharRequest
+{
+    public long ObjectId { get; } = objectId;
+}

OwnChar/Api/Packets/General/LoginRequest.cs

@@ -0,0 +1,10 @@
+using OwnChar.Api.Packets;
+using Pilz.Cryptography;
+
+namespace OwnChar.Api.Packets.General;
+
+public class LoginRequest(string username, SecureString password) : OwnCharRequest
+{
+    public new string Username { get; set; } = username;
+    public SecureString Password { get; } = password;
+}

OwnChar/Api/Packets/General/LoginResponse.cs

@@ -0,0 +1,11 @@
+using OwnChar.Api.Packets;
+using OwnChar.Data.Model.Client;
+
+namespace OwnChar.Api.Packets.General;
+
+public class LoginResponse(UserAccount? account, UserProfile? profile, string? secret) : OwnCharResponse
+{
+    public UserAccount? Account { get; } = account;
+    public UserProfile? Profile { get; } = profile;
+    public string? Secret { get; } = secret;
+}

OwnChar/Api/Packets/General/SetOwnerRequest.cs

@@ -0,0 +1,7 @@
+namespace OwnChar.Api.Packets.General;
+
+public class SetOwnerRequest : OwnCharRequest
+{
+    public long ObjectId { get; set; }
+    public bool Enforce { get; set; }
+}

OwnChar/Api/Packets/General/UpdateRequest.cs

@@ -0,0 +1,9 @@
+using OwnChar.Api.Packets;
+using OwnChar.Api.Updates;
+
+namespace OwnChar.Api.Packets.General;
+
+public class UpdateRequest(OwnCharObjectUpdate update) : OwnCharRequest
+{
+    public OwnCharObjectUpdate Update { get; } = update;
+}

OwnChar/Api/Packets/Groups/CreateGroupRequest.cs

@@ -0,0 +1,8 @@
+using OwnChar.Api.Packets;
+
+namespace OwnChar.Api.Packets.Groups;
+
+public class CreateGroupRequest : OwnCharRequest
+{
+    public string? Name { get; set; }
+}

OwnChar/Api/Packets/Groups/CreateGroupResponse.cs

@@ -0,0 +1,9 @@
+using OwnChar.Api.Packets;
+using OwnChar.Data.Model.Client;
+
+namespace OwnChar.Api.Packets.Groups;
+
+public class CreateGroupResponse(Group? group) : OwnCharResponse
+{
+    public Group? Group { get; } = group;
+}

OwnChar/Api/Packets/Groups/GetGroupMembersRequest.cs

@@ -0,0 +1,8 @@
+using OwnChar.Api.Packets;
+
+namespace OwnChar.Api.Packets.Groups;
+
+public class GetGroupMembersRequest(long groupId) : OwnCharRequest
+{
+    public long GroupId { get; } = groupId;
+}

OwnChar/Api/Packets/Groups/GetGroupMembersResponse.cs

@@ -0,0 +1,9 @@
+using OwnChar.Data;
+using OwnChar.Data.Model.Client;
+
+namespace OwnChar.Api.Packets.Groups;
+
+public class GetGroupMembersResponse(List<MemberEntry> members) : OwnCharResponse
+{
+    public List<MemberEntry> Members { get; } = members;
+}

OwnChar/Api/Packets/Groups/GetGroupsRequest.cs

@@ -0,0 +1,10 @@
+using OwnChar.Api.Packets;
+
+namespace OwnChar.Api.Packets.Groups;
+
+public class GetGroupsRequest : OwnCharRequest
+{
+    public long ProfileId { get; set; } = -1;
+    public bool UseProfileId { get; set; }
+    public bool IncludeNonPublic { get; set; }
+}

OwnChar/Api/Packets/Groups/GetGroupsResponse.cs

@@ -0,0 +1,9 @@
+using OwnChar.Api.Packets;
+using OwnChar.Data.Model.Client;
+
+namespace OwnChar.Api.Packets.Groups;
+
+public class GetGroupsResponse(List<Group> groups) : OwnCharResponse
+{
+    public List<Group> Groups { get; } = groups;
+}

OwnChar/Api/Packets/Groups/GroupMemberAddRequest.cs

@@ -0,0 +1,9 @@
+using OwnChar.Data;
+
+namespace OwnChar.Api.Packets.Groups;
+
+public class GroupMemberAddRequest() : OwnCharRequest
+{
+    public long GroupId { get; set; } = -1;
+    public Dictionary<long, MemberLevel> Members { get; set; } = [];
+}

OwnChar/Api/Packets/Groups/GroupMemberAddResponse.cs

@@ -0,0 +1,8 @@
+using OwnChar.Data.Model.Client;
+
+namespace OwnChar.Api.Packets.Groups;
+
+public class GroupMemberAddResponse(List<MemberEntry> addedMembers) : OwnCharResponse
+{
+    public List<MemberEntry> AddedMembers { get; } = addedMembers;
+}

OwnChar/Api/Packets/OwnCharRequest.cs

@@ -0,0 +1,7 @@
+using Pilz.Net.Api;
+
+namespace OwnChar.Api.Packets;
+
+public class OwnCharRequest : ApiMessage
+{
+}

OwnChar/Api/Packets/OwnCharResponse.cs

@@ -0,0 +1,7 @@
+using Pilz.Net.Api;
+
+namespace OwnChar.Api.Packets;
+
+public class OwnCharResponse : ApiMessage
+{
+}

OwnChar/Api/Packets/UserProfiles/GetUserProfileRequest.cs

@@ -0,0 +1,8 @@
+using OwnChar.Api.Packets;
+
+namespace OwnChar.Api.Packets.UserProfiles;
+
+public class GetUserProfileRequest(long userProfileId) : OwnCharRequest
+{
+    public long UserProfileId { get; } = userProfileId;
+}

OwnChar/Api/Packets/UserProfiles/GetUserProfileResponse.cs

@@ -0,0 +1,9 @@
+using OwnChar.Api.Packets;
+using OwnChar.Data.Model.Client;
+
+namespace OwnChar.Api.Packets.UserProfiles;
+
+public class GetUserProfileResponse(UserProfile? profile) : OwnCharResponse
+{
+    public UserProfile? Profile { get; } = profile;
+}

OwnChar/Api/Packets/UserProfiles/GetUserProfilesRequest.cs

@@ -0,0 +1,8 @@
+using OwnChar.Api.Packets;
+
+namespace OwnChar.Api.Packets.UserProfiles;
+
+public class GetUserProfilesRequest : OwnCharRequest
+{
+    public bool AllProfiles { get; set; }
+}

OwnChar/Api/Packets/UserProfiles/GetUserProfilesResponse.cs

@@ -0,0 +1,9 @@
+using OwnChar.Api.Packets;
+using OwnChar.Data.Model.Client;
+
+namespace OwnChar.Api.Packets.UserProfiles;
+
+public class GetUserProfilesResponse(List<UserProfile> profiles) : OwnCharResponse
+{
+    public List<UserProfile> Profiles { get; } = profiles;
+}

OwnChar/Api/Updates/GroupUpdate.cs

@@ -1,6 +1,6 @@
-using OwnChar.Client.Data.Model;
+using OwnChar.Data.Model.Client;
 
-namespace OwnChar.Base.Data.Updates;
+namespace OwnChar.Api.Updates;
 
 public class GroupUpdate : OwnCharObjectUpdate
 {

OwnChar/Api/Updates/MemberUpdate.cs

@@ -0,0 +1,9 @@
+using OwnChar.Data;
+
+namespace OwnChar.Api.Updates;
+
+public class MemberUpdate : OwnCharObjectUpdate
+{
+    public long GroupId { get; set; }
+    public MemberLevel Level { get; set; }
+}

OwnChar/Api/Updates/OwnCharObjectUpdate.cs

@@ -1,4 +1,6 @@
-namespace OwnChar.Base.Data.Updates;
+using OwnChar.Data;
+
+namespace OwnChar.Api.Updates;
 
 public abstract class OwnCharObjectUpdate
 {

OwnChar/AssemblyInfo.cs

@@ -0,0 +1,3 @@
+using System.Runtime.CompilerServices;
+
+[assembly: InternalsVisibleTo("OwnChar.Server")]

OwnChar/Base/Data/Requests/GroupMemberAddRequest.cs

@@ -1,8 +0,0 @@
-using OwnChar.Client.Data.Model;
-
-namespace OwnChar.Base.Data.Requests;
-
-public class GroupMemberAddRequest
-{
-    public Dictionary<long, MemberLevel> Members { get; } = [];
-}

OwnChar/Base/Data/Requests/GroupMemberRemoveRequest.cs

@@ -1,8 +0,0 @@
-using OwnChar.Client.Data.Model;
-
-namespace OwnChar.Base.Data.Requests;
-
-public class GroupMemberRemoveRequest
-{
-    public List<long> Members { get; } = [];
-}

OwnChar/Base/Data/Requests/LoginRequest.cs

@@ -1,9 +0,0 @@
-using Pilz.Cryptography;
-
-namespace OwnChar.Base.Data.Requests;
-
-public class LoginRequest(string username, SecureString password)
-{
-    public string Username { get; } = username;
-    public SecureString Password { get; } = password;
-}

OwnChar/Base/Data/Requests/LogoutRequest.cs

@@ -1,5 +0,0 @@
-namespace OwnChar.Base.Data.Requests;
-
-public class LogoutRequest
-{
-}

OwnChar/Base/Data/Requests/UpdateRequest.cs

@@ -1,8 +0,0 @@
-using OwnChar.Base.Data.Updates;
-
-namespace OwnChar.Base.Data.Requests;
-
-public class UpdateRequest(OwnCharObjectUpdate update)
-{
-    public OwnCharObjectUpdate Update { get; } = update;
-}

OwnChar/Base/Data/Responses/LoginResponse.cs

@@ -1,10 +0,0 @@
-using OwnChar.Client.Data.Model;
-
-namespace OwnChar.Base.Data.Responses;
-
-public class LoginResponse(UserAccount account, UserProfile profile, string secret)
-{
-    public UserAccount Account { get; } = account;
-    public UserProfile Profile { get; } = profile;
-    public string? Secret { get; } = secret;
-}

OwnChar/Client/Data/Clients/CharactersApiClient.cs

@@ -1,5 +0,0 @@
-namespace OwnChar.Client.Data.Clients;
-
-public class CharactersApiClient
-{
-}

OwnChar/Client/Data/Clients/GroupsApiClient.cs

@@ -1,5 +0,0 @@
-namespace OwnChar.Client.Data.Clients;
-
-public class GroupsApiClient
-{
-}

OwnChar/Client/Data/Clients/LoginApiClient.cs

@@ -1,14 +0,0 @@
-namespace OwnChar.Client.Data.Clients;
-
-public class LoginApiClient
-{
-    public string Login(string username, string password)
-    {
-
-    }
-
-    public string Logout()
-    {
-
-    }
-}

OwnChar/Client/Data/Clients/UsersApiClient.cs

@@ -1,5 +0,0 @@
-namespace OwnChar.Client.Data.Clients;
-
-public class UsersApiClient
-{
-}

OwnChar/Client/Data/Model/Group.cs

@@ -1,14 +0,0 @@
-using OwnChar.Base.Data.Model;
-
-namespace OwnChar.Client.Data.Model;
-
-public class Group() : GroupBase
-{
-    internal Group(GroupBase group) : this()
-    {
-        Id = group.Id;
-        Name = group.Name;
-        IsInternal = group.IsInternal;
-        Fandom = group.Fandom;
-    }
-}

OwnChar/Client/Data/Model/MemberEntry.cs

@@ -1,13 +0,0 @@
-using OwnChar.Base.Data.Model;
-
-namespace OwnChar.Client.Data.Model;
-
-public class MemberEntry() : MemberEntryBase
-{
-    internal MemberEntry(MemberEntryBase entry) : this()
-    {
-        Id = entry.Id;
-        User = entry.User;
-        Level = entry.Level;
-    }
-}

OwnChar/Client/Data/Model/UserAccount.cs

@@ -1,14 +0,0 @@
-using OwnChar.Base.Data.Model;
-
-namespace OwnChar.Client.Data.Model;
-
-public class UserAccount() : UserAccountBase
-{
-    internal UserAccount(UserAccountBase account) : this()
-    {
-        Id = account.Id;
-        Username = account.Username;
-        Email = account.Email;
-        Type = account.Type;
-    }
-}

OwnChar/Client/Data/Model/UserProfile.cs

@@ -1,12 +0,0 @@
-using OwnChar.Base.Data.Model;
-
-namespace OwnChar.Client.Data.Model;
-
-public class UserProfile() : UserProfileBase
-{
-    internal UserProfile(UserProfileBase profile) : this()
-    {
-        Id = profile.Id;
-        Name = profile.Name;
-    }
-}

OwnChar/Client/Data/OwnCharApiClient.cs

@@ -1,6 +0,0 @@
-namespace OwnChar.Client.Data;
-
-public class OwnCharApiClient
-{
-    private readonly HttpClient httpClient = new();
-}

OwnChar/Client/IOwnCharManager.cs

@@ -1,25 +0,0 @@
-using OwnChar.Client.Managers;
-using OwnChar.Data;
-using OwnChar.Model;
-using Pilz.Cryptography;
-
-namespace OwnChar.Client;
-
-public interface IOwnCharManager
-{
-    IDataManager? DataManager { get; set; }
-    UserAccountBase? CurrentUser { get; }
-    bool IsLoggedIn { get; }
-
-    IUserManager Users { get; }
-    IGroupsManager Groups { get; }
-    ICharacterManager Characters { get; }
-
-    bool Login(IDataManager? proxy, string? username, SecureString? password);
-    bool Logout();
-
-    public static IOwnCharManager CreateDefault()
-    {
-        return new OwnCharManager();
-    }
-}

OwnChar/Data/MemberLevel.cs

@@ -1,4 +1,4 @@
-namespace OwnChar.Base.Data;
+namespace OwnChar.Data;
 
 public enum MemberLevel
 {

OwnChar/Data/Model.Base/CharacterBase.cs

@@ -1,4 +1,4 @@
-namespace OwnChar.Base.Data.Model;
+namespace OwnChar.Data.Model.Base;
 
 public abstract class CharacterBase : OwnCharObject
 {

OwnChar/Data/Model.Base/GroupBase.cs

@@ -1,8 +1,8 @@
-namespace OwnChar.Base.Data.Model;
+namespace OwnChar.Data.Model.Base;
 
 public abstract class GroupBase : OwnCharObject
 {
     public virtual string? Name { get; set; }
-    public virtual string? Fandom {  get; set; }
+    public virtual string? Fandom { get; set; }
     public virtual bool IsInternal { get; set; }
 }

OwnChar/Data/Model.Base/MemberEntryBase.cs

@@ -1,6 +1,4 @@
-using OwnChar.Client.Data.Model;
+namespace OwnChar.Data.Model.Base;
-
-namespace OwnChar.Base.Data.Model;
 
 public abstract class MemberEntryBase : OwnCharObject
 {

OwnChar/Data/Model.Base/PropertyBase.cs

@@ -1,4 +1,4 @@
-namespace OwnChar.Base.Data.Model;
+namespace OwnChar.Data.Model.Base;
 
 public abstract class PropertyBase : OwnCharObject
 {

OwnChar/Data/Model.Base/PropertyCategoryBase.cs

@@ -1,4 +1,4 @@
-namespace OwnChar.Base.Data.Model;
+namespace OwnChar.Data.Model.Base;
 
 public abstract class PropertyCategoryBase : OwnCharObject
 {

OwnChar/Data/Model.Base/UserAccountBase.cs

@@ -1,4 +1,4 @@
-namespace OwnChar.Base.Data.Model;
+namespace OwnChar.Data.Model.Base;
 
 public abstract class UserAccountBase : OwnCharObject
 {

OwnChar/Data/Model.Base/UserProfileBase.cs

@@ -1,4 +1,4 @@
-namespace OwnChar.Base.Data.Model;
+namespace OwnChar.Data.Model.Base;
 
 public abstract class UserProfileBase : OwnCharObject
 {

OwnChar/Data/Model.Client/Character.cs

@@ -1,6 +1,6 @@
-using OwnChar.Base.Data.Model;
+using OwnChar.Data.Model.Base;
 
-namespace OwnChar.Client.Data.Model;
+namespace OwnChar.Data.Model.Client;
 
 public class Character() : CharacterBase
 {

OwnChar/Data/Model.Client/Group.cs

@@ -0,0 +1,7 @@
+using OwnChar.Data.Model.Base;
+
+namespace OwnChar.Data.Model.Client;
+
+public class Group : GroupBase
+{
+}

OwnChar/Data/Model.Client/MemberEntry.cs

@@ -0,0 +1,8 @@
+using OwnChar.Data.Model.Base;
+
+namespace OwnChar.Data.Model.Client;
+
+public class MemberEntry() : MemberEntryBase
+{
+    public long UserProfileId { get; set; }
+}

OwnChar/Data/Model.Client/Property.cs

@@ -1,6 +1,6 @@
-using OwnChar.Base.Data.Model;
+using OwnChar.Data.Model.Base;
 
-namespace OwnChar.Client.Data.Model;
+namespace OwnChar.Data.Model.Client;
 
 public class Property() : PropertyBase
 {

OwnChar/Data/Model.Client/PropertyCategory.cs

@@ -1,6 +1,6 @@
-using OwnChar.Base.Data.Model;
+using OwnChar.Data.Model.Base;
 
-namespace OwnChar.Client.Data.Model;
+namespace OwnChar.Data.Model.Client;
 
 public class PropertyCategory() : PropertyCategoryBase
 {

OwnChar/Data/Model.Client/UserAccount.cs

@@ -0,0 +1,7 @@
+using OwnChar.Data.Model.Base;
+
+namespace OwnChar.Data.Model.Client;
+
+public class UserAccount() : UserAccountBase
+{
+}

OwnChar/Data/Model.Client/UserProfile.cs

@@ -0,0 +1,7 @@
+using OwnChar.Data.Model.Base;
+
+namespace OwnChar.Data.Model.Client;
+
+public class UserProfile() : UserProfileBase
+{
+}

OwnChar/Data/Model.Server/CharacterDb.cs

@@ -1,11 +1,10 @@
-using OwnChar.Base.Data.Model;
+using OwnChar.Data.Model.Base;
-using OwnChar.Client.Data.Model;
 
-namespace OwnChar.Server.Data.Model;
+namespace OwnChar.Data.Model.Server;
 
 public class CharacterDb : CharacterBase
 {
-    public UserProfileDb? Owner {  get; set; }
+    public UserProfileDb? Owner { get; set; }
     public List<PropertyCategoryDb> PropCats { get; } = [];
     public List<PropertyDb> Props { get; } = [];
 }

OwnChar/Data/Model.Server/DatabaseContext.cs

@@ -1,8 +1,9 @@
 using Microsoft.EntityFrameworkCore;
+using Pilz.Cryptography;
 
-namespace OwnChar.Data;
+namespace OwnChar.Server.Data;
 
-public class DatabaseContext(string? dbHost, string? dbUser, string? dbPassword) : DbContext
+public class DatabaseContext(string dbHost, string dbDatabase, string dbUser, SecureString dbPassword) : DbContext
 {
     protected override void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
     {

OwnChar/Data/Model.Server/GroupDb.cs

@@ -0,0 +1,9 @@
+using OwnChar.Data.Model.Base;
+
+namespace OwnChar.Data.Model.Server;
+
+public class GroupDb : GroupBase
+{
+    public List<CharacterDb> Characters { get; } = [];
+    public List<MemberEntryDb> Members { get; } = [];
+}

OwnChar/Data/Model.Server/MemberEntryDb.cs

@@ -0,0 +1,8 @@
+using OwnChar.Data.Model.Base;
+
+namespace OwnChar.Data.Model.Server;
+
+public class MemberEntryDb() : MemberEntryBase
+{
+    public virtual UserProfileDb? User { get; set; }
+}

OwnChar/Data/Model.Server/PropertyCategoryDb.cs

@@ -0,0 +1,7 @@
+using OwnChar.Data.Model.Base;
+
+namespace OwnChar.Data.Model.Server;
+
+public class PropertyCategoryDb : PropertyCategoryBase
+{
+}

OwnChar/Data/Model.Server/PropertyDb.cs

@@ -0,0 +1,7 @@
+using OwnChar.Data.Model.Base;
+
+namespace OwnChar.Data.Model.Server;
+
+public class PropertyDb : PropertyBase
+{
+}

OwnChar/Data/Model.Server/UserAccountDb.cs

@@ -1,6 +1,6 @@
-using OwnChar.Base.Data.Model;
+using OwnChar.Data.Model.Base;
 
-namespace OwnChar.Server.Data.Model;
+namespace OwnChar.Data.Model.Server;
 
 public class UserAccountDb : UserAccountBase
 {

OwnChar/Data/Model.Server/UserProfileDb.cs

@@ -1,6 +1,6 @@
-using OwnChar.Base.Data.Model;
+using OwnChar.Data.Model.Base;
 
-namespace OwnChar.Server.Data.Model;
+namespace OwnChar.Data.Model.Server;
 
 public class UserProfileDb : UserProfileBase
 {

OwnChar/Data/OwnCharObject.cs

@@ -1,4 +1,4 @@
-namespace OwnChar.Base.Data;
+namespace OwnChar.Data;
 
 public class OwnCharObject
 {

OwnChar/Data/UserType.cs

@@ -1,9 +1,9 @@
-namespace OwnChar.Base.Data;
+namespace OwnChar.Data;
 
 public enum UserType
 {
     None,
     Guest,
     User,
-    Admin
+    Admin,
 }

OwnChar/Extensions/ApiRequestInfoExtensions.cs

@@ -0,0 +1,11 @@
+using Pilz.Net.Api;
+
+namespace OwnChar.Extensions;
+
+public static class ApiRequestInfoExtensions
+{
+    public static string? GetUsername(this ApiRequestInfo @this)
+    {
+        return @this.AuthKey?.Split(':').ElementAtOrDefault(0);
+    }
+}

OwnChar/Extensions/ModelExtensions.cs

@@ -0,0 +1,48 @@
+using OwnChar.Data.Model.Client;
+using OwnChar.Data.Model.Server;
+
+namespace OwnChar.Server.Extensions;
+
+public static class ModelExtensions
+{
+    public static Group ToClient(this GroupDb @this)
+    {
+        return new()
+        {
+            Id = @this.Id,
+            Name = @this.Name,
+            Fandom = @this.Fandom,
+            IsInternal = @this.IsInternal,
+        };
+    }
+
+    public static UserAccount ToClient(this UserAccountDb @this)
+    {
+        return new()
+        {
+            Id = @this.Id,
+            Email = @this.Email,
+            Type = @this.Type,
+            Username = @this.Username,
+        };
+    }
+
+    public static UserProfile ToClient(this UserProfileDb @this)
+    {
+        return new()
+        {
+            Id = @this.Id,
+            Name = @this.Name,
+        };
+    }
+
+    public static MemberEntry ToClient(this MemberEntryDb @this)
+    {
+        return new()
+        {
+            Id = @this.Id,
+            UserProfileId = @this.User!.Id,
+            Level = @this.Level,
+        };
+    }
+}

OwnChar/Extensions/OwnCharApiServerExtensions.cs

@@ -0,0 +1,47 @@
+using OwnChar.Api;
+using OwnChar.Data;
+using OwnChar.Data.Model.Base;
+using OwnChar.Data.Model.Server;
+using Pilz.Net.Api;
+using System.Diagnostics.CodeAnalysis;
+
+namespace OwnChar.Server.Extensions;
+
+public static class OwnCharApiServerExtensions
+{
+    public static bool CheckLogin(this IOwnCharApiServer server, ApiRequestInfo request, UserType userType)
+    {
+        if (server.Data is null
+            || !request.IsAuthenticated
+            || request.AuthKey.Split(":") is not string[] authKey
+            || authKey.ElementAtOrDefault(0) is not string username
+            || authKey.ElementAtOrDefault(1) is not string secret
+            || string.IsNullOrWhiteSpace(username)
+            || string.IsNullOrWhiteSpace(secret)
+            || !server.IsLoggedIn(secret)
+            || server.GetUser(secret) is not UserAccountBase usr
+            || usr.Type < userType)
+            return false;
+        return true;
+    }
+
+    public static bool CheckLogin(this IOwnCharApiServer server, ApiRequestInfo request, UserType userType, [NotNullWhen(true)] out UserAccountDb? user)
+    {
+        if (server.Data is null
+            || !request.IsAuthenticated
+            || request.AuthKey.Split(":") is not string[] authKey
+            || authKey.ElementAtOrDefault(0) is not string username
+            || authKey.ElementAtOrDefault(1) is not string secret
+            || string.IsNullOrWhiteSpace(username)
+            || string.IsNullOrWhiteSpace(secret)
+            || !server.IsLoggedIn(secret)
+            || server.GetUser(secret) is not UserAccountDb usr
+            || usr.Type < userType)
+        {
+            user = null;
+            return false;
+        }
+        user = usr;
+        return true;
+    }
+}

OwnChar/IOwnCharManager.cs

@@ -0,0 +1,23 @@
+using OwnChar.Api;
+using OwnChar.Data.Model.Client;
+using OwnChar.Modules;
+using Pilz.Cryptography;
+
+namespace OwnChar;
+
+public interface IOwnCharManager
+{
+    bool IsLoggedIn { get; }
+
+    IOwnCharApiClient? Api { get; }
+
+    IUserManager Users { get; }
+    
+    IGroupsManager Groups { get; }
+    
+    ICharacterManager Characters { get; }
+
+    Task<UserProfile?> Login(string? username, SecureString? password);
+
+    Task<bool> Logout();
+}

OwnChar/JsonHelpers.cs

@@ -0,0 +1,39 @@
+using Newtonsoft.Json;
+using OwnChar.Api.Packets;
+
+namespace OwnChar;
+
+public static class JsonHelpers
+{
+    private static JsonSerializerSettings? defaultSerializerSettings;
+
+    public static JsonSerializerSettings DefaultSerializerSettings => defaultSerializerSettings ??= CreateDefaultSerializerSettings();
+
+    private static JsonSerializerSettings CreateDefaultSerializerSettings()
+    {
+        return new JsonSerializerSettings
+        {
+            TypeNameHandling = TypeNameHandling.Auto,
+        };
+    }
+
+    public static string? SerializeRequest<T>(T request) where T : OwnCharRequest
+    {
+        return JsonConvert.SerializeObject(request, DefaultSerializerSettings);
+    }
+
+    public static string? SerializeResponse<T>(T request) where T : OwnCharResponse
+    {
+        return JsonConvert.SerializeObject(request, DefaultSerializerSettings);
+    }
+
+    public static T? DeserializeRequest<T>(string request) where T : OwnCharRequest
+    {
+        return JsonConvert.DeserializeObject<T>(request, DefaultSerializerSettings);
+    }
+
+    public static T? DeserializeResponse<T>(string request) where T : OwnCharResponse
+    {
+        return JsonConvert.DeserializeObject<T>(request, DefaultSerializerSettings);
+    }
+}

OwnChar/Modules/CharacterManager.cs

@@ -1,7 +1,7 @@
 using OwnChar.Data;
 using OwnChar.Model;
 
-namespace OwnChar.Client.Managers;
+namespace OwnChar.Modules;
 
 internal class CharacterManager(OwnCharManager manager) : OwnCharManagerModule(manager), ICharacterManager
 {

OwnChar/Modules/GroupsManager.cs

@@ -1,7 +1,4 @@
-using OwnChar.Data;
+namespace OwnChar.Modules;
-using OwnChar.Model;
-
-namespace OwnChar.Client.Managers;
 
 internal class GroupsManager(OwnCharManager manager) : OwnCharManagerModule(manager), IGroupsManager
 {

OwnChar/Modules/ICharacterManager.cs

@@ -1,6 +1,6 @@
 using OwnChar.Model;
 
-namespace OwnChar.Client.Managers;
+namespace OwnChar.Modules;
 public interface ICharacterManager
 {
     CharacterBase? CreateCharacter(string? name);

OwnChar/Modules/IGroupsManager.cs

@@ -1,6 +1,6 @@
 using OwnChar.Model;
 
-namespace OwnChar.Client.Managers;
+namespace OwnChar.Modules;
 public interface IGroupsManager
 {
     IQueryable<GroupBase>? GetGroups(UserProfileBase? profile);

OwnChar/Modules/IUserManager.cs

@@ -1,7 +1,7 @@
 using OwnChar.Model;
 using Pilz.Cryptography;
 
-namespace OwnChar.Client.Managers;
+namespace OwnChar.Modules;
 
 public interface IUserManager
 {

OwnChar/Modules/UserManager.cs

@@ -2,7 +2,7 @@
 using OwnChar.Model;
 using Pilz.Cryptography;
 
-namespace OwnChar.Client.Managers;
+namespace OwnChar.Modules;
 
 internal class UserManager(OwnCharManager manager) : OwnCharManagerModule(manager), IUserManager
 {

OwnChar/OwnChar.csproj

@@ -7,11 +7,12 @@
   </PropertyGroup>
 
   <ItemGroup>
-    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore" Version="8.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Proxies" Version="8.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.Sqlite" Version="8.0.8" />
-    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.7" />
+    <PackageReference Include="Microsoft.EntityFrameworkCore.SqlServer" Version="8.0.8" />
-    <PackageReference Include="Pilz.Cryptography" Version="2.0.1" />
+    <PackageReference Include="Pilz.Cryptography" Version="2.1.1" />
+    <PackageReference Include="Pilz.Net" Version="2.0.4" />
   </ItemGroup>
 
 </Project>

OwnChar/OwnCharExtensions.cs

@@ -1,6 +1,7 @@
-using OwnChar.Base.Data;
+using OwnChar.Api.Exceptions;
+using OwnChar.Api.Packets;
 using OwnChar.Data;
-using OwnChar.Model;
+using OwnChar.Data.Model.Base;
 using System.Diagnostics.CodeAnalysis;
 
 namespace OwnChar;
@@ -23,55 +24,25 @@ public static class OwnCharExtensions
         return account.Type >= permissions;
     }
 
-    #region OnActionEventArgs
+    public static void EnsureSuccess(this OwnCharResponse response)
-
-    public static bool SetResult(this OnActionEventArgs @this, object? data)
     {
-        @this.Result = data;
+        if (!response.IsSuccess)
-        return @this.Result != null;
+            throw new ApiException("This API call failed! Reason: " + response.ErrorCode.ToString());
     }
 
-    public static bool SetResultT(this OnActionEventArgs @this, object? data)
+    public static T With<T>(this T response, OwnCharResponseError error) where T : OwnCharResponse
     {
-        @this.Result = data;
+        response.ErrorCode = error;
-        return true;
+        return response;
     }
 
-    public static bool GetParam<T>(this OnActionEventArgs @this, int index, [NotNullWhen(true)] out T? result)
+    public static bool Is(this UserAccountBase user, UserType type)
     {
-        return @this.Parameters.GetAt(index, out result);
+        return user.Type >= type;
     }
 
-    public static bool GetObject<T>(this OnActionEventArgs @this, [NotNullWhen(true)] out T? result)
+    public static bool IsNot(this UserAccountBase user, UserType type)
     {
-        if (@this.Object is T t)
+        return user.Type < type;
-        {
-            result = t;
-            return true;
-        }
-        result = default;
-        return false;
     }
-
-    public static bool Is(this OnActionEventArgs @this, DataManagerActionType actionType)
-    {
-        return @this.ActionType == actionType;
-    }
-
-    public static bool Is(this OnActionEventArgs @this, DataManagerAction action)
-    {
-        return @this.Action == action;
-    }
-
-    public static bool Is(this OnActionEventArgs @this, UserType minLevel)
-    {
-        return @this.CurrentUser.HasPermission(minLevel);
-    }
-
-    public static bool Is(this OnActionEventArgs @this, UserType maxLevel, UserType minLevel, Func<OnActionEventArgs, bool> isOwner)
-    {
-        return @this.Is(maxLevel) || (@this.Is(minLevel) && isOwner(@this));
-    }
-
-    #endregion
 }

OwnChar/OwnCharManager.cs

@@ -1,25 +1,23 @@
-using OwnChar.Api.Exceptions;
+using OwnChar.Api;
-using OwnChar.Client.Managers;
+using OwnChar.Api.Exceptions;
-using OwnChar.Data;
+using OwnChar.Data.Model.Client;
-using OwnChar.Manager.Modules;
+using OwnChar.Modules;
-using OwnChar.Model;
 using Pilz.Cryptography;
 using System.Diagnostics.CodeAnalysis;
 
-namespace OwnChar.Client;
+namespace OwnChar;
 
-internal class OwnCharManager : IOwnCharManager
+public class OwnCharManager : IOwnCharManager
 {
-    // User
+    [MemberNotNullWhen(true, nameof(Api))]
-    public bool IsLoggedIn => CurrentUser != null;
+    public bool IsLoggedIn => Api is not null && Api.IsLoggedIn;
-    public UserAccountBase? CurrentUser { get; private set; }
 
-    // Data Provider
+    public IOwnCharApiClient? Api { get; private set; }
-    public IDataManager? DataManager { get; set; }
 
-    // Manager
     public IUserManager Users { get; }
+    
     public IGroupsManager Groups { get; }
+    
     public ICharacterManager Characters { get; }
 
     public OwnCharManager()
@@ -29,10 +27,10 @@ internal class OwnCharManager : IOwnCharManager
         Characters = new CharacterManager(this);
     }
 
-    [MemberNotNull(nameof(CurrentUser), nameof(DataManager))]
+    [MemberNotNull(nameof(Api))]
     internal protected void CheckLogin()
     {
-        if (!IsLoggedIn || DataManager == null)
+        if (!IsLoggedIn)
             throw new LoginException("You are already logged in!");
     }
 
@@ -40,25 +38,25 @@ internal class OwnCharManager : IOwnCharManager
     /// Tries to login on the given data provider.
     /// </summary>
     /// <returns>Returns <see cref="true"/> if the login was successfull and <see cref="false"/> if not.</returns>
-    public bool Login(IDataManager? proxy, string? username, SecureString? password)
+    public Task<UserProfile?> Login(string? username, SecureString? password)
     {
-        ArgumentNullException.ThrowIfNull(proxy, nameof(proxy));
+        ArgumentNullException.ThrowIfNull(Api, nameof(Api));
         ArgumentException.ThrowIfNullOrWhiteSpace(username, nameof(username));
         ArgumentException.ThrowIfNullOrWhiteSpace(password, nameof(password));
 
         username = username.Trim().ToLower();
-        CurrentUser = proxy.Login(username, OwnCharUtils.HashPassword(username, password));
-        DataManager = proxy;
 
-        return IsLoggedIn;
+        return Api.Auth.Login(username, OwnCharUtils.HashPassword(username, password));
     }
 
     /// <summary>
     /// Closes the session on the current data provider.
     /// </summary>
     /// <returns></returns>
-    public bool Logout()
+    public async Task<bool> Logout()
     {
-        return DataManager?.Logout(CurrentUser) ?? true;
+        if (Api is null)
+            return true;
+        return await Api.Auth.Logout();
     }
 }

OwnChar/OwnCharManagerModule.cs

@@ -1,4 +1,4 @@
-namespace OwnChar.Client;
+namespace OwnChar;
 
 public abstract class OwnCharManagerModule(IOwnCharManager manager)
 {

OwnChar/Server/Data/Model/GroupDb.cs

@@ -1,16 +0,0 @@
-using OwnChar.Base.Data.Updates;
-using OwnChar.Base.Data.Model;
-
-namespace OwnChar.Server.Data.Model;
-
-public class GroupDb : GroupBase
-{
-    public List<CharacterDb> Characters { get; } = [];
-    public List<MemberEntryDb> Members { get; } = [];
-
-    public void Update(GroupUpdate update)
-    {
-        Name = update.Name;
-        Fandom = update.Fandom;
-    }
-}

OwnChar/Server/Data/Model/MemberEntryDb.cs

@@ -1,15 +0,0 @@
-using OwnChar.Base.Data.Model;
-using OwnChar.Client.Data.Model;
-
-namespace OwnChar.Server.Data.Model;
-
-public class MemberEntryDb() : MemberEntryBase
-{
-    public virtual UserProfile? User { get; set; }
-
-    internal MemberEntryDb(MemberEntryBase entry) : this()
-    {
-        Id = entry.Id;
-        Level = entry.Level;
-    }
-}