tudor.stanciu
/
network-resurrector
mirror of https://dev.azure.com/tstanciu94/NetworkResurrector/_git/NetworkResurrector
1
0
Fork 0
Code Issues Packages Projects Releases Wiki Activity

Tuitio packages update

master
Tudor Stanciu 2023-02-04 11:14:21 +02:00
parent e3ca8df153
commit 359dc5dad1
14 changed files with 30 additions and 24 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

2
Directory.Build.props
View File

@ -1,7 +1,7 @@
<Project> <Project>
<Import Project="dependencies.props" /> <Import Project="dependencies.props" />
<PropertyGroup> <PropertyGroup>
<Version>1.1.1</Version> <Version>1.1.2</Version>
<Authors>Tudor Stanciu</Authors> <Authors>Tudor Stanciu</Authors>
<Company>STA</Company> <Company>STA</Company>
<PackageTags>NetworkResurrector</PackageTags> <PackageTags>NetworkResurrector</PackageTags>

10
ReleaseNotes.xml
View File

@ -17,7 +17,7 @@
<Version>1.0.2</Version> <Version>1.0.2</Version>
<Content> <Content>
Replaced Swagger and MediatR implementations with inhouse nuget packages. Replaced Swagger and MediatR implementations with inhouse nuget packages.
Integration with local Identity Server. Integration with Tuitio.
</Content> </Content>
</Note> </Note>
<Note> <Note>
@ -58,4 +58,12 @@
• Small fixes • Small fixes
</Content> </Content>
</Note> </Note>
<Note>
<Version>1.1.2</Version>
<Content>
Tuitio latest updates
• Tuitio nuget packages upgrade
• Tuitio configuration changes
</Content>
</Note>
</ReleaseNotes> </ReleaseNotes>

4
dependencies.props
View File

@ -10,8 +10,8 @@
<MediatRPackageVersion>9.0.0</MediatRPackageVersion> <MediatRPackageVersion>9.0.0</MediatRPackageVersion>
<NBBPackageVersion>6.0.30</NBBPackageVersion> <NBBPackageVersion>6.0.30</NBBPackageVersion>
<EntityFrameworkCorePackageVersion>6.0.1</EntityFrameworkCorePackageVersion> <EntityFrameworkCorePackageVersion>6.0.1</EntityFrameworkCorePackageVersion>
<NetmashExtensionsSwaggerPackageVersion>1.0.6</NetmashExtensionsSwaggerPackageVersion> <NetmashExtensionsSwaggerPackageVersion>1.0.7</NetmashExtensionsSwaggerPackageVersion>
<NetmashSecurityAuthenticationPackageVersion>1.0.8</NetmashSecurityAuthenticationPackageVersion> <NetmashTuitioAuthenticationPackageVersion>2.0.0</NetmashTuitioAuthenticationPackageVersion>
<NetmashDatabaseMigrationPackageVersion>1.2.0</NetmashDatabaseMigrationPackageVersion> <NetmashDatabaseMigrationPackageVersion>1.2.0</NetmashDatabaseMigrationPackageVersion>
<CorreoPublishedLanguage>1.0.1</CorreoPublishedLanguage> <CorreoPublishedLanguage>1.0.1</CorreoPublishedLanguage>
</PropertyGroup> </PropertyGroup>

6
src/agent/NetworkResurrector.Agent/Extensions/StartupExtensions.cs
View File

@ -5,7 +5,7 @@ using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Netmash.Extensions.Swagger; using Netmash.Extensions.Swagger;
using Netmash.Extensions.Swagger.Constants; using Netmash.Extensions.Swagger.Constants;
using Netmash.Security.Authentication.Identity; using Netmash.Security.Authentication.Tuitio;
using NetworkResurrector.Agent.Application; using NetworkResurrector.Agent.Application;
using System.Reflection; using System.Reflection;
@ -18,7 +18,7 @@ namespace NetworkResurrector.Agent.Extensions
services.AddControllers(); services.AddControllers();
// Add basic authentication // Add basic authentication
services.AddIdentityAuthentication(configuration.GetSection("IdentityServer")["BaseAddress"]); services.AddTuitioAuthentication(configuration.GetSection("Tuitio")["BaseAddress"]);
// MediatR // MediatR
services.AddMediatR(GetMediatRAssemblies()); services.AddMediatR(GetMediatRAssemblies());
@ -30,7 +30,7 @@ namespace NetworkResurrector.Agent.Extensions
// Swagger // Swagger
var agentCode = configuration.GetValue<string>("Agent:Code"); var agentCode = configuration.GetValue<string>("Agent:Code");
services.AddSwagger($"NetworkResurrectorAgent {agentCode}", AuthorizationType.InhouseIdentity); services.AddSwagger($"NetworkResurrectorAgent {agentCode}", AuthorizationType.Tuitio);
// Data access // Data access
// services.AddDataAccess(); // services.AddDataAccess();

2
src/agent/NetworkResurrector.Agent/NetworkResurrector.Agent.csproj
View File

@ -11,7 +11,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsPackageVersion)" /> <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsPackageVersion)" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsPackageVersion)" />
<PackageReference Include="Netmash.Extensions.Swagger" Version="$(NetmashExtensionsSwaggerPackageVersion)" /> <PackageReference Include="Netmash.Extensions.Swagger" Version="$(NetmashExtensionsSwaggerPackageVersion)" />
<PackageReference Include="Netmash.Security.Authentication.Identity" Version="$(NetmashSecurityAuthenticationPackageVersion)" /> <PackageReference Include="Netmash.Security.Authentication.Tuitio" Version="$(NetmashTuitioAuthenticationPackageVersion)" />
<PackageReference Include="Serilog.AspNetCore" Version="$(SerilogPackageVersion)" /> <PackageReference Include="Serilog.AspNetCore" Version="$(SerilogPackageVersion)" />
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="$(SerilogSinksMSSqlServerPackageVersion)" /> <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="$(SerilogSinksMSSqlServerPackageVersion)" />
<PackageReference Include="Serilog.Sinks.Seq" Version="$(SerilogSinksSeqPackageVersion)" /> <PackageReference Include="Serilog.Sinks.Seq" Version="$(SerilogSinksSeqPackageVersion)" />

2
src/agent/NetworkResurrector.Agent/appsettings.json
View File

@ -26,7 +26,7 @@
"Agent": { "Agent": {
"Code": "DEV_AGENT" "Code": "DEV_AGENT"
}, },
"IdentityServer": { "Tuitio": {
"BaseAddress": "http://<host>:<port>/api/" "BaseAddress": "http://<host>:<port>/api/"
}, },
"Restrictions": { "Restrictions": {

2
src/api/NetworkResurrector.Api/Controllers/SystemController.cs
View File

@ -5,7 +5,7 @@ using NetworkResurrector.Api.Application.Queries;
using System; using System;
using System.Threading.Tasks; using System.Threading.Tasks;
namespace IdentityServer.Api.Controllers namespace NetworkResurrector.Api.Controllers
{ {
[Authorize] [Authorize]
[ApiController] [ApiController]

6
src/api/NetworkResurrector.Api/Extensions/StartupExtensions.cs
View File

@ -7,7 +7,7 @@ using Netmash.Extensions.Swagger;
using Netmash.Extensions.Swagger.Constants; using Netmash.Extensions.Swagger.Constants;
using Netmash.Infrastructure.DatabaseMigration; using Netmash.Infrastructure.DatabaseMigration;
using Netmash.Infrastructure.DatabaseMigration.Constants; using Netmash.Infrastructure.DatabaseMigration.Constants;
using Netmash.Security.Authentication.Identity; using Netmash.Security.Authentication.Tuitio;
using NetworkResurrector.Agent.Wrapper; using NetworkResurrector.Agent.Wrapper;
using NetworkResurrector.Api.Application; using NetworkResurrector.Api.Application;
using NetworkResurrector.Api.Domain.Abstractions; using NetworkResurrector.Api.Domain.Abstractions;
@ -26,7 +26,7 @@ namespace NetworkResurrector.Api.Extensions
.AddNewtonsoftJson(o => o.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Utc); .AddNewtonsoftJson(o => o.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Utc);
// Add basic authentication // Add basic authentication
services.AddIdentityAuthentication(configuration.GetSection("IdentityServer")["BaseAddress"]); services.AddTuitioAuthentication(configuration.GetSection("Tuitio")["BaseAddress"]);
services.AddHttpContextAccessor(); services.AddHttpContextAccessor();
services.AddScoped<IUserService, UserService>(); services.AddScoped<IUserService, UserService>();
@ -40,7 +40,7 @@ namespace NetworkResurrector.Api.Extensions
services.AddAutoMapper(typeof(Application.Mappings.MappingProfile).Assembly); services.AddAutoMapper(typeof(Application.Mappings.MappingProfile).Assembly);
// Swagger // Swagger
services.AddSwagger("NetworkResurrector API", AuthorizationType.InhouseIdentity); services.AddSwagger("NetworkResurrector API", AuthorizationType.Tuitio);
// Add network resurrector server services // Add network resurrector server services
services.UseResurrectorServices(configuration.GetSection("NetworkResurrectorServer")["BaseAddress"]); services.UseResurrectorServices(configuration.GetSection("NetworkResurrectorServer")["BaseAddress"]);

2
src/api/NetworkResurrector.Api/NetworkResurrector.Api.csproj
View File

@ -14,7 +14,7 @@
<PackageReference Include="NBB.Messaging.Nats" Version="$(NBBPackageVersion)" /> <PackageReference Include="NBB.Messaging.Nats" Version="$(NBBPackageVersion)" />
<PackageReference Include="Netmash.Extensions.Swagger" Version="$(NetmashExtensionsSwaggerPackageVersion)" /> <PackageReference Include="Netmash.Extensions.Swagger" Version="$(NetmashExtensionsSwaggerPackageVersion)" />
<PackageReference Include="Netmash.Infrastructure.DatabaseMigration" Version="$(NetmashDatabaseMigrationPackageVersion)" /> <PackageReference Include="Netmash.Infrastructure.DatabaseMigration" Version="$(NetmashDatabaseMigrationPackageVersion)" />
<PackageReference Include="Netmash.Security.Authentication.Identity" Version="$(NetmashSecurityAuthenticationPackageVersion)" /> <PackageReference Include="Netmash.Security.Authentication.Tuitio" Version="$(NetmashTuitioAuthenticationPackageVersion)" />
<PackageReference Include="Serilog.AspNetCore" Version="$(SerilogPackageVersion)" /> <PackageReference Include="Serilog.AspNetCore" Version="$(SerilogPackageVersion)" />
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="$(SerilogSinksMSSqlServerPackageVersion)" /> <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="$(SerilogSinksMSSqlServerPackageVersion)" />
<PackageReference Include="Serilog.Sinks.Seq" Version="$(SerilogSinksSeqPackageVersion)" /> <PackageReference Include="Serilog.Sinks.Seq" Version="$(SerilogSinksSeqPackageVersion)" />

2
src/api/NetworkResurrector.Api/Services/UserService.cs
View File

@ -39,7 +39,7 @@ namespace NetworkResurrector.Api.Services
public bool UserIsGuest() public bool UserIsGuest()
{ {
var userIsGuest = _httpAccessor.HttpContext.User?.Claims.FirstOrDefault(z => z.Type == Netmash.Security.Authentication.Identity.Constants.ClaimTypes.IsGuestUser)?.Value; var userIsGuest = _httpAccessor.HttpContext.User?.Claims.FirstOrDefault(z => z.Type == Netmash.Security.Authentication.Tuitio.Constants.ClaimTypes.IsGuestUser)?.Value;
return !string.IsNullOrEmpty(userIsGuest) && bool.TrueString == userIsGuest; return !string.IsNullOrEmpty(userIsGuest) && bool.TrueString == userIsGuest;
} }
} }

2
src/api/NetworkResurrector.Api/appsettings.json
View File

@ -26,7 +26,7 @@
"Service": { "Service": {
"Code": "NETWORK_RESURRECTOR_API" "Code": "NETWORK_RESURRECTOR_API"
}, },
"IdentityServer": { "Tuitio": {
"BaseAddress": "http://<host>:<port>/api/" "BaseAddress": "http://<host>:<port>/api/"
}, },
"NetworkResurrectorServer": { "NetworkResurrectorServer": {

8
src/server/NetworkResurrector.Server/Extensions/StartupExtensions.cs
View File

@ -1,13 +1,11 @@
using MediatR; using MediatR;
using MediatR.Pipeline; using MediatR.Pipeline;
using Microsoft.AspNetCore.Builder; using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.Extensions.Configuration; using Microsoft.Extensions.Configuration;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Microsoft.Extensions.Hosting;
using Netmash.Extensions.Swagger; using Netmash.Extensions.Swagger;
using Netmash.Extensions.Swagger.Constants; using Netmash.Extensions.Swagger.Constants;
using Netmash.Security.Authentication.Identity; using Netmash.Security.Authentication.Tuitio;
using NetworkResurrector.Server.Application; using NetworkResurrector.Server.Application;
using Newtonsoft.Json; using Newtonsoft.Json;
using System.Reflection; using System.Reflection;
@ -22,7 +20,7 @@ namespace NetworkResurrector.Server.Extensions
.AddNewtonsoftJson(o => o.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Utc); .AddNewtonsoftJson(o => o.SerializerSettings.DateTimeZoneHandling = DateTimeZoneHandling.Utc);
// Add basic authentication // Add basic authentication
services.AddIdentityAuthentication(configuration.GetSection("IdentityServer")["BaseAddress"]); services.AddTuitioAuthentication(configuration.GetSection("Tuitio")["BaseAddress"]);
services.AddHttpContextAccessor(); services.AddHttpContextAccessor();
@ -36,7 +34,7 @@ namespace NetworkResurrector.Server.Extensions
typeof(Application.Mappings.MappingProfile).Assembly); typeof(Application.Mappings.MappingProfile).Assembly);
// Swagger // Swagger
services.AddSwagger("NetworkResurrector Server API", AuthorizationType.InhouseIdentity); services.AddSwagger("NetworkResurrector Server API", AuthorizationType.Tuitio);
// Application // Application
services.AddApplicationServices(); services.AddApplicationServices();

2
src/server/NetworkResurrector.Server/NetworkResurrector.Server.csproj
View File

@ -11,7 +11,7 @@
<PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsPackageVersion)" /> <PackageReference Include="Microsoft.Extensions.Configuration.FileExtensions" Version="$(MicrosoftExtensionsPackageVersion)" />
<PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsPackageVersion)" /> <PackageReference Include="Microsoft.Extensions.Configuration.Json" Version="$(MicrosoftExtensionsPackageVersion)" />
<PackageReference Include="Netmash.Extensions.Swagger" Version="$(NetmashExtensionsSwaggerPackageVersion)" /> <PackageReference Include="Netmash.Extensions.Swagger" Version="$(NetmashExtensionsSwaggerPackageVersion)" />
<PackageReference Include="Netmash.Security.Authentication.Identity" Version="$(NetmashSecurityAuthenticationPackageVersion)" /> <PackageReference Include="Netmash.Security.Authentication.Tuitio" Version="$(NetmashTuitioAuthenticationPackageVersion)" />
<PackageReference Include="Serilog.AspNetCore" Version="$(SerilogPackageVersion)" /> <PackageReference Include="Serilog.AspNetCore" Version="$(SerilogPackageVersion)" />
<PackageReference Include="Serilog.Sinks.MSSqlServer" Version="$(SerilogSinksMSSqlServerPackageVersion)" /> <PackageReference Include="Serilog.Sinks.MSSqlServer" Version="$(SerilogSinksMSSqlServerPackageVersion)" />
<PackageReference Include="Serilog.Sinks.Seq" Version="$(SerilogSinksSeqPackageVersion)" /> <PackageReference Include="Serilog.Sinks.Seq" Version="$(SerilogSinksSeqPackageVersion)" />

2
src/server/NetworkResurrector.Server/appsettings.json
View File

@ -23,7 +23,7 @@
} }
}, },
"AllowedHosts": "*", "AllowedHosts": "*",
"IdentityServer": { "Tuitio": {
"BaseAddress": "http://<host>:<port>/api/" "BaseAddress": "http://<host>:<port>/api/"
}, },
"WakeOnLan": { "WakeOnLan": {