Fixed minor issues. (sound-it-out#171)

src/SIO.Domain/User/CommandHandlers/ForgotPasswordCommandHandler.cs → src/SIO.Domain/Users/CommandHandlers/ForgotPasswordCommandHandler.cs

@@ -2,12 +2,12 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using OpenEventSourcing.Commands;
-using SIO.Domain.User.Commands;
-using SIO.Domain.User.Events;
+using SIO.Domain.Users.Commands;
+using SIO.Domain.Users.Events;
 using SIO.Infrastructure.Events;
 using SIO.Migrations;
 
-namespace SIO.Domain.User.CommandHandlers
+namespace SIO.Domain.Users.CommandHandlers
 {
     public class ForgotPasswordCommandHandler : ICommandHandler<ForgotPasswordCommand>
     {

src/SIO.Domain/User/CommandHandlers/LoginCommandHandler.cs → src/SIO.Domain/Users/CommandHandlers/LoginCommandHandler.cs

@@ -2,12 +2,12 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using OpenEventSourcing.Commands;
-using SIO.Domain.User.Commands;
-using SIO.Domain.User.Events;
+using SIO.Domain.Users.Commands;
+using SIO.Domain.Users.Events;
 using SIO.Infrastructure.Events;
 using SIO.Migrations;
 
-namespace SIO.Domain.User.CommandHandlers
+namespace SIO.Domain.Users.CommandHandlers
 {
     internal class LoginCommandHandler : ICommandHandler<LoginCommand>
     {

src/SIO.Domain/User/CommandHandlers/LogoutCommandHandler.cs → src/SIO.Domain/Users/CommandHandlers/LogoutCommandHandler.cs

@@ -3,12 +3,12 @@
 using IdentityServer4.Services;
 using Microsoft.AspNetCore.Identity;
 using OpenEventSourcing.Commands;
-using SIO.Domain.User.Commands;
-using SIO.Domain.User.Events;
+using SIO.Domain.Users.Commands;
+using SIO.Domain.Users.Events;
 using SIO.Infrastructure.Events;
 using SIO.Migrations;
 
-namespace SIO.Domain.User.CommandHandlers
+namespace SIO.Domain.Users.CommandHandlers
 {
     internal class LogoutCommandHandler : ICommandHandler<LogoutCommand>
     {

src/SIO.Domain/User/CommandHandlers/RegisterUserCommandHandler.cs → src/SIO.Domain/Users/CommandHandlers/RegisterUserCommandHandler.cs

@@ -2,12 +2,12 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using OpenEventSourcing.Commands;
-using SIO.Domain.User.Commands;
-using SIO.Domain.User.Events;
+using SIO.Domain.Users.Commands;
+using SIO.Domain.Users.Events;
 using SIO.Infrastructure.Events;
 using SIO.Migrations;
 
-namespace SIO.Domain.User.CommandHandlers
+namespace SIO.Domain.Users.CommandHandlers
 {
     internal class RegisterUserCommandHandler : ICommandHandler<RegisterUserCommand>
     {

src/SIO.Domain/User/CommandHandlers/VerifyUserCommandHandler.cs → src/SIO.Domain/Users/CommandHandlers/VerifyUserCommandHandler.cs

@@ -4,12 +4,12 @@
 using System.Threading.Tasks;
 using Microsoft.AspNetCore.Identity;
 using OpenEventSourcing.Commands;
-using SIO.Domain.User.Commands;
-using SIO.Domain.User.Events;
+using SIO.Domain.Users.Commands;
+using SIO.Domain.Users.Events;
 using SIO.Infrastructure.Events;
 using SIO.Migrations;
 
-namespace SIO.Domain.User.CommandHandlers
+namespace SIO.Domain.Users.CommandHandlers
 {
     public class VerifyUserCommandHandler : ICommandHandler<VerifyUserCommand>
     {

src/SIO.Domain/User/Commands/EmailConfirmationException.cs → src/SIO.Domain/Users/Commands/EmailConfirmationException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class EmailConfirmationException : UserCommandException
     {

src/SIO.Domain/User/Commands/EmailInUseException.cs → src/SIO.Domain/Users/Commands/EmailInUseException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class EmailInUseException : UserCommandException
     {

src/SIO.Domain/User/Commands/ForgotPasswordCommand.cs → src/SIO.Domain/Users/Commands/ForgotPasswordCommand.cs

@@ -1,7 +1,7 @@
 using System;
 using OpenEventSourcing.Commands;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class ForgotPasswordCommand : Command
     {

src/SIO.Domain/User/Commands/IncorrectPasswordException.cs → src/SIO.Domain/Users/Commands/IncorrectPasswordException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class IncorrectPasswordException : UserCommandException
     {

src/SIO.Domain/User/Commands/LoginCommand.cs → src/SIO.Domain/Users/Commands/LoginCommand.cs

@@ -1,8 +1,8 @@
 using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using OpenEventSourcing.Commands;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class LoginCommand : Command
     {

src/SIO.Domain/User/Commands/LogoutCommand.cs → src/SIO.Domain/Users/Commands/LogoutCommand.cs

@@ -1,7 +1,7 @@
 using System;
 using OpenEventSourcing.Commands;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class LogoutCommand : Command
     {

src/SIO.Domain/User/Commands/PasswordCreationException.cs → src/SIO.Domain/Users/Commands/PasswordCreationException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class PasswordCreationException : UserCommandException
     {

src/SIO.Domain/User/Commands/RegisterUserCommand.cs → src/SIO.Domain/Users/Commands/RegisterUserCommand.cs

@@ -1,7 +1,7 @@
 using System;
 using OpenEventSourcing.Commands;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class RegisterUserCommand : Command
     {

src/SIO.Domain/User/Commands/UserCommandException.cs → src/SIO.Domain/Users/Commands/UserCommandException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class UserCommandException : Exception
     {

src/SIO.Domain/User/Commands/UserCreationException.cs → src/SIO.Domain/Users/Commands/UserCreationException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class UserCreationException : UserCommandException
     {

src/SIO.Domain/User/Commands/UserDoesntExistException.cs → src/SIO.Domain/Users/Commands/UserDoesntExistException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class UserDoesntExistException : UserCommandException
     {

src/SIO.Domain/User/Commands/UserIsArchivedException.cs → src/SIO.Domain/Users/Commands/UserIsArchivedException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class UserIsArchivedException : UserCommandException
     {

src/SIO.Domain/User/Commands/UserIsLockedOutException.cs → src/SIO.Domain/Users/Commands/UserIsLockedOutException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class UserIsLockedOutException : UserCommandException
     {

src/SIO.Domain/User/Commands/UserNotVerifiedException.cs → src/SIO.Domain/Users/Commands/UserNotVerifiedException.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Runtime.Serialization;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class UserNotVerifiedException : UserCommandException
     {

src/SIO.Domain/User/Commands/VerifyUserCommand.cs → src/SIO.Domain/Users/Commands/VerifyUserCommand.cs

@@ -1,8 +1,8 @@
 using System;
-using Newtonsoft.Json;
+using Newtonsoft.Json;
 using OpenEventSourcing.Commands;
 
-namespace SIO.Domain.User.Commands
+namespace SIO.Domain.Users.Commands
 {
     public class VerifyUserCommand : Command
     {

src/SIO.Domain/User/Events/UserEmailChanged.cs → src/SIO.Domain/Users/Events/UserEmailChanged.cs

@@ -1,7 +1,7 @@
 using System;
 using OpenEventSourcing.Events;
 
-namespace SIO.Domain.User.Events
+namespace SIO.Domain.Users.Events
 {
     public class UserEmailChanged : Event
     {

src/SIO.Domain/User/Events/UserLoggedIn.cs → src/SIO.Domain/Users/Events/UserLoggedIn.cs

@@ -1,7 +1,7 @@
 using System;
 using OpenEventSourcing.Events;
 
-namespace SIO.Domain.User.Events
+namespace SIO.Domain.Users.Events
 {
     public class UserLoggedIn : Event
     {

src/SIO.Domain/User/Events/UserLoggedOut.cs → src/SIO.Domain/Users/Events/UserLoggedOut.cs

@@ -1,7 +1,7 @@
 using System;
 using OpenEventSourcing.Events;
 
-namespace SIO.Domain.User.Events
+namespace SIO.Domain.Users.Events
 {
     public class UserLoggedOut : Event
     {

src/SIO.Domain/User/Events/UserPasswordTokenGenerated.cs → src/SIO.Domain/Users/Events/UserPasswordTokenGenerated.cs

@@ -3,7 +3,7 @@
 using System.Text;
 using OpenEventSourcing.Events;
 
-namespace SIO.Domain.User.Events
+namespace SIO.Domain.Users.Events
 {
     public class UserPasswordTokenGenerated : Event
     {

src/SIO.Domain/User/Events/UserRegistered.cs → src/SIO.Domain/Users/Events/UserRegistered.cs

@@ -1,7 +1,7 @@
 using System;
 using OpenEventSourcing.Events;
 
-namespace SIO.Domain.User.Events
+namespace SIO.Domain.Users.Events
 {
     public class UserRegistered : Event
     {

src/SIO.Domain/User/Events/UserVerified.cs → src/SIO.Domain/Users/Events/UserVerified.cs

@@ -1,7 +1,7 @@
 using System;
 using OpenEventSourcing.Events;
 
-namespace SIO.Domain.User.Events
+namespace SIO.Domain.Users.Events
 {
     public class UserVerified : Event
     {

src/SIO.Identity/ForgotPassword/ForgotPasswordController.cs

@@ -4,8 +4,8 @@
 using Microsoft.AspNetCore.Mvc;
 using OpenEventSourcing.Commands;
 using OpenEventSourcing.Events;
-using SIO.Domain.User.Commands;
-using SIO.Domain.User.Events;
+using SIO.Domain.Users.Commands;
+using SIO.Domain.Users.Events;
 using SIO.Identity.ForgotPassword.Requests;
 using SIO.Migrations;
 

src/SIO.Identity/Login/LoginController.cs

@@ -10,8 +10,8 @@
 using Microsoft.Extensions.Configuration;
 using OpenEventSourcing.Commands;
 using OpenEventSourcing.Events;
-using SIO.Domain.User.Commands;
-using SIO.Domain.User.Events;
+using SIO.Domain.Users.Commands;
+using SIO.Domain.Users.Events;
 using SIO.Identity.Login.Requests;
 using SIO.Identity.Login.Responses;
 using SIO.Migrations;

src/SIO.Identity/Logout/LogoutController.cs

@@ -6,7 +6,7 @@
 using IdentityServer4.Services;
 using Microsoft.AspNetCore.Mvc;
 using OpenEventSourcing.Commands;
-using SIO.Domain.User.Commands;
+using SIO.Domain.Users.Commands;
 using SIO.Identity.Logout.Requests;
 
 namespace SIO.Identity.Logout

src/SIO.Identity/Register/RegisterController.cs

@@ -5,8 +5,8 @@
 using Microsoft.Extensions.Configuration;
 using OpenEventSourcing.Commands;
 using OpenEventSourcing.Events;
-using SIO.Domain.User.Commands;
-using SIO.Domain.User.Events;
+using SIO.Domain.Users.Commands;
+using SIO.Domain.Users.Events;
 using SIO.Identity.Register.Requests;
 using SIO.Migrations;
 

src/SIO.Identity/ServiceCollectionExtensions.cs

@@ -57,6 +57,8 @@ public static IServiceCollection AddSIOIdentity(this IServiceCollection services
                 options.UserInteraction.LogoutUrl = "/logout";
                 options.UserInteraction.ErrorUrl = "/error";
                 options.UserInteraction.ConsentUrl = "/consent";
+                options.Cors.CorsPaths.Add("/v1/client");
+                options.PublicOrigin = configuration.GetValue<string>("Identity:Authority");
             })
             .AddConfigurationStore(options =>
             {

src/SIO.Identity/Startup.cs

@@ -9,7 +9,7 @@
 using OpenEventSourcing.EntityFrameworkCore.SqlServer;
 using SIO.Migrations;
 using OpenEventSourcing.RabbitMQ.Extensions;
-using SIO.Domain.User.Events;
+using SIO.Domain.Users.Events;
 using SIO.Infrastructure;
 using OpenEventSourcing.Azure.ServiceBus.Extensions;
 using Microsoft.Extensions.Hosting;

src/SIO.Identity/Verify/VerifyController.cs

@@ -6,8 +6,8 @@
 using Microsoft.Extensions.Configuration;
 using OpenEventSourcing.Commands;
 using OpenEventSourcing.Events;
-using SIO.Domain.User.Commands;
-using SIO.Domain.User.Events;
+using SIO.Domain.Users.Commands;
+using SIO.Domain.Users.Events;
 using SIO.Identity.Verify.Requests;
 using SIO.Migrations;
 

src/SIO.Identity/appsettings.Development.json

@@ -19,12 +19,13 @@
   ],
   "Clients": [
     {
+      "EnableLocalLogin": true,
       "ClientId": "web-client",
       "ClientName": "Sound It Out - Web Application",
       "AllowedGrantTypes": [ "authorization_code" ],
-      "RequirePkce": true,
-      "RequireClientSecret": false,
       "AllowAccessTokensViaBrowser": true,
+      "AlwaysIncludeUserClaimsInIdToken": true,
+      "AlwaysSendClientClaims": true,
       "ClientSecrets": [],
       "RequireConsent": false,
       "RedirectUris": [
@@ -49,7 +50,7 @@
     }
   ],
   "Identity": {
-    "Authority": "http://localhost:50647/",
+    "Authority": "https://localhost:44335",
     "ClientId": "Sound It Out"
   },
   "DefaultAppUrl": "http://localhost:8080",

tests/SIO.Identity.Tests/ForgotPassword/ForgotPasswordController/ForgotPassword/Post/WhenUserIsActive.cs

@@ -5,7 +5,7 @@
 using Microsoft.AspNetCore.Identity;
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
-using SIO.Domain.User.Events;
+using SIO.Domain.Users.Events;
 using SIO.Identity.ForgotPassword.Requests;
 using SIO.Migrations;
 

tests/SIO.Identity.Tests/Login/LoginController/Login/Post/WhenPasswordIsCorrect.cs

@@ -7,7 +7,7 @@
 using Microsoft.AspNetCore.Mvc;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
-using SIO.Domain.User.Events;
+using SIO.Domain.Users.Events;
 using SIO.Identity.Login.Requests;
 using SIO.Migrations;
 

tests/SIO.Identity.Tests/Login/LoginController/Login/Post/WhenPasswordIsCorrectAndReturnUrlIsInvalid.cs

@@ -8,7 +8,7 @@
 using Microsoft.Extensions.Configuration;
 using Microsoft.Extensions.DependencyInjection;
 using Moq;
-using SIO.Domain.User.Events;
+using SIO.Domain.Users.Events;
 using SIO.Identity.Login.Requests;
 using SIO.Migrations;