Skip to content

Commit d35ca45

Browse files
committed
Improve Login
1 parent ed180ba commit d35ca45

File tree

4 files changed

+11
-8
lines changed

4 files changed

+11
-8
lines changed

CheckDrive.Web/CheckDrive.Web/Controllers/AuthController.cs

+4-3
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using CheckDrive.Web.Stores.User;
1+
using CheckDrive.ApiContracts.Account;
2+
using CheckDrive.Web.Stores.User;
23
using CheckDrive.Web.ViewModels;
34
using Microsoft.AspNetCore.Mvc;
45
using System.IdentityModel.Tokens.Jwt;
@@ -52,14 +53,14 @@ public IActionResult Index()
5253
}
5354

5455
[HttpPost]
55-
public async Task<IActionResult> Index(LoginViewModel loginViewModel)
56+
public async Task<IActionResult> Index(AccountForLoginDto loginViewModel)
5657
{
5758
if (!ModelState.IsValid)
5859
{
5960
return View(loginViewModel);
6061
}
6162

62-
var user = new LoginViewModel
63+
var user = new AccountForLoginDto
6364
{
6465
Login = loginViewModel.Login,
6566
Password = loginViewModel.Password,
Original file line numberDiff line numberDiff line change
@@ -1,9 +1,10 @@
1-
using CheckDrive.Web.ViewModels;
1+
using CheckDrive.ApiContracts.Account;
2+
using CheckDrive.Web.ViewModels;
23

34
namespace CheckDrive.Web.Stores.User
45
{
56
public interface IUserDataStore
67
{
7-
public Task<(bool Success, string Token)> AuthenticateLoginAsync(LoginViewModel loginViewModel);
8+
public Task<(bool Success, string Token)> AuthenticateLoginAsync(AccountForLoginDto loginViewModel);
89
}
910
}

CheckDrive.Web/CheckDrive.Web/Stores/User/UserDataStore.cs

+3-2
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,5 @@
1-
using CheckDrive.Web.Service;
1+
using CheckDrive.ApiContracts.Account;
2+
using CheckDrive.Web.Service;
23
using CheckDrive.Web.ViewModels;
34
using Newtonsoft.Json;
45
using System.Text;
@@ -12,7 +13,7 @@ public UserDataStore(ApiClient apiClient)
1213
{
1314
_apiClient = apiClient;
1415
}
15-
public async Task<(bool Success, string Token)> AuthenticateLoginAsync(LoginViewModel loginViewModel)
16+
public async Task<(bool Success, string Token)> AuthenticateLoginAsync(AccountForLoginDto loginViewModel)
1617
{
1718
var json = JsonConvert.SerializeObject(loginViewModel);
1819
var content = new StringContent(json, Encoding.UTF8, "application/json");

CheckDrive.Web/CheckDrive.Web/Views/Auth/Index.cshtml

+1-1
Original file line numberDiff line numberDiff line change
@@ -1,4 +1,4 @@
1-
@model CheckDrive.Web.ViewModels.LoginViewModel
1+
@model CheckDrive.ApiContracts.Account.AccountForLoginDto
22

33
@{
44
ViewData["Title"] = "Index";

0 commit comments

Comments
 (0)