Merge Report, MassMailing and TokenLifetime
This commit is contained in:
@@ -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;
|
||||
}
|
||||
|
||||
|
||||
@@ -17,13 +17,13 @@ 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();
|
||||
}
|
||||
|
||||
protected override void Down(MigrationBuilder migrationBuilder)
|
||||
{
|
||||
var entityBuilder = new AdminModulesEntityBuilder(migrationBuilder, ActiveDatabase);
|
||||
var entityBuilder = new MassMailingTemplateEntityBuilder(migrationBuilder, ActiveDatabase);
|
||||
entityBuilder.Drop();
|
||||
}
|
||||
}
|
||||
|
||||
@@ -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");
|
||||
91
Server/Repository/AdminSettingsRepository.cs
Normal file
91
Server/Repository/AdminSettingsRepository.cs
Normal file
@@ -0,0 +1,91 @@
|
||||
using Microsoft.EntityFrameworkCore;
|
||||
using System.Linq;
|
||||
using System.Collections.Generic;
|
||||
using System.IO;
|
||||
using System.Runtime.CompilerServices;
|
||||
using System.Text.Json;
|
||||
using SZUAbsolventenverein.Module.AdminModules.Models;
|
||||
using Oqtane.Modules;
|
||||
|
||||
namespace SZUAbsolventenverein.Module.AdminModules.Repository
|
||||
{
|
||||
/// <summary>
|
||||
/// Repository to manage admin settings in the database.
|
||||
/// </summary>
|
||||
public interface IAdminSettingsRepository
|
||||
{
|
||||
/// <summary>
|
||||
/// Retrieves the administrative settings entry from the Database.
|
||||
/// </summary>
|
||||
/// <returns>An <see cref="Models.AdminSetting"/> object containing the settings for the specified module. Returns <see
|
||||
/// langword="null"/> if the module is not found.</returns>
|
||||
Models.AdminSetting GetAdminSetting();
|
||||
|
||||
/// <summary>
|
||||
/// Updates the administrative settings with the specified values.
|
||||
/// </summary>
|
||||
/// <param name="adminSetting">The new administrative settings to apply. Cannot be null.</param>
|
||||
/// <returns>The updated <see cref="Models.AdminSetting"/> object reflecting the applied changes.</returns>
|
||||
Models.AdminSetting SetAdminSettings(Models.AdminSetting adminSetting);
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Implementation of the <see cref="IAdminSettingsRepository"/> interface for managing admin settings in the database.
|
||||
/// </summary>
|
||||
public class AdminSettingsRepository : IAdminSettingsRepository, ITransientService
|
||||
{
|
||||
public AdminSettingsRepository()
|
||||
{
|
||||
}
|
||||
|
||||
public AdminSetting GetAdminSetting()
|
||||
{
|
||||
return AdminSettingsExtensions.LoadSettings();
|
||||
}
|
||||
|
||||
public AdminSetting SetAdminSettings(AdminSetting adminSetting)
|
||||
{
|
||||
return adminSetting.SaveChanges();
|
||||
}
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Extension methods for saving and loading admin settings to/from a JSON file.
|
||||
/// </summary>
|
||||
public static class AdminSettingsExtensions
|
||||
{
|
||||
/// <summary>
|
||||
/// Path to the JSON file where admin settings are stored.
|
||||
/// </summary>
|
||||
private static string path = "AdminSettings.json";
|
||||
|
||||
/// <summary>
|
||||
/// Saves the adminSettingsObject to a JSON file.
|
||||
/// </summary>
|
||||
/// <param name="adminSetting">Settings to save</param>
|
||||
/// <returns>The same AdminSettings object for chaining of Operations</returns>
|
||||
public static AdminSetting SaveChanges(this AdminSetting adminSetting)
|
||||
{
|
||||
string res = JsonSerializer.Serialize(adminSetting);
|
||||
|
||||
File.WriteAllText(path, res);
|
||||
|
||||
return adminSetting;
|
||||
}
|
||||
|
||||
/// <summary>
|
||||
/// Loads the admin settings from the JSON file. If the file does not exist, returns a new AdminSetting object with default (0) values.
|
||||
/// </summary>
|
||||
/// <returns></returns>
|
||||
public static AdminSetting LoadSettings()
|
||||
{
|
||||
if (File.Exists(path))
|
||||
{
|
||||
string json = File.ReadAllText(path);
|
||||
return JsonSerializer.Deserialize<AdminSetting>(json);
|
||||
}
|
||||
|
||||
return new AdminSetting();
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -168,8 +168,8 @@ namespace SZUAbsolventenverein.Module.AdminModules.Services
|
||||
User user = _userRepository.GetUser(userid);
|
||||
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
|
||||
string body = template.Content;
|
||||
|
||||
// Fields bef<EFBFBD>llen.
|
||||
|
||||
// Fields befüllen.
|
||||
string token = await _identityUserManager.GeneratePasswordResetTokenAsync(identityuser);
|
||||
string url = _alias.Protocol + _alias.Name + "/reset?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token);
|
||||
|
||||
|
||||
77
Server/Services/AdminSettingsService.cs
Normal file
77
Server/Services/AdminSettingsService.cs
Normal file
@@ -0,0 +1,77 @@
|
||||
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 Microsoft.Extensions.DependencyInjection;
|
||||
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());
|
||||
}
|
||||
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))
|
||||
{
|
||||
_logger.Log(LogLevel.Critical, this, LogFunction.Update, "Set AdminSettings");
|
||||
return Task.FromResult(_AdminSettingsRepository.SetAdminSettings(AdminSettings));
|
||||
}
|
||||
else
|
||||
{
|
||||
_logger.Log(LogLevel.Error, this, LogFunction.Security, "Unauthorized AdminModules Get Attempt {ModuleId}", 1);
|
||||
return null;
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
@@ -1,12 +1,17 @@
|
||||
using Interfaces;
|
||||
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.Models;
|
||||
using SZUAbsolventenverein.Module.AdminModules.Repository;
|
||||
using SZUAbsolventenverein.Module.AdminModules.Services;
|
||||
|
||||
using SZUAbsolventenverein.Module.ReportSystem.Repository;
|
||||
using SZUAbsolventenverein.Module.ReportSystem.Services;
|
||||
using SZUAbsolventenverein.Module.AdminSettings.Services;
|
||||
|
||||
namespace SZUAbsolventenverein.Module.AdminModules.Startup
|
||||
{
|
||||
@@ -27,8 +32,31 @@ namespace SZUAbsolventenverein.Module.AdminModules.Startup
|
||||
services.AddTransient<IAdminModulesService, ServerAdminModulesService>();
|
||||
services.AddTransient<IReportSystemReportingService, ServerReportSystemReportingService>();
|
||||
services.AddTransient<IReportingHandler, ServerReportSystemReportingService>();
|
||||
services.AddTransient<IAdminSettingsService, ServerAdminSettingsService>();
|
||||
services.AddTransient<IAdminSettingsRepository, AdminSettingsRepository>();
|
||||
|
||||
services.AddDbContextFactory<AdminModulesContext>(opt => { }, ServiceLifetime.Transient);
|
||||
services.AddDbContextFactory<ReportingContext>(opt => { }, ServiceLifetime.Transient);
|
||||
services.AddDbContextFactory<AdminModulesContext>(opt => { }, ServiceLifetime.Transient);
|
||||
|
||||
services.Configure<DataProtectionTokenProviderOptions>(options =>
|
||||
{
|
||||
options.TokenLifespan = TimeSpan.FromDays(2);
|
||||
});
|
||||
|
||||
try
|
||||
{
|
||||
AdminSetting settings = AdminSettingsExtensions.LoadSettings();
|
||||
services.Configure<DataProtectionTokenProviderOptions>(options =>
|
||||
{
|
||||
options.TokenLifespan = TimeSpan.FromDays(settings.TokenLifetime);
|
||||
});
|
||||
Console.WriteLine("Saving token lifetime: " + settings.TokenLifetime + " days");
|
||||
}
|
||||
catch (Exception ex)
|
||||
{
|
||||
Console.WriteLine(ex);
|
||||
}
|
||||
}
|
||||
}
|
||||
}
|
||||
|
||||
Reference in New Issue
Block a user