Skip to content

TD-5727-Fix for Full user who is not a catalogue editor/admin can access My contribution page by navigating to the link directly #1283

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jul 30, 2025
Merged

TD-5727-Fix for Full user who is not a catalogue editor/admin can access My contribution page by navigating to the link directly #1283

Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
20ca42e
TD-5727
AnjuJose011 Jul 10, 2025
19d6cfc
TD-5727
AnjuJose011 Jul 10, 2025
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
7 changes: 6 additions & 1 deletion LearningHub.Nhs.WebUI/Controllers/ContributeController.cs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -28,6 +28,7 @@ public class ContributeController : BaseController
private readonly IFileService fileService;
private readonly IResourceService resourceService;
private readonly IUserService userService;
private readonly IUserGroupService userGroupService;

/// <summary>
/// Initializes a new instance of the <see cref="ContributeController"/> class.
Expand All @@ -37,6 +38,7 @@ public class ContributeController : BaseController
/// <param name="logger">Logger.</param>
/// <param name="settings">Settings.</param>
/// <param name="userService">User service.</param>
/// <param name="userGroupService"> userGroupService.</param>
/// <param name="fileService">File service.</param>
/// <param name="resourceService">Resource service.</param>
/// <param name="azureMediaService">Azure media service.</param>
Expand All @@ -48,6 +50,7 @@ public ContributeController(
ILogger<ContributeController> logger,
IOptions<Settings> settings,
IUserService userService,
IUserGroupService userGroupService,
IFileService fileService,
IResourceService resourceService,
IAzureMediaService azureMediaService,
Expand All @@ -58,6 +61,7 @@ public ContributeController(
this.authConfig = authConfig;

this.userService = userService;
this.userGroupService = userGroupService;
this.fileService = fileService;
this.resourceService = resourceService;
this.azureMediaService = azureMediaService;
Expand Down Expand Up @@ -167,7 +171,8 @@ public async Task<IActionResult> CreateVersion(int resourceId)
[Route("my-contributions/{selectedTab}/{catalogueId}/{nodeId}")]
public async Task<IActionResult> MyContributions()
{
if ((this.User.IsInRole("ReadOnly") || this.User.IsInRole("BasicUser")) && !await this.resourceService.UserHasPublishedResourcesAsync())
bool catalogueContributionPermission = await this.userGroupService.UserHasCatalogueContributionPermission();
if ((this.User.IsInRole("ReadOnly") || this.User.IsInRole("BasicUser")) || (!catalogueContributionPermission && (!await this.resourceService.UserHasPublishedResourcesAsync())))
{
return this.RedirectToAction("AccessDenied", "Home");
}
Expand Down
Loading