Skip to content

Commit e0ea356

Browse files
committed
chore: Cleanup Access Layer
1 parent acf012e commit e0ea356

File tree

3 files changed

+17
-15
lines changed

3 files changed

+17
-15
lines changed

src/app/ApplicationTemplate.Access/ApiClients/Authentication/AuthenticationApiClientMock.cs

Lines changed: 11 additions & 4 deletions
Original file line numberDiff line numberDiff line change
@@ -28,7 +28,7 @@ public async Task<AuthenticationData> CreateAccount(CancellationToken ct, string
2828
await SimulateDelay(ct);
2929

3030
// We authenticate the user on account creation, since we don't have a backend to register and validate the user.
31-
return CreateAuthenticationData();
31+
return CreateAuthenticationData(email: email);
3232
}
3333

3434
public async Task ResetPassword(CancellationToken ct, string email)
@@ -40,7 +40,7 @@ public async Task<AuthenticationData> Login(CancellationToken ct, string email,
4040
{
4141
await SimulateDelay(ct);
4242

43-
return CreateAuthenticationData();
43+
return CreateAuthenticationData(email: email);
4444
}
4545

4646
public async Task<AuthenticationData> RefreshToken(CancellationToken ct, AuthenticationData unauthorizedToken)
@@ -49,7 +49,7 @@ public async Task<AuthenticationData> RefreshToken(CancellationToken ct, Authent
4949

5050
await SimulateDelay(ct);
5151

52-
return CreateAuthenticationData(unauthorizedToken.AccessToken.Payload);
52+
return CreateAuthenticationData(token: unauthorizedToken.AccessToken.Payload);
5353
}
5454

5555
/// <summary>
@@ -70,11 +70,18 @@ public static string CreateJsonWebToken(AuthenticationToken token = null, string
7070

7171
now ??= DateTimeOffset.Now;
7272

73-
token ??= new AuthenticationToken(email: email, expiration: now.Value.AddSeconds(TokenExpirationSeconds), issuedAt: now.Value);
73+
token ??= new AuthenticationToken()
74+
{
75+
Email = email,
76+
Expiration = now.Value.AddSeconds(TokenExpirationSeconds),
77+
IssuedAt = now.Value,
78+
};
7479

7580
string payload;
7681
using (var stream = new MemoryStream())
7782
{
83+
var test = JsonSerializer.Serialize(token, serializerOptions);
84+
7885
JsonSerializer.Serialize(stream, token, serializerOptions);
7986
payload = Convert.ToBase64String(stream.ToArray());
8087
}

src/app/ApplicationTemplate.Access/ApiClients/Authentication/Data/AuthenticationToken.cs

Lines changed: 3 additions & 10 deletions
Original file line numberDiff line numberDiff line change
@@ -5,21 +5,14 @@ namespace ApplicationTemplate.DataAccess;
55

66
public sealed class AuthenticationToken
77
{
8-
public AuthenticationToken(string email, DateTimeOffset expiration, DateTimeOffset issuedAt)
9-
{
10-
Email = email;
11-
Expiration = expiration;
12-
IssuedAt = issuedAt;
13-
}
14-
158
[JsonPropertyName("unique_name")]
16-
public string Email { get; }
9+
public string Email { get; init; }
1710

1811
[JsonPropertyName("exp")]
1912
[JsonConverter(typeof(UnixTimestampJsonConverter))]
20-
public DateTimeOffset Expiration { get; }
13+
public DateTimeOffset Expiration { get; init; }
2114

2215
[JsonPropertyName("iat")]
2316
[JsonConverter(typeof(UnixTimestampJsonConverter))]
24-
public DateTimeOffset IssuedAt { get; }
17+
public DateTimeOffset IssuedAt { get; init; }
2518
}

src/app/ApplicationTemplate.Presentation/Configuration/AppServicesConfiguration.cs

Lines changed: 3 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using System.Reactive.Concurrency;
1+
using System;
2+
using System.Reactive.Concurrency;
23
using ApplicationTemplate.Business;
34
using ApplicationTemplate.DataAccess;
45
using ApplicationTemplate.Presentation;
@@ -22,6 +23,7 @@ public static class AppServicesConfiguration
2223
public static IServiceCollection AddAppServices(this IServiceCollection services)
2324
{
2425
return services
26+
.AddSingleton<TimeProvider>(TimeProvider.System)
2527
.AddSingleton<IMessageDialogService, AcceptOrDefaultMessageDialogService>()
2628
.AddSingleton<IBackgroundScheduler>(s => TaskPoolScheduler.Default.ToBackgroundScheduler())
2729
.AddSingleton<IApplicationSettingsRepository, ApplicationSettingsRepository>()

0 commit comments

Comments
 (0)