This commit is contained in:
2025-11-27 12:49:36 +01:00
parent 002b3cafff
commit bb30c7fb42
24 changed files with 386 additions and 56 deletions

View File

@@ -16,11 +16,13 @@ namespace SZUAbsolventenverein.Module.AdminModules.Manager
public class AdminModulesManager : MigratableModuleBase, IInstallable, IPortable, ISearchable
{
private readonly IAdminModulesRepository _AdminModulesRepository;
private readonly IAdminSettingsRepository _AdminSettingsRepository;
private readonly IDBContextDependencies _DBContextDependencies;
public AdminModulesManager(IAdminModulesRepository AdminModulesRepository, IDBContextDependencies DBContextDependencies)
public AdminModulesManager(IAdminModulesRepository AdminModulesRepository, IAdminSettingsRepository AdminSettingsRepository, IDBContextDependencies DBContextDependencies)
{
_AdminModulesRepository = AdminModulesRepository;
_AdminSettingsRepository = AdminSettingsRepository;
_DBContextDependencies = DBContextDependencies;
}

View File

@@ -4,6 +4,7 @@ using Oqtane.Databases.Interfaces;
using Oqtane.Migrations;
using SZUAbsolventenverein.Module.AdminModules.Migrations.EntityBuilders;
using SZUAbsolventenverein.Module.AdminModules.Repository;
using SZUAbsolventenverein.Module.AdminModules.Server.Migrations.EntityBuilders;
namespace SZUAbsolventenverein.Module.AdminModules.Migrations
{
@@ -17,14 +18,18 @@ namespace SZUAbsolventenverein.Module.AdminModules.Migrations
protected override void Up(MigrationBuilder migrationBuilder)
{
var entityBuilder = new AdminModulesEntityBuilder(migrationBuilder, ActiveDatabase);
entityBuilder.Create();
var massMailingTemplateEntityBuilder = new MassMailingTemplateEntityBuilder(migrationBuilder, ActiveDatabase);
massMailingTemplateEntityBuilder.Create();
var adminSettingsEntityBuilder = new AdminSettingsEntityBuilder(migrationBuilder, ActiveDatabase);
adminSettingsEntityBuilder.Create();
}
protected override void Down(MigrationBuilder migrationBuilder)
{
var entityBuilder = new AdminModulesEntityBuilder(migrationBuilder, ActiveDatabase);
var entityBuilder = new MassMailingTemplateEntityBuilder(migrationBuilder, ActiveDatabase);
entityBuilder.Drop();
var adminSettingsEntityBuilder = new AdminSettingsEntityBuilder(migrationBuilder, ActiveDatabase);
adminSettingsEntityBuilder.Drop();
}
}
}

View File

@@ -0,0 +1,34 @@
using Microsoft.EntityFrameworkCore.Migrations;
using Microsoft.EntityFrameworkCore.Migrations.Operations;
using Microsoft.EntityFrameworkCore.Migrations.Operations.Builders;
using Oqtane.Databases.Interfaces;
using Oqtane.Migrations;
using Oqtane.Migrations.EntityBuilders;
using SZUAbsolventenverein.Module.AdminModules.Migrations.EntityBuilders;
namespace SZUAbsolventenverein.Module.AdminModules.Server.Migrations.EntityBuilders
{
public class AdminSettingsEntityBuilder : AuditableBaseEntityBuilder<AdminSettingsEntityBuilder>
{
private const string _entityTableName = "SZUAbsolventenvereinAdminSettings";
private readonly PrimaryKey<AdminSettingsEntityBuilder> _primaryKey = new("PK_SZUAbsolventenvereinAdminSettings", x => x.AdminSettingsId);
public AdminSettingsEntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database)
{
EntityTableName = _entityTableName;
PrimaryKey = _primaryKey;
}
protected override AdminSettingsEntityBuilder BuildTable(ColumnsBuilder table)
{
AdminSettingsId = AddAutoIncrementColumn(table, "AdminSettingsId");
TokenLifetime = AddIntegerColumn(table, "TokenLifetime");
AddAuditableColumns(table);
return this;
}
public OperationBuilder<AddColumnOperation> AdminSettingsId { get; set; }
public OperationBuilder<AddColumnOperation> TokenLifetime { get; set; }
}
}

View File

@@ -7,20 +7,20 @@ using Oqtane.Migrations.EntityBuilders;
namespace SZUAbsolventenverein.Module.AdminModules.Migrations.EntityBuilders
{
public class AdminModulesEntityBuilder : AuditableBaseEntityBuilder<AdminModulesEntityBuilder>
public class MassMailingTemplateEntityBuilder : AuditableBaseEntityBuilder<MassMailingTemplateEntityBuilder>
{
private const string _entityTableName = "SZUAbsolventenvereinAdminModules";
private readonly PrimaryKey<AdminModulesEntityBuilder> _primaryKey = new("PK_SZUAbsolventenvereinAdminModules", x => x.AdminModulesId);
private readonly ForeignKey<AdminModulesEntityBuilder> _moduleForeignKey = new("FK_SZUAbsolventenvereinAdminModules_Module", x => x.ModuleId, "Module", "ModuleId", ReferentialAction.Cascade);
private readonly PrimaryKey<MassMailingTemplateEntityBuilder> _primaryKey = new("PK_SZUAbsolventenvereinAdminModules", x => x.AdminModulesId);
private readonly ForeignKey<MassMailingTemplateEntityBuilder> _moduleForeignKey = new("FK_SZUAbsolventenvereinAdminModules_Module", x => x.ModuleId, "Module", "ModuleId", ReferentialAction.Cascade);
public AdminModulesEntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database)
public MassMailingTemplateEntityBuilder(MigrationBuilder migrationBuilder, IDatabase database) : base(migrationBuilder, database)
{
EntityTableName = _entityTableName;
PrimaryKey = _primaryKey;
ForeignKeys.Add(_moduleForeignKey);
}
protected override AdminModulesEntityBuilder BuildTable(ColumnsBuilder table)
protected override MassMailingTemplateEntityBuilder BuildTable(ColumnsBuilder table)
{
AdminModulesId = AddAutoIncrementColumn(table,"AdminModulesId");
ModuleId = AddIntegerColumn(table,"ModuleId");

View File

@@ -10,6 +10,7 @@ namespace SZUAbsolventenverein.Module.AdminModules.Repository
public class AdminModulesContext : DBContextBase, ITransientService, IMultiDatabase
{
public virtual DbSet<Models.AdminModules> AdminModules { get; set; }
public virtual DbSet<Models.AdminSetting> AdminSettings { get; set; }
public AdminModulesContext(IDBContextDependencies DBContextDependencies) : base(DBContextDependencies)
{
@@ -21,6 +22,7 @@ namespace SZUAbsolventenverein.Module.AdminModules.Repository
base.OnModelCreating(builder);
builder.Entity<Models.AdminModules>().ToTable(ActiveDatabase.RewriteName("SZUAbsolventenvereinAdminModules"));
builder.Entity<Models.AdminSetting>().ToTable(ActiveDatabase.RewriteName("SZUAbsolventenvereinAdminSettings"));
}
}
}

View File

@@ -0,0 +1,38 @@
using Microsoft.EntityFrameworkCore;
using System.Linq;
using System.Collections.Generic;
using SZUAbsolventenverein.Module.AdminModules.Models;
using Oqtane.Modules;
namespace SZUAbsolventenverein.Module.AdminModules.Repository
{
public interface IAdminSettingsRepository
{
Models.AdminSetting GetAdminSetting(int AdminModuleId);
Models.AdminSetting SetAdminSettings(Models.AdminSetting adminSetting);
}
public class AdminSettingRepository : IAdminSettingsRepository, ITransientService
{
private readonly IDbContextFactory<AdminModulesContext> _factory;
public AdminSettingRepository(IDbContextFactory<AdminModulesContext> factory)
{
_factory = factory;
}
public AdminSetting GetAdminSetting(int AdminModuleId)
{
using var db = _factory.CreateDbContext();
return db.AdminSettings.First();
}
public AdminSetting SetAdminSettings(AdminSetting adminSetting)
{
using var db = _factory.CreateDbContext();
db.Entry(adminSetting).State = EntityState.Modified;
db.SaveChanges();
return adminSetting;
}
}
}

View File

@@ -19,10 +19,10 @@
</ItemGroup>
<ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.8" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.8" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
</ItemGroup>
<ItemGroup>

View File

@@ -168,7 +168,7 @@ namespace SZUAbsolventenverein.Module.AdminModules.Services
User user = _userRepository.GetUser(userid);
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
string body = template.Content;
// Fields bef<65>llen.
string token = await _identityUserManager.GeneratePasswordResetTokenAsync(identityuser);
string url = _alias.Protocol + _alias.Name + "/reset?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);

View File

@@ -0,0 +1,75 @@
using Microsoft.AspNetCore.Http;
using Microsoft.AspNetCore.Identity;
using Oqtane.Enums;
using Oqtane.Extensions;
using Oqtane.Infrastructure;
using Oqtane.Models;
using Oqtane.Repository;
using Oqtane.Security;
using Oqtane.Shared;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net;
using System.Reflection;
using System.Threading.Tasks;
using SZUAbsolventenverein.Module.AdminModules.Models;
using SZUAbsolventenverein.Module.AdminModules.Repository;
using SZUAbsolventenverein.Module.AdminSettings.Services;
namespace SZUAbsolventenverein.Module.AdminModules.Services
{
public class ServerAdminSettingsService : IAdminSettingsService
{
private readonly IAdminSettingsRepository _AdminSettingsRepository;
private readonly UserManager<IdentityUser> _identityUserManager;
private readonly IUserPermissions _userPermissions;
private readonly IRoleRepository _roleRepository;
private readonly IUserRepository _userRepository;
private readonly IUserRoleRepository _userRoleRepository;
private readonly INotificationRepository _notifications;
private readonly ILogManager _logger;
private readonly IHttpContextAccessor _accessor;
private readonly Alias _alias;
public ServerAdminSettingsService(IAdminSettingsRepository AdminSettingsRepository, UserManager<IdentityUser> identityUserManager, INotificationRepository notifications, IUserPermissions userPermissions, IRoleRepository roleRepository, IUserRepository userRepository, IUserRoleRepository userRoleRepository, ITenantManager tenantManager, ILogManager logger, IHttpContextAccessor accessor)
{
_AdminSettingsRepository = AdminSettingsRepository;
_identityUserManager = identityUserManager;
_userPermissions = userPermissions;
_roleRepository = roleRepository;
_userRepository = userRepository;
_userRoleRepository = userRoleRepository;
_notifications = notifications;
_logger = logger;
_accessor = accessor;
_alias = tenantManager.GetAlias();
}
public Task<AdminSetting> GetAdminSettingsAsync(int ModuleId)
{
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, ModuleId, PermissionNames.View))
{
return Task.FromResult(_AdminSettingsRepository.GetAdminSetting(ModuleId));
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized AdminModules Get Attempt {ModuleId}", ModuleId);
return null;
}
}
public Task<AdminSetting> SetAdminSettingsAsync(AdminSetting AdminSettings)
{
if (_userPermissions.IsAuthorized(_accessor.HttpContext.User, _alias.SiteId, EntityNames.Module, 1, PermissionNames.View))
{
return Task.FromResult(_AdminSettingsRepository.SetAdminSettings(AdminSettings));
}
else
{
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized AdminModules Get Attempt {ModuleId}", 1);
return null;
}
}
}
}

View File

@@ -1,9 +1,12 @@
using Microsoft.AspNetCore.Builder;
using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.DependencyInjection;
using Oqtane.Infrastructure;
using System;
using SZUAbsolventenverein.Module.AdminModules.Repository;
using SZUAbsolventenverein.Module.AdminModules.Services;
using SZUAbsolventenverein.Module.AdminSettings.Services;
namespace SZUAbsolventenverein.Module.AdminModules.Startup
{
@@ -21,7 +24,13 @@ namespace SZUAbsolventenverein.Module.AdminModules.Startup
public void ConfigureServices(IServiceCollection services)
{
services.Configure<DataProtectionTokenProviderOptions>(options =>
{
options.TokenLifespan = TimeSpan.FromDays(14);
});
services.AddTransient<IAdminModulesService, ServerAdminModulesService>();
services.AddTransient<IAdminSettingsService, ServerAdminSettingsService>();
services.AddDbContextFactory<AdminModulesContext>(opt => { }, ServiceLifetime.Transient);
}
}