Skip to content
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

Jump to bottom

Fix geoblock middleware #195

Merged
merged 3 commits into from
Jun 21, 2024
Merged

Fix geoblock middleware #195

Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
f099426
fix: remove fancy middleware matcher regex
AlexBHarley Jun 21, 2024
31c9922
chore: rm log
AlexBHarley Jun 21, 2024
dbd8840
fix: fully qualified url
AlexBHarley Jun 21, 2024
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
7 changes: 4 additions & 3 deletions src/middleware.ts
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -1,7 +1,8 @@
import { NextRequest, NextResponse } from 'next/server';

export const config = {
matcher: ['/((?!blocked/_next/static/backgrounds/fonts/favicon).*)'],
// only run on the index
matcher: '/',
};

const BLOCKED_COUNTRIES = [
Expand Down Expand Up @@ -47,15 +48,15 @@ export function middleware(req: NextRequest) {
const region = req.geo?.region;

if (country && BLOCKED_COUNTRIES.includes(country)) {
return NextResponse.redirect('/blocked');
return NextResponse.redirect(new URL('/blocked', req.url));
}

if (
country &&
region &&
BLOCKED_REGIONS.find((x) => x.country === country)?.regions.includes(region)
) {
return NextResponse.redirect('/blocked');
return NextResponse.redirect(new URL('/blocked', req.url));
}

return NextResponse.next();
Expand Down
Loading