Merge pull request #25 from MahdiyarGHD/develop

Deimplement token generation and Identity services

src/CSharp/EasyMicroservices.AuthenticationsMicroservice.Clients/EasyMicroservices.AuthenticationsMicroservice.Clients.csproj

@@ -5,7 +5,7 @@
     <Platforms>AnyCPU;x64;x86</Platforms>
     <Authors>EasyMicroservices</Authors>
     <GeneratePackageOnBuild>true</GeneratePackageOnBuild>
-    <Version>0.0.0.10</Version>
+    <Version>0.0.0.13</Version>
     <Description>client generated code.</Description>
     <Copyright>[email protected]</Copyright>
     <PackageTags>microservice,auth,authentication,client</PackageTags>

src/CSharp/EasyMicroservices.AuthenticationsMicroservice.Domain/Contracts/Requests/GetUserByUserNameRequestContract.cs

@@ -0,0 +1,13 @@
+using System;
+using System.Collections.Generic;
+using System.Linq;
+using System.Text;
+using System.Threading.Tasks;
+
+namespace EasyMicroservices.AuthenticationsMicroservice.Contracts.Requests
+{
+    public class GetUserByUserNameRequestContract
+    {
+        public string Username { get; set; }
+    }
+}

src/CSharp/EasyMicroservices.AuthenticationsMicroservice.Logics/EasyMicroservices.AuthenticationsMicroservice.Logics.csproj

@@ -13,6 +13,7 @@
 
   <ItemGroup>
     <Folder Include="DatabaseLogics\" />
+    <Folder Include="Interfaces\" />
     <Folder Include="Mappers\" />
   </ItemGroup>
 

src/CSharp/EasyMicroservices.AuthenticationsMicroservice.StartUp/DatabaseBuilder.cs

@@ -14,8 +14,8 @@ public DatabaseBuilder(IConfiguration configuration)
 
         public void OnConfiguring(DbContextOptionsBuilder optionsBuilder)
         {
-            //optionsBuilder.UseInMemoryDatabase("AuthDb");
-            optionsBuilder.UseSqlServer(_configuration.GetConnectionString("local"));
+            optionsBuilder.UseInMemoryDatabase("AuthDb");
+            //optionsBuilder.UseSqlServer(_configuration.GetConnectionString("local"));
         }
     }
 }

src/CSharp/EasyMicroservices.AuthenticationsMicroservice.WebApi/Controllers/UserController.cs

@@ -3,7 +3,6 @@
 using EasyMicroservices.AuthenticationsMicroservice.Contracts.Responses;
 using EasyMicroservices.AuthenticationsMicroservice.Database.Entities;
 using EasyMicroservices.AuthenticationsMicroservice.Helpers;
-using EasyMicroservices.AuthenticationsMicroservice.Interfaces;
 using EasyMicroservices.Cores.AspCoreApi;
 using EasyMicroservices.Cores.AspEntityFrameworkCoreApi.Interfaces;
 using EasyMicroservices.ServiceContracts;
@@ -15,104 +14,24 @@ namespace EasyMicroservices.AuthenticationsMicroservice.WebApi.Controllers
     public class UsersController : SimpleQueryServiceController<UserEntity, AddUserRequestContract, UserContract, UserContract, long>
     {
         private readonly IUnitOfWork _unitOfWork;
-        private readonly IJWTManager _jwtManager;
 
-        public UsersController(IUnitOfWork unitOfWork, IJWTManager jwtManager) : base(unitOfWork)
+        public UsersController(IUnitOfWork unitOfWork) : base(unitOfWork)
         {
             _unitOfWork = unitOfWork;
-            _jwtManager = jwtManager;
         }
 
         [HttpPost]
-        public async Task<MessageContract<bool>> VerifyUserName(VerifyEmailAddressContract request)
+        public async Task<MessageContract<UserContract>> GetUserByUserName(GetUserByUserNameRequestContract request)
         {
-            var logic = _unitOfWork.GetLongContractLogic<UserEntity, AddUserRequestContract, UserContract, UserContract>();
-            var user = await logic.GetById(new Cores.Contracts.Requests.GetIdRequestContract<long> { Id = request.UserId }).AsCheckedResult();
-            if (user.IsUsernameVerified)
-                return true;
-
-            await logic.Update(new UserContract
-            {
-                CreationDateTime = user.CreationDateTime,
-                DeletedDateTime = user.DeletedDateTime,
-                Id = user.Id,
-                IsDeleted = user.IsDeleted,
-                IsUsernameVerified = true,
-                ModificationDateTime = user.ModificationDateTime,
-                Password = user.Password,
-                UniqueIdentity = user.UniqueIdentity,
-                UserName = user.UserName,
-            }).AsCheckedResult();
-
-            return true;
-
-        }
-        [HttpPost]
-        public async Task<MessageContract<long>> Register(AddUserRequestContract request)
-        {
-            return await _jwtManager.Register(request);
-        }
-
-        [HttpPost]
-        public async Task<MessageContract<long>> Login(UserSummaryContract request)
-        {
-            string password = await AuthenticationHelper.HashPassword(request.Password);
-            request.Password = password;
-
-            var response = await _jwtManager.Login(request);
-
-            return response;
-        }
-
-        [HttpPost]
-        public async Task<MessageContract<UserResponseContract>> GenerateToken(UserClaimContract request)
-        {
-            string password = await AuthenticationHelper.HashPassword(request.Password);
-            request.Password = password;
-
-            var response = await _jwtManager.GenerateToken(request);
-
-            return response;
+            return await _unitOfWork.GetContractLogic<UserEntity, AddUserRequestContract, UserContract, UserContract, long>().GetBy(x => x.UserName == request.Username);
         }
-
+               
         [HttpPost]
-        public async Task<MessageContract<UserResponseContract>> RegenerateToken(RegenerateTokenContract request)
-        {
-            var logic = _unitOfWork.GetLongContractLogic<UserEntity, AddUserRequestContract, UserContract, UserContract>();
-            var user = await logic.GetById(new Cores.Contracts.Requests.GetIdRequestContract<long>
-            {
-                Id = request.UserId
-            });
-
-            if (user)
-            {
-
-                string password = user.Result.Password;
-
-                var req = new UserClaimContract
-                {
-                    Password = password,
-                    UserName = user.Result.UserName,
-                    Claims = request.Claims
-                };
-
-                var response = await _jwtManager.GenerateToken(req);
-
-                return new UserResponseContract
-                {
-                    Token = response.Result.Token
-                };
-            }
-
-            return user.ToContract<UserResponseContract>();
-        }
-
-        [HttpGet]
-        [Authorize]
-        public string Test()
+        public async Task<MessageContract<UserContract>> VerifyUserIdentity(UserSummaryContract request)
         {
-            return "test";
+            return await _unitOfWork.GetContractLogic<UserEntity, AddUserRequestContract, UserContract, UserContract, long>().GetBy(x => x.UserName == request.UserName && x.Password == request.Password);
         }
 
+
     }
 }

src/CSharp/EasyMicroservices.AuthenticationsMicroservice.WebApi/Program.cs

@@ -1,5 +1,4 @@
 using EasyMicroservices.AuthenticationsMicroservice.Database.Contexts;
-using EasyMicroservices.AuthenticationsMicroservice.Interfaces;
 using EasyMicroservices.Cores.AspEntityFrameworkCoreApi;
 using EasyMicroservices.Cores.AspEntityFrameworkCoreApi.Interfaces;
 using EasyMicroservices.Cores.Interfaces;
@@ -73,7 +72,7 @@ static WebApplicationBuilder CreateBuilder(string[] args)
                                   });
             });
 
-            app.Services.AddScoped<IJWTManager, JWTManager>();
+            //app.Services.AddScoped<IJWTManager, JWTManager>();
 
             app.Services.AddAuthentication(JwtBearerDefaults.AuthenticationScheme)
                 .AddJwtBearer(options =>