ログイン機能の追加

mitaina-back/package.json

@@ -13,7 +13,9 @@
 	"license": "ISC",
 	"devDependencies": {
 		"@types/bcrypt": "^5.0.0",
+		"@types/cookie-parser": "^1.4.3",
 		"@types/express": "^4.17.13",
+		"@types/jsonwebtoken": "^8.5.8",
 		"@types/node": "^18.0.0",
 		"nodemon": "^2.0.18",
 		"prisma": "^3.9.2",
@@ -23,6 +25,8 @@
 	"dependencies": {
 		"@prisma/client": "^4.0.0",
 		"bcrypt": "^5.0.1",
-		"express": "^4.18.1"
+		"cookie-parser": "^1.4.6",
+		"express": "^4.18.1",
+		"jsonwebtoken": "^8.5.1"
 	}
 }

mitaina-back/src/repository/userRepository.ts

@@ -27,4 +27,24 @@ export class UserRepository {
 		});
 		return !!user;
 	}
+
+	static async getUserByLoginId(loginId: string): Promise<User | null> {
+		const user = await prisma.user.findUnique({
+			where: { loginId }
+		});
+		if (!user) {
+			return null;
+		}
+		return user;
+	}
+
+	static async getUser(userId: string): Promise<User | null> {
+		const user = await prisma.user.findUnique({
+			where: { id: userId }
+		});
+		if (!user) {
+			return null;
+		}
+		return user;
+	}
 }

mitaina-back/src/routes/api/api.ts

@@ -1,11 +1,14 @@
 import { Router } from 'express';
 import registerRouter from './register';
+import signinRouter from './signin';
+import authRouter from './auth';
 
 // Export the base-router
 const baseRouter = Router();
 
 // Setup routers
-baseRouter.use('/users', registerRouter);
-
+baseRouter.use('/register', registerRouter);
+baseRouter.use('/signin', signinRouter);
+baseRouter.use('/auth', authRouter);
 // Export default.
 export default baseRouter;

mitaina-back/src/routes/api/auth/index.ts

@@ -0,0 +1,34 @@
+import { Request, Response, Router } from 'express';
+// import prisma from '../../../lib/prisma';
+// import { UserRepository } from '../../../repository/userRepository';
+// import bcrypt from 'bcrypt';
+import jwt from 'jsonwebtoken';
+import { UserRepository } from '../../../repository/userRepository';
+
+const router = Router();
+
+function verifyJWT<Payload = unknown>(token: string, secret: string): Payload | null {
+	try {
+		return jwt.verify(token, secret, { algorithms: ['HS256'] }) as Payload;
+	} catch (e: any) {
+		if (e.name === 'TokenExpiredError' || e.name === 'JsonWebTokenError') {
+			return null;
+		} else {
+			throw e;
+		}
+	}
+}
+
+router.get('/user', async (req: Request, res: Response) => {
+	const cookies = req.cookies;
+	if (cookies['mitaina-session']) {
+		const sessionInfo = verifyJWT<{ sub: string }>(cookies['mitaina-session'], 'secret');
+		if (sessionInfo) {
+			const currentUser = await UserRepository.getUser(sessionInfo.sub);
+			return res.json(currentUser);
+		}
+	}
+	return res.status(401).send('Unauthorized');
+});
+
+export default router;

mitaina-back/src/routes/api/signin/index.ts

@@ -0,0 +1,43 @@
+import { Request, Response, Router } from 'express';
+import prisma from '../../../lib/prisma';
+import { UserRepository } from '../../../repository/userRepository';
+import bcrypt from 'bcrypt';
+import jwt from 'jsonwebtoken';
+
+// Constants
+const router = Router();
+
+const sessionExpiresIn = 7 * 24 * 60 * 60; // 7 days
+
+router.get('/', async (req: Request, res: Response) => {
+	const users = await prisma.user.findMany();
+	return res.json(users);
+});
+
+router.post('/', async (req: Request, res: Response) => {
+	const data = await req.body;
+	const user = await UserRepository.getUserByLoginId(data.loginId);
+	const passwordCheck = user && (await bcrypt.compare(data.password, user.passwordHash));
+	if (!(user && passwordCheck)) {
+		return res.status(400).send('Invalid loginId or password');
+	}
+
+	const now = Math.floor(Date.now() / 1000);
+	const sessionInfo = {
+		iat: now,
+		exp: now + sessionExpiresIn,
+		sub: user.id
+	};
+	const token = jwt.sign(sessionInfo, 'secret');
+
+	return res
+		.cookie('mitaina-session', token, {
+			httpOnly: true,
+			secure: true,
+			path: `/`
+		})
+		.status(204)
+		.send();
+});
+
+export default router;

mitaina-back/src/routes/index.ts

@@ -2,12 +2,14 @@ import express, { Request, Response } from 'express';
 import path from 'path';
 import prisma from '../lib/prisma';
 import apiRouter from './api/api';
+import cookieParser from 'cookie-parser';
 
 const app = express();
 const port = process.env.PORT || 8080;
 
 app.use(express.static(path.join(__dirname, '../../mitaina-front/build')));
 app.use(express.json());
+app.use(cookieParser('secret'));
 
 app.get('/users', async (req: Request, res: Response) => {
 	const users = await prisma.user.findMany();

mitaina-front/src/App.tsx

@@ -7,33 +7,15 @@ import { BrowserRouter, Route, Routes } from 'react-router-dom';
 import Top from './pages/Top';
 import Login from './pages/Auth/Login';
 import Register from './pages/Auth/Register';
-
-//Types
-import { User } from '@prisma/client';
+import { LoggedInRoute } from './components/LoggedInRoute';
 
 function App() {
-	const [users, setUsers] = useState<User[]>([]);
-	useEffect(() => {
-		const getUsers = async () => {
-			const users: User[] | undefined = await getJSON('/users/get');
-			console.log(users);
-			users && setUsers(users);
-		};
-		getUsers();
-	}, []);
-	console.log(users);
-
 	return (
 		<BrowserRouter>
 			<Routes>
-				{/* <Route
-      exact
-      path="/"
-      element={<LoggedInRoute component={<Room />} />}
-    /> */}
+				<Route path="/" element={<LoggedInRoute component={<Top />} />} />
 				<Route path="/login" element={<Login />} />
 				<Route path="/register" element={<Register />} />
-				<Route path="/" element={<Top />} />
 			</Routes>
 		</BrowserRouter>
 	);

mitaina-front/src/components/LoggedInRoute.tsx

@@ -0,0 +1,9 @@
+import { Navigate } from 'react-router-dom';
+import { useRecoilValue } from 'recoil';
+import { userAtom } from '../store/user';
+
+export const LoggedInRoute = ({ component }: any) => {
+	const user = useRecoilValue(userAtom);
+
+	return <>{user ? component : <Navigate to="/login" />}</>;
+};