Skip to content

Commit dc55a3e

Browse files
albxalbx
committed
Merge branch 'release/1.0.0-rc4'
2 parents e4c9cc0 + bda5fe6 commit dc55a3e

File tree

8 files changed

+38
-28
lines changed

8 files changed

+38
-28
lines changed

‎Wilcommerce.Auth.Test/Wilcommerce.Auth.Test.csproj‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -1,7 +1,7 @@
11
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
4-
<TargetFramework>netcoreapp2.0</TargetFramework>
4+
<TargetFramework>netcoreapp2.1</TargetFramework>
55
<AssemblyName>Wilcommerce.Auth.Test</AssemblyName>
66
<PackageId>Wilcommerce.Auth.Test</PackageId>
77
<GenerateRuntimeConfigurationFiles>true</GenerateRuntimeConfigurationFiles>
@@ -17,8 +17,8 @@
1717
</ItemGroup>
1818

1919
<ItemGroup>
20-
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.6.1" />
21-
<PackageReference Include="Moq" Version="4.8.2" />
20+
<PackageReference Include="Microsoft.NET.Test.Sdk" Version="15.7.2" />
21+
<PackageReference Include="Moq" Version="4.8.3" />
2222
<PackageReference Include="xunit.runner.visualstudio" Version="2.3.1" />
2323
<PackageReference Include="xunit" Version="2.3.1" />
2424
</ItemGroup>

‎src/Wilcommerce.Auth/Commands/Handlers/RecoverPasswordCommandHandler.cs‎

Lines changed: 2 additions & 2 deletions
Original file line numberDiff line numberDiff line change
@@ -28,8 +28,8 @@ public class RecoverPasswordCommandHandler : Interfaces.IRecoverPasswordCommandH
2828
/// <param name="eventBus">The event bus instance</param>
2929
public RecoverPasswordCommandHandler(IRepository repository, Core.Infrastructure.IEventBus eventBus)
3030
{
31-
Repository = repository;
32-
EventBus = eventBus;
31+
Repository = repository ?? throw new ArgumentNullException(nameof(repository));
32+
EventBus = eventBus ?? throw new ArgumentNullException(nameof(eventBus));
3333
}
3434

3535
/// <summary>

‎src/Wilcommerce.Auth/Commands/Handlers/ValidatePasswordRecoveryCommandHandler.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -36,9 +36,9 @@ public class ValidatePasswordRecoveryCommandHandler : Interfaces.IValidatePasswo
3636
/// <param name="eventBus">The event bus instance</param>
3737
public ValidatePasswordRecoveryCommandHandler(IAuthDatabase database, IRepository repository, Core.Infrastructure.IEventBus eventBus)
3838
{
39-
Database = database;
40-
Repository = repository;
41-
EventBus = eventBus;
39+
Database = database ?? throw new ArgumentNullException(nameof(database));
40+
Repository = repository ?? throw new ArgumentNullException(nameof(repository));
41+
EventBus = eventBus ?? throw new ArgumentNullException(nameof(eventBus));
4242
}
4343

4444
/// <summary>

‎src/Wilcommerce.Auth/Events/User/Handlers/UserEventHandler.cs‎

Lines changed: 8 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -45,9 +45,14 @@ public class UserEventHandler :
4545
/// <param name="httpContextAccessor">The http context accessor instance</param>
4646
public UserEventHandler(IEventStore eventStore, IIdentityFactory identityFactory, ICommonDatabase commonDatabase, IHttpContextAccessor httpContextAccessor)
4747
{
48-
EventStore = eventStore;
49-
IdentityFactory = identityFactory;
50-
CommonDatabase = commonDatabase;
48+
if (httpContextAccessor == null)
49+
{
50+
throw new ArgumentNullException(nameof(httpContextAccessor));
51+
}
52+
53+
EventStore = eventStore ?? throw new ArgumentNullException(nameof(eventStore));
54+
IdentityFactory = identityFactory ?? throw new ArgumentNullException(nameof(identityFactory));
55+
CommonDatabase = commonDatabase ?? throw new ArgumentNullException(nameof(commonDatabase));
5156
Context = httpContextAccessor.HttpContext;
5257
}
5358

‎src/Wilcommerce.Auth/Models/UserToken.cs‎

Lines changed: 3 additions & 3 deletions
Original file line numberDiff line numberDiff line change
@@ -74,18 +74,18 @@ public static UserToken PasswordRecovery(User user, string token, DateTime expir
7474
{
7575
if (user == null)
7676
{
77-
throw new ArgumentNullException("user");
77+
throw new ArgumentNullException(nameof(user));
7878
}
7979

8080
if (string.IsNullOrEmpty(token))
8181
{
82-
throw new ArgumentNullException("token");
82+
throw new ArgumentNullException(nameof(token));
8383
}
8484

8585
var now = DateTime.Now;
8686
if (expirationDate < now)
8787
{
88-
throw new ArgumentException("Invalid expiration date", "expirationDate");
88+
throw new ArgumentException("Invalid expiration date", nameof(expirationDate));
8989
}
9090

9191
var userToken = new UserToken

‎src/Wilcommerce.Auth/Services/AuthenticationService.cs‎

Lines changed: 12 additions & 7 deletions
Original file line numberDiff line numberDiff line change
@@ -72,14 +72,19 @@ public class AuthenticationService : Interfaces.IAuthenticationService
7272
/// <param name="identityFactory">The identity factory instance</param>
7373
public AuthenticationService(IHttpContextAccessor httpContextAccessor, ICommonDatabase commonDatabase, IPasswordHasher<User> passwordHasher, ITokenGenerator tokenGenerator, IRecoverPasswordCommandHandler recoverPasswordHandler, IValidatePasswordRecoveryCommandHandler validatePasswordRecoveryHandler, IEventBus eventBus, IIdentityFactory identityFactory)
7474
{
75+
if (httpContextAccessor == null)
76+
{
77+
throw new ArgumentNullException(nameof(httpContextAccessor));
78+
}
79+
7580
Context = httpContextAccessor.HttpContext;
76-
CommonDatabase = commonDatabase;
77-
PasswordHasher = passwordHasher;
78-
TokenGenerator = tokenGenerator;
79-
RecoverPasswordHandler = recoverPasswordHandler;
80-
ValidatePasswordRecoveryHandler = validatePasswordRecoveryHandler;
81-
EventBus = eventBus;
82-
IdentityFactory = identityFactory;
81+
CommonDatabase = commonDatabase ?? throw new ArgumentNullException(nameof(commonDatabase));
82+
PasswordHasher = passwordHasher ?? throw new ArgumentNullException(nameof(passwordHasher));
83+
TokenGenerator = tokenGenerator ?? throw new ArgumentNullException(nameof(tokenGenerator));
84+
RecoverPasswordHandler = recoverPasswordHandler ?? throw new ArgumentNullException(nameof(recoverPasswordHandler));
85+
ValidatePasswordRecoveryHandler = validatePasswordRecoveryHandler ?? throw new ArgumentNullException(nameof(validatePasswordRecoveryHandler));
86+
EventBus = eventBus ?? throw new ArgumentNullException(nameof(eventBus));
87+
IdentityFactory = identityFactory ?? throw new ArgumentNullException(nameof(identityFactory));
8388
}
8489

8590
/// <see cref="Interfaces.IAuthenticationService.SignIn(string, string, bool)"/>

‎src/Wilcommerce.Auth/Services/IdentityFactory.cs‎

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -17,7 +17,7 @@ public virtual ClaimsPrincipal CreateIdentity(User user)
1717
{
1818
if (user == null)
1919
{
20-
throw new ArgumentNullException("user");
20+
throw new ArgumentNullException(nameof(user));
2121
}
2222

2323
var identity = new ClaimsIdentity();

‎src/Wilcommerce.Auth/Wilcommerce.Auth.csproj‎

Lines changed: 6 additions & 6 deletions
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
<Project Sdk="Microsoft.NET.Sdk">
1+
<Project Sdk="Microsoft.NET.Sdk">
22

33
<PropertyGroup>
44
<VersionPrefix>1.0.0</VersionPrefix>
@@ -15,7 +15,7 @@
1515
<GenerateAssemblyConfigurationAttribute>false</GenerateAssemblyConfigurationAttribute>
1616
<GenerateAssemblyCompanyAttribute>false</GenerateAssemblyCompanyAttribute>
1717
<GenerateAssemblyProductAttribute>false</GenerateAssemblyProductAttribute>
18-
<Version>1.0.0-rc3</Version>
18+
<Version>1.0.0-rc4</Version>
1919
<PackageReleaseNotes></PackageReleaseNotes>
2020
<Description>Wilcommerce Authentication and Authorization library</Description>
2121
</PropertyGroup>
@@ -33,11 +33,11 @@
3333
</ItemGroup>
3434

3535
<ItemGroup>
36-
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.0.1" />
37-
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.0.1" />
38-
<PackageReference Include="Wilcommerce.Core.Common" Version="1.0.0-rc2" />
36+
<PackageReference Include="Microsoft.AspNetCore.Authentication.Cookies" Version="2.1.1" />
37+
<PackageReference Include="Microsoft.AspNetCore.Owin" Version="2.1.1" />
38+
<PackageReference Include="Wilcommerce.Core.Common" Version="1.0.0-rc3" />
3939
<PackageReference Include="System.Linq.Queryable" Version="4.3.0" />
40-
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.0.1" />
40+
<PackageReference Include="Microsoft.AspNetCore.Identity" Version="2.1.1" />
4141
</ItemGroup>
4242

4343
</Project>

0 commit comments

Comments
 (0)