diff --git a/src/Api/Controllers/AuthRequestsController.cs b/src/Api/Controllers/AuthRequestsController.cs index a155d3f31..def2997ff 100644 --- a/src/Api/Controllers/AuthRequestsController.cs +++ b/src/Api/Controllers/AuthRequestsController.cs @@ -46,7 +46,7 @@ public class AuthRequestsController : Controller { var userId = _userService.GetProperUserId(User).Value; 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(responses); } @@ -60,7 +60,7 @@ public class AuthRequestsController : Controller throw new NotFoundException(); } - return new AuthRequestResponseModel(authRequest, _globalSettings); + return new AuthRequestResponseModel(authRequest, _globalSettings.BaseServiceUri.Vault); } [HttpGet("{id}/response")] @@ -73,7 +73,7 @@ public class AuthRequestsController : Controller throw new NotFoundException(); } - return new AuthRequestResponseModel(authRequest, _globalSettings); + return new AuthRequestResponseModel(authRequest, _globalSettings.BaseServiceUri.Vault); } [HttpPost("")] @@ -111,7 +111,7 @@ public class AuthRequestsController : Controller }; authRequest = await _authRequestRepository.CreateAsync(authRequest); await _pushNotificationService.PushAuthRequestAsync(authRequest); - var r = new AuthRequestResponseModel(authRequest, _globalSettings); + var r = new AuthRequestResponseModel(authRequest, _globalSettings.BaseServiceUri.Vault); return r; } @@ -141,6 +141,6 @@ public class AuthRequestsController : Controller await _pushNotificationService.PushAuthRequestResponseAsync(authRequest); } - return new AuthRequestResponseModel(authRequest, _globalSettings); + return new AuthRequestResponseModel(authRequest, _globalSettings.BaseServiceUri.Vault); } } diff --git a/src/Api/Models/Response/AuthRequestResponseModel.cs b/src/Api/Models/Response/AuthRequestResponseModel.cs index 153140328..348355e95 100644 --- a/src/Api/Models/Response/AuthRequestResponseModel.cs +++ b/src/Api/Models/Response/AuthRequestResponseModel.cs @@ -3,13 +3,12 @@ using System.Reflection; using Bit.Core.Entities; using Bit.Core.Enums; using Bit.Core.Models.Api; -using Bit.Core.Settings; namespace Bit.Api.Models.Response; 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) { if (authRequest == null) @@ -28,7 +27,7 @@ public class AuthRequestResponseModel : ResponseModel CreationDate = authRequest.CreationDate; RequestApproved = !string.IsNullOrWhiteSpace(Key) && (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; }