From fd3f05da47911ecc195fda5d3a6788554b4b6d5e Mon Sep 17 00:00:00 2001 From: =?UTF-8?q?Daniel=20Garc=C3=ADa?= Date: Mon, 12 Feb 2024 11:04:00 +0100 Subject: [PATCH] [PM-6137] Fix invalid Swagger generation in knowndevice (#3760) * Fix invalid swagger generation in knowndevice * Format --- src/Api/Controllers/DevicesController.cs | 8 +++++--- .../Models/Request/KnownDeviceRequestModel.cs | 16 ---------------- 2 files changed, 5 insertions(+), 19 deletions(-) delete mode 100644 src/Api/Models/Request/KnownDeviceRequestModel.cs diff --git a/src/Api/Controllers/DevicesController.cs b/src/Api/Controllers/DevicesController.cs index 6787fe515c..46e312bc03 100644 --- a/src/Api/Controllers/DevicesController.cs +++ b/src/Api/Controllers/DevicesController.cs @@ -1,4 +1,4 @@ -using Api.Models.Request; +using System.ComponentModel.DataAnnotations; using Bit.Api.Auth.Models.Request; using Bit.Api.Auth.Models.Request.Accounts; using Bit.Api.Models.Request; @@ -207,8 +207,10 @@ public class DevicesController : Controller [AllowAnonymous] [HttpGet("knowndevice")] - public async Task GetByIdentifierQuery([FromHeader] KnownDeviceRequestModel request) - => await GetByIdentifier(CoreHelpers.Base64UrlDecodeString(request.Email), request.DeviceIdentifier); + public async Task GetByIdentifierQuery( + [Required][FromHeader(Name = "X-Request-Email")] string Email, + [Required][FromHeader(Name = "X-Device-Identifier")] string DeviceIdentifier) + => await GetByIdentifier(CoreHelpers.Base64UrlDecodeString(Email), DeviceIdentifier); [Obsolete("Path is deprecated due to encoding issues, use /knowndevice instead.")] [AllowAnonymous] diff --git a/src/Api/Models/Request/KnownDeviceRequestModel.cs b/src/Api/Models/Request/KnownDeviceRequestModel.cs deleted file mode 100644 index 8232f596af..0000000000 --- a/src/Api/Models/Request/KnownDeviceRequestModel.cs +++ /dev/null @@ -1,16 +0,0 @@ -using System.ComponentModel.DataAnnotations; -using Microsoft.AspNetCore.Mvc; - -namespace Api.Models.Request; - -public class KnownDeviceRequestModel -{ - [Required] - [FromHeader(Name = "X-Request-Email")] - public string Email { get; set; } - - [Required] - [FromHeader(Name = "X-Device-Identifier")] - public string DeviceIdentifier { get; set; } - -}