Merge pull request #965 from gordon-cs/changes_release_07102023

Changes release 07102023

Gordon360/Controllers/MembershipsController.cs

@@ -25,7 +25,6 @@ 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>
@@ -44,18 +43,11 @@ 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.
- else if (!(username == authenticatedUserUsername
-  || viewerGroups.Contains(AuthGroup.SiteAdmin)
-   || viewerGroups.Contains(AuthGroup.Police)
-  ))
+ if (
+ (username is null || username != authenticatedUserUsername)
+ && !(viewerGroups.Contains(AuthGroup.SiteAdmin) || viewerGroups.Contains(AuthGroup.Police))
+ )
  {
  memberships = _membershipService.RemovePrivateMemberships(memberships, authenticatedUserUsername);
  }

Gordon360/Models/ViewModels/VersionViewModel.cs

@@ -7,6 +7,4 @@ public class VersionViewModel
  public string GitHash { get; set; }
  public string BuildTime { get; set; }
  }
-
-
 }