Implement Auth
This commit is contained in:
@@ -3,7 +3,8 @@ const router = express.Router();
|
|||||||
const defineUser = require("../../models/users");
|
const defineUser = require("../../models/users");
|
||||||
const { DataTypes } = require("sequelize");
|
const { DataTypes } = require("sequelize");
|
||||||
const roles = require("./roles");
|
const roles = require("./roles");
|
||||||
const bcrypt = require('bcrypt');
|
const bcrypt = require("bcrypt");
|
||||||
|
const jwt = require("jsonwebtoken");
|
||||||
|
|
||||||
module.exports = function (sequelize) {
|
module.exports = function (sequelize) {
|
||||||
const User = defineUser(sequelize, DataTypes);
|
const User = defineUser(sequelize, DataTypes);
|
||||||
@@ -19,14 +20,20 @@ module.exports = function (sequelize) {
|
|||||||
? roles.findIndex((entry) => entry.uid === "user")
|
? roles.findIndex((entry) => entry.uid === "user")
|
||||||
: roles.findIndex((entry) => entry.uid === "admin");
|
: roles.findIndex((entry) => entry.uid === "admin");
|
||||||
|
|
||||||
await User.create({
|
const user = await User.create({
|
||||||
email,
|
email,
|
||||||
password: hashedPassword,
|
password: hashedPassword,
|
||||||
username: username,
|
username: username,
|
||||||
role: initialRole,
|
role: initialRole,
|
||||||
avatarPath: null,
|
avatarPath: null,
|
||||||
});
|
});
|
||||||
res.status(201).json({ message: "User registered successfully" });
|
|
||||||
|
const accessToken = jwt.sign({ userId: user.id }, "your-secret-key", {
|
||||||
|
expiresIn: "1h",
|
||||||
|
});
|
||||||
|
|
||||||
|
user.password = undefined;;
|
||||||
|
res.status(200).json({ access_token: accessToken, user });
|
||||||
} catch (error) {
|
} catch (error) {
|
||||||
console.error(error);
|
console.error(error);
|
||||||
res.status(500).send("Sign up failed");
|
res.status(500).send("Sign up failed");
|
||||||
|
|||||||
@@ -39,8 +39,8 @@
|
|||||||
"password_not_match": "パスワードが一致しません",
|
"password_not_match": "パスワードが一致しません",
|
||||||
"email_already_exist": "登録済みのメールアドレスです",
|
"email_already_exist": "登録済みのメールアドレスです",
|
||||||
"email_not_exist": "メールアドレスが見つかりません",
|
"email_not_exist": "メールアドレスが見つかりません",
|
||||||
"signup_error": "新規登録できません",
|
"signup_error": "新規登録に失敗しました",
|
||||||
"signin_error": "サインインできません"
|
"signin_error": "サインインに失敗しました"
|
||||||
},
|
},
|
||||||
"Projects": {
|
"Projects": {
|
||||||
"projectList": "プロジェクト一覧",
|
"projectList": "プロジェクト一覧",
|
||||||
|
|||||||
@@ -18,10 +18,10 @@ async function signUp(newUser: UserType) {
|
|||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error(`HTTP error! Status: ${response.status}`);
|
throw new Error(`HTTP error! Status: ${response.status}`);
|
||||||
}
|
}
|
||||||
const data = await response.json();
|
const accessToken = await response.json();
|
||||||
return data;
|
storeToken(accessToken);
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
console.error("Error creating sign up:", error);
|
console.error("Error sign up:", error);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
@@ -42,12 +42,20 @@ async function signIn(signInUser: UserType) {
|
|||||||
if (!response.ok) {
|
if (!response.ok) {
|
||||||
throw new Error(`HTTP error! Status: ${response.status}`);
|
throw new Error(`HTTP error! Status: ${response.status}`);
|
||||||
}
|
}
|
||||||
const data = await response.json();
|
const accessToken = await response.json();
|
||||||
return data;
|
storeToken(accessToken);
|
||||||
} catch (error: any) {
|
} catch (error: any) {
|
||||||
console.error("Error sign in:", error);
|
console.error("Error sign in:", error);
|
||||||
throw error;
|
throw error;
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
export { signUp, signIn };
|
function storeToken(accessToken: Object) {
|
||||||
|
localStorage.setItem("testplat-auth-token", JSON.stringify(accessToken));
|
||||||
|
}
|
||||||
|
|
||||||
|
function signOut() {
|
||||||
|
localStorage.removeItem("testplat-auth-token");
|
||||||
|
}
|
||||||
|
|
||||||
|
export { signUp, signIn, signOut };
|
||||||
|
|||||||
@@ -58,13 +58,19 @@ export default function AuthPage({ isSignup, messages, locale }: Props) {
|
|||||||
|
|
||||||
const submit = async () => {
|
const submit = async () => {
|
||||||
if (isSignup) {
|
if (isSignup) {
|
||||||
const signUpRet = await signUp(user);
|
try {
|
||||||
console.log(signUpRet);
|
await signUp(user);
|
||||||
// if success, move to signin page
|
// Move to signin page
|
||||||
|
} catch {
|
||||||
|
setErrorMessage(messages.signupError);
|
||||||
|
}
|
||||||
} else {
|
} else {
|
||||||
const signInRet = await signIn(user);
|
try {
|
||||||
console.log(signInRet);
|
signIn(user);
|
||||||
// if success, move to account page
|
// Move to signin page
|
||||||
|
} catch {
|
||||||
|
setErrorMessage(messages.signinError);
|
||||||
|
}
|
||||||
}
|
}
|
||||||
};
|
};
|
||||||
|
|
||||||
|
|||||||
Reference in New Issue
Block a user