Skip to content
Snippets Groups Projects
Commit 05c263ea authored by Klaus Fischer's avatar Klaus Fischer
Browse files

Renamed Encryption classes due to extraction from inheritance

parent e65478ff
No related branches found
No related tags found
1 merge request!3Feature/440 mvp net sdk part 1
......@@ -24,7 +24,7 @@ public class SenderEncryptionWithSelfSignedCertificateTest {
[OneTimeSetUp]
public void OneTimeSetup() {
_certificate = EncryptionBaseClass.CreateSelfSignedCertificate("./");
_certificate = RsaEncryption.CreateSelfSignedCertificate("./");
}
[OneTimeTearDown]
......
......@@ -11,19 +11,19 @@
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1"/>
<PackageReference Include="Newtonsoft.Json" Version="13.0.1"/>
<PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.14"/>
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.19.0"/>
<PackageReference Include="Microsoft.Extensions.Logging.Abstractions" Version="6.0.1" />
<PackageReference Include="Newtonsoft.Json" Version="13.0.1" />
<PackageReference Include="Newtonsoft.Json.Schema" Version="3.0.14" />
<PackageReference Include="System.IdentityModel.Tokens.Jwt" Version="6.19.0" />
</ItemGroup>
<ItemGroup>
<None Remove="metadata.schema.json"/>
<EmbeddedResource Include="metadata.schema.json"/>
<None Remove="metadata.schema.json" />
<EmbeddedResource Include="metadata.schema.json" />
</ItemGroup>
<ItemGroup>
<Folder Include="Interfaces"/>
<Folder Include="Interfaces" />
</ItemGroup>
</Project>
......@@ -9,20 +9,24 @@ namespace FitConnect;
public class FunctionalBaseClass {
protected readonly ILogger? Logger;
public IEncryptionBaseClass Encryption;
public readonly IEncryption Encryption;
/// <summary>
/// Constructor for the FunctionalBaseClass
/// </summary>
/// <param name="logger">ILogger implementation</param>
/// <param name="endpoints">FitConnect endpoints</param>
/// <param name="certificate">The Encryption certificate</param>
/// <example>
/// new Sender(logger, FitConnectEndpoints.Create(FitConnectEndpoints.EndpointType.Development))
/// </example>
protected FunctionalBaseClass(ILogger? logger, FitConnectEndpoints? endpoints,
X509Certificate2? certificate) {
Endpoints = endpoints ??
FitConnectEndpoints.Create(FitConnectEndpoints.EndpointType.Development);
Logger = logger;
Encryption = new EncryptionBaseClass(logger, certificate);
Encryption = new RsaEncryption(logger, certificate);
}
public FitConnectEndpoints Endpoints { get; }
......@@ -30,13 +34,14 @@ public class FunctionalBaseClass {
/// <summary>
/// Requesting an OAuth token from the FitConnect API.
/// You can get the Client ID and Client Secret from the FitConnect Self Service portal
/// under https://portal.auth-testing.fit-connect.fitko.dev
/// <para>You can get the Client ID and Client Secret from the FitConnect Self Service portal
/// under <br/>
/// https://portal.auth-testing.fit-connect.fitko.dev</para>
/// </summary>
/// <param name="clientId">Your client Id</param>
/// <param name="clientSecret">Your client Secret</param>
/// <param name="scope">Scope if needed</param>
/// <returns></returns>
/// <returns>The received token or null</returns>
public async Task<OAuthAccessToken?> GetTokenAsync(string clientId, string clientSecret,
string? scope = null) {
var client = new HttpClient();
......
......@@ -2,7 +2,7 @@ using System.Security.Cryptography.X509Certificates;
namespace FitConnect;
public interface IEncryptionBaseClass {
public interface IEncryption {
/// <summary>
/// Just for Proof of Concept
/// </summary>
......
......@@ -7,7 +7,7 @@ using Microsoft.IdentityModel.Tokens;
namespace FitConnect;
public class EncryptionBaseClass : IEncryptionBaseClass {
public class RsaEncryption : IEncryption {
private readonly ILogger? _logger;
private readonly RSA _rsa;
private readonly X509Certificate2? certificate;
......@@ -15,7 +15,7 @@ public class EncryptionBaseClass : IEncryptionBaseClass {
private RSA? _publicKey;
internal EncryptionBaseClass(ILogger? logger, X509Certificate2? certificate) {
internal RsaEncryption(ILogger? logger, X509Certificate2? certificate) {
_logger = logger;
_rsa = RSA.Create(4096);
......
0% Loading or .
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment