Logout route

compose.ci.yaml

@@ -8,6 +8,7 @@ services:
     image: test
     environment:
       - DATABASE_URL=mongodb://root:root@db/admin
+      - SESSION_SECRET=secret
     ports:
       - 8000:8000
     container_name: test

src/client/components/NavBar/index.tsx

@@ -17,6 +17,7 @@ import {
 import { Language, LoginOutlined, LogoutOutlined } from '@mui/icons-material'
 import { useTranslation } from 'react-i18next'
 
+import { HOST_NAME } from '../../../config'
 import useCurrentUser from '../../hooks/useCurrentUser'
 import hyLogo from '../../assets/hy_logo.svg'
 import styles from './styles'
@@ -56,7 +57,7 @@ const NavBar = () => {
           <Box>
             {user ? (
               <Link
-                href="https://openid.ext.ocp-test-0.k8s.it.helsinki.fi/api/logout"
+                href={`${HOST_NAME}/api/logout`}
                 style={{ textDecoration: 'none' }}
               >
                 <Button>
@@ -65,7 +66,7 @@ const NavBar = () => {
               </Link>
             ) : (
               <Link
-                href="https://openid.ext.ocp-test-0.k8s.it.helsinki.fi/api/login"
+                href={`${HOST_NAME}/api/oidc`}
                 style={{ textDecoration: 'none' }}
               >
                 <Button>

src/client/hooks/useCurrentUser.ts

@@ -7,7 +7,7 @@ export const queryKey = ['login']
 
 const useCurrentUser = () => {
   const queryFn = async (): Promise<User | null> => {
-    const res = await fetch(`${BASE_PATH}/api/users`)
+    const res = await fetch(`${BASE_PATH}/api/login`)
 
     if (res.status === 401) return null
 

src/config.ts

@@ -7,3 +7,5 @@ export const inProduction = !inStaging && process.env.NODE_ENV === 'production'
 export const inE2EMode = process.env.E2E === 'true'
 
 export const BASE_PATH = process.env.BASE_PATH || ''
+
+export const HOST_NAME = process.env.HOST_NAME || 'http://localhost:3000'

src/server/routes/index.ts

@@ -4,7 +4,6 @@ import cors from 'cors'
 import { inDevelopment, inE2EMode } from '../../config'
 import userMiddleware from '../middleware/user'
 import loginRouter from './login'
-import userRouter from './user'
 import counterRouter from './counter'
 
 const router = express()
@@ -19,7 +18,6 @@ if (inDevelopment || inE2EMode) {
 router.get('/ping', (_, res) => res.send('pong'))
 
 router.use('/', loginRouter)
-router.use('/users', userRouter)
 router.use('/counter', counterRouter)
 
 export default router

src/server/routes/login.ts

@@ -1,4 +1,5 @@
 import express from 'express'
+import passport from 'passport'
 
 import { RequestWithUser } from '../types'
 
@@ -12,4 +13,23 @@ loginRouter.get('/login', async (req, res) => {
   return res.send(user)
 })
 
+loginRouter.get('/oidc', passport.authenticate('oidc'))
+
+loginRouter.get(
+  '/callback',
+  passport.authenticate('oidc', { failureRedirect: '/' }),
+  (_, res) => {
+    res.redirect('/')
+  }
+)
+
+loginRouter.get('/logout', async (req, res, next) => {
+  // eslint-disable-next-line consistent-return
+  req.logout((err) => {
+    if (err) return next(err)
+  })
+
+  res.redirect('/')
+})
+
 export default loginRouter