register修正

This commit is contained in:
ろむねこ 2024-06-25 15:46:50 +09:00
parent 504ebeed08
commit 07efcde405
Signed by: Fujimatsu
GPG Key ID: FA1F39A1BA37D168
2 changed files with 12 additions and 9 deletions

View File

@ -1,6 +1,7 @@
import { Router, Request, Response } from 'express'; import { Router, Request, Response } from 'express';
import { registUser, loginUser } from '@src/services/parent/authService'; import { registUser, loginUser } from '@src/services/parent/authService';
import Logger from '@src/logger'; import Logger from '@src/logger';
import { TokenResponse } from '@src/models/Token';
const router = Router(); const router = Router();
const logger = new Logger(); const logger = new Logger();
@ -9,10 +10,8 @@ logger.setTag('authRouter');
router.post('/register', (req: Request, res: Response) => { router.post('/register', (req: Request, res: Response) => {
const { email, password } = req.body; const { email, password } = req.body;
registUser(email, password) registUser(email, password)
.then((token) => { .then((tokenResponse: TokenResponse) => {
res.json({ res.status(201).json(tokenResponse);
"accessToken": token
});
}) })
.catch((err) => { .catch((err) => {
res.status(401).json({ message: "ユーザー登録失敗: すでに登録されているemailです" }); res.status(401).json({ message: "ユーザー登録失敗: すでに登録されているemailです" });

View File

@ -3,11 +3,12 @@ import bcrypt from "bcryptjs";
import { issueTokenByUserId } from "@src/utils/tokenUtils"; import { issueTokenByUserId } from "@src/utils/tokenUtils";
import { createHomeGroup } from "@src/services/homeGroupService"; import { createHomeGroup } from "@src/services/homeGroupService";
import Logger from "@src/logger"; import Logger from "@src/logger";
import { TokenResponse } from "@src/models/Token";
const logger = new Logger(); const logger = new Logger();
logger.setTag('authService'); logger.setTag('authService');
async function registUser(email: string, password: string, homeGroupId?: string): Promise<String> { async function registUser(email: string, password: string, homeGroupId?: string): Promise<TokenResponse> {
const hashedPassword = bcrypt.hashSync(password, 10); const hashedPassword = bcrypt.hashSync(password, 10);
@ -40,7 +41,10 @@ async function registUser(email: string, password: string, homeGroupId?: string)
}); });
const user = await registUser; const user = await registUser;
return issueTokenByUserId(user.id); const response: TokenResponse = {
accessToken: await issueTokenByUserId(user.id)
};
return Promise.resolve(response)
} }
async function loginUser(email: string, password: string): Promise<String | null> { async function loginUser(email: string, password: string): Promise<String | null> {
@ -49,10 +53,10 @@ async function loginUser(email: string, password: string): Promise<String | null
email: email email: email
} }
}); });
if(!user) { if (!user) {
return null; return null;
} }
if(bcrypt.compareSync(password, user.password)) { if (bcrypt.compareSync(password, user.password)) {
return issueTokenByUserId(user.id); return issueTokenByUserId(user.id);
} else { } else {
return null; return null;