Fixed auth check.
This commit is contained in:
@@ -86,7 +86,7 @@ function decodeHeader(s: string | undefined | null): string | undefined | null {
|
||||
return Buffer.from(s, 'latin1').toString('utf-8');
|
||||
}
|
||||
|
||||
export async function getLocation(ip: string, headers: Headers) {
|
||||
export async function getLocation(ip: string = '', headers: Headers) {
|
||||
// Ignore local ips
|
||||
if (await isLocalhost(ip)) {
|
||||
return;
|
||||
|
||||
@@ -22,6 +22,7 @@ export async function parseRequest(
|
||||
let query = Object.fromEntries(url.searchParams);
|
||||
let body = await getJsonBody(request);
|
||||
let error: () => void | undefined;
|
||||
let auth = null;
|
||||
|
||||
if (schema) {
|
||||
const isGet = request.method === 'GET';
|
||||
@@ -36,10 +37,12 @@ export async function parseRequest(
|
||||
}
|
||||
}
|
||||
|
||||
const auth = !error && !options?.skipAuth ? await checkAuth(request) : null;
|
||||
if (!options?.skipAuth && !error) {
|
||||
auth = await checkAuth(request);
|
||||
|
||||
if (!error && !auth) {
|
||||
error = () => unauthorized();
|
||||
if (!auth) {
|
||||
error = () => unauthorized();
|
||||
}
|
||||
}
|
||||
|
||||
return { url, query, body, auth, error };
|
||||
|
||||
Reference in New Issue
Block a user