Diplomarbeit-Absolventenverein/oqtane.framework
9
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #1448 from sbwalker/dev

Browse Source 
use new service auth pattern in module template
This commit is contained in:
Shaun Walker 2021-06-04 14:57:23 -04:00 committed by GitHub
commit 33405b9457
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 7 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
Oqtane.Server/Controllers/ModuleControllerBase.cs
View File

@ -28,9 +28,9 @@ namespace Oqtane.Controllers
} }
} }
// legacy support // legacy support
if (_authEntityId.ContainsKey(EntityNames.Module)) if (accessor.HttpContext.Request.Query.ContainsKey("entityid"))
{ {
_entityId = _authEntityId[EntityNames.Module]; _entityId = int.Parse(accessor.HttpContext.Request.Query["entityid"]);
} }
} }

10
Oqtane.Server/wwwroot/Modules/Templates/External/Server/Controllers/[Module]Controller.cs vendored
View File

@ -25,7 +25,7 @@ namespace [Owner].[Module].Controllers
[Authorize(Policy = PolicyNames.ViewModule)] [Authorize(Policy = PolicyNames.ViewModule)]
public IEnumerable<Models.[Module]> Get(string moduleid) public IEnumerable<Models.[Module]> Get(string moduleid)
{ {
if (int.Parse(moduleid) == _entityId) if (int.Parse(moduleid) == _authEntityId[EntityNames.Module])
{ {
return _[Module]Repository.Get[Module]s(int.Parse(moduleid)); return _[Module]Repository.Get[Module]s(int.Parse(moduleid));
} }
@ -41,7 +41,7 @@ namespace [Owner].[Module].Controllers
public Models.[Module] Get(int id) public Models.[Module] Get(int id)
{ {
Models.[Module] [Module] = _[Module]Repository.Get[Module](id); Models.[Module] [Module] = _[Module]Repository.Get[Module](id);
if ([Module] != null && [Module].ModuleId != _entityId) if ([Module] != null && [Module].ModuleId != _authEntityId[EntityNames.Module])
{ {
[Module] = null; [Module] = null;
} }
@ -53,7 +53,7 @@ namespace [Owner].[Module].Controllers
[Authorize(Policy = PolicyNames.EditModule)] [Authorize(Policy = PolicyNames.EditModule)]
public Models.[Module] Post([FromBody] Models.[Module] [Module]) public Models.[Module] Post([FromBody] Models.[Module] [Module])
{ {
if (ModelState.IsValid && [Module].ModuleId == _entityId) if (ModelState.IsValid && [Module].ModuleId == _authEntityId[EntityNames.Module])
{ {
[Module] = _[Module]Repository.Add[Module]([Module]); [Module] = _[Module]Repository.Add[Module]([Module]);
_logger.Log(LogLevel.Information, this, LogFunction.Create, "[Module] Added {[Module]}", [Module]); _logger.Log(LogLevel.Information, this, LogFunction.Create, "[Module] Added {[Module]}", [Module]);
@ -66,7 +66,7 @@ namespace [Owner].[Module].Controllers
[Authorize(Policy = PolicyNames.EditModule)] [Authorize(Policy = PolicyNames.EditModule)]
public Models.[Module] Put(int id, [FromBody] Models.[Module] [Module]) public Models.[Module] Put(int id, [FromBody] Models.[Module] [Module])
{ {
if (ModelState.IsValid && [Module].ModuleId == _entityId) if (ModelState.IsValid && [Module].ModuleId == _authEntityId[EntityNames.Module])
{ {
[Module] = _[Module]Repository.Update[Module]([Module]); [Module] = _[Module]Repository.Update[Module]([Module]);
_logger.Log(LogLevel.Information, this, LogFunction.Update, "[Module] Updated {[Module]}", [Module]); _logger.Log(LogLevel.Information, this, LogFunction.Update, "[Module] Updated {[Module]}", [Module]);
@ -80,7 +80,7 @@ namespace [Owner].[Module].Controllers
public void Delete(int id) public void Delete(int id)
{ {
Models.[Module] [Module] = _[Module]Repository.Get[Module](id); Models.[Module] [Module] = _[Module]Repository.Get[Module](id);
if ([Module] != null && [Module].ModuleId == _entityId) if ([Module] != null && [Module].ModuleId == _authEntityId[EntityNames.Module])
{ {
_[Module]Repository.Delete[Module](id); _[Module]Repository.Delete[Module](id);
_logger.Log(LogLevel.Information, this, LogFunction.Delete, "[Module] Deleted {[Module]Id}", id); _logger.Log(LogLevel.Information, this, LogFunction.Delete, "[Module] Deleted {[Module]Id}", id);