Merge pull request #15 from brunohbrito/dev

Changes to docker-file

Author: brunobritodev

CHANGELOG.md

@@ -1,6 +1,8 @@
 # v1.2.2
 
 Added ENV for Default User and Pass, to autofill Login Page. Specially made for Dev and Docker environments
+Changed all Configurations to respect inheritance from IConfiguration
+When a registered user login through another external provider, eg google or facebook, then add new login instead try to register it again.
 
 # v1.2.1
 

build/docker-compose.yml

@@ -27,13 +27,16 @@ services:
         depends_on:
             - jpdatabase
         environment: 
-            DATABASE_TYPE: "MySql"
-            CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
-            ASPNETCORE_ENVIRONMENT: "Development"
+            ASPNETCORE_ENVIRONMENT: Development
             ASPNETCORE_URLS: http://+:5000
-            DEFAULT_USER: bruno
-            DEFAULT_PASS: Pa$$word123
-            DEFAULT_EMAIL: bhdebrito@gmail.com
+            CUSTOMCONNSTR_SSOConnection: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
+            ApplicationSettings:EnableExternalProviders: "false" # Because Auth url is http://jpproject (modified by host to point to 127.0.0.1), then Google and Facebook reject it.
+            ApplicationSettings:DatabaseType: MySql
+            ApplicationSettings:DefaultUser: bruno
+            ApplicationSettings:DefaultPass: Pa$$word123
+            ApplicationSettings:DefaultEmail: bhdebrito@gmail.com
+            ApplicationSettings:UserManagementURL: http://localhost:4200
+            ApplicationSettings:IS4AdminUi: http://localhost:4300
 
     # #############################
     # # Management API
@@ -45,11 +48,11 @@ services:
         depends_on:
             - jpdatabase
         environment: 
-            DATABASE_TYPE: "MySql"
-            CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
             ASPNETCORE_ENVIRONMENT: "Development"
-            AUTHORITY: "http://jpproject:5000"
             ASPNETCORE_URLS: http://+
+            CUSTOMCONNSTR_SSOConnection: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
+            ApplicationSettings:Authority: "http://jpproject:5000"
+            ApplicationSettings:DatabaseType: MySql
 
     #############################
     # User management UI

build/jpproject-docker-windows.zip

@@ -30,13 +30,17 @@ services:
         depends_on:
             - jpdatabase
         environment: 
-            DATABASE_TYPE: "MySql"
-            CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
-            ASPNETCORE_ENVIRONMENT: "Development"
+            ASPNETCORE_ENVIRONMENT: Development
             ASPNETCORE_URLS: http://+:5000
-            DEFAULT_USER: bruno
-            DEFAULT_PASS: Pa$$word123
-            DEFAULT_EMAIL: bhdebrito@gmail.com
+            CUSTOMCONNSTR_SSOConnection: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
+            ApplicationSettings:EnableExternalProviders: "false" # Because Auth url is http://jpproject (modified by host to point to 127.0.0.1), then Google and Facebook reject it.
+            ApplicationSettings:DatabaseType: MySql
+            ApplicationSettings:DefaultUser: bruno
+            ApplicationSettings:DefaultPass: Pa$$word123
+            ApplicationSettings:DefaultEmail: bhdebrito@gmail.com
+            ApplicationSettings:UserManagementURL: http://localhost:4200
+            ApplicationSettings:IS4AdminUi: http://localhost:4300
+            CertificateOptions:Type: Temporary
 
     # #############################
     # # Management API
@@ -51,11 +55,11 @@ services:
         depends_on:
             - jpdatabase
         environment: 
-            DATABASE_TYPE: "MySql"
-            CUSTOMCONNSTR_DATABASE_CONNECTION: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
             ASPNETCORE_ENVIRONMENT: "Development"
-            AUTHORITY: "http://jpproject:5000"
             ASPNETCORE_URLS: http://+
+            CUSTOMCONNSTR_SSOConnection: "server=jpdatabase,port=3306;database=jpproject;user=jp;password=10203040"
+            ApplicationSettings:Authority: "http://jpproject:5000"
+            ApplicationSettings:DatabaseType: MySql
 
     #############################
     # User management UI

docker-compose.yml

@@ -34,6 +34,7 @@ public ViewModelToDomainMappingProfile()
             CreateMap<ForgotPasswordViewModel, SendResetLinkCommand>().ConstructUsing(c => new SendResetLinkCommand(c.UsernameOrEmail, c.UsernameOrEmail));
             CreateMap<ResetPasswordViewModel, ResetPasswordCommand>().ConstructUsing(c => new ResetPasswordCommand(c.Password, c.ConfirmPassword, c.Code, c.Email));
             CreateMap<ConfirmEmailViewModel, ConfirmEmailCommand>().ConstructUsing(c => new ConfirmEmailCommand(c.Code, c.Email));
+            CreateMap<SocialViewModel, AddLoginCommand>().ConstructUsing(c => new AddLoginCommand(c.Email, c.Provider, c.ProviderId));
 
             /*
              * User Management commands

src/Backend/Jp.Application/AutoMapper/ViewModelToDomainMappingProfile.cs

@@ -19,5 +19,6 @@ public interface IUserAppService : IDisposable
         Task<UserViewModel> FindByNameAsync(string username);
         Task<UserViewModel> FindByEmailAsync(string username);
         Task<UserViewModel> FindByProviderAsync(string provider, string providerUserId);
+        Task AddLogin(SocialViewModel user);
     }
 }

src/Backend/Jp.Application/Interfaces/IUserAppService.cs

@@ -82,6 +82,12 @@ public async Task<UserViewModel> FindByProviderAsync(string provider, string pro
             return _mapper.Map<UserViewModel>(user);
         }
 
+        public Task AddLogin(SocialViewModel model)
+        {
+            var registerCommand = _mapper.Map<AddLoginCommand>(model);
+            return Bus.SendCommand(registerCommand);
+        }
+
         public Task<bool> CheckUsername(string userName)
         {
             return _userService.UsernameExist(userName);
@@ -98,8 +104,6 @@ public async Task<RegisterUserViewModel> FindByLoginAsync(string provider, strin
             return _mapper.Map<RegisterUserViewModel>(model);
         }
 
-     
-
         public void Dispose()
         {
             GC.SuppressFinalize(this);

src/Backend/Jp.Application/Services/UserAppService.cs

@@ -17,7 +17,8 @@ public class UserCommandHandler : CommandHandler,
         IRequestHandler<RegisterNewUserWithProviderCommand, bool>,
         IRequestHandler<SendResetLinkCommand, bool>,
         IRequestHandler<ResetPasswordCommand, bool>,
-        IRequestHandler<ConfirmEmailCommand, bool>
+        IRequestHandler<ConfirmEmailCommand, bool>,
+        IRequestHandler<AddLoginCommand, bool>
     {
         private readonly IUserService _userService;
 
@@ -47,6 +48,21 @@ public async Task<bool> Handle(RegisterNewUserCommand request, CancellationToken
                 phoneNumber: request.PhoneNumber,
                 picture: request.Picture
             );
+
+            var emailAlreadyExist = await _userService.FindByEmailAsync(user.Email);
+            if (emailAlreadyExist != null)
+            {
+                await Bus.RaiseEvent(new DomainNotification("1001", "E-mail already exist. If you don't remember your passwork, reset it."));
+                return false;
+            }
+            var usernameAlreadyExist = await _userService.FindByNameAsync(user.UserName);
+
+            if (usernameAlreadyExist != null)
+            {
+                await Bus.RaiseEvent(new DomainNotification("1002", "Username already exist. If you don't remember your passwork, reset it."));
+                return false;
+            }
+
             var id = await _userService.CreateUserWithPass(user, request.Password);
             if (id.HasValue)
             {
@@ -72,6 +88,21 @@ public async Task<bool> Handle(RegisterNewUserWithoutPassCommand request, Cancel
                 phoneNumber: request.PhoneNumber,
                 picture: request.Picture
             );
+
+            var emailAlreadyExist = await _userService.FindByEmailAsync(user.Email);
+            if (emailAlreadyExist != null)
+            {
+                await Bus.RaiseEvent(new DomainNotification("1001", "E-mail already exist. If you don't remember your passwork, reset it."));
+                return false;
+            }
+            var usernameAlreadyExist = await _userService.FindByNameAsync(user.UserName);
+
+            if (usernameAlreadyExist != null)
+            {
+                await Bus.RaiseEvent(new DomainNotification("1002", "Username already exist. If you don't remember your passwork, reset it."));
+                return false;
+            }
+
             var id = await _userService.CreateUserWithProvider(user, request.Provider, request.ProviderId);
             if (id.HasValue)
             {
@@ -159,6 +190,22 @@ public async Task<bool> Handle(ConfirmEmailCommand request, CancellationToken ca
             return false;
         }
 
+        public async Task<bool> Handle(AddLoginCommand request, CancellationToken cancellationToken)
+        {
+            if (!request.IsValid())
+            {
+                NotifyValidationErrors(request);
+                return false; ;
+            }
+
+            var result = await _userService.AddLoginAsync(request.Email, request.Provider, request.ProviderId);
+            if (result.HasValue)
+            {
+                await Bus.RaiseEvent(new NewLoginAddedEvent(result.Value, request.Email, request.Provider, request.ProviderId));
+                return true;
+            }
+            return false;
+        }
     }
 
 

src/Backend/Jp.Domain/CommandHandlers/UserCommandHandler.cs

@@ -0,0 +1,21 @@
+using Jp.Domain.Validations.User;
+
+namespace Jp.Domain.Commands.User
+{
+    public class AddLoginCommand : UserCommand
+    {
+
+        public AddLoginCommand(string email, string provider, string providerId)
+        {
+            Provider = provider;
+            ProviderId = providerId;
+            Email = email;
+        }
+
+        public override bool IsValid()
+        {
+            ValidationResult = new AddLoginCommandValidation().Validate(this);
+            return ValidationResult.IsValid;
+        }
+    }
+}

src/Backend/Jp.Domain/Commands/User/AddLoginCommand.cs

@@ -4,7 +4,6 @@ namespace Jp.Domain.Commands.User
 {
     public class ConfirmEmailCommand : UserCommand
     {
-        public string Code { get; }
 
         public ConfirmEmailCommand(string code, string email)
         {