mirror of
https://github.com/r-ca/kidshift-be.git
synced 2024-10-26 00:24:02 +00:00
parent
c8be7dc01d
commit
f580ae3864
|
@ -1,5 +1,5 @@
|
||||||
import prisma from "@src/prisma";
|
import prisma from "@src/prisma";
|
||||||
import { hashSync, compareSync } from "bcryptjs";
|
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";
|
||||||
|
@ -9,7 +9,7 @@ logger.setTag('authService');
|
||||||
|
|
||||||
async function registUser(email: string, password: string, homeGroupId?: string): Promise<String> {
|
async function registUser(email: string, password: string, homeGroupId?: string): Promise<String> {
|
||||||
|
|
||||||
const hashedPassword = hashSync(password, 10);
|
const hashedPassword = bcrypt.hashSync(password, 10);
|
||||||
|
|
||||||
if (!homeGroupId) { // TODO: 作成失敗したときにHomeGroupだけ残るのを防ぐ
|
if (!homeGroupId) { // TODO: 作成失敗したときにHomeGroupだけ残るのを防ぐ
|
||||||
logger.info("HomeGroup is not specified, creating new HomeGroup");
|
logger.info("HomeGroup is not specified, creating new HomeGroup");
|
||||||
|
@ -52,7 +52,7 @@ async function loginUser(email: string, password: string): Promise<String | null
|
||||||
if(!user) {
|
if(!user) {
|
||||||
return null;
|
return null;
|
||||||
}
|
}
|
||||||
if(compareSync(password, user.password)) {
|
if(bcrypt.compareSync(password, user.password)) {
|
||||||
return issueTokenByUserId(user.id);
|
return issueTokenByUserId(user.id);
|
||||||
} else {
|
} else {
|
||||||
return null;
|
return null;
|
||||||
|
|
Loading…
Reference in New Issue
Block a user