Merge branch 'main' into fix/watt-filter-chip-bug

apps/dh/api-dh/source/DataHub.WebApi/GraphQL/Query/UserRoleQuery.cs

@@ -12,6 +12,7 @@
 // See the License for the specific language governing permissions and
 // limitations under the License.
 using Energinet.DataHub.WebApi.Clients.MarketParticipant.v1;
+using Energinet.DataHub.WebApi.Extensions;
 
 namespace Energinet.DataHub.WebApi.GraphQL.Query;
 
@@ -34,6 +35,20 @@ public async Task<UserRoleWithPermissionsDto> GetUserRoleByIdAsync(
         await client.UserRolesGetAsync(id);
 
     public async Task<IEnumerable<UserRoleDto>> GetUserRolesAsync(
-        [Service] IMarketParticipantClient_V1 client) =>
-        await client.UserRolesGetAsync();
+        [Service] IHttpContextAccessor httpContext,
+        [Service] IMarketParticipantClient_V1 client)
+    {
+        if (httpContext.HttpContext == null)
+        {
+            return Enumerable.Empty<UserRoleDto>();
+        }
+
+        var user = httpContext.HttpContext.User;
+        if (user.IsFas())
+        {
+            return await client.UserRolesGetAsync();
+        }
+
+        return await client.ActorsRolesAsync(user.GetAssociatedActor());
+    }
 }