Skip to content

Commit

Permalink
Revert "clean up code"
Browse files Browse the repository at this point in the history
This reverts commit abfa8be.
  • Loading branch information
ArabellaJi committed Jul 12, 2023
1 parent a7604c5 commit dc03476
Show file tree
Hide file tree
Showing 2 changed files with 14 additions and 4 deletions.
16 changes: 12 additions & 4 deletions Gordon360/Controllers/MembershipsController.cs
Original file line number Diff line number Diff line change
Expand Up @@ -25,6 +25,7 @@ public MembershipsController(IMembershipService membershipService)
/// <summary>
/// Get all the memberships associated with a given activity
/// </summary>
/// <param name="myProf">Optional boolean indication if you are searching for your public profile</param>
/// <param name="involvementCode">Optional involvementCode filter</param>
/// <param name="username">Optional username filter</param>
/// <param name="sessionCode">Optional session code for which session memberships should be retrieved. Defaults to current session. Use "*" for all sessions.</param>
Expand All @@ -43,11 +44,18 @@ public ActionResult<IEnumerable<MembershipView>> GetMemberships(string? involvem
sessionCode: sessionCode,
participationTypes: participationTypes);

// When user is null, only SiteAdmin and Police can see all the user's memberships.
if ((username is null) && !(viewerGroups.Contains(AuthGroup.SiteAdmin)
|| viewerGroups.Contains(AuthGroup.Police)))
{
memberships = _membershipService.RemovePrivateMemberships(memberships, authenticatedUserUsername);
return Ok(memberships);
}
// Only user, siteAdmin and Police can see all the user's memberships.
if (
(username is null || username != authenticatedUserUsername)
&& !(viewerGroups.Contains(AuthGroup.SiteAdmin) || viewerGroups.Contains(AuthGroup.Police))
)
else if (!(username == authenticatedUserUsername
|| viewerGroups.Contains(AuthGroup.SiteAdmin)
|| viewerGroups.Contains(AuthGroup.Police)
))
{
memberships = _membershipService.RemovePrivateMemberships(memberships, authenticatedUserUsername);
}
Expand Down
2 changes: 2 additions & 0 deletions Gordon360/Models/ViewModels/VersionViewModel.cs
Original file line number Diff line number Diff line change
Expand Up @@ -7,4 +7,6 @@ public class VersionViewModel
public string GitHash { get; set; }
public string BuildTime { get; set; }
}


}

0 comments on commit dc03476

Please sign in to comment.