diff --git a/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/AccountDataController.cs b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/AccountDataController.cs
index 8cd5c75..a32d283 100644
--- a/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/AccountDataController.cs
+++ b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/AccountDataController.cs
@@ -1,81 +1,68 @@
-using System.Text.Json.Nodes;
-using ArcaneLibs.Extensions;
-using LibMatrix.EventTypes.Spec.State;
-using LibMatrix.Filters;
-using LibMatrix.HomeserverEmulator.Services;
-using LibMatrix.Responses;
-using Microsoft.AspNetCore.Mvc;
-
-namespace LibMatrix.HomeserverEmulator.Controllers;
-
-[ApiController]
-[Route("/_matrix/client/{version}/")]
-public class AccountDataController(ILogger<AccountDataController> logger, TokenService tokenService, UserStore userStore, RoomStore roomStore) : ControllerBase {
- [HttpGet("user/{mxid}/account_data/{type}")]
- public async Task<object> GetAccountData(string type) {
- var token = tokenService.GetAccessToken(HttpContext);
- if (token is null)
- throw new MatrixException() {
- ErrorCode = "M_UNAUTHORIZED",
- Error = "No token passed."
- };
-
- var user = await userStore.GetUserByToken(token, false);
- if (user is null)
- throw new MatrixException() {
- ErrorCode = "M_UNAUTHORIZED",
- Error = "Invalid token."
- };
- var value = user.AccountData.FirstOrDefault(x=>x.Type == type);
- if (value is null)
- throw new MatrixException() {
- ErrorCode = "M_NOT_FOUND",
- Error = "Key not found."
- };
- return value;
- }
-
- [HttpPut("user/{mxid}/account_data/{type}")]
- public async Task<object> SetAccountData(string type, [FromBody] JsonObject data) {
- var token = tokenService.GetAccessToken(HttpContext);
- if (token is null)
- throw new MatrixException() {
- ErrorCode = "M_UNAUTHORIZED",
- Error = "No token passed."
- };
-
- var user = await userStore.GetUserByToken(token, false);
- if (user is null)
- throw new MatrixException() {
- ErrorCode = "M_UNAUTHORIZED",
- Error = "Invalid token."
- };
-
- user.AccountData.Where(x=>x.Type == type).ToList().ForEach(response => user.AccountData.Remove(response));
-
- user.AccountData.Add(new() {
- Type = type,
- RawContent = data
- });
- return data;
- }
-
- // specialised account data...
- [HttpGet("pushrules")]
- public async Task<object> GetPushRules() {
- var token = tokenService.GetAccessToken(HttpContext);
- if (token is null)
- throw new MatrixException() {
- ErrorCode = "M_UNAUTHORIZED",
- Error = "No token passed."
- };
-
- var user = await userStore.GetUserByToken(token, false);
- if (user is null)
- throw new MatrixException() {
- ErrorCode = "M_UNAUTHORIZED",
- Error = "Invalid token."
- };
- return new { };
- }
+using System.Text.Json.Nodes;
+using ArcaneLibs.Extensions;
+using LibMatrix.EventTypes.Spec.State;
+using LibMatrix.Filters;
+using LibMatrix.HomeserverEmulator.Services;
+using LibMatrix.Responses;
+using Microsoft.AspNetCore.Mvc;
+
+namespace LibMatrix.HomeserverEmulator.Controllers;
+
+[ApiController]
+[Route("/_matrix/client/{version}/")]
+public class AccountDataController(ILogger<AccountDataController> logger, TokenService tokenService, UserStore userStore, RoomStore roomStore) : ControllerBase {
+ [HttpGet("user/{mxid}/account_data/{type}")]
+ public async Task<object> GetAccountData(string type) {
+ var token = tokenService.GetAccessToken(HttpContext);
+ var user = await userStore.GetUserByToken(token, false);
+ if (user is null)
+ throw new MatrixException() {
+ ErrorCode = "M_UNAUTHORIZED",
+ Error = "Invalid token."
+ };
+
+ var value = user.AccountData.FirstOrDefault(x => x.Type == type);
+ if (value is null)
+ throw new MatrixException() {
+ ErrorCode = "M_NOT_FOUND",
+ Error = "Key not found."
+ };
+ return value;
+ }
+
+ [HttpPut("user/{mxid}/account_data/{type}")]
+ public async Task<object> SetAccountData(string type, [FromBody] JsonObject data) {
+ var token = tokenService.GetAccessToken(HttpContext);
+ var user = await userStore.GetUserByToken(token, false);
+ if (user is null)
+ throw new MatrixException() {
+ ErrorCode = "M_UNAUTHORIZED",
+ Error = "Invalid token."
+ };
+
+ user.AccountData.Add(new() {
+ Type = type,
+ RawContent = data
+ });
+ return data;
+ }
+
+ // specialised account data...
+ [HttpGet("pushrules")]
+ public async Task<object> GetPushRules() {
+ var token = tokenService.GetAccessToken(HttpContext);
+ if (token is null)
+ throw new MatrixException() {
+ ErrorCode = "M_UNAUTHORIZED",
+ Error = "No token passed."
+ };
+
+ var user = await userStore.GetUserByToken(token, false);
+ if (user is null)
+ throw new MatrixException() {
+ ErrorCode = "M_UNAUTHORIZED",
+ Error = "Invalid token."
+ };
+ return new { };
+ }
}
\ No newline at end of file
diff --git a/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/FilterController.cs b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/FilterController.cs
index ecbccd4..bdee7bc 100644
--- a/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/FilterController.cs
+++ b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/FilterController.cs
@@ -14,12 +14,6 @@ public class FilterController(ILogger<FilterController> logger, TokenService tok
[HttpPost("user/{mxid}/filter")]
public async Task<object> CreateFilter(string mxid, [FromBody] SyncFilter filter) {
var token = tokenService.GetAccessToken(HttpContext);
- if (token is null)
- throw new MatrixException() {
- ErrorCode = "M_UNAUTHORIZED",
- Error = "No token passed."
- };
-
var user = await userStore.GetUserByToken(token, false);
if (user is null)
throw new MatrixException() {
@@ -36,12 +30,6 @@ public class FilterController(ILogger<FilterController> logger, TokenService tok
[HttpGet("user/{mxid}/filter/{filterId}")]
public async Task<SyncFilter> GetFilter(string mxid, string filterId) {
var token = tokenService.GetAccessToken(HttpContext);
- if (token is null)
- throw new MatrixException() {
- ErrorCode = "M_UNAUTHORIZED",
- Error = "No token passed."
- };
-
var user = await userStore.GetUserByToken(token, false);
if (user is null)
throw new MatrixException() {
diff --git a/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/UserController.cs b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/UserController.cs
index e886d46..2be3896 100644
--- a/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/UserController.cs
+++ b/Tests/LibMatrix.HomeserverEmulator/Controllers/Users/UserController.cs
@@ -15,12 +15,6 @@ public class UserController(ILogger<UserController> logger, TokenService tokenSe
[HttpGet("account/whoami")]
public async Task<WhoAmIResponse> Login() {
var token = tokenService.GetAccessToken(HttpContext);
- if (token is null)
- throw new MatrixException() {
- ErrorCode = "M_UNAUTHORIZED",
- Error = "No token passed."
- };
-
var user = await userStore.GetUserByToken(token, Random.Shared.Next(101) <= 10, tokenService.GenerateServerName(HttpContext));
if (user is null)
throw new MatrixException() {
@@ -36,12 +30,6 @@ public class UserController(ILogger<UserController> logger, TokenService tokenSe
[HttpGet("joined_rooms")]
public async Task<object> GetJoinedRooms() {
var token = tokenService.GetAccessToken(HttpContext);
- if (token is null)
- throw new MatrixException() {
- ErrorCode = "M_UNAUTHORIZED",
- Error = "No token passed."
- };
-
var user = await userStore.GetUserByToken(token, false);
if (user is null)
throw new MatrixException() {
@@ -60,12 +48,6 @@ public class UserController(ILogger<UserController> logger, TokenService tokenSe
[HttpGet("devices")]
public async Task<DevicesResponse> GetDevices() {
var token = tokenService.GetAccessToken(HttpContext);
- if (token is null)
- throw new MatrixException() {
- ErrorCode = "M_UNAUTHORIZED",
- Error = "No token passed."
- };
-
var user = await userStore.GetUserByToken(token, false);
if (user is null)
throw new MatrixException() {
|
