Skip to content

Commit 4729bc5

Browse files
jgauffinjgauffin
committed
Updated to DotNetCqs 2.0
1 parent 010907c commit 4729bc5

File tree

259 files changed

+1919
-3072
lines changed

Some content is hidden

Large Commits have some content hidden by default. Use the searchbox below for content that may be hidden.

259 files changed

+1919
-3072
lines changed

‎src/Server/Coderr.Server.Api.Client.Tests/TryTheClient.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Net;
3+
using System.Security.Claims;
34
using System.Threading.Tasks;
45
using codeRR.Server.Api.Core.Accounts.Queries;
56
using FluentAssertions;

‎src/Server/Coderr.Server.Api.Client.Tests/codeRR.Server.Api.Client.Tests.csproj‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -30,8 +30,8 @@
3030
<WarningLevel>4</WarningLevel>
3131
</PropertyGroup>
3232
<ItemGroup>
33-
<Reference Include="DotNetCqs, Version=1.0.1.0, Culture=neutral, processorArchitecture=MSIL">
34-
<HintPath>..\packages\DotNetCqs.1.0.1\lib\net452\DotNetCqs.dll</HintPath>
33+
<Reference Include="DotNetCqs, Version=2.0.3.7, Culture=neutral, processorArchitecture=MSIL">
34+
<HintPath>..\packages\DotNetCqs.2.0.3.7\lib\net452\DotNetCqs.dll</HintPath>
3535
</Reference>
3636
<Reference Include="FluentAssertions, Version=4.19.4.0, Culture=neutral, PublicKeyToken=33f2691a05b67b6a, processorArchitecture=MSIL">
3737
<HintPath>..\packages\FluentAssertions.4.19.4\lib\net45\FluentAssertions.dll</HintPath>

‎src/Server/Coderr.Server.Api.Client.Tests/packages.config‎

Lines changed: 11 additions & 11 deletions
Original file line numberDiff line numberDiff line change
@@ -1,12 +1,12 @@
1-
<?xml version="1.0" encoding="utf-8"?>
2-
<packages>
3-
<package id="DotNetCqs" version="1.0.1" targetFramework="net452" />
4-
<package id="FluentAssertions" version="4.19.4" targetFramework="net452" />
5-
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
6-
<package id="xunit" version="2.2.0" targetFramework="net452" />
7-
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
8-
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
9-
<package id="xunit.core" version="2.2.0" targetFramework="net452" />
10-
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
11-
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
1+
<?xml version="1.0" encoding="utf-8"?>
2+
<packages>
3+
<package id="DotNetCqs" version="2.0.3.7" targetFramework="net452" />
4+
<package id="FluentAssertions" version="4.19.4" targetFramework="net452" />
5+
<package id="Newtonsoft.Json" version="10.0.3" targetFramework="net452" />
6+
<package id="xunit" version="2.2.0" targetFramework="net452" />
7+
<package id="xunit.abstractions" version="2.0.1" targetFramework="net452" />
8+
<package id="xunit.assert" version="2.2.0" targetFramework="net452" />
9+
<package id="xunit.core" version="2.2.0" targetFramework="net452" />
10+
<package id="xunit.extensibility.core" version="2.2.0" targetFramework="net452" />
11+
<package id="xunit.extensibility.execution" version="2.2.0" targetFramework="net452" />
1212
</packages>

‎src/Server/Coderr.Server.Api.Client/OneTrueClient.cs‎

Lines changed: 27 additions & 39 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using System.Net;
3+
using System.Security.Claims;
34
using System.Security.Cryptography;
45
using System.Text;
56
using System.Threading.Tasks;
@@ -12,7 +13,7 @@ namespace codeRR.Server.Api.Client
1213
/// <summary>
1314
/// Client for the codeRR server API
1415
/// </summary>
15-
public class ServerApiClient : IQueryBus, ICommandBus, IEventBus
16+
public class ServerApiClient : IMessageBus, IQueryBus
1617
{
1718
private readonly JsonSerializerSettings _jsonSerializerSettings = new JsonSerializerSettings
1819
{
@@ -34,37 +35,16 @@ public ServerApiClient()
3435
_jsonSerializerSettings.ContractResolver = new IncludeNonPublicMembersContractResolver();
3536
}
3637

37-
/// <summary>
38-
/// Execute a command
39-
/// </summary>
40-
/// <typeparam name="T">type of query (from the <c>codeRR.Server.Api</c> class library)</typeparam>
41-
/// <param name="command">command to execute</param>
42-
/// <returns>task</returns>
43-
public async Task ExecuteAsync<T>(T command) where T : Command
44-
{
45-
var response = await RequestAsync("POST", "command", command);
46-
response.Close();
47-
}
4838

49-
/// <summary>
50-
/// Publish an event
51-
/// </summary>
52-
/// <typeparam name="TApplicationEvent">type of event (from the <c>codeRR.Server.Api</c> class library)</typeparam>
53-
/// <param name="e">event to publish</param>
54-
/// <returns>task</returns>
55-
public async Task PublishAsync<TApplicationEvent>(TApplicationEvent e)
56-
where TApplicationEvent : ApplicationEvent
39+
async Task<TResult> IQueryBus.QueryAsync<TResult>(ClaimsPrincipal user, Query<TResult> query)
5740
{
58-
var response = await RequestAsync("POST", "event", e);
59-
response.Close();
41+
//TODO: Unwrap the cqs object to query parameters instead
42+
//to allow caching in the server
43+
var response = await RequestAsync("POST", "query", query);
44+
return await DeserializeResponse<TResult>(response);
45+
6046
}
6147

62-
/// <summary>
63-
/// Make a query
64-
/// </summary>
65-
/// <typeparam name="TResult">Result from a query (a class from the <c>codeRR.Server.Api</c> library)</typeparam>
66-
/// <param name="query"></param>
67-
/// <returns></returns>
6848
public async Task<TResult> QueryAsync<TResult>(Query<TResult> query)
6949
{
7050
//TODO: Unwrap the cqs object to query parameters instead
@@ -73,18 +53,25 @@ public async Task<TResult> QueryAsync<TResult>(Query<TResult> query)
7353
return await DeserializeResponse<TResult>(response);
7454
}
7555

76-
/// <summary>
77-
/// Make a request
78-
/// </summary>
79-
/// <typeparam name="TReply">Reply from a request (a class from the <c>codeRR.Server.Api</c> library)</typeparam>
80-
/// <param name="request">request being made</param>
81-
/// <returns></returns>
82-
public async Task<TReply> RequestAsync<TReply>(Request<TReply> request)
56+
57+
async Task IMessageBus.SendAsync(ClaimsPrincipal principal, object message)
8358
{
84-
//TODO: Unwrap the cqs object to query parameters instead
85-
//to allow caching in the server
86-
var response = await RequestAsync("POST", "request", request);
87-
return await DeserializeResponse<TReply>(response);
59+
await RequestAsync("POST", "send", message);
60+
}
61+
62+
async Task IMessageBus.SendAsync(ClaimsPrincipal principal, Message message)
63+
{
64+
await RequestAsync("POST", "send", message.Body);
65+
}
66+
67+
async Task IMessageBus.SendAsync(Message message)
68+
{
69+
await RequestAsync("POST", "send", message.Body);
70+
}
71+
72+
public async Task SendAsync(object message)
73+
{
74+
await RequestAsync("POST", "send", message);
8875
}
8976

9077

@@ -100,6 +87,7 @@ public void Open(Uri uri, string apiKey, string sharedSecret)
10087
_sharedSecret = sharedSecret ?? throw new ArgumentNullException(nameof(sharedSecret));
10188
_uri = uri ?? throw new ArgumentNullException(nameof(uri));
10289
}
90+
10391

10492
private async Task<TResult> DeserializeResponse<TResult>(HttpWebResponse response)
10593
{

‎src/Server/Coderr.Server.Api.Client/codeRR.Server.Api.Client.csproj‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -22,7 +22,7 @@
2222
<AssemblyName>Coderr.Server.Api.Client</AssemblyName>
2323
</PropertyGroup>
2424
<ItemGroup>
25-
<PackageReference Include="DotNetCqs" Version="1.0.1" />
25+
<PackageReference Include="DotNetCqs" Version="2.0.3.7" />
2626
<PackageReference Include="System.ComponentModel.Annotations" Version="4.4.0" />
2727
</ItemGroup>
2828
<ItemGroup>

‎src/Server/Coderr.Server.Api/AuthorizeAttribute.cs‎

Lines changed: 1 addition & 0 deletions
Original file line numberDiff line numberDiff line change
@@ -1,5 +1,6 @@
11
using System;
22
using codeRR.Server.Api.Core;
3+
using codeRR.Server.Api.Core.Accounts.Requests;
34

45
namespace codeRR.Server.Api
56
{

‎src/Server/Coderr.Server.Api/Core/Accounts/Commands/DeclineInvitation.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -6,7 +6,8 @@ namespace codeRR.Server.Api.Core.Accounts.Commands
66
/// <summary>
77
/// Invited person do not want to accept the invitation
88
/// </summary>
9-
public class DeclineInvitation : Command
9+
[Message]
10+
public class DeclineInvitation
1011
{
1112
/// <summary>
1213
/// Serialization constructor

‎src/Server/Coderr.Server.Api/Core/Accounts/Commands/RegisterAccount.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -7,7 +7,8 @@ namespace codeRR.Server.Api.Core.Accounts.Commands
77
/// <summary>
88
/// Register a new account and send out an activation email.
99
/// </summary>
10-
public class RegisterAccount : Command
10+
[Message]
11+
public class RegisterAccount
1112
{
1213
/// <summary>
1314
/// Creates a new instance of <see cref="RegisterAccount" />

‎src/Server/Coderr.Server.Api/Core/Accounts/Commands/RequestPasswordReset.cs‎

Lines changed: 2 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -12,7 +12,8 @@ namespace codeRR.Server.Api.Core.Accounts.Commands
1212
/// <see cref="ResetPassword" /> will be exeucted when the user clicks on the link.
1313
/// </para>
1414
/// </remarks>
15-
public class RequestPasswordReset : Command
15+
[Message]
16+
public class RequestPasswordReset
1617
{
1718
/// <summary>
1819
/// Serialization constructor

‎src/Server/Coderr.Server.Api/Core/Accounts/Events/AccountActivated.cs‎

Lines changed: 3 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -6,13 +6,14 @@ namespace codeRR.Server.Api.Core.Accounts.Events
66
/// <summary>
77
/// Published when the user have clicked on the activation link in the registration email.
88
/// </summary>
9-
public class AccountActivated : ApplicationEvent
9+
[Message]
10+
public class AccountActivated
1011
{
1112
/// <summary>
1213
/// Creates a new instance of <see cref="AccountActivated" />-
1314
/// </summary>
1415
/// <param name="accountId">Primary key for the created account</param>
15-
/// <param name="userName">username that the account was created with.</param>
16+
/// <param name="userName">user name that the account was created with.</param>
1617
public AccountActivated(int accountId, string userName)
1718
{
1819
if (userName == null) throw new ArgumentNullException("userName");

0 commit comments

Comments
 (0)