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.

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

UI auth #699

Merged
merged 10 commits into from
Nov 24, 2023
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
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
1 change: 1 addition & 0 deletions docker-compose-dev.yml
Original file line number Diff line number Diff line change
Expand Up @@ -201,6 +201,7 @@ services:
<<: *catalog-config
DATABASE_URL: postgres://postgres:postgres@catalog:5432/postgres
PEERDB_FLOW_SERVER_HTTP: http://flow_api:8113
PEERDB_PASSWORD: peerdb

volumes:
pgdata:
13 changes: 13 additions & 0 deletions ui/app/api/login/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,13 @@
import { cookies } from 'next/headers';

export async function POST(request: Request) {
const { password } = await request.json();
if (process.env.PEERDB_PASSWORD !== password) {
return new Response(JSON.stringify({ error: 'wrong password' }));
}
cookies().set('auth', password, {
expires: Date.now() + 24 * 60 * 60 * 1000,
secure: process.env.PEERDB_SECURE_COOKIES === 'true',
});
return new Response('{}');
}
6 changes: 6 additions & 0 deletions ui/app/api/logout/route.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,6 @@
import { cookies } from 'next/headers';

export async function POST(req: Request) {
cookies().delete('auth');
return new Response('');
}
61 changes: 61 additions & 0 deletions ui/app/login/page.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,61 @@
'use client';
import Image from 'next/image';
import { useRouter, useSearchParams } from 'next/navigation';
import { useState } from 'react';

import { Button } from '@/lib/Button';
import { Layout, LayoutMain } from '@/lib/Layout';
import { TextField } from '@/lib/TextField';

export default function Login() {
const router = useRouter();
const searchParams = useSearchParams();
const [pass, setPass] = useState('');
const [error, setError] = useState(() =>
searchParams.has('reject') ? 'Authentication failed, please login' : ''
);
const login = () => {
fetch('/api/login', {
method: 'POST',
body: JSON.stringify({ password: pass }),
})
.then((res) => res.json())
.then((res) => {
if (res.error) setError(res.error);
else router.push('/');
});
};
return (
<Layout>
<LayoutMain alignSelf='center' justifySelf='center' width='xxLarge'>
<Image src='/images/peerdb-combinedMark.svg' alt='PeerDB' width={512} />
{error && (
<div
style={{
borderRadius: '8px',
fontWeight: 'bold',
color: '#600',
backgroundColor: '#c66',
}}
>
{error}
</div>
)}
<TextField
variant='simple'
placeholder='Password'
value={pass}
onChange={(e: React.ChangeEvent<HTMLInputElement>) =>
setPass(e.target.value)
}
onKeyPress={(e: React.KeyboardEvent<HTMLInputElement>) => {
if (e.key === 'Enter') {
login();
}
}}
/>
<Button onClick={login}>Login</Button>
</LayoutMain>
</Layout>
);
}
3 changes: 2 additions & 1 deletion ui/app/page.tsx
Original file line number Diff line number Diff line change
@@ -1,10 +1,11 @@
import SidebarComponent from '@/components/SidebarComponent';
import { Header } from '@/lib/Header';
import { Layout, LayoutMain } from '@/lib/Layout';
import { cookies } from 'next/headers';

export default function Home() {
return (
<Layout sidebar={<SidebarComponent />}>
<Layout sidebar={<SidebarComponent logout={!!cookies().get('auth')} />}>
<LayoutMain alignSelf='center' justifySelf='center' width='xxLarge'>
<Header variant='largeTitle'>PeerDB Home Page</Header>
</LayoutMain>
Expand Down
16 changes: 16 additions & 0 deletions ui/components/Logout.tsx
Original file line number Diff line number Diff line change
@@ -0,0 +1,16 @@
'use client';
import { Button } from '@/lib/Button';

export default function Logout() {
return (
<Button
onClick={() =>
fetch('/api/logout', { method: 'POST' }).then((res) =>
location.assign('/login')
)
}
>
Logout
</Button>
);
}
6 changes: 3 additions & 3 deletions ui/components/SidebarComponent.tsx
Original file line number Diff line number Diff line change
@@ -1,15 +1,15 @@
'use client';

import useTZStore from '@/app/globalstate/time';
import Logout from '@/components/Logout';
import { BrandLogo } from '@/lib/BrandLogo';
import { Button } from '@/lib/Button';
import { Icon } from '@/lib/Icon';
import { Label } from '@/lib/Label';
import { RowWithSelect } from '@/lib/Layout';
import { Sidebar, SidebarItem } from '@/lib/Sidebar';
import Link from 'next/link';

export default function SidebarComponent() {
export default function SidebarComponent(props: { logout?: boolean }) {
const timezones = ['UTC', 'Local', 'Relative'];
const setZone = useTZStore((state) => state.setZone);
const zone = useTZStore((state) => state.timezone);
Expand Down Expand Up @@ -60,7 +60,7 @@ export default function SidebarComponent() {
/>
</div>
</div>
<Button className='w-full'>Help and Support</Button>
{props.logout && <Logout />}
</>
}
bottomLabel={<Label variant='footnote'>App. v0.7.0</Label>}
Expand Down
23 changes: 23 additions & 0 deletions ui/middleware.ts
Original file line number Diff line number Diff line change
@@ -0,0 +1,23 @@
import type { NextRequest } from 'next/server';
import { NextResponse } from 'next/server';

export default function middleware(req: NextRequest) {
Copy link
Contributor

Choose a reason for hiding this comment

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

What do you think of something like:

const router = createEdgeRouter<NextRequest, NextFetchEvent>();

router.use('/', async (request) => {
  let path = request.nextUrl.pathname;
  let excludedPaths = ['/api/auth/callback', '/api/auth/login'];
  if (!excludedPaths.includes(path)) {
    // ...
    return authMiddleware(request);
  } else {
    return NextResponse.next();
  }
});

export function middleware(request: NextRequest, event: NextFetchEvent) {
  return router.run(request, event);
}

export const config = {
  matcher: [
    // Match everything other than static assets
    '/((?!_next/static|_next/image|favicon.ico).*)',
  ],
};

Copy link
Contributor Author

Choose a reason for hiding this comment

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

I'll add export const config but for now the rest seems unnecessary

if (
req.nextUrl.pathname !== '/login' &&
req.nextUrl.pathname !== '/api/login' &&
req.nextUrl.pathname !== '/api/logout' &&
process.env.PEERDB_PASSWORD &&
req.cookies.get('auth')?.value !== process.env.PEERDB_PASSWORD
) {
req.cookies.delete('auth');
return NextResponse.redirect(new URL('/login?reject', req.url));
}
return NextResponse.next();
}

export const config = {
matcher: [
// Match everything other than static assets
'/((?!_next/static/|images/|favicon.ico$).*)',
],
};
Loading