Make tests pass

This commit is contained in:
Jesse Wierzbinski 2023-09-13 16:49:26 -10:00
parent 91242b73bf
commit 4ced6744fa
No known key found for this signature in database
GPG key ID: F9A1E418934E40B0
2 changed files with 12 additions and 12 deletions

View file

@ -12,7 +12,9 @@ export default async (
req: Request, req: Request,
matchedRoute: MatchedRoute matchedRoute: MatchedRoute
): Promise<Response> => { ): Promise<Response> => {
const scopes = matchedRoute.query.scopes.replaceAll("+", " ").split(" "); const scopes = (matchedRoute.query.scopes || "")
.replaceAll("+", " ")
.split(" ");
const redirect_uri = matchedRoute.query.redirect_uri; const redirect_uri = matchedRoute.query.redirect_uri;
const response_type = matchedRoute.query.response_type; const response_type = matchedRoute.query.response_type;
const client_id = matchedRoute.query.client_id; const client_id = matchedRoute.query.client_id;
@ -54,10 +56,5 @@ export default async (
await token.save(); await token.save();
// Redirect back to application // Redirect back to application
return new Response(null, { return Response.redirect(`${redirect_uri}?code=${token.code}`);
status: 302,
headers: {
Location: `${redirect_uri}?code=${token.code}`,
},
});
}; };

View file

@ -76,11 +76,11 @@ describe("POST /auth/login/", () => {
{ {
method: "POST", method: "POST",
body: formData, body: formData,
redirect: "manual",
} }
); );
expect(response.status).toBe(302); expect(response.status).toBe(302);
expect(response.headers.get("location")).toMatch( expect(response.headers.get("Location")).toMatch(
/https:\/\/example.com\?code=/ /https:\/\/example.com\?code=/
); );
@ -108,13 +108,16 @@ describe("POST /v1/oauth/token/", () => {
} }
); );
// eslint-disable-next-line @typescript-eslint/no-unsafe-assignment
const json = await response.json();
expect(response.status).toBe(200); expect(response.status).toBe(200);
expect(response.headers.get("content-type")).toBe("application/json"); expect(response.headers.get("content-type")).toBe("application/json");
expect(await response.json()).toEqual({ expect(json).toEqual({
access_token: expect.any(String), access_token: expect.any(String),
token_type: "bearer", token_type: "Bearer",
scope: "read write", scope: "read write",
created_at: expect.any(Number), created_at: expect.any(String),
}); });
}); });
}); });