Skip to content

Change spoof login response back to 200 + JSON #1785

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
david-crespo merged 3 commits into from
Oct 5, 2022
Merged

Change spoof login response back to 200 + JSON #1785

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
4dda092
change spoof login response back to 200
david-crespo Oct 5, 2022
8737025
200 -> 204, update openapi spec
david-crespo Oct 5, 2022
35b00ce
forgot to update test
david-crespo Oct 5, 2022
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
10 changes: 8 additions & 2 deletions nexus/src/external_api/console_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -47,6 +47,9 @@ pub struct SpoofLoginBody {
pub username: String,
}

#[derive(Clone, Debug, Deserialize, Serialize, JsonSchema)]
pub struct SpoofLoginResponse {}

// This is just for demo purposes. we will probably end up with a real
// username/password login endpoint, but I think it will only be for use while
// setting up the rack
Expand All @@ -60,7 +63,8 @@ pub struct SpoofLoginBody {
pub async fn login_spoof(
rqctx: Arc<RequestContext<Arc<ServerContext>>>,
params: TypedBody<SpoofLoginBody>,
) -> Result<HttpResponseSeeOther, HttpError> {
) -> Result<HttpResponseHeaders<HttpResponseOk<SpoofLoginResponse>>, HttpError>
{
let apictx = rqctx.context();
let handler = async {
let nexus = &apictx.nexus;
Expand All @@ -85,7 +89,9 @@ pub async fn login_spoof(
let authn_opctx = nexus.opctx_external_authn();
let session = nexus.session_create(&authn_opctx, user_id).await?;

let mut response = http_response_see_other(String::from("/"))?;
let mut response = HttpResponseHeaders::new_unnamed(HttpResponseOk(
SpoofLoginResponse {},
));
Copy link
Contributor Author

@david-crespo david-crespo Oct 5, 2022

Choose a reason for hiding this comment

The reason will be displayed to describe this comment to others. Learn more.

This was kind of a weird API, had to look at the Dropshot source to find a way that works. But I get the feeling what I'm trying to do here is a little unusual.

{
let headers = response.headers_mut();
headers.append(
Expand Down
2 changes: 1 addition & 1 deletion nexus/tests/integration_tests/console_api.rs
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -398,7 +398,7 @@ fn get_header_value(resp: TestResponse, header_name: HeaderName) -> String {
async fn log_in_and_extract_token(testctx: &ClientTestContext) -> String {
let login = RequestBuilder::new(&testctx, Method::POST, "/login")
.body(Some(&SpoofLoginBody { username: "unprivileged".to_string() }))
.expect_status(Some(StatusCode::SEE_OTHER))
.expect_status(Some(StatusCode::OK))
.execute()
.await
.expect("failed to log in");
Expand Down