shrukan/bank-backend
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Doxy, -Wall -Werror, other cleanup and organization first round

Browse Source
This commit is contained in:
tjwise99
2023-08-19 20:46:31 -04:00
parent 1fedd4d016
commit 49de8aa8d7
43 changed files with 728 additions and 354 deletions
Download Patch File Download Diff File Expand all files Collapse all files

12
src/IO.Swagger/Attributes/ValidateModelStateAttribute.cs
View File

@ -1,9 +1,9 @@
using System.ComponentModel.DataAnnotations;
using System.Reflection;
using Microsoft.AspNetCore.Mvc;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.AspNetCore.Mvc.Filters;
using Microsoft.AspNetCore.Mvc.ModelBinding;
using System.ComponentModel.DataAnnotations;
using System.Reflection;
namespace IO.Swagger.Attributes
{
@ -19,8 +19,7 @@ namespace IO.Swagger.Attributes
public override void OnActionExecuting(ActionExecutingContext context)
{
// Per https://blog.markvincze.com/how-to-validate-action-parameters-with-dataannotation-attributes/
var descriptor = context.ActionDescriptor as ControllerActionDescriptor;
if (descriptor != null)
if (context.ActionDescriptor is ControllerActionDescriptor descriptor)
{
foreach (var parameter in descriptor.MethodInfo.GetParameters())
{
@ -40,14 +39,13 @@ namespace IO.Swagger.Attributes
}
}
private void ValidateAttributes(ParameterInfo parameter, object args, ModelStateDictionary modelState)
private static void ValidateAttributes(ParameterInfo parameter, object args, ModelStateDictionary modelState)
{
foreach (var attributeData in parameter.CustomAttributes)
{
var attributeInstance = parameter.GetCustomAttribute(attributeData.AttributeType);
var validationAttribute = attributeInstance as ValidationAttribute;
if (validationAttribute != null)
if (attributeInstance is ValidationAttribute validationAttribute)
{
var isValid = validationAttribute.IsValid(args);
if (!isValid)

25
src/IO.Swagger/Controllers/AuthApi.cs
View File

@ -7,24 +7,21 @@
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*/
using System;
using System.Collections.Generic;
using AutoMapper;
using IO.Swagger.Attributes;
using IO.Swagger.Models.RequestDto;
using IO.Swagger.Models.ResponseDto;
using IO.Swagger.Repositories;
using IO.Swagger.Security;
using IO.Swagger.Services;
using Microsoft.AspNetCore.Authorization;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
using Swashbuckle.AspNetCore.SwaggerGen;
using Newtonsoft.Json;
using System.ComponentModel.DataAnnotations;
using IO.Swagger.Attributes;
using IO.Swagger.Security;
using Microsoft.AspNetCore.Authorization;
using IO.Swagger.Models.dto;
using IO.Swagger.Repositories;
using System.Threading.Tasks;
using System;
using System.Collections.Generic;
using System.Linq;
using IO.Swagger.Services;
using System.Security.Claims;
using AutoMapper;
using Newtonsoft.Json.Linq;
using System.Threading.Tasks;
namespace IO.Swagger.Controllers
{

35
src/IO.Swagger/Controllers/CurrencyApi.cs
View File

@ -7,34 +7,43 @@
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*/
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
using Swashbuckle.AspNetCore.SwaggerGen;
using Newtonsoft.Json;
using System.ComponentModel.DataAnnotations;
using AutoMapper;
using IO.Swagger.Attributes;
using IO.Swagger.Models.RequestDto;
using IO.Swagger.Models.ResponseDto;
using IO.Swagger.Repositories;
using IO.Swagger.Security;
using Microsoft.AspNetCore.Authorization;
using IO.Swagger.Models.dto;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using System.Threading.Tasks;
using IO.Swagger.Repositories;
using AutoMapper;
namespace IO.Swagger.Controllers
{
/// <summary>
///
/// </summary>
/// <seealso cref="Microsoft.AspNetCore.Mvc.ControllerBase" />
[ApiController]
public class CurrencyApiController : ControllerBase
{
private readonly ICurrencyRepository repo;
private readonly IMapper mapper;
/// <summary>
/// Initializes a new instance of the <see cref="CurrencyApiController"/> class.
/// </summary>
/// <param name="repo">The repo.</param>
/// <param name="mapper">The mapper.</param>
/// <exception cref="System.ArgumentNullException">
/// repo
/// or
/// mapper
/// </exception>
public CurrencyApiController(ICurrencyRepository repo, IMapper mapper)
{
this.repo = repo ?? throw new ArgumentNullException(nameof(repo));
@ -96,7 +105,7 @@ namespace IO.Swagger.Controllers
/// <summary>
/// Create a new currency type
/// </summary>
/// <param name="body"></param>
/// <param name="body">The currency to create</param>
/// <response code="201">Currency type created successfully</response>
/// <response code="400">Bad Request</response>
/// <response code="401">Unauthorized</response>
@ -123,7 +132,7 @@ namespace IO.Swagger.Controllers
/// <summary>
/// Mint additional units of a currency
/// </summary>
/// <param name="body"></param>
/// <param name="body">The information on the currency to mint</param>
/// <response code="200">Successful minting</response>
/// <response code="400">Bad Request</response>
/// <response code="401">Unauthorized</response>
@ -151,7 +160,7 @@ namespace IO.Swagger.Controllers
/// </summary>
/// <response code="200">Returns all known currencies</response>
/// <response code="401">Unauthorized</response>
[HttpPost]
[HttpGet]
[Route("/v1/api/currency/getAll")]
[Authorize(AuthenticationSchemes = BearerAuthenticationHandler.SchemeName)]
[ValidateModelState]

30
src/IO.Swagger/Controllers/WalletApi.cs
View File

@ -7,27 +7,25 @@
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*/
using System;
using System.Collections.Generic;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
using Swashbuckle.AspNetCore.SwaggerGen;
using Newtonsoft.Json;
using System.ComponentModel.DataAnnotations;
using AutoMapper;
using IO.Swagger.Attributes;
using IO.Swagger.Models.RequestDto;
using IO.Swagger.Models.ResponseDto;
using IO.Swagger.Repositories;
using IO.Swagger.Security;
using Microsoft.AspNetCore.Authorization;
using IO.Swagger.Models.dto;
using Microsoft.AspNetCore.Mvc;
using Swashbuckle.AspNetCore.Annotations;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Security.Claims;
using IO.Swagger.Repositories;
using System.Threading.Tasks;
using AutoMapper;
namespace IO.Swagger.Controllers
{
/// <summary>
///
/// The controller for accessing routes for wallet management
/// </summary>
[ApiController]
public class WalletApiController : ControllerBase
@ -35,6 +33,16 @@ namespace IO.Swagger.Controllers
private readonly ITransactionRepository transactionRepository;
private readonly IMapper mapper;
/// <summary>
/// Initializes a new instance of the <see cref="WalletApiController"/> class.
/// </summary>
/// <param name="transactionRepository">The transaction repository.</param>
/// <param name="mapper">The mapper.</param>
/// <exception cref="System.ArgumentNullException">
/// transactionRepository
/// or
/// mapper
/// </exception>
public WalletApiController(ITransactionRepository transactionRepository, IMapper mapper)
{
this.transactionRepository = transactionRepository ?? throw new ArgumentNullException(nameof(transactionRepository));

5
src/IO.Swagger/Filters/BasePathFilter.cs
View File

@ -1,8 +1,7 @@
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;
using System.Linq;
using System.Text.RegularExpressions;
using Swashbuckle.AspNetCore.Swagger;
using Swashbuckle.AspNetCore.SwaggerGen;
using Microsoft.OpenApi.Models;
namespace IO.Swagger.Filters
{

14
src/IO.Swagger/Filters/GeneratePathParamsValidationFilter.cs
View File

@ -1,8 +1,8 @@
using System.ComponentModel.DataAnnotations;
using System.Linq;
using Microsoft.AspNetCore.Mvc.Controllers;
using Microsoft.OpenApi.Models;
using Swashbuckle.AspNetCore.SwaggerGen;
using System.ComponentModel.DataAnnotations;
using System.Linq;
namespace IO.Swagger.Filters
{
@ -42,7 +42,7 @@ namespace IO.Swagger.Filters
string regex = (string)regexAttr.ConstructorArguments[0].Value;
if (swaggerParam is OpenApiParameter)
{
((OpenApiParameter)swaggerParam).Schema.Pattern = regex;
swaggerParam.Schema.Pattern = regex;
}
}
@ -72,8 +72,8 @@ namespace IO.Swagger.Filters
if (swaggerParam is OpenApiParameter)
{
((OpenApiParameter)swaggerParam).Schema.MinLength = minLenght;
((OpenApiParameter)swaggerParam).Schema.MaxLength = maxLength;
swaggerParam.Schema.MinLength = minLenght;
swaggerParam.Schema.MaxLength = maxLength;
}
// Range [Range]
@ -85,8 +85,8 @@ namespace IO.Swagger.Filters
if (swaggerParam is OpenApiParameter)
{
((OpenApiParameter)swaggerParam).Schema.Minimum = rangeMin;
((OpenApiParameter)swaggerParam).Schema.Maximum = rangeMax;
swaggerParam.Schema.Minimum = rangeMin;
swaggerParam.Schema.Maximum = rangeMax;
}
}
}

8
src/IO.Swagger/IO.Swagger.csproj
View File

@ -8,6 +8,14 @@
<AssemblyName>IO.Swagger</AssemblyName>
<PackageId>IO.Swagger</PackageId>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Debug|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<PropertyGroup Condition="'$(Configuration)|$(Platform)'=='Release|AnyCPU'">
<WarningLevel>9999</WarningLevel>
<TreatWarningsAsErrors>True</TreatWarningsAsErrors>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="AutoMapper" Version="12.0.1" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="7.0.10" />

4
src/IO.Swagger/Migrations/20230819185130_Started transactions and currencies.cs
View File

@ -1,5 +1,5 @@
using System;
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations;
using System;
#nullable disable

22
src/IO.Swagger/Models/dto/AuthLoginBody.cs → src/IO.Swagger/Models/RequestDto/AuthLoginBody.cs
View File

@ -7,18 +7,12 @@
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*/
using System;
using System.Linq;
using System.IO;
using System.Text;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
using Newtonsoft.Json;
using System;
using System.Runtime.Serialization;
using System.Text;
namespace IO.Swagger.Models.dto
namespace IO.Swagger.Models.RequestDto
{
/// <summary>
///
@ -48,8 +42,8 @@ namespace IO.Swagger.Models.dto
{
var sb = new StringBuilder();
sb.Append("class AuthLoginBody {\n");
sb.Append(" Email: ").Append(Email).Append("\n");
sb.Append(" Password: ").Append(Password).Append("\n");
sb.Append(" Email: ").Append(Email).Append('\n');
sb.Append(" Password: ").Append(Password).Append('\n');
sb.Append("}\n");
return sb.ToString();
}
@ -70,7 +64,7 @@ namespace IO.Swagger.Models.dto
/// <returns>Boolean</returns>
public override bool Equals(object obj)
{
if (ReferenceEquals(null, obj)) return false;
if (obj is null) return false;
if (ReferenceEquals(this, obj)) return true;
return obj.GetType() == GetType() && Equals((AuthLoginBody)obj);
}
@ -82,7 +76,7 @@ namespace IO.Swagger.Models.dto
/// <returns>Boolean</returns>
public bool Equals(AuthLoginBody other)
{
if (ReferenceEquals(null, other)) return false;
if (other is null) return false;
if (ReferenceEquals(this, other)) return true;
return

11
src/IO.Swagger/Models/dto/AuthRegisterBody.cs → src/IO.Swagger/Models/RequestDto/AuthRegisterBody.cs
View File

@ -7,18 +7,13 @@
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*/
using Newtonsoft.Json;
using System;
using System.Linq;
using System.IO;
using System.Text;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
using Newtonsoft.Json;
using System.Text;
namespace IO.Swagger.Models.dto
namespace IO.Swagger.Models.RequestDto
{
/// <summary>
///

11
src/IO.Swagger/Models/dto/CurrencyAddAssetBody.cs → src/IO.Swagger/Models/RequestDto/CurrencyAddAssetBody.cs
View File

@ -7,18 +7,13 @@
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*/
using Newtonsoft.Json;
using System;
using System.Linq;
using System.IO;
using System.Text;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
using Newtonsoft.Json;
using System.Text;
namespace IO.Swagger.Models.dto
namespace IO.Swagger.Models.RequestDto
{
/// <summary>
///

19
src/IO.Swagger/Models/dto/CurrencyCreateBody.cs → src/IO.Swagger/Models/RequestDto/CurrencyCreateBody.cs
View File

@ -7,18 +7,13 @@
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*/
using Newtonsoft.Json;
using System;
using System.Linq;
using System.IO;
using System.Text;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
using Newtonsoft.Json;
using System.Text;
namespace IO.Swagger.Models.dto
namespace IO.Swagger.Models.RequestDto
{
/// <summary>
///
@ -50,8 +45,8 @@ namespace IO.Swagger.Models.dto
{
var sb = new StringBuilder();
sb.Append("class CurrencyCreateBody {\n");
sb.Append(" Name: ").Append(Name).Append("\n");
sb.Append(" Symbol: ").Append(Symbol).Append("\n");
sb.Append(" Name: ").Append(Name).Append('\n');
sb.Append(" Symbol: ").Append(Symbol).Append('\n');
sb.Append("}\n");
return sb.ToString();
}
@ -72,7 +67,7 @@ namespace IO.Swagger.Models.dto
/// <returns>Boolean</returns>
public override bool Equals(object obj)
{
if (ReferenceEquals(null, obj)) return false;
if (obj is null) return false;
if (ReferenceEquals(this, obj)) return true;
return obj.GetType() == GetType() && Equals((CurrencyCreateBody)obj);
}
@ -84,7 +79,7 @@ namespace IO.Swagger.Models.dto
/// <returns>Boolean</returns>
public bool Equals(CurrencyCreateBody other)
{
if (ReferenceEquals(null, other)) return false;
if (other is null) return false;
if (ReferenceEquals(this, other)) return true;
return

14
src/IO.Swagger/Models/dto/CurrencyCreateCollectionBody.cs → src/IO.Swagger/Models/RequestDto/CurrencyCreateCollectionBody.cs
View File

@ -7,18 +7,12 @@
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*/
using System;
using System.Linq;
using System.IO;
using System.Text;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
using Newtonsoft.Json;
using System;
using System.Runtime.Serialization;
using System.Text;
namespace IO.Swagger.Models.dto
namespace IO.Swagger.Models.RequestDto
{
/// <summary>
///

32
src/IO.Swagger/Models/dto/CurrencyMintBody.cs → src/IO.Swagger/Models/RequestDto/CurrencyMintBody.cs
View File

@ -7,18 +7,13 @@
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*/
using Newtonsoft.Json;
using System;
using System.Linq;
using System.IO;
using System.Text;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
using Newtonsoft.Json;
using System.Text;
namespace IO.Swagger.Models.dto
namespace IO.Swagger.Models.RequestDto
{
/// <summary>
///
@ -50,8 +45,8 @@ namespace IO.Swagger.Models.dto
{
var sb = new StringBuilder();
sb.Append("class CurrencyMintBody {\n");
sb.Append(" CurrencyId: ").Append(CurrencyId).Append("\n");
sb.Append(" Amount: ").Append(Amount).Append("\n");
sb.Append(" CurrencyId: ").Append(CurrencyId).Append('\n');
sb.Append(" Amount: ").Append(Amount).Append('\n');
sb.Append("}\n");
return sb.ToString();
}
@ -72,7 +67,7 @@ namespace IO.Swagger.Models.dto
/// <returns>Boolean</returns>
public override bool Equals(object obj)
{
if (ReferenceEquals(null, obj)) return false;
if (obj is null) return false;
if (ReferenceEquals(this, obj)) return true;
return obj.GetType() == GetType() && Equals((CurrencyMintBody)obj);
}
@ -84,18 +79,16 @@ namespace IO.Swagger.Models.dto
/// <returns>Boolean</returns>
public bool Equals(CurrencyMintBody other)
{
if (ReferenceEquals(null, other)) return false;
if (other is null) return false;
if (ReferenceEquals(this, other)) return true;
return
(
CurrencyId == other.CurrencyId ||
CurrencyId != null &&
CurrencyId.Equals(other.CurrencyId)
) &&
(
Amount == other.Amount ||
Amount != null &&
Amount.Equals(other.Amount)
);
}
@ -106,16 +99,7 @@ namespace IO.Swagger.Models.dto
/// <returns>Hash code</returns>
public override int GetHashCode()
{
unchecked // Overflow is fine, just wrap
{
var hashCode = 41;
// Suitable nullity checks etc, of course :)
if (CurrencyId != null)
hashCode = hashCode * 59 + CurrencyId.GetHashCode();
if (Amount != null)
hashCode = hashCode * 59 + Amount.GetHashCode();
return hashCode;
}
return HashCode.Combine(CurrencyId, Amount);
}
#region Operators

14
src/IO.Swagger/Models/dto/WalletTransferDigitalBody.cs → src/IO.Swagger/Models/RequestDto/WalletTransferDigitalBody.cs
View File

@ -7,18 +7,12 @@
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*/
using System;
using System.Linq;
using System.IO;
using System.Text;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
using Newtonsoft.Json;
using System;
using System.Runtime.Serialization;
using System.Text;
namespace IO.Swagger.Models.dto
namespace IO.Swagger.Models.RequestDto
{
/// <summary>
///

35
src/IO.Swagger/Models/dto/WalletTransferPhysicalBody.cs → src/IO.Swagger/Models/RequestDto/WalletTransferPhysicalBody.cs
View File

@ -7,18 +7,13 @@
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*/
using Newtonsoft.Json;
using System;
using System.Linq;
using System.IO;
using System.Text;
using System.Collections;
using System.Collections.Generic;
using System.Collections.ObjectModel;
using System.ComponentModel.DataAnnotations;
using System.Runtime.Serialization;
using Newtonsoft.Json;
using System.Text;
namespace IO.Swagger.Models.dto
namespace IO.Swagger.Models.RequestDto
{
/// <summary>
///
@ -34,19 +29,25 @@ namespace IO.Swagger.Models.dto
public string DestUserEmail { get; set; }
/// <summary>
/// Gets or Sets Amount
/// Gets or Sets Amount of the transaction
/// </summary>
[Range(0.1, float.MaxValue, ErrorMessage = "Please enter a valid transfer amount")]
[DataMember(Name = "amount")]
public float Amount { get; set; }
/// <summary>
/// Gets or Sets CurrencyId
/// Gets or Sets CurrencyId the transaction will be performed with
/// </summary>
[Required]
[DataMember(Name = "currencyId")]
public int CurrencyId { get; set; }
/// <summary>
/// Gets or sets the memo of the transaction.
/// </summary>
/// <value>
/// The memo.
/// </value>
[DataMember(Name = "memo")]
[StringLength(32, MinimumLength = 2)]
[Required]
@ -60,9 +61,9 @@ namespace IO.Swagger.Models.dto
{
var sb = new StringBuilder();
sb.Append("class WalletTransferPhysicalBody {\n");
sb.Append(" DestUserEmail: ").Append(DestUserEmail).Append("\n");
sb.Append(" Amount: ").Append(Amount).Append("\n");
sb.Append(" CurrencyId: ").Append(CurrencyId).Append("\n");
sb.Append(" DestUserEmail: ").Append(DestUserEmail).Append('\n');
sb.Append(" Amount: ").Append(Amount).Append('\n');
sb.Append(" CurrencyId: ").Append(CurrencyId).Append('\n');
sb.Append("}\n");
return sb.ToString();
}
@ -83,7 +84,7 @@ namespace IO.Swagger.Models.dto
/// <returns>Boolean</returns>
public override bool Equals(object obj)
{
if (ReferenceEquals(null, obj)) return false;
if (obj is null) return false;
if (ReferenceEquals(this, obj)) return true;
return obj.GetType() == GetType() && Equals((WalletTransferPhysicalBody)obj);
}
@ -95,7 +96,7 @@ namespace IO.Swagger.Models.dto
/// <returns>Boolean</returns>
public bool Equals(WalletTransferPhysicalBody other)
{
if (ReferenceEquals(null, other)) return false;
if (other is null) return false;
if (ReferenceEquals(this, other)) return true;
return
@ -106,12 +107,10 @@ namespace IO.Swagger.Models.dto
) &&
(
Amount == other.Amount ||
Amount != null &&
Amount.Equals(other.Amount)
) &&
(
CurrencyId == other.CurrencyId ||
CurrencyId != null &&
CurrencyId.Equals(other.CurrencyId)
);
}
@ -128,9 +127,7 @@ namespace IO.Swagger.Models.dto
// Suitable nullity checks etc, of course :)
if (DestUserEmail != null)
hashCode = hashCode * 59 + DestUserEmail.GetHashCode();
if (Amount != null)
hashCode = hashCode * 59 + Amount.GetHashCode();
if (CurrencyId != null)
hashCode = hashCode * 59 + CurrencyId.GetHashCode();
return hashCode;
}

34
src/IO.Swagger/Models/ResponseDto/CurrencyDto.cs Normal file
View File

@ -0,0 +1,34 @@
using System.ComponentModel.DataAnnotations;
namespace IO.Swagger.Models.ResponseDto
{
/// <summary>
/// The output DTO for basic currency information
/// </summary>
public class CurrencyDto
{
/// <summary>
/// Gets or sets the currency identifier.
/// </summary>
/// <value>
/// The currency identifier.
/// </value>
public int CurrencyId { get; set; }
/// <summary>
/// Gets or sets the name of the currency.
/// </summary>
/// <value>
/// The name.
/// </value>
[StringLength(32, MinimumLength = 1)]
public string Name { get; set; }
/// <summary>
/// Gets or sets the symbol of the currency.
/// </summary>
/// <value>
/// The symbol.
/// </value>
[StringLength(4, MinimumLength = 1)]
public string Symbol { get; set; }
}
}

31
src/IO.Swagger/Models/ResponseDto/CurrencyInfoDto.cs Normal file
View File

@ -0,0 +1,31 @@
namespace IO.Swagger.Models.ResponseDto
{
/// <summary>
/// The DTO for returning detailed currency information
/// </summary>
/// <seealso cref="IO.Swagger.Models.ResponseDto.CurrencyDto" />
public class CurrencyInfoDto : CurrencyDto
{
/// <summary>
/// Gets or sets the currency owner.
/// </summary>
/// <value>
/// The currency owner.
/// </value>
public UserDto CurrencyOwner { get; set; }
/// <summary>
/// Gets or sets a value indicating whether this logged in user is the owner of this currency.
/// </summary>
/// <value>
/// <c>true</c> if this instance is owner; otherwise, <c>false</c>.
/// </value>
public bool IsOwner { get; set; }
/// <summary>
/// Gets or sets the amount in circulation of this currency.
/// </summary>
/// <value>
/// The amount in circulation.
/// </value>
public float AmountInCirculation { get; set; }
}
}

16
src/IO.Swagger/Models/ResponseDto/TokenDto.cs Normal file
View File

@ -0,0 +1,16 @@
namespace IO.Swagger.Models.ResponseDto
{
/// <summary>
/// The DTO returned when a JWT is requested
/// </summary>
public class TokenDto
{
/// <summary>
/// Gets or sets the valid JWT that can be used for accessing other API routes.
/// </summary>
/// <value>
/// The token.
/// </value>
public string Token { get; set; }
}
}

54
src/IO.Swagger/Models/ResponseDto/TransactionDto.cs Normal file
View File

@ -0,0 +1,54 @@
using System;
namespace IO.Swagger.Models.ResponseDto
{
/// <summary>
/// The DTO that is return when transactions are requested
/// </summary>
public class TransactionDto
{
/// <summary>
/// Gets or sets the user that originated the transaction.
/// </summary>
/// <value>
/// From user.
/// </value>
public UserDto FromUser { get; set; }
/// <summary>
/// Gets or sets the user that received the transaction.
/// </summary>
/// <value>
/// From user.
/// </value>
public UserDto ToUser { get; set; }
/// <summary>
/// Gets or sets the amount of the transaction.
/// </summary>
/// <value>
/// The amount.
/// </value>
public float Amount { get; set; }
/// <summary>
/// Gets or sets the currency the transaction was performed with.
/// </summary>
/// <value>
/// The currency.
/// </value>
public CurrencyDto Currency { get; set; }
/// <summary>
/// Gets or sets the memo of the transaction.
/// </summary>
/// <value>
/// The memo.
/// </value>
public string Memo { get; set; }
/// <summary>
/// Gets or sets the time the transaction occurred.
/// </summary>
/// <value>
/// The transaction time.
/// </value>
public DateTime TransactionTime { get; set; }
}
}

30
src/IO.Swagger/Models/ResponseDto/UserDto.cs Normal file
View File

@ -0,0 +1,30 @@
namespace IO.Swagger.Models.ResponseDto
{
/// <summary>
/// The dto for returning user information
/// </summary>
public class UserDto
{
/// <summary>
/// Gets or sets the email of the user.
/// </summary>
/// <value>
/// The email.
/// </value>
public string Email { get; set; }
/// <summary>
/// Gets or sets the first name of the user.
/// </summary>
/// <value>
/// The first name.
/// </value>
public string FirstName { get; set; }
/// <summary>
/// Gets or sets the last name of the user.
/// </summary>
/// <value>
/// The last name.
/// </value>
public string LastName { get; set; }
}
}

23
src/IO.Swagger/Models/ResponseDto/WalletBalanceDto.cs Normal file
View File

@ -0,0 +1,23 @@
namespace IO.Swagger.Models.ResponseDto
{
/// <summary>
/// The DTP returned for the balance of a single currency type in a wallet.
/// </summary>
public class WalletBalanceDto
{
/// <summary>
/// Gets or sets the currency the balance is in.
/// </summary>
/// <value>
/// The currency.
/// </value>
public CurrencyDto Currency { get; set; }
/// <summary>
/// Gets or sets the amount of the currency.
/// </summary>
/// <value>
/// The balance.
/// </value>
public float Balance { get; set; }
}
}

44
src/IO.Swagger/Models/db/Currency.cs
View File

@ -1,23 +1,59 @@
using System.Collections;
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using System.Runtime.Serialization;
using System.Text.Json.Serialization;
namespace IO.Swagger.Models.db
{
/// <summary>
/// The basic representation of currency
/// </summary>
public class Currency
{
/// <summary>
/// Gets or sets the currency identifier.
/// </summary>
/// <value>
/// The currency identifier.
/// </value>
public int CurrencyId { get; set; }
/// <summary>
/// Gets or sets the name of the currency.
/// </summary>
/// <value>
/// The name.
/// </value>
[StringLength(32, MinimumLength = 1)]
public string Name { get; set; }
/// <summary>
/// Gets or sets the symbol to use for shorthand representation of the currency.
/// </summary>
/// <value>
/// The symbol.
/// </value>
[StringLength(4, MinimumLength = 1)]
public string Symbol { get; set; }
/// <summary>
/// Gets or sets the user identifier that created the currency.
/// </summary>
/// <value>
/// The user identifier.
/// </value>
[ForeignKey("FK_Currency_UserId")]
public int UserId { get; set; }
/// <summary>
/// Gets or sets the user that created the currency.
/// </summary>
/// <value>
/// The user.
/// </value>
public User User { get; set; }
/// <summary>
/// Gets or sets the transactions that have been performed with this currency.
/// </summary>
/// <value>
/// The transactions.
/// </value>
public ICollection<Transaction> Transactions { get; set; }
}
}

69
src/IO.Swagger/Models/db/Transaction.cs
View File

@ -1,29 +1,88 @@
using Microsoft.EntityFrameworkCore;
using Microsoft.VisualBasic;
using System;
using System;
using System.ComponentModel.DataAnnotations;
using System.Text.Json.Serialization;
namespace IO.Swagger.Models.db
{
/// <summary>
/// The basic unit of a transaction
/// </summary>
public class Transaction
{
/// <summary>
/// Gets or sets the transaction identifier.
/// </summary>
/// <value>
/// The transaction identifier.
/// </value>
public int TransactionId { get; set; }
/// <summary>
/// Gets or sets the user identifier of the wallet the money came from.
/// </summary>
/// <value>
/// From user identifier.
/// </value>
public int FromUserId { get; set; }
/// <summary>
/// Gets or sets the user that the money came from.
/// </summary>
/// <value>
/// From user.
/// </value>
public User FromUser { get; set; }
/// <summary>
/// Gets or sets the user identifier of the wallet the money went to.
/// </summary>
/// <value>
/// From user identifier.
/// </value>
public int ToUserId { get; set; }
/// <summary>
/// Gets or sets the user that the money went to.
/// </summary>
/// <value>
/// From user.
/// </value>
public User ToUser { get; set; }
/// <summary>
/// Gets or sets the amount exchanged in the transaction.
/// </summary>
/// <value>
/// The amount.
/// </value>
[Range(0.01, float.MaxValue)]
public float Amount { get; set; }
/// <summary>
/// Gets or sets the memo of the transaction.
/// </summary>
/// <value>
/// The memo.
/// </value>
[Required]
[StringLength(32, MinimumLength = 2)]
public string Memo { get; set; }
/// <summary>
/// Gets or sets the currency the transaction amount was issued in.
/// </summary>
/// <value>
/// The currency.
/// </value>
public Currency Currency { get; set; }
/// <summary>
/// Gets or sets the currency identifier the transaction amount was issued in.
/// </summary>
/// <value>
/// The currency identifier.
/// </value>
public int CurrencyId { get; set; }
/// <summary>
/// Gets or sets the time the transaction occured.
/// </summary>
/// <value>
/// The transaction time.
/// </value>
public DateTime TransactionTime { get; set; } = DateTime.UtcNow;
}
}

62
src/IO.Swagger/Models/db/User.cs
View File

@ -1,23 +1,77 @@
using System.Collections;
using System.Collections.Generic;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
using System.Text.Json.Serialization;
namespace IO.Swagger.Models.db
{
/// <summary>
/// The basic representation of a user
/// </summary>
public class User
{
/// <summary>
/// Gets or sets the identifier.
/// </summary>
/// <value>
/// The identifier.
/// </value>
public int Id { get; set; }
/// <summary>
/// Gets or sets the email of the user.
/// </summary>
/// <value>
/// The email.
/// </value>
public string Email { get; set; }
/// <summary>
/// Gets or sets the first name of the user.
/// </summary>
/// <value>
/// The first name.
/// </value>
[StringLength(32, MinimumLength = 3)]
public string FirstName { get; set; }
/// <summary>
/// Gets or sets the last name of the user.
/// </summary>
/// <value>
/// The last name.
/// </value>
[StringLength(32, MinimumLength = 3)]
public string LastName { get; set; }
/// <summary>
/// Gets or sets the hashed and salted equivalent of the users password.
/// </summary>
/// <value>
/// The password hash.
/// </value>
public string PasswordHash { get; set; }
/// <summary>
/// Gets or sets the randomly generated salt of the users password.
/// </summary>
/// <value>
/// The salt.
/// </value>
public string Salt { get; set; }
/// <summary>
/// Gets or sets the currencies the user has created.
/// </summary>
/// <value>
/// The currencies.
/// </value>
public ICollection<Currency> Currencies { get; set; }
/// <summary>
/// Gets or sets the transactions from the user.
/// </summary>
/// <value>
/// The transactions from.
/// </value>
public ICollection<Transaction> TransactionsFrom { get; set; }
/// <summary>
/// Gets or sets the transactions to the user.
/// </summary>
/// <value>
/// The transactions to.
/// </value>
public ICollection<Transaction> TransactionsTo { get; set; }
}

13
src/IO.Swagger/Models/dto/CurrencyDto.cs
View File

@ -1,13 +0,0 @@
using System.ComponentModel.DataAnnotations;
namespace IO.Swagger.Models.dto
{
public class CurrencyDto
{
public int CurrencyId { get; set; }
[StringLength(32, MinimumLength = 1)]
public string Name { get; set; }
[StringLength(4, MinimumLength = 1)]
public string Symbol { get; set; }
}
}

9
src/IO.Swagger/Models/dto/CurrencyInfoDto.cs
View File

@ -1,9 +0,0 @@
namespace IO.Swagger.Models.dto
{
public class CurrencyInfoDto : CurrencyDto
{
public UserDto CurrencyOwner { get; set; }
public bool IsOwner { get; set; }
public float AmountInCirculation { get; set; }
}
}

7
src/IO.Swagger/Models/dto/TokenDto.cs
View File

@ -1,7 +0,0 @@
namespace IO.Swagger.Models.dto
{
public class TokenDto
{
public string Token { get; set; }
}
}

16
src/IO.Swagger/Models/dto/TransactionDto.cs
View File

@ -1,16 +0,0 @@
using Microsoft.SqlServer.Server;
using Microsoft.VisualBasic;
using System;
namespace IO.Swagger.Models.dto
{
public class TransactionDto
{
public UserDto FromUser { get; set; }
public UserDto ToUser { get; set; }
public float Amount { get; set; }
public CurrencyDto Currency { get; set; }
public string Memo { get; set; }
public DateTime TransactionTime { get; set; }
}
}

13
src/IO.Swagger/Models/dto/UserDto.cs
View File

@ -1,13 +0,0 @@
using IO.Swagger.Models.db;
using System.Collections.Generic;
using System.ComponentModel.DataAnnotations;
namespace IO.Swagger.Models.dto
{
public class UserDto
{
public string Email { get; set; }
public string FirstName { get; set; }
public string LastName { get; set; }
}
}

8
src/IO.Swagger/Models/dto/WalletBalanceDto.cs
View File

@ -1,8 +0,0 @@
namespace IO.Swagger.Models.dto
{
public class WalletBalanceDto
{
public CurrencyDto Currency { get; set; }
public float Balance { get; set; }
}
}

2
src/IO.Swagger/Program.cs
View File

@ -1,5 +1,5 @@
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore;
using Microsoft.AspNetCore.Hosting;
namespace IO.Swagger
{

17
src/IO.Swagger/Repositories/CurrencyRepository.cs
View File

@ -1,28 +1,38 @@
using IO.Swagger.Models.db;
using IO.Swagger.Models.dto;
using IO.Swagger.Models.RequestDto;
using IO.Swagger.Services;
using Microsoft.EntityFrameworkCore;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Threading.Tasks;
namespace IO.Swagger.Repositories
{
/// <summary>
/// The EF implementation of this interface
/// </summary>
/// <seealso cref="ICurrencyRepository" />
public class CurrencyRepository : ICurrencyRepository
{
BankDbContext context;
private readonly BankDbContext context;
/// <summary>
/// Initializes a new instance of the <see cref="CurrencyRepository"/> class.
/// </summary>
/// <param name="context">The db context.</param>
/// <exception cref="ArgumentNullException">context</exception>
public CurrencyRepository(BankDbContext context)
{
this.context = context ?? throw new ArgumentNullException(nameof(context));
}
/// <inheritdoc/>
public async Task<List<Currency>> GetAllCurrencies()
{
return await context.Currencies.Include(c => c.User).Include(c => c.Transactions).ToListAsync();
}
/// <inheritdoc/>
public async Task<bool> CreateCurrency(CurrencyCreateBody request, int userId)
{
request.Symbol = request.Symbol.Trim();
@ -40,6 +50,7 @@ namespace IO.Swagger.Repositories
return await context.SaveChangesAsync() > 0;
}
/// <inheritdoc/>
public async Task<bool> MintCurrency(CurrencyMintBody request, int userId)
{
var existsAndIsOwner = await context.Currencies.AnyAsync(c => c.CurrencyId == request.CurrencyId && c.UserId == userId);

23
src/IO.Swagger/Repositories/ICurrencyRepository.cs
View File

@ -1,14 +1,33 @@
using IO.Swagger.Models.db;
using IO.Swagger.Models.dto;
using IO.Swagger.Models.RequestDto;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace IO.Swagger.Repositories
{
/// <summary>
/// The interface defining all currency management activities
/// </summary>
public interface ICurrencyRepository
{
Task<bool> CreateCurrency(CurrencyCreateBody request, int userId);
/// <summary>
/// Gets all currencies.
/// </summary>
/// <returns>A list of all known currencies</returns>
Task<List<Currency>> GetAllCurrencies();
/// <summary>
/// Creates the currency.
/// </summary>
/// <param name="request">The currency to create.</param>
/// <param name="userId">The user id creating the currency.</param>
/// <returns>True if the creation was successful, false otherwise.</returns>
Task<bool> CreateCurrency(CurrencyCreateBody request, int userId);
/// <summary>
/// Mints the supplied amount of the supplied currency.
/// </summary>
/// <param name="request">The currency to mint and how much.</param>
/// <param name="userId">The user id mintung the currency.</param>
/// <returns>True if the currency was minted, false otherwise.</returns>
Task<bool> MintCurrency(CurrencyMintBody request, int userId);
}
}

36
src/IO.Swagger/Repositories/ITransactionRepository.cs
View File

@ -1,23 +1,57 @@
using IO.Swagger.Models.db;
using IO.Swagger.Models.dto;
using IO.Swagger.Models.RequestDto;
using System;
using System.Collections.Generic;
using System.Threading.Tasks;
namespace IO.Swagger.Repositories
{
/// <summary>
/// The enum defining transaction creation results
/// </summary>
public enum TransactionReturnCode
{
/// <summary>
/// The success code
/// </summary>
Success,
/// <summary>
/// The transaction had insufficient funds
/// </summary>
InsufficientFunds,
/// <summary>
/// The the transaction had unknown destination user
/// </summary>
UnknownDestinationUser,
/// <summary>
/// The transaction encountered database error
/// </summary>
DbError
}
/// <summary>
/// The interface defining all transaction actions
/// </summary>
public interface ITransactionRepository
{
/// <summary>
/// Gets the balances for user.
/// </summary>
/// <param name="userId">The user identifier.</param>
/// <returns>The currencies and associated balance of that currency</returns>
Task<List<Tuple<Currency, float>>> GetBalancesForUser(int userId);
/// <summary>
/// Gets the transactions for user.
/// </summary>
/// <param name="userId">The user identifier.</param>
/// <returns>A list of all transactions the user has performed in time descending order.</returns>
Task<List<Transaction>> GetTransactionsForUser(int userId);
/// <summary>
/// Transfers the physical currency from one account to another.
/// </summary>
/// <param name="request">The transfer request.</param>
/// <param name="fromUserId">From user identifier.</param>
/// <returns>The TransactionReturnCode corresponding to action that was performed.</returns>
Task<TransactionReturnCode> TransferPhysical(WalletTransferPhysicalBody request, int fromUserId);
}
}

20
src/IO.Swagger/Repositories/IUserRepository.cs
View File

@ -1,13 +1,31 @@
using IO.Swagger.Models.db;
using IO.Swagger.Models.dto;
using IO.Swagger.Models.RequestDto;
using System.Threading.Tasks;
namespace IO.Swagger.Repositories
{
/// <summary>
/// The repository governing how to access user data
/// </summary>
public interface IUserRepository
{
/// <summary>
/// Logins the user.
/// </summary>
/// <param name="request">The login request.</param>
/// <returns>The user if login was successful, null otherwise</returns>
Task<User> LoginUser(AuthLoginBody request);
/// <summary>
/// Registers the user.
/// </summary>
/// <param name="request">The request.</param>
/// <returns>The user if registration was successful, null otherwise</returns>
Task<User> RegisterUser(AuthRegisterBody request);
/// <summary>
/// Retrieves the information about the user.
/// </summary>
/// <param name="userId">The user identifier.</param>
/// <returns>The users information if it exists, null otherwise.</returns>
Task<User> RetrieveUser(int userId);
}
}

21
src/IO.Swagger/Repositories/TransactionRepository.cs
View File

@ -1,5 +1,5 @@
using IO.Swagger.Models.db;
using IO.Swagger.Models.dto;
using IO.Swagger.Models.RequestDto;
using IO.Swagger.Services;
using Microsoft.EntityFrameworkCore;
using System;
@ -9,16 +9,25 @@ using System.Threading.Tasks;
namespace IO.Swagger.Repositories
{
/// <summary>
/// The EF implementation of this interface
/// </summary>
/// <seealso cref="IO.Swagger.Repositories.ITransactionRepository" />
public class TransactionRepository : ITransactionRepository
{
BankDbContext context;
private readonly BankDbContext context;
/// <summary>
/// Initializes a new instance of the <see cref="TransactionRepository"/> class.
/// </summary>
/// <param name="context">The context.</param>
/// <exception cref="System.ArgumentNullException">context</exception>
public TransactionRepository(BankDbContext context)
{
this.context = context ?? throw new ArgumentNullException(nameof(context));
}
/// <inheritdoc/>
public async Task<List<Transaction>> GetTransactionsForUser(int userId)
{
var transactions = await context.Transactions.Where(t => t.ToUserId == userId || t.FromUserId == userId)
@ -34,6 +43,8 @@ namespace IO.Swagger.Repositories
return transactions;
}
/// <inheritdoc/>
public async Task<List<Tuple<Currency, float>>> GetBalancesForUser(int userId)
{
var transactions = await context.Transactions.Where(t => t.ToUserId == userId || t.FromUserId == userId)
@ -52,6 +63,8 @@ namespace IO.Swagger.Repositories
return transactions;
}
/// <inheritdoc/>
public async Task<TransactionReturnCode> TransferPhysical(WalletTransferPhysicalBody request, int fromUserId)
{
var trimmedDest = request.DestUserEmail.Trim().ToLower();

27
src/IO.Swagger/Repositories/UserRepository.cs
View File

@ -1,23 +1,31 @@
using IO.Swagger.Models.db;
using System.Security.Cryptography;
using System;
using IO.Swagger.Models.RequestDto;
using IO.Swagger.Services;
using IO.Swagger.Models.dto;
using System.Threading.Tasks;
using Microsoft.EntityFrameworkCore;
using System.Linq;
using System;
using System.Security.Cryptography;
using System.Threading.Tasks;
namespace IO.Swagger.Repositories
{
/// <summary>
/// The EF implementation of this interface
/// </summary>
/// <seealso cref="IO.Swagger.Repositories.IUserRepository" />
public class UserRepository : IUserRepository
{
private readonly BankDbContext bankDbContext;
/// <summary>
/// Initializes a new instance of the <see cref="UserRepository"/> class.
/// </summary>
/// <param name="bankDbContext">The bank database context.</param>
public UserRepository(BankDbContext bankDbContext)
{
this.bankDbContext = bankDbContext;
}
/// <inheritdoc/>
public async Task<User> RegisterUser(AuthRegisterBody request)
{
request.Email = request.Email.ToLower();
@ -25,15 +33,14 @@ namespace IO.Swagger.Repositories
return null;
// Generate a random salt
byte[] saltBytes = new byte[16];
new RNGCryptoServiceProvider().GetBytes(saltBytes);
byte[] saltBytes = RandomNumberGenerator.GetBytes(16);
string salt = Convert.ToBase64String(saltBytes);
// Hash the password along with the salt
string password = request.Password;
string saltedPassword = password + salt;
byte[] passwordBytes = System.Text.Encoding.UTF8.GetBytes(saltedPassword);
byte[] hashedBytes = new SHA256Managed().ComputeHash(passwordBytes);
byte[] hashedBytes = SHA256.HashData(passwordBytes);
string hashedPassword = Convert.ToBase64String(hashedBytes);
// Create and insert the user
@ -51,6 +58,7 @@ namespace IO.Swagger.Repositories
return newUser;
}
/// <inheritdoc/>
public async Task<User> LoginUser(AuthLoginBody request)
{
request.Email = request.Email.ToLower();
@ -62,13 +70,14 @@ namespace IO.Swagger.Repositories
string password = request.Password;
string saltedPassword = password + user.Salt;
byte[] passwordBytes = System.Text.Encoding.UTF8.GetBytes(saltedPassword);
byte[] hashedBytes = new SHA256Managed().ComputeHash(passwordBytes);
byte[] hashedBytes = SHA256.HashData(passwordBytes);
string hashedPassword = Convert.ToBase64String(hashedBytes);
if (hashedPassword != user.PasswordHash)
return null;
return user;
}
/// <inheritdoc/>
public async Task<User> RetrieveUser(int userId)
{
return await bankDbContext.Users.FirstOrDefaultAsync(u => u.Id == userId);

20
src/IO.Swagger/Security/BearerAuthenticationHandler.cs
View File

@ -1,16 +1,14 @@
using Microsoft.AspNetCore.Authentication;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.Tokens;
using System;
using System.IdentityModel.Tokens.Jwt;
using System.Linq;
using System.Net.Http.Headers;
using System.Security.Claims;
using System.Text;
using System.Text.Encodings.Web;
using System.Threading.Tasks;
using Microsoft.AspNetCore.Authentication;
using Microsoft.Extensions.Logging;
using Microsoft.Extensions.Options;
using Microsoft.IdentityModel.Tokens;
using Newtonsoft.Json.Linq;
namespace IO.Swagger.Security
{
@ -19,6 +17,7 @@ namespace IO.Swagger.Security
/// </summary>
public class BearerAuthenticationHandler : AuthenticationHandler<AuthenticationSchemeOptions>
{
//TODO: Clean this up and use the service for it
private readonly string secretKey;
private readonly byte[] secretBytes;
@ -27,6 +26,7 @@ namespace IO.Swagger.Security
/// </summary>
public const string SchemeName = "Bearer";
/// <inheritdoc/>
public BearerAuthenticationHandler(IOptionsMonitor<AuthenticationSchemeOptions> options, ILoggerFactory logger, UrlEncoder encoder, ISystemClock clock) : base(options, logger, encoder, clock)
{
secretKey = Environment.GetEnvironmentVariable("JWT_SECRET_KEY");
@ -36,7 +36,9 @@ namespace IO.Swagger.Security
/// <summary>
/// verify that require authorization header exists.
/// </summary>
protected override async Task<AuthenticateResult> HandleAuthenticateAsync()
protected override Task<AuthenticateResult> HandleAuthenticateAsync()
{
return Task.Run(() =>
{
if (!Request.Headers.ContainsKey("Authorization"))
{
@ -74,9 +76,6 @@ namespace IO.Swagger.Security
{
return AuthenticateResult.Fail("Invalid Auth Token");
}
}
catch
{
@ -84,6 +83,7 @@ namespace IO.Swagger.Security
}
return AuthenticateResult.Fail("Missing Authorization Header");
});
}
}
}

26
src/IO.Swagger/Services/BankDbContext.cs
View File

@ -3,18 +3,40 @@ using Microsoft.EntityFrameworkCore;
namespace IO.Swagger.Services
{
/// <summary>
/// The EF DbContext that owns all connections and interactions
/// </summary>
/// <seealso cref="Microsoft.EntityFrameworkCore.DbContext" />
public class BankDbContext : DbContext
{
/// <inheritdoc/>
public BankDbContext(DbContextOptions options) : base(options)
{
}
/// <summary>
/// Gets or sets the collections of users.
/// </summary>
/// <value>
/// The users.
/// </value>
public DbSet<User> Users { get; set; }
/// <summary>
/// Gets or sets the collection of currencies.
/// </summary>
/// <value>
/// The currencies.
/// </value>
public DbSet<Currency> Currencies { get; set; }
/// <summary>
/// Gets or sets the collection of transactions.
/// </summary>
/// <value>
/// The transactions.
/// </value>
public DbSet<Transaction> Transactions { get; set; }
/// <inheritdoc/>
protected override void OnModelCreating(ModelBuilder modelBuilder)
{
base.OnModelCreating(modelBuilder);

20
src/IO.Swagger/Services/JwtService.cs
View File

@ -1,28 +1,38 @@
using Microsoft.IdentityModel.Tokens;
using System;
using System.IdentityModel.Tokens.Jwt;
using System.Security.Claims;
using System.Text;
using System;
namespace IO.Swagger.Services
{
/// <summary>
/// The internal service for creating and reading JWTs
/// </summary>
public class JwtService
{
private readonly string secretKey;
private readonly byte[] secretBytes;
/// <summary>
/// Initializes a new instance of the <see cref="JwtService"/> class.
/// </summary>
public JwtService()
{
secretKey = Environment.GetEnvironmentVariable("JWT_SECRET_KEY");
secretBytes = Encoding.UTF8.GetBytes(secretKey);
}
/// <summary>
/// Generates the JWT.
/// </summary>
/// <param name="userId">The user identifier.</param>
/// <returns>A JWT that will expire in 1hr from time of issue enconding the user id supplied</returns>
public string GenerateJwt(int userId)
{
var claims = new[]
{
new Claim(ClaimTypes.NameIdentifier, userId.ToString())
// You can add more claims as needed
};
var tokenHandler = new JwtSecurityTokenHandler();
@ -36,11 +46,5 @@ namespace IO.Swagger.Services
var token = tokenHandler.CreateToken(tokenDescriptor);
return tokenHandler.WriteToken(token);
}
public int GetUserIdFromJwt(string jwtToken)
{
return -1; // Return -1 if user ID extraction fails
}
}
}

9
src/IO.Swagger/Services/MapperProfile.cs
View File

@ -1,12 +1,19 @@
using AutoMapper;
using IO.Swagger.Models.db;
using IO.Swagger.Models.dto;
using IO.Swagger.Models.ResponseDto;
using System.Linq;
namespace IO.Swagger.Services
{
/// <summary>
/// The configuration of all automapper profiles
/// </summary>
/// <seealso cref="AutoMapper.Profile" />
public class MapperProfile : Profile
{
/// <summary>
/// Initializes a new instance of the <see cref="MapperProfile"/> class.
/// </summary>
public MapperProfile()
{
CreateMap<User, UserDto>();

23
src/IO.Swagger/Startup.cs
View File

@ -7,11 +7,15 @@
*
* Generated by: https://github.com/swagger-api/swagger-codegen.git
*/
using System;
using System.IO;
using AutoMapper;
using IO.Swagger.Filters;
using IO.Swagger.Repositories;
using IO.Swagger.Security;
using IO.Swagger.Services;
using Microsoft.AspNetCore.Authentication;
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.EntityFrameworkCore;
using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
@ -19,14 +23,8 @@ using Microsoft.Extensions.Logging;
using Microsoft.OpenApi.Models;
using Newtonsoft.Json.Converters;
using Newtonsoft.Json.Serialization;
using Swashbuckle.AspNetCore.Swagger;
using Swashbuckle.AspNetCore.SwaggerGen;
using IO.Swagger.Filters;
using IO.Swagger.Security;
using IO.Swagger.Repositories;
using IO.Swagger.Services;
using Microsoft.EntityFrameworkCore;
using AutoMapper;
using System;
using System.IO;
namespace IO.Swagger
{
@ -118,7 +116,7 @@ namespace IO.Swagger
Id="bearerAuth"
}
},
new string[]{}
Array.Empty<string>()
}
});
});
@ -131,7 +129,8 @@ namespace IO.Swagger
// CORS sucks
services.AddCors(opt => {
services.AddCors(opt =>
{
opt.AddDefaultPolicy(po =>
{
po.AllowAnyHeader()