refactoring

T-PortBackend/TPort/Common/Credentials.cs → T-PortBackend/TPort/Commons/Credentials.cs

@@ -1,8 +1,6 @@
 using System;
-using System.Security.Cryptography;
-using System.Text;
 
-namespace TPort.Common
+namespace TPort.Commons
 {
     public class Credentials
     {

T-PortBackend/TPort/Domain/UserManagement/Account.cs

@@ -1,6 +1,6 @@
 using System;
 using System.Collections.Generic;
-using TPort.Common;
+using TPort.Commons;
 
 namespace TPort.Domain.UserManagement
 {

T-PortBackend/TPort/Infrastructure/DataAccess/IAccountRepository.cs

@@ -1,5 +1,5 @@
 using System;
-using TPort.Common;
+using TPort.Commons;
 using TPort.Domain.UserManagement;
 
 namespace TPort.Infrastructure.DataAccess

T-PortBackend/TPort/Infrastructure/DataAccess/InMemoryAccountRepository.cs

@@ -1,7 +1,7 @@
 using System;
 using System.Collections.Generic;
 using System.Linq;
-using TPort.Common;
+using TPort.Commons;
 using TPort.Domain.UserManagement;
 
 namespace TPort.Infrastructure.DataAccess

T-PortBackend/TPort/Services/AccountManager.cs

@@ -1,12 +1,12 @@
 using System;
 using System.Collections.Generic;
-using TPort.Common;
+using TPort.Commons;
 using TPort.Domain.UserManagement;
 using TPort.Infrastructure.DataAccess;
 
 namespace TPort.Services
 {
-    public class AccountManager
+    public class AccountManager : IAccountManager
     {
         public AccountManager(IAccountRepository accountRepository)
         {
@@ -28,7 +28,7 @@ public Guid CreateAccount(Credentials credentials)
             return newAccount.Id;
         }
 
-        public Account LoadAccount(string phoneNumber) //TODO тут не должно быть этого, нужно убрать логику из контроллера если можно и перенести ее сюда
+        public Account LoadAccount(string phoneNumber)
         {
             return _accountRepository.LoadAccount(phoneNumber);
         }

T-PortBackend/TPort/Services/IAccountManager.cs

@@ -0,0 +1,17 @@
+using System;
+using TPort.Commons;
+using TPort.Domain.UserManagement;
+
+namespace TPort.Services
+{
+    public interface IAccountManager
+    {
+        Guid CreateAccount(Credentials credentials);
+
+        Account LoadAccount(string phoneNumber);
+
+        void AddTripToAccount(Guid tripId, Guid accountId);
+
+        void AddBankCardToAccount(string cardNumber, DateTime validity, Guid accountId);
+    }
+}

T-PortBackend/TPort/Services/ISmsManager.cs

@@ -0,0 +1,7 @@
+namespace TPort.Services
+{
+    public interface ISmsManager
+    {
+        void SendMessage(string phoneNumber, string message);
+    }
+}

T-PortBackend/TPort/Services/ITotpManager.cs

@@ -0,0 +1,9 @@
+namespace TPort.Services
+{
+    public interface ITotpManager
+    {
+        int GenerateToken(string phoneNumber);
+
+        bool ValidateToken(string phoneNumber, int token);
+    }
+}

T-PortBackend/TPort/Services/SmsManager.cs

@@ -1,6 +1,6 @@
 namespace TPort.Services
 {
-    public class SmsManager
+    public class SmsManager : ISmsManager
     {
         public SmsManager()
         {

T-PortBackend/TPort/Services/TotpManager.cs

@@ -4,10 +4,11 @@
 using AspNetCore.Totp.Interface;
 using TPort.Domain.Exceptions;
 using TPort.Infrastructure.DataAccess;
+using TPort.Services;
 
 namespace TPortApi.Security
 {
-    public class TotpManager
+    public class TotpManager : ITotpManager
     {
         public TotpManager(ITotpGenerator totpGenerator, string secretKey, int totpTokenLifetimeInSeconds, ITotpTokenRepository totpTokenRepository)
         {
@@ -27,11 +28,11 @@ public int GenerateToken(string phoneNumber)
         public bool ValidateToken(string phoneNumber, int token)
         {
             return true;
-            var existingToken = _totpTokenRepository.GetToken(phoneNumber);
-            if (existingToken == 0) throw new UnregisteredPhoneNumberException();
-            if (existingToken != token) throw new InvalidTokenException();
-            var totpValidator = new TotpValidator(_totpGenerator);
-            return totpValidator.Validate(_secretKey, token, _totpTokenLifetimeInSeconds);
+//            var existingToken = _totpTokenRepository.GetToken(phoneNumber);
+//            if (existingToken == 0) throw new UnregisteredPhoneNumberException();
+//            if (existingToken != token) throw new InvalidTokenException();
+//            var totpValidator = new TotpValidator(_totpGenerator);
+//            return totpValidator.Validate(_secretKey, token, _totpTokenLifetimeInSeconds);
         }
 
 

T-PortBackend/TPort/TPort.csproj

@@ -1,4 +1,4 @@
-<Project Sdk="Microsoft.NET.Sdk">
+<Project Sdk="Microsoft.NET.Sdk">
 
     <PropertyGroup>
         <TargetFramework>netcoreapp2.1</TargetFramework>
@@ -7,6 +7,12 @@
     <ItemGroup>
       <PackageReference Include="AspNetCore.Totp" Version="2.3.0" />
       <PackageReference Include="Microsoft.AspNet.WebApi.Client" Version="5.2.7" />
+      <PackageReference Include="Microsoft.AspNetCore.App" Version="2.1.1" />
+      <PackageReference Include="Newtonsoft.Json" Version="12.0.2-beta1" />
+    </ItemGroup>
+
+    <ItemGroup>
+      <Folder Include="Infrastructure\ApiClients" />
     </ItemGroup>
 
 </Project>

T-PortBackend/TPortApi/Controllers/AccountController.cs

@@ -1,17 +1,16 @@
 using System;
 using Microsoft.AspNetCore.Authorization;
 using Microsoft.AspNetCore.Mvc;
-using TPort.Common;
+using TPort.Commons;
 using TPort.Services;
-using TPortApi.Extensions;
 using TPortApi.Models.AccountModels;
 using TPortApi.Security;
 
 namespace TPortApi.Controllers
 {
     public class AccountController : Controller
     {
-        public AccountController(AccountManager accountManager, IJwtIssuer jwtIssuer, SmsManager smsManager, TotpManager totpManager)
+        public AccountController(IAccountManager accountManager, IJwtIssuer jwtIssuer, ISmsManager smsManager, ITotpManager totpManager)
         {
             _accountManager = accountManager ?? throw new ArgumentNullException(nameof(accountManager));
             _jwtIssuer = jwtIssuer ?? throw new ArgumentNullException(nameof(jwtIssuer));
@@ -31,7 +30,6 @@ public IActionResult Login([FromBody] LoginRequest loginRequest)
                     .ToString());
 
             return Ok();
-
         }
 
         /// <summary>
@@ -44,7 +42,7 @@ public IActionResult Login([FromBody] LoginRequest loginRequest)
         [Route("login")]
         public IActionResult Login([FromBody] LoginConfirmationRequest loginConfirmationRequest)
         {
-            _totpManager.ValidateToken(loginConfirmationRequest.Phone, int.Parse(loginConfirmationRequest.Code));
+            _totpManager.ValidateToken(loginConfirmationRequest.Phone, loginConfirmationRequest.Code);
             var account = _accountManager.LoadAccount(loginConfirmationRequest.Phone);
             var credentials = new Credentials(Request.Headers["User-Agent"], loginConfirmationRequest.Phone);
             var accountId = account?.Id ?? _accountManager.CreateAccount(credentials);
@@ -62,9 +60,9 @@ public ActionResult AddBankCard([FromBody]BankCardModel bankCardModel)
             return Ok();
         }
 
-        private readonly SmsManager _smsManager;
-        private readonly AccountManager _accountManager;
+        private readonly ISmsManager _smsManager;
+        private readonly IAccountManager _accountManager;
         private readonly IJwtIssuer _jwtIssuer;
-        private readonly TotpManager _totpManager;
+        private readonly ITotpManager _totpManager;
     }
 }