Browse Source

added expiration date and creator identifier to the Send access response model (#1166)

pull/1172/head
Addison Beck 5 years ago committed by GitHub
parent
commit
b21c9042ca
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
  1. 7
      src/Api/Controllers/SendsController.cs
  2. 4
      src/Core/Models/Api/Response/SendAccessResponseModel.cs

7
src/Api/Controllers/SendsController.cs

@ -60,7 +60,12 @@ namespace Bit.Api.Controllers @@ -60,7 +60,12 @@ namespace Bit.Api.Controllers
throw new NotFoundException();
}
return new ObjectResult(new SendAccessResponseModel(send, _globalSettings));
var sendResponse = new SendAccessResponseModel(send, _globalSettings);
if (send.UserId.HasValue) {
var creator = await _userService.GetUserByIdAsync(send.UserId.Value);
sendResponse.CreatorIdentifier = creator.Email;
}
return new ObjectResult(sendResponse);
}
[AllowAnonymous]

4
src/Core/Models/Api/Response/SendAccessResponseModel.cs

@ -4,6 +4,7 @@ using Bit.Core.Models.Data; @@ -4,6 +4,7 @@ using Bit.Core.Models.Data;
using Bit.Core.Models.Table;
using Bit.Core.Utilities;
using Bit.Core.Settings;
using Bit.Core.Services;
using Newtonsoft.Json;
namespace Bit.Core.Models.Api
@ -39,6 +40,7 @@ namespace Bit.Core.Models.Api @@ -39,6 +40,7 @@ namespace Bit.Core.Models.Api
}
Name = sendData.Name;
ExpirationDate = send.ExpirationDate;
}
public string Id { get; set; }
@ -46,5 +48,7 @@ namespace Bit.Core.Models.Api @@ -46,5 +48,7 @@ namespace Bit.Core.Models.Api
public string Name { get; set; }
public SendFileModel File { get; set; }
public SendTextModel Text { get; set; }
public DateTime? ExpirationDate { get; set; }
public string CreatorIdentifier { get; set; }
}
}

Loading…
Cancel
Save