fix: rm auth check for logout
This commit is contained in:
@@ -140,22 +140,9 @@ router.post("/login", async (req, res) => {
|
|||||||
}
|
}
|
||||||
});
|
});
|
||||||
|
|
||||||
router.get(
|
router.get("/logout", async (req, res) => {
|
||||||
"/logout",
|
|
||||||
requireSignIn,
|
|
||||||
async (req: Request, res) => {
|
|
||||||
const authenticatedReq = req as AuthenticatedRequest;
|
|
||||||
try {
|
try {
|
||||||
if (!authenticatedReq.user) {
|
|
||||||
return res.status(401).json({
|
|
||||||
ok: false,
|
|
||||||
message: "Unauthorized",
|
|
||||||
code: "unauthorized"
|
|
||||||
});
|
|
||||||
}
|
|
||||||
|
|
||||||
res.clearCookie("token");
|
res.clearCookie("token");
|
||||||
|
|
||||||
return res.status(200).json({
|
return res.status(200).json({
|
||||||
ok: true,
|
ok: true,
|
||||||
message: "Logged out successfully",
|
message: "Logged out successfully",
|
||||||
@@ -176,13 +163,12 @@ router.get(
|
|||||||
router.get(
|
router.get(
|
||||||
"/current-user",
|
"/current-user",
|
||||||
requireSignIn,
|
requireSignIn,
|
||||||
async (req: Request, res) => {
|
async (req: AuthenticatedRequest, res) => {
|
||||||
const authenticatedReq = req as AuthenticatedRequest;
|
|
||||||
try {
|
try {
|
||||||
if (!authenticatedReq.user) {
|
if (!req.user) {
|
||||||
return res.status(401).json({ ok: false, error: "Unauthorized" });
|
return res.status(401).json({ ok: false, error: "Unauthorized" });
|
||||||
}
|
}
|
||||||
const user = await User.findByPk(authenticatedReq.user.id, {
|
const user = await User.findByPk(req.user.id, {
|
||||||
attributes: { exclude: ["password"] },
|
attributes: { exclude: ["password"] },
|
||||||
});
|
});
|
||||||
if (!user) {
|
if (!user) {
|
||||||
@@ -205,7 +191,7 @@ router.get(
|
|||||||
router.get(
|
router.get(
|
||||||
"/user/:id",
|
"/user/:id",
|
||||||
requireSignIn,
|
requireSignIn,
|
||||||
async (req: Request, res) => {
|
async (req: AuthenticatedRequest, res) => {
|
||||||
try {
|
try {
|
||||||
const { id } = req.params;
|
const { id } = req.params;
|
||||||
if (!id) {
|
if (!id) {
|
||||||
@@ -234,13 +220,12 @@ router.get(
|
|||||||
router.post(
|
router.post(
|
||||||
"/generate-api-key",
|
"/generate-api-key",
|
||||||
requireSignIn,
|
requireSignIn,
|
||||||
async (req: Request, res) => {
|
async (req: AuthenticatedRequest, res) => {
|
||||||
const authenticatedReq = req as AuthenticatedRequest;
|
|
||||||
try {
|
try {
|
||||||
if (!authenticatedReq.user) {
|
if (!req.user) {
|
||||||
return res.status(401).json({ ok: false, error: "Unauthorized" });
|
return res.status(401).json({ ok: false, error: "Unauthorized" });
|
||||||
}
|
}
|
||||||
const user = await User.findByPk(authenticatedReq.user.id, {
|
const user = await User.findByPk(req.user.id, {
|
||||||
attributes: { exclude: ["password"] },
|
attributes: { exclude: ["password"] },
|
||||||
});
|
});
|
||||||
|
|
||||||
@@ -275,14 +260,13 @@ router.post(
|
|||||||
router.get(
|
router.get(
|
||||||
"/api-key",
|
"/api-key",
|
||||||
requireSignIn,
|
requireSignIn,
|
||||||
async (req: Request, res) => {
|
async (req: AuthenticatedRequest, res) => {
|
||||||
const authenticatedReq = req as AuthenticatedRequest;
|
|
||||||
try {
|
try {
|
||||||
if (!authenticatedReq.user) {
|
if (!req.user) {
|
||||||
return res.status(401).json({ ok: false, error: "Unauthorized" });
|
return res.status(401).json({ ok: false, error: "Unauthorized" });
|
||||||
}
|
}
|
||||||
|
|
||||||
const user = await User.findByPk(authenticatedReq.user.id, {
|
const user = await User.findByPk(req.user.id, {
|
||||||
raw: true,
|
raw: true,
|
||||||
attributes: ["api_key"],
|
attributes: ["api_key"],
|
||||||
});
|
});
|
||||||
@@ -304,14 +288,13 @@ router.get(
|
|||||||
router.delete(
|
router.delete(
|
||||||
"/delete-api-key",
|
"/delete-api-key",
|
||||||
requireSignIn,
|
requireSignIn,
|
||||||
async (req: Request, res) => {
|
async (req: AuthenticatedRequest, res) => {
|
||||||
const authenticatedReq = req as AuthenticatedRequest;
|
if (!req.user) {
|
||||||
if (!authenticatedReq.user) {
|
|
||||||
return res.status(401).send({ error: "Unauthorized" });
|
return res.status(401).send({ error: "Unauthorized" });
|
||||||
}
|
}
|
||||||
|
|
||||||
try {
|
try {
|
||||||
const user = await User.findByPk(authenticatedReq.user.id, { raw: true });
|
const user = await User.findByPk(req.user.id, { raw: true });
|
||||||
|
|
||||||
if (!user) {
|
if (!user) {
|
||||||
return res.status(404).json({ message: "User not found" });
|
return res.status(404).json({ message: "User not found" });
|
||||||
@@ -321,7 +304,7 @@ router.delete(
|
|||||||
return res.status(404).json({ message: "API Key not found" });
|
return res.status(404).json({ message: "API Key not found" });
|
||||||
}
|
}
|
||||||
|
|
||||||
await User.update({ api_key: null }, { where: { id: authenticatedReq.user.id } });
|
await User.update({ api_key: null }, { where: { id: req.user.id } });
|
||||||
|
|
||||||
capture("maxun-oss-api-key-deleted", {
|
capture("maxun-oss-api-key-deleted", {
|
||||||
user_id: user.id,
|
user_id: user.id,
|
||||||
|
|||||||
Reference in New Issue
Block a user