1
0
mirror of https://github.com/bitwarden/server.git synced 2025-07-01 08:02:49 -05:00

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

* 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
2 changed files with 7 additions and 8 deletions

View File

@ -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<AuthRequestResponseModel>(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);
}
}