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

@@ -2,7 +2,7 @@
@using SZUAbsolventenverein.Module.AdminModules.Services @using SZUAbsolventenverein.Module.AdminModules.Services
@using SZUAbsolventenverein.Module.AdminModules.Models @using SZUAbsolventenverein.Module.AdminModules.Models
@namespace SZUAbsolventenverein.Module.AdminModules @namespace SZUAbsolventenverein.Module.AdminMassMailing
@inherits ModuleBase @inherits ModuleBase
@inject IAdminModulesService AdminModulesService @inject IAdminModulesService AdminModulesService
@inject NavigationManager NavigationManager @inject NavigationManager NavigationManager

View File

@@ -1,7 +1,7 @@
@using SZUAbsolventenverein.Module.AdminModules.Services @using SZUAbsolventenverein.Module.AdminModules.Services
@using SZUAbsolventenverein.Module.AdminModules.Models @using SZUAbsolventenverein.Module.AdminModules.Models
@namespace SZUAbsolventenverein.Module.AdminModules @namespace SZUAbsolventenverein.Module.AdminMassMailing
@inherits ModuleBase @inherits ModuleBase
@inject IAdminModulesService AdminModulesService @inject IAdminModulesService AdminModulesService
@inject NavigationManager NavigationManager @inject NavigationManager NavigationManager

View File

@@ -0,0 +1,19 @@
using Oqtane.Models;
using Oqtane.Modules;
namespace SZUAbsolventenverein.Module.AdminMassMailing
{
public class ModuleInfo : IModule
{
public ModuleDefinition ModuleDefinition => new ModuleDefinition
{
Name = "AdminMassMailing",
Description = "Mass Mailing Tool",
Version = "1.0.7",
ServerManagerType = "SZUAbsolventenverein.Module.AdminModules.Manager.AdminModulesManager, SZUAbsolventenverein.Module.AdminModules.Server.Oqtane",
ReleaseVersions = "1.0.0,1.0.1,1.0.2,1.0.3,1.0.4,1.0.5,1.0.6,1.0.7",
Dependencies = "SZUAbsolventenverein.Module.AdminModules.Shared.Oqtane",
PackageName = "SZUAbsolventenverein.Module.AdminMassMailing"
};
}
}

View File

@@ -3,7 +3,7 @@
@using SZUAbsolventenverein.Module.AdminModules.Models @using SZUAbsolventenverein.Module.AdminModules.Models
@using Microsoft.AspNetCore.Components.Forms; @using Microsoft.AspNetCore.Components.Forms;
@namespace SZUAbsolventenverein.Module.AdminModules @namespace SZUAbsolventenverein.Module.AdminMassMailing
@inherits ModuleBase @inherits ModuleBase
@inject IAdminModulesService AdminModulesService @inject IAdminModulesService AdminModulesService
@inject NavigationManager NavigationManager @inject NavigationManager NavigationManager
@@ -11,12 +11,6 @@
<form @ref="form" class="@(validated ? " was-validated" : "needs-validation" )" novalidate> <form @ref="form" class="@(validated ? " was-validated" : "needs-validation" )" novalidate>
<div class="container"> <div class="container">
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="name" HelpText="Enter a name" ResourceKey="Name">Name: </Label>
<div class="col-sm-9">
<input id="name" class="form-control" @bind="@_name" required />
</div>
</div>
<div class="row mb-1 align-items-center"> <div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="role" HelpText="Select a role" ResourceKey="Role">Role: </Label> <Label Class="col-sm-3" For="role" HelpText="Select a role" ResourceKey="Role">Role: </Label>
<div class="col-sm-9"> <div class="col-sm-9">
@@ -40,10 +34,17 @@
} }
</div> </div>
<p></p> <p></p>
<button type="button" class="btn btn-success" @onclick="Save">@Localizer["Save"]</button> @if(userCount != null)
{
<ActionDialog Header="@(userCount != null ? userCount + " Nachrichten versenden" : "-")"
Message="Are You Sure You Wish To Send this Mass Notification?"
Action="SendConfirm"
Security="SecurityAccessLevel.Edit"
Class="btn btn-success"
OnClick="@(async () => await Save())"
ResourceKey="SendConfirm" />
}
<NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink> <NavLink class="btn btn-secondary" href="@NavigateUrl()">@Localizer["Cancel"]</NavLink>
<br /><br />
<AuditInfo CreatedBy="@_createdby" CreatedOn="@_createdon" ModifiedBy="@_modifiedby" ModifiedOn="@_modifiedon"></AuditInfo>
</form> </form>
@code { @code {
@@ -77,13 +78,7 @@
private bool validated = false; private bool validated = false;
private int _id; private int _id;
private string _name;
private string _richText;
private string _createdby;
private DateTime _createdon;
private string _modifiedby;
private DateTime _modifiedon;
private async void RefetchUserCount() private async void RefetchUserCount()
{ {
EmailFields ef = new EmailFields(); EmailFields ef = new EmailFields();
@@ -103,16 +98,6 @@
if (PageState.Action == "Send") if (PageState.Action == "Send")
{ {
_id = Int32.Parse(PageState.QueryString["id"]); _id = Int32.Parse(PageState.QueryString["id"]);
AdminModules AdminModules = await AdminModulesService.GetAdminModulesAsync(_id, ModuleState.ModuleId);
if (AdminModules != null)
{
_name = AdminModules.Name;
_richText = AdminModules.Content;
_createdby = AdminModules.CreatedBy;
_createdon = AdminModules.CreatedOn;
_modifiedby = AdminModules.ModifiedBy;
_modifiedon = AdminModules.ModifiedOn;
}
roles = await AdminModulesService.GetRoles(ModuleState.ModuleId); roles = await AdminModulesService.GetRoles(ModuleState.ModuleId);
} }
} }

View File

@@ -1,4 +1,4 @@
@namespace SZUAbsolventenverein.Module.AdminModules @namespace SZUAbsolventenverein.Module.AdminMassMailing
@inherits ModuleBase @inherits ModuleBase
@inject ISettingService SettingService @inject ISettingService SettingService
@inject IStringLocalizer<Settings> Localizer @inject IStringLocalizer<Settings> Localizer

View File

@@ -0,0 +1,56 @@
@using SZUAbsolventenverein.Module.AdminSettings.Services
@using SZUAbsolventenverein.Module.AdminModules.Models
@namespace SZUAbsolventenverein.Module.AdminSettings
@inherits ModuleBase
@inject IAdminSettingsService AdminSettingsService
@inject NavigationManager NavigationManager
@inject IStringLocalizer<Index> Localizer
@if (_AdminSetting == null)
{
<p><em>Loading...</em></p>
}
else
{
<Microsoft.AspNetCore.Components.Forms.InputNumber @bind-Value="_AdminSetting.TokenLifeTimeInDays" />
<button class="btn btn-primary" onclick="Save">Save</button>
}
@code {
public override string RenderMode => RenderModes.Static;
public override List<Resource> Resources => new List<Resource>()
{
new Stylesheet("_content/SZUAbsolventenverein.Module.AdminModules/Module.css"),
new Script("_content/SZUAbsolventenverein.Module.AdminModules/Module.js")
};
private AdminSetting _AdminSetting;
protected override async Task OnInitializedAsync()
{
try
{
_AdminSetting = await AdminSettingsService.GetAdminSettingsAsync(ModuleState.ModuleId);
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Loading AdminSettings {Error}", ex.Message);
AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
}
}
protected async Task Save()
{
try
{
await AdminSettingsService.SetAdminSettingsAsync(_AdminSetting);
}
catch (Exception ex)
{
await logger.LogError(ex, "Error Saving AdminSettings {Error}", ex.Message);
AddModuleMessage(Localizer["Message.LoadError"], MessageType.Error);
}
}
}

View File

@@ -1,19 +1,19 @@
using Oqtane.Models; using Oqtane.Models;
using Oqtane.Modules; using Oqtane.Modules;
namespace SZUAbsolventenverein.Module.AdminModules namespace SZUAbsolventenverein.Module.AdminSettings
{ {
public class ModuleInfo : IModule public class ModuleInfo : IModule
{ {
public ModuleDefinition ModuleDefinition => new ModuleDefinition public ModuleDefinition ModuleDefinition => new ModuleDefinition
{ {
Name = "AdminModules", Name = "Admin - Settings",
Description = "Admin Tools", Description = "Einstellungen in Oqtane",
Version = "1.0.2", Version = "1.0.0",
ServerManagerType = "SZUAbsolventenverein.Module.AdminModules.Manager.AdminModulesManager, SZUAbsolventenverein.Module.AdminModules.Server.Oqtane", ServerManagerType = "SZUAbsolventenverein.Module.AdminModules.Manager.AdminModulesManager, SZUAbsolventenverein.Module.AdminModules.Server.Oqtane",
ReleaseVersions = "1.0.0,1.0.1,1.0.2", ReleaseVersions = "1.0.0",
Dependencies = "SZUAbsolventenverein.Module.AdminModules.Shared.Oqtane", Dependencies = "SZUAbsolventenverein.Module.AdminModules.Shared.Oqtane",
PackageName = "SZUAbsolventenverein.Module.AdminModules" PackageName = "SZUAbsolventenverein.Module.AdminSettings"
}; };
} }
} }

View File

@@ -0,0 +1,47 @@
@namespace SZUAbsolventenverein.Module.AdminSettings
@inherits ModuleBase
@inject ISettingService SettingService
@inject IStringLocalizer<Settings> Localizer
<div class="container">
<div class="row mb-1 align-items-center">
<Label Class="col-sm-3" For="value" HelpText="Enter a value" ResourceKey="SettingName" ResourceType="@resourceType">Name: </Label>
<div class="col-sm-9">
<input id="value" type="text" class="form-control" @bind="@_value" />
</div>
</div>
</div>
@code {
private string resourceType = "SZUAbsolventenverein.Module.AdminSettings.Settings, SZUAbsolventenverein.Module.AdminSettings.Client.Oqtane"; // for localization
public override string Title => "Admin - Settings Settings";
string _value;
protected override async Task OnInitializedAsync()
{
try
{
Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
_value = SettingService.GetSetting(settings, "SettingName", "");
}
catch (Exception ex)
{
AddModuleMessage(ex.Message, MessageType.Error);
}
}
public async Task UpdateSettings()
{
try
{
Dictionary<string, string> settings = await SettingService.GetModuleSettingsAsync(ModuleState.ModuleId);
SettingService.SetSetting(settings, "SettingName", _value);
await SettingService.UpdateModuleSettingsAsync(settings, ModuleState.ModuleId);
}
catch (Exception ex)
{
AddModuleMessage(ex.Message, MessageType.Error);
}
}
}

View File

@@ -13,11 +13,11 @@
</PropertyGroup> </PropertyGroup>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.8" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly" Version="9.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.8" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Authentication" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" /> <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Http" Version="9.0.8" /> <PackageReference Include="Microsoft.Extensions.Http" Version="9.0.9" />
<PackageReference Include="System.Net.Http.Json" Version="9.0.8" /> <PackageReference Include="System.Net.Http.Json" Version="9.0.9" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@@ -0,0 +1,37 @@
using Oqtane.Models;
using Oqtane.Services;
using Oqtane.Shared;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Net.Http;
using System.Reflection;
using System.Threading.Tasks;
using SZUAbsolventenverein.Module.AdminModules.Models;
namespace SZUAbsolventenverein.Module.AdminSettings.Services
{
public interface IAdminSettingsService
{
Task<AdminSetting> GetAdminSettingsAsync(int ModuleId);
Task<AdminSetting> SetAdminSettingsAsync(AdminSetting AdminSettings);
}
public class AdminSettingsService : ServiceBase, IAdminSettingsService
{
public AdminSettingsService(HttpClient http, SiteState siteState) : base(http, siteState) { }
private string Apiurl => CreateApiUrl("AdminSettings");
public async Task<AdminSetting> GetAdminSettingsAsync(int ModuleId)
{
return await GetJsonAsync<AdminSetting>(CreateAuthorizationPolicyUrl($"{Apiurl}?moduleid={ModuleId}", EntityNames.Module, ModuleId), null);
}
public async Task<AdminSetting> SetAdminSettingsAsync(AdminSetting AdminSettings)
{
return await PostJsonAsync<AdminSetting>(CreateAuthorizationPolicyUrl($"{Apiurl}", EntityNames.Module, AdminSettings.ModuleId), AdminSettings);
}
}
}

View File

@@ -2,6 +2,7 @@ using Microsoft.Extensions.DependencyInjection;
using System.Linq; using System.Linq;
using Oqtane.Services; using Oqtane.Services;
using SZUAbsolventenverein.Module.AdminModules.Services; using SZUAbsolventenverein.Module.AdminModules.Services;
using SZUAbsolventenverein.Module.AdminSettings.Services;
namespace SZUAbsolventenverein.Module.AdminModules.Startup namespace SZUAbsolventenverein.Module.AdminModules.Startup
{ {
@@ -13,6 +14,10 @@ namespace SZUAbsolventenverein.Module.AdminModules.Startup
{ {
services.AddScoped<IAdminModulesService, AdminModulesService>(); services.AddScoped<IAdminModulesService, AdminModulesService>();
} }
if (!services.Any(s => s.ServiceType == typeof(IAdminSettingsService)))
{
services.AddScoped<IAdminSettingsService, AdminSettingsService>();
}
} }
} }
} }

View File

@@ -2,7 +2,7 @@
<package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd"> <package xmlns="http://schemas.microsoft.com/packaging/2010/07/nuspec.xsd">
<metadata> <metadata>
<id>$projectname$</id> <id>$projectname$</id>
<version>1.0.2</version> <version>1.0.6</version>
<authors>SZUAbsolventenverein</authors> <authors>SZUAbsolventenverein</authors>
<owners>SZUAbsolventenverein</owners> <owners>SZUAbsolventenverein</owners>
<title>AdminModules</title> <title>AdminModules</title>

View File

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

View File

@@ -4,6 +4,7 @@ using Oqtane.Databases.Interfaces;
using Oqtane.Migrations; using Oqtane.Migrations;
using SZUAbsolventenverein.Module.AdminModules.Migrations.EntityBuilders; using SZUAbsolventenverein.Module.AdminModules.Migrations.EntityBuilders;
using SZUAbsolventenverein.Module.AdminModules.Repository; using SZUAbsolventenverein.Module.AdminModules.Repository;
using SZUAbsolventenverein.Module.AdminModules.Server.Migrations.EntityBuilders;
namespace SZUAbsolventenverein.Module.AdminModules.Migrations namespace SZUAbsolventenverein.Module.AdminModules.Migrations
{ {
@@ -17,14 +18,18 @@ namespace SZUAbsolventenverein.Module.AdminModules.Migrations
protected override void Up(MigrationBuilder migrationBuilder) protected override void Up(MigrationBuilder migrationBuilder)
{ {
var entityBuilder = new AdminModulesEntityBuilder(migrationBuilder, ActiveDatabase); var massMailingTemplateEntityBuilder = new MassMailingTemplateEntityBuilder(migrationBuilder, ActiveDatabase);
entityBuilder.Create(); massMailingTemplateEntityBuilder.Create();
var adminSettingsEntityBuilder = new AdminSettingsEntityBuilder(migrationBuilder, ActiveDatabase);
adminSettingsEntityBuilder.Create();
} }
protected override void Down(MigrationBuilder migrationBuilder) protected override void Down(MigrationBuilder migrationBuilder)
{ {
var entityBuilder = new AdminModulesEntityBuilder(migrationBuilder, ActiveDatabase); var entityBuilder = new MassMailingTemplateEntityBuilder(migrationBuilder, ActiveDatabase);
entityBuilder.Drop(); 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 namespace SZUAbsolventenverein.Module.AdminModules.Migrations.EntityBuilders
{ {
public class AdminModulesEntityBuilder : AuditableBaseEntityBuilder<AdminModulesEntityBuilder> public class MassMailingTemplateEntityBuilder : AuditableBaseEntityBuilder<MassMailingTemplateEntityBuilder>
{ {
private const string _entityTableName = "SZUAbsolventenvereinAdminModules"; private const string _entityTableName = "SZUAbsolventenvereinAdminModules";
private readonly PrimaryKey<AdminModulesEntityBuilder> _primaryKey = new("PK_SZUAbsolventenvereinAdminModules", x => x.AdminModulesId); private readonly PrimaryKey<MassMailingTemplateEntityBuilder> _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 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; EntityTableName = _entityTableName;
PrimaryKey = _primaryKey; PrimaryKey = _primaryKey;
ForeignKeys.Add(_moduleForeignKey); ForeignKeys.Add(_moduleForeignKey);
} }
protected override AdminModulesEntityBuilder BuildTable(ColumnsBuilder table) protected override MassMailingTemplateEntityBuilder BuildTable(ColumnsBuilder table)
{ {
AdminModulesId = AddAutoIncrementColumn(table,"AdminModulesId"); AdminModulesId = AddAutoIncrementColumn(table,"AdminModulesId");
ModuleId = AddIntegerColumn(table,"ModuleId"); ModuleId = AddIntegerColumn(table,"ModuleId");

View File

@@ -10,6 +10,7 @@ namespace SZUAbsolventenverein.Module.AdminModules.Repository
public class AdminModulesContext : DBContextBase, ITransientService, IMultiDatabase public class AdminModulesContext : DBContextBase, ITransientService, IMultiDatabase
{ {
public virtual DbSet<Models.AdminModules> AdminModules { get; set; } public virtual DbSet<Models.AdminModules> AdminModules { get; set; }
public virtual DbSet<Models.AdminSetting> AdminSettings { get; set; }
public AdminModulesContext(IDBContextDependencies DBContextDependencies) : base(DBContextDependencies) public AdminModulesContext(IDBContextDependencies DBContextDependencies) : base(DBContextDependencies)
{ {
@@ -21,6 +22,7 @@ namespace SZUAbsolventenverein.Module.AdminModules.Repository
base.OnModelCreating(builder); base.OnModelCreating(builder);
builder.Entity<Models.AdminModules>().ToTable(ActiveDatabase.RewriteName("SZUAbsolventenvereinAdminModules")); 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>
<ItemGroup> <ItemGroup>
<PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.8" /> <PackageReference Include="Microsoft.AspNetCore.Components.WebAssembly.Server" Version="9.0.9" />
<PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.8" /> <PackageReference Include="Microsoft.AspNetCore.Identity.EntityFrameworkCore" Version="9.0.9" />
<PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.8" /> <PackageReference Include="Microsoft.EntityFrameworkCore" Version="9.0.9" />
<PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.8" /> <PackageReference Include="Microsoft.Extensions.Localization" Version="9.0.9" />
</ItemGroup> </ItemGroup>
<ItemGroup> <ItemGroup>

View File

@@ -168,7 +168,7 @@ namespace SZUAbsolventenverein.Module.AdminModules.Services
User user = _userRepository.GetUser(userid); User user = _userRepository.GetUser(userid);
IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username); IdentityUser identityuser = await _identityUserManager.FindByNameAsync(user.Username);
string body = template.Content; string body = template.Content;
// Fields bef<65>llen. // Fields bef<65>llen.
string token = await _identityUserManager.GeneratePasswordResetTokenAsync(identityuser); string token = await _identityUserManager.GeneratePasswordResetTokenAsync(identityuser);
string url = _alias.Protocol + _alias.Name + "/reset?name=" + user.Username + "&token=" + WebUtility.UrlEncode(token); 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.Builder;
using Microsoft.AspNetCore.Hosting; using Microsoft.AspNetCore.Hosting;
using Microsoft.AspNetCore.Identity;
using Microsoft.Extensions.DependencyInjection; using Microsoft.Extensions.DependencyInjection;
using Oqtane.Infrastructure; using Oqtane.Infrastructure;
using System;
using SZUAbsolventenverein.Module.AdminModules.Repository; using SZUAbsolventenverein.Module.AdminModules.Repository;
using SZUAbsolventenverein.Module.AdminModules.Services; using SZUAbsolventenverein.Module.AdminModules.Services;
using SZUAbsolventenverein.Module.AdminSettings.Services;
namespace SZUAbsolventenverein.Module.AdminModules.Startup namespace SZUAbsolventenverein.Module.AdminModules.Startup
{ {
@@ -21,7 +24,13 @@ namespace SZUAbsolventenverein.Module.AdminModules.Startup
public void ConfigureServices(IServiceCollection services) public void ConfigureServices(IServiceCollection services)
{ {
services.Configure<DataProtectionTokenProviderOptions>(options =>
{
options.TokenLifespan = TimeSpan.FromDays(14);
});
services.AddTransient<IAdminModulesService, ServerAdminModulesService>(); services.AddTransient<IAdminModulesService, ServerAdminModulesService>();
services.AddTransient<IAdminSettingsService, ServerAdminSettingsService>();
services.AddDbContextFactory<AdminModulesContext>(opt => { }, ServiceLifetime.Transient); services.AddDbContextFactory<AdminModulesContext>(opt => { }, ServiceLifetime.Transient);
} }
} }

View File

@@ -0,0 +1,16 @@
using System;
using System.ComponentModel.DataAnnotations;
using System.ComponentModel.DataAnnotations.Schema;
using Oqtane.Models;
namespace SZUAbsolventenverein.Module.AdminModules.Models
{
[Table("SZUAbsolventenvereinAdminSettings")]
public class AdminSetting
{
[Key]
public int AdminSettingsId { get; set; }
public int ModuleId { get; set; }
public int TokenLifeTimeInDays { get; set; }
}
}