Commit 3fa04183 authored by Benedikt Heinrichs's avatar Benedikt Heinrichs

Merge branch 'Topic/232-userMgmt' into Sprint/20190829

parents 41ea14d2 5b688779
......@@ -49,7 +49,7 @@ namespace Coscine.Api.Project.Controllers
{
role = roleModel.GetById(projectRole.RoleId);
}
return new ProjectRoleObject(projectRole.ProjectId, new UserObject(userInst.Id, userInst.DisplayName), new RoleObject(role.Id, role.DisplayName));
return new ProjectRoleObject(projectRole.ProjectId, new UserObject(userInst.Id, userInst.DisplayName, userInst.EmailAddress), new RoleObject(role.Id, role.DisplayName));
});
}
else
......
using Coscine.ApiCommons.ReturnObjects;
using System;
using System.Collections.Generic;
using System.Linq;
using System.Text;
using System.Threading.Tasks;
namespace Coscine.Api.Project.ReturnObjects
{
......@@ -13,11 +9,13 @@ namespace Coscine.Api.Project.ReturnObjects
public Guid Id { get; set; }
public string DisplayName { get; set; }
public string EmailAddress { get; set; }
public UserObject(Guid id, string displayName)
public UserObject(Guid id, string displayName, string emailAddress)
{
Id = id;
DisplayName = displayName;
EmailAddress = emailAddress;
}
}
}
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment