monkee.ch/monkeeShark
1
0
Fork 0
Code Pull requests Activity

reduce typescript warnings on tests

Browse source
This commit is contained in:
Kagami Sascha Rosylight 2023-06-04 14:20:52 +02:00
parent 967989c5f8
commit 9a5fa00f9a
1 changed files with 20 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

29
packages/backend/test/e2e/oauth.ts
View file

@ -65,7 +65,7 @@ function fetchDecision(transactionId: string, user: misskey.entities.MeSignup, {
return fetch(new URL('/oauth/decision', host), { return fetch(new URL('/oauth/decision', host), {
method: 'post', method: 'post',
body: new URLSearchParams({ body: new URLSearchParams({
transaction_id: transactionId!, transaction_id: transactionId,
login_token: user.token, login_token: user.token,
cancel: cancel ? 'cancel' : '', cancel: cancel ? 'cancel' : '',
}), }),
@ -78,11 +78,12 @@ function fetchDecision(transactionId: string, user: misskey.entities.MeSignup, {
async function fetchDecisionFromResponse(response: Response, user: misskey.entities.MeSignup, { cancel }: { cancel?: boolean } = {}): Promise<Response> { async function fetchDecisionFromResponse(response: Response, user: misskey.entities.MeSignup, { cancel }: { cancel?: boolean } = {}): Promise<Response> {
const { transactionId } = getMeta(await response.text()); const { transactionId } = getMeta(await response.text());
assert.ok(transactionId);
return await fetchDecision(transactionId!, user, { cancel }); return await fetchDecision(transactionId, user, { cancel });
} }
async function fetchAuthorizationCode(user: ImmediateSignup, scope: string, code_challenge: string) { async function fetchAuthorizationCode(user: ImmediateSignup, scope: string, code_challenge: string): Promise<{ client: AuthorizationCode, code: string }> {
const client = getClient(); const client = getClient();
const response = await fetch(client.authorizeURL({ const response = await fetch(client.authorizeURL({
@ -98,11 +99,14 @@ async function fetchAuthorizationCode(user: ImmediateSignup, scope: string, code
const decisionResponse = await fetchDecisionFromResponse(response, user); const decisionResponse = await fetchDecisionFromResponse(response, user);
assert.strictEqual(decisionResponse.status, 302); assert.strictEqual(decisionResponse.status, 302);
const location = new URL(decisionResponse.headers.get('location')!); const locationHeader = decisionResponse.headers.get('location');
assert.ok(locationHeader);
const location = new URL(locationHeader);
assert.ok(location.searchParams.has('code')); assert.ok(location.searchParams.has('code'));
const code = new URL(location).searchParams.get('code')!; const code = new URL(location).searchParams.get('code');
assert.ok(!!code); assert.ok(code);
return { client, code }; return { client, code };
} }
@ -157,20 +161,27 @@ describe('OAuth', () => {
const meta = getMeta(await response.text()); const meta = getMeta(await response.text());
assert.strictEqual(typeof meta.transactionId, 'string'); assert.strictEqual(typeof meta.transactionId, 'string');
assert.ok(meta.transactionId);
assert.strictEqual(meta.clientName, 'Misklient'); assert.strictEqual(meta.clientName, 'Misklient');
const decisionResponse = await fetchDecision(meta.transactionId!, alice); const decisionResponse = await fetchDecision(meta.transactionId, alice);
assert.strictEqual(decisionResponse.status, 302); assert.strictEqual(decisionResponse.status, 302);
assert.ok(decisionResponse.headers.has('location')); assert.ok(decisionResponse.headers.has('location'));
const location = new URL(decisionResponse.headers.get('location')!); const locationHeader = decisionResponse.headers.get('location');
assert.ok(locationHeader);
const location = new URL(locationHeader);
assert.strictEqual(location.origin + location.pathname, redirect_uri); assert.strictEqual(location.origin + location.pathname, redirect_uri);
assert.ok(location.searchParams.has('code')); assert.ok(location.searchParams.has('code'));
assert.strictEqual(location.searchParams.get('state'), 'state'); assert.strictEqual(location.searchParams.get('state'), 'state');
assert.strictEqual(location.searchParams.get('iss'), 'http://misskey.local'); // RFC 9207 assert.strictEqual(location.searchParams.get('iss'), 'http://misskey.local'); // RFC 9207
const code = new URL(location).searchParams.get('code');
assert.ok(code);
const token = await client.getToken({ const token = await client.getToken({
code: location.searchParams.get('code')!, code,
redirect_uri, redirect_uri,
code_verifier, code_verifier,
} as AuthorizationTokenConfigExtended); } as AuthorizationTokenConfigExtended);