refactor(DocumentController): remvoe Open endpoint and its client method
This commit is contained in:
parent
82a63b0dae
commit
3394a580f4
@ -15,23 +15,18 @@ public class DocumentController : BaseController
|
|||||||
{
|
{
|
||||||
private readonly EnvelopeOldService envelopeService;
|
private readonly EnvelopeOldService envelopeService;
|
||||||
private readonly ActionService? actionService;
|
private readonly ActionService? actionService;
|
||||||
[Obsolete("Use MediatR")]
|
|
||||||
private readonly IEnvelopeDocumentService _envDocService;
|
|
||||||
|
|
||||||
[Obsolete("Use MediatR")]
|
[Obsolete("Use MediatR")]
|
||||||
public DocumentController(DatabaseService database, EnvelopeOldService envelope, IEnvelopeDocumentService envDocService, ILogger<DocumentController> logger) : base(database, logger)
|
public DocumentController(DatabaseService database, EnvelopeOldService envelope, ILogger<DocumentController> logger) : base(database, logger)
|
||||||
{
|
{
|
||||||
envelopeService = envelope;
|
envelopeService = envelope;
|
||||||
actionService = database.Services?.actionService;
|
actionService = database.Services?.actionService;
|
||||||
_envDocService = envDocService;
|
|
||||||
}
|
}
|
||||||
|
|
||||||
[Obsolete("Use MediatR")]
|
[Obsolete("Use MediatR")]
|
||||||
[NonAction]
|
[NonAction]
|
||||||
public async Task<IActionResult> Get([FromRoute] string envelopeKey, [FromQuery] int index)
|
public async Task<IActionResult> Get([FromRoute] string envelopeKey, [FromQuery] int index)
|
||||||
{
|
{
|
||||||
// Validate Envelope Key and load envelope
|
|
||||||
envelopeService.EnsureValidEnvelopeKey(envelopeKey);
|
|
||||||
EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);
|
EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);
|
||||||
|
|
||||||
// Load document info
|
// Load document info
|
||||||
@ -43,23 +38,4 @@ public class DocumentController : BaseController
|
|||||||
// Return the document as bytes
|
// Return the document as bytes
|
||||||
return File(bytes, "application/octet-stream");
|
return File(bytes, "application/octet-stream");
|
||||||
}
|
}
|
||||||
|
|
||||||
[Authorize(Roles = ReceiverRole.FullyAuth)]
|
|
||||||
[HttpPost("{envelopeKey}")]
|
|
||||||
[Obsolete("Use MediatR")]
|
|
||||||
public async Task<IActionResult> Open(string envelopeKey)
|
|
||||||
{
|
|
||||||
var authSignature = this.GetAuthReceiverSignature();
|
|
||||||
|
|
||||||
if (authSignature != envelopeKey.GetReceiverSignature())
|
|
||||||
return Forbid();
|
|
||||||
|
|
||||||
// Validate Envelope Key and load envelope
|
|
||||||
envelopeService.EnsureValidEnvelopeKey(envelopeKey);
|
|
||||||
EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);
|
|
||||||
|
|
||||||
actionService?.OpenEnvelope(response.Envelope, response.Receiver);
|
|
||||||
|
|
||||||
return Ok(new object());
|
|
||||||
}
|
|
||||||
}
|
}
|
||||||
@ -23,8 +23,6 @@ public class EnvelopeController : BaseController
|
|||||||
[Obsolete("Use MediatR")]
|
[Obsolete("Use MediatR")]
|
||||||
private readonly IEnvelopeHistoryService _histService;
|
private readonly IEnvelopeHistoryService _histService;
|
||||||
[Obsolete("Use MediatR")]
|
[Obsolete("Use MediatR")]
|
||||||
private readonly IReceiverService _receiverService;
|
|
||||||
[Obsolete("Use MediatR")]
|
|
||||||
private readonly IEnvelopeReceiverService _envRcvService;
|
private readonly IEnvelopeReceiverService _envRcvService;
|
||||||
|
|
||||||
[Obsolete("Use MediatR")]
|
[Obsolete("Use MediatR")]
|
||||||
@ -32,14 +30,12 @@ public class EnvelopeController : BaseController
|
|||||||
EnvelopeOldService envelope,
|
EnvelopeOldService envelope,
|
||||||
ILogger<EnvelopeController> logger, UrlEncoder urlEncoder,
|
ILogger<EnvelopeController> logger, UrlEncoder urlEncoder,
|
||||||
IEnvelopeHistoryService envelopeHistoryService,
|
IEnvelopeHistoryService envelopeHistoryService,
|
||||||
IReceiverService receiverService,
|
|
||||||
IEnvelopeReceiverService envelopeReceiverService) : base(database, logger)
|
IEnvelopeReceiverService envelopeReceiverService) : base(database, logger)
|
||||||
{
|
{
|
||||||
envelopeService = envelope;
|
envelopeService = envelope;
|
||||||
actionService = database?.Services?.actionService;
|
actionService = database?.Services?.actionService;
|
||||||
_urlEncoder = urlEncoder;
|
_urlEncoder = urlEncoder;
|
||||||
_histService = envelopeHistoryService;
|
_histService = envelopeHistoryService;
|
||||||
_receiverService = receiverService;
|
|
||||||
_envRcvService = envelopeReceiverService;
|
_envRcvService = envelopeReceiverService;
|
||||||
}
|
}
|
||||||
|
|
||||||
@ -49,9 +45,6 @@ public class EnvelopeController : BaseController
|
|||||||
{
|
{
|
||||||
envelopeKey = _urlEncoder.Encode(envelopeKey);
|
envelopeKey = _urlEncoder.Encode(envelopeKey);
|
||||||
|
|
||||||
// Validate Envelope Key and load envelope
|
|
||||||
envelopeService.EnsureValidEnvelopeKey(envelopeKey);
|
|
||||||
|
|
||||||
EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);
|
EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);
|
||||||
|
|
||||||
if (envelopeService.ReceiverAlreadySigned(response.Envelope, response.Receiver.Id) == true)
|
if (envelopeService.ReceiverAlreadySigned(response.Envelope, response.Receiver.Id) == true)
|
||||||
@ -75,8 +68,6 @@ public class EnvelopeController : BaseController
|
|||||||
if (authSignature != envelopeKey.GetReceiverSignature())
|
if (authSignature != envelopeKey.GetReceiverSignature())
|
||||||
return Unauthorized();
|
return Unauthorized();
|
||||||
|
|
||||||
// Validate Envelope Key and load envelope
|
|
||||||
envelopeService.EnsureValidEnvelopeKey(envelopeKey);
|
|
||||||
EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);
|
EnvelopeReceiver response = await envelopeService.LoadEnvelope(envelopeKey);
|
||||||
|
|
||||||
// Again check if receiver has already signed
|
// Again check if receiver has already signed
|
||||||
|
|||||||
@ -33,24 +33,6 @@ public class EnvelopeOldService
|
|||||||
_configService = configService;
|
_configService = configService;
|
||||||
}
|
}
|
||||||
|
|
||||||
public void EnsureValidEnvelopeKey(string envelopeKey)
|
|
||||||
{
|
|
||||||
_logger.LogInformation("Parsing EnvelopeKey..");
|
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(envelopeKey))
|
|
||||||
throw new ArgumentNullException("EnvelopeKey");
|
|
||||||
|
|
||||||
Tuple<string, string> result = Helpers.DecodeEnvelopeReceiverId(envelopeKey);
|
|
||||||
_logger.LogInformation("EnvelopeUUID: [{0}]", result.Item1);
|
|
||||||
_logger.LogInformation("ReceiverSignature: [{0}]", result.Item2);
|
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(result.Item1))
|
|
||||||
throw new ArgumentNullException("EnvelopeUUID");
|
|
||||||
|
|
||||||
if (string.IsNullOrEmpty(result.Item2))
|
|
||||||
throw new ArgumentNullException("ReceiverSignature");
|
|
||||||
}
|
|
||||||
|
|
||||||
[Obsolete("Use MediatR")]
|
[Obsolete("Use MediatR")]
|
||||||
public async Task<EnvelopeReceiver> LoadEnvelope(string pEnvelopeKey)
|
public async Task<EnvelopeReceiver> LoadEnvelope(string pEnvelopeKey)
|
||||||
{
|
{
|
||||||
|
|||||||
@ -71,17 +71,8 @@ class App {
|
|||||||
try {
|
try {
|
||||||
this.signatureCount = this.currentDocument.elements.length
|
this.signatureCount = this.currentDocument.elements.length
|
||||||
await createAnnotations(this.currentDocument, this.Instance)
|
await createAnnotations(this.currentDocument, this.Instance)
|
||||||
|
|
||||||
const openResponse = await this.Network.openDocument(this.envelopeKey)
|
|
||||||
|
|
||||||
if (openResponse.fatal || openResponse.error) {
|
|
||||||
return Swal.fire({
|
|
||||||
title: 'Fehler',
|
|
||||||
text: 'Umschlag konnte nicht geöffnet werden!',
|
|
||||||
icon: 'error',
|
|
||||||
})
|
|
||||||
}
|
|
||||||
} catch (e) {
|
} catch (e) {
|
||||||
|
console.error("Error loading annotations:", e);
|
||||||
}
|
}
|
||||||
|
|
||||||
//add click events of external buttons
|
//add click events of external buttons
|
||||||
|
|||||||
@ -30,15 +30,6 @@
|
|||||||
.then(this.wrapBinaryResponse.bind(this))
|
.then(this.wrapBinaryResponse.bind(this))
|
||||||
}
|
}
|
||||||
|
|
||||||
/**
|
|
||||||
* Tell the server that document has been seen
|
|
||||||
* @param {any} envelopeKey
|
|
||||||
*/
|
|
||||||
async openDocument(envelopeKey) {
|
|
||||||
return this.postRequest(`/api/document/${envelopeKey}`, {})
|
|
||||||
.then(this.wrapJsonResponse.bind(this))
|
|
||||||
}
|
|
||||||
|
|
||||||
/**
|
/**
|
||||||
* Add CSRF Token to request headers
|
* Add CSRF Token to request headers
|
||||||
* @param {any} options
|
* @param {any} options
|
||||||
|
|||||||
Loading…
x
Reference in New Issue
Block a user