nhyatt/bitwarden
1
0
Fork 0
mirror of https://github.com/bitwarden/server.git synced 2025-04-06 05:28:15 -05:00
Code

[SG-686] Correctly format AuthRequestResponse.Origin (#2325)

Browse Source 
* Remove hardcoded URL case from AuthRequestResponse

* Just use URI host for AuthRequestResponse.Origin
This commit is contained in:
Addison Beck 2022-10-04 11:06:01 -04:00 committed by GitHub
parent 8325f0eed4
commit 54354237ba
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 7 additions and 8 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

10
src/Api/Controllers/AuthRequestsController.cs
View File

@ -46,7 +46,7 @@ public class AuthRequestsController : Controller
{ {
var userId = _userService.GetProperUserId(User).Value; var userId = _userService.GetProperUserId(User).Value;
var authRequests = await _authRequestRepository.GetManyByUserIdAsync(userId); var authRequests = await _authRequestRepository.GetManyByUserIdAsync(userId);
var responses = authRequests.Select(a => new AuthRequestResponseModel(a, _globalSettings)).ToList(); var responses = authRequests.Select(a => new AuthRequestResponseModel(a, _globalSettings.BaseServiceUri.Vault)).ToList();
return new ListResponseModel<AuthRequestResponseModel>(responses); return new ListResponseModel<AuthRequestResponseModel>(responses);
} }
@ -60,7 +60,7 @@ public class AuthRequestsController : Controller
throw new NotFoundException(); throw new NotFoundException();
} }
return new AuthRequestResponseModel(authRequest, _globalSettings); return new AuthRequestResponseModel(authRequest, _globalSettings.BaseServiceUri.Vault);
} }
[HttpGet("{id}/response")] [HttpGet("{id}/response")]
@ -73,7 +73,7 @@ public class AuthRequestsController : Controller
throw new NotFoundException(); throw new NotFoundException();
} }
return new AuthRequestResponseModel(authRequest, _globalSettings); return new AuthRequestResponseModel(authRequest, _globalSettings.BaseServiceUri.Vault);
} }
[HttpPost("")] [HttpPost("")]
@ -111,7 +111,7 @@ public class AuthRequestsController : Controller
}; };
authRequest = await _authRequestRepository.CreateAsync(authRequest); authRequest = await _authRequestRepository.CreateAsync(authRequest);
await _pushNotificationService.PushAuthRequestAsync(authRequest); await _pushNotificationService.PushAuthRequestAsync(authRequest);
var r = new AuthRequestResponseModel(authRequest, _globalSettings); var r = new AuthRequestResponseModel(authRequest, _globalSettings.BaseServiceUri.Vault);
return r; return r;
} }
@ -141,6 +141,6 @@ public class AuthRequestsController : Controller
await _pushNotificationService.PushAuthRequestResponseAsync(authRequest); await _pushNotificationService.PushAuthRequestResponseAsync(authRequest);
} }
return new AuthRequestResponseModel(authRequest, _globalSettings); return new AuthRequestResponseModel(authRequest, _globalSettings.BaseServiceUri.Vault);
} }
} }

5
src/Api/Models/Response/AuthRequestResponseModel.cs
View File

@ -3,13 +3,12 @@ using System.Reflection;
using Bit.Core.Entities; using Bit.Core.Entities;
using Bit.Core.Enums; using Bit.Core.Enums;
using Bit.Core.Models.Api; using Bit.Core.Models.Api;
using Bit.Core.Settings;
namespace Bit.Api.Models.Response; namespace Bit.Api.Models.Response;
public class AuthRequestResponseModel : ResponseModel public class AuthRequestResponseModel : ResponseModel
{ {
public AuthRequestResponseModel(AuthRequest authRequest, IGlobalSettings globalSettings, string obj = "auth-request") public AuthRequestResponseModel(AuthRequest authRequest, string vaultUri, string obj = "auth-request")
: base(obj) : base(obj)
{ {
if (authRequest == null) if (authRequest == null)
@ -28,7 +27,7 @@ public class AuthRequestResponseModel : ResponseModel
CreationDate = authRequest.CreationDate; CreationDate = authRequest.CreationDate;
RequestApproved = !string.IsNullOrWhiteSpace(Key) && RequestApproved = !string.IsNullOrWhiteSpace(Key) &&
(authRequest.Type == AuthRequestType.Unlock || !string.IsNullOrWhiteSpace(MasterPasswordHash)); (authRequest.Type == AuthRequestType.Unlock || !string.IsNullOrWhiteSpace(MasterPasswordHash));
Origin = globalSettings.SelfHosted ? globalSettings.BaseServiceUri.Vault : "bitwarden.com"; Origin = new Uri(vaultUri).Host;
} }
public string Id { get; set; } public string Id { get; set; }