Merge pull request #26 from eliasson/improve-first-login

Improve first login

src/Quarter.Style/src/pages/_timesheet.sass

@@ -26,6 +26,11 @@
                 width: 20px
                 height: 20px
 
+        .q-activity-list--header
+            font-size: $font-size-kilo
+            font-weight: 600
+            margin-bottom: $pillow-small
+
         .q-activity-list
             display: none
 

src/Quarter/Pages/Application/Timesheet/TimesheetActivitySelectorWidget.razor

@@ -2,6 +2,7 @@
     <div class="q-list">
         <div class="q-list-item @(_isActive ? "q-list-item--expanded" : "")" >
             <div class="q-list-item__header" @onclick="@ToggleActive">
+                <div class="q-activity-list--header">Current activity:</div>
                 <div class="q-activity-marker">
                     @{
                         var selectedActivity = SelectedActivity();

src/Quarter/Services/UserAuthorizationService.cs

@@ -7,8 +7,8 @@
 using Microsoft.AspNetCore.Components.Authorization;
 using Microsoft.Extensions.Logging;
 using Microsoft.Extensions.Options;
-using Quarter.Auth;
 using Quarter.Core.Auth;
+using Quarter.Core.Commands;
 using Quarter.Core.Exceptions;
 using Quarter.Core.Models;
 using Quarter.Core.Options;
@@ -73,27 +73,28 @@ public class UserAuthorizationService : IUserAuthorizationService
         private readonly IUserRepository _userRepository;
         private readonly AuthenticationStateProvider _authenticationStateProvider;
         private readonly ILogger<UserAuthorizationService> _logger;
+        private readonly ICommandHandler _commandHandler;
         private readonly IOptions<AuthOptions> _authOptions;
 
         public UserAuthorizationService(
             AuthenticationStateProvider authenticationStateProvider,
             IRepositoryFactory repositoryFactory,
-            ILogger<UserAuthorizationService> logger,
-            IOptions<AuthOptions> authOptions)
+            ICommandHandler commandHandler,
+            IOptions<AuthOptions> authOptions,
+            ILogger<UserAuthorizationService> logger)
         {
             _userRepository = repositoryFactory.UserRepository();
             _authenticationStateProvider = authenticationStateProvider;
             _logger = logger;
+            _commandHandler = commandHandler;
             _authOptions = authOptions;
         }
 
         public async Task<AuthorizedResult> AuthorizeOrCreateUserAsync(string email, CancellationToken ct)
         {
             try
             {
-                var user = await _userRepository.GetUserByEmailAsync(email, ct);
-                _logger.LogInformation("Successfully authorized user {Email} at login", email);
-                return AuthorizedResult.AuthorizedWith(ClaimsForUser(user).ToArray());
+                return await tryWithExistingUser();
             }
             catch (NotFoundException)
             {
@@ -104,10 +105,18 @@ public async Task<AuthorizedResult> AuthorizeOrCreateUserAsync(string email, Can
                 }
 
                 _logger.LogInformation("Unauthorized user {Email} tried to login, creating new user and granting access", email);
-                var user = User.StandardUser(new Email(email));
-                user = await _userRepository.CreateAsync(user, ct);
-                return AuthorizedResult.AuthorizedWith(ClaimsForUser(user).ToArray());
 
+                var command = new AddUserCommand(new Email(email), ArraySegment<UserRole>.Empty);
+
+                await _commandHandler.ExecuteAsync(command, OperationContext.None, ct);
+                return await tryWithExistingUser();
+            }
+
+            async Task<AuthorizedResult> tryWithExistingUser()
+            {
+                var user = await _userRepository.GetUserByEmailAsync(email, ct);
+                _logger.LogInformation("Successfully authorized user {Email} at login", email);
+                return AuthorizedResult.AuthorizedWith(ClaimsForUser(user).ToArray());
             }
         }