Skip to content

Commits on Source 3

......@@ -4,7 +4,7 @@
<RootNamespace>Coscine.Api.Project.Tests</RootNamespace>
<AssemblyName>Coscine.Api.Project.Tests</AssemblyName>
<TargetFramework>net6.0</TargetFramework>
<Version>2.9.0</Version></PropertyGroup>
<Version>3.0.0</Version></PropertyGroup>
<ItemGroup>
<ProjectReference Include="..\Project\Project.csproj" />
</ItemGroup>
......
......@@ -662,7 +662,7 @@ namespace Coscine.Api.Project.Controllers
/// <summary>
/// List all invitations of a project.
/// </summary>
/// <param name="projectId">Project id of the project</param>
/// <param name="projectId">Id of the project</param>
/// <returns>List of invitations</returns>
[HttpGet("[controller]/invitation/list/{projectId}")]
public ActionResult<IEnumerable<InvitationReturnObject>> ListInvitations(Guid projectId)
......@@ -723,9 +723,9 @@ namespace Coscine.Api.Project.Controllers
}
/// <summary>
/// Create and send an invitation to specified mail.
/// Create and send a project invitation to a specified mail.
/// </summary>
/// <param name="sendInvitationObject">Informations for sending an invitation</param>
/// <param name="sendInvitationObject">Informations for sending an invitation. The invitation token is stored inside the URL under ".../?invitationToken={token}".</param>
/// <returns>NoContent</returns>
[HttpPost("[controller]/invitation")]
public IActionResult SendInvitation([FromBody] SendInvitationObject sendInvitationObject)
......@@ -784,7 +784,7 @@ namespace Coscine.Api.Project.Controllers
{
["placeholder"] = new JObject()
{
["confirmation_link"] = $"{_configuration.GetString("coscine/local/api/additional/url")}/SitePages/Home.aspx?token={token}"
["confirmation_link"] = $"{_configuration.GetString("coscine/local/api/additional/url")}/?invitationToken={token}"
}
}
};
......@@ -799,10 +799,11 @@ namespace Coscine.Api.Project.Controllers
return NoContent();
}
/// <summary>
/// Deletes an invitation.
/// Deletes a project invitation.
/// </summary>
/// <param name="invitationId">Id of a invitation</param>
/// <param name="invitationId">Id of an invitation</param>
/// <returns>NoContent</returns>
[HttpDelete("[controller]/invitation/{invitationId}")]
public IActionResult DeleteInvitation(Guid invitationId)
......@@ -827,16 +828,16 @@ namespace Coscine.Api.Project.Controllers
}
/// <summary>
/// Resolve an invitation for the current user.
/// Resolve a project invitation for the current user.
/// </summary>
/// <param name="token">Token of a invitation</param>
/// <param name="invitationToken">Token for a project invitation stored inside the URL under ".../?invitationToken={token}"</param>
/// <returns>NoContent</returns>
[HttpGet("[controller]/invitation/resolve/{token}")]
public IActionResult ResolveInvitation(Guid token)
[HttpGet("[controller]/invitation/resolve/{invitationToken}")]
public IActionResult ResolveInvitation(Guid invitationToken)
{
var user = _authenticator.GetUser();
var invitation = _invitationModel.GetByToken(token);
var invitation = _invitationModel.GetByToken(invitationToken);
if (invitation == null)
{
......
......@@ -5,7 +5,7 @@
<AssemblyName>Coscine.Api.Project</AssemblyName>
<GenerateDocumentationFile>true</GenerateDocumentationFile>
<TargetFramework>net6.0</TargetFramework>
<Version>2.9.0</Version>
<Version>3.0.0</Version>
</PropertyGroup>
<PropertyGroup>
<Authors>RWTH Aachen University</Authors>
......@@ -17,7 +17,7 @@
<PackageRequireLicenseAcceptance>false</PackageRequireLicenseAcceptance>
</PropertyGroup>
<ItemGroup>
<PackageReference Include="Coscine.Action" Version="2.*-*" />
<PackageReference Include="Coscine.Action" Version="3.*-*" />
<PackageReference Include="Coscine.ApiCommons" Version="2.*-*" />
<PackageReference Include="Coscine.Database" Version="2.*-*" />
<PackageReference Include="Coscine.Logging" Version="2.*-*" />
......