From eca7b96de39e5e4b0feead4c874dd60d395fd91c Mon Sep 17 00:00:00 2001
From: Flam3rboy <34555296+Flam3rboy@users.noreply.github.com>
Date: Wed, 17 Feb 2021 18:12:07 +0100
Subject: [PATCH] :bug: fix token checking

---
 .DS_Store                         | Bin 8196 -> 8196 bytes
 src/middlewares/Authentication.ts |  11 ++++++++---
 src/routes/api/v8/guilds/index.ts |   3 ++-
 3 files changed, 10 insertions(+), 4 deletions(-)

diff --git a/.DS_Store b/.DS_Store
index 7baa692ac03ba38a3b45dab94e209dfbbcf29645..0510bdb2119faa489983b1df836ab3de82d75cef 100644
GIT binary patch
delta 472
zcmZp1XmOa}&#1OBU^hRb+GZYsSuFKQ<;4X_Ir&Kp3=BV#3UV@wOAHKdFfuW-u(Gjp
zaB^{TbMtX?#s+8Pmj{<5mXsDdB^JdC$OLDmq$VX6g=eOeWQ3&Vx#pynrRMn;`6QO4
z7Da;;hvety02M&kiAiCZspatkBF_1FC5f4NsYPJ(KxWh@7R7{T=B4D9JLQ+=r4)lT
zKurg;0}@LzfCh0WJ7hfox{-l_lan)EK)SkG*U-S&LPx>K%&1mJq1w{SOh>`c(Ac!L
zmXm`+Qr#^muC%Fd*6bxqmn}bf46KoXkr6^O2tsKf#Rg^`-#kYomT5D)#5b0DVqH!n
NhwBmRa=62zm;hoKidX;u

delta 42
ycmZp1XmOa}&#1aFU^hRb>Si8+SuC5khz2ulEZ}3@%r5bbWiz+fAI6OZ+>8J%zzw$m

diff --git a/src/middlewares/Authentication.ts b/src/middlewares/Authentication.ts
index d6eb5796..2bb8a124 100644
--- a/src/middlewares/Authentication.ts
+++ b/src/middlewares/Authentication.ts
@@ -18,8 +18,13 @@ export async function Authentication(req: Request, res: Response, next: NextFunc
 	if (!req.headers.authorization) return next(new HTTPError("Missing Authorization Header", 401));
 	// TODO: check if user is banned/token expired
 
-	const decoded: any = await checkToken(req.headers.authorization);
+	try {
+		const decoded: any = await checkToken(req.headers.authorization);
 
-	req.token = decoded;
-	req.userid = decoded.id;
+		req.token = decoded;
+		req.userid = decoded.id;
+		return next();
+	} catch (error) {
+		return next(error);
+	}
 }
diff --git a/src/routes/api/v8/guilds/index.ts b/src/routes/api/v8/guilds/index.ts
index 93d5292e..f2c9d556 100644
--- a/src/routes/api/v8/guilds/index.ts
+++ b/src/routes/api/v8/guilds/index.ts
@@ -169,10 +169,11 @@ router.post("/", check(GuildCreateSchema), async (req: Request, res: Response) =
 			data: guild,
 			guild_id: guildID,
 		} as GuildCreateEvent);
+
+		res.status(201).json({ id: guild.id });
 	} catch (error) {
 		throw new HTTPError("Couldnt create Guild", 500);
 	}
-	res.status(201).json({ id: guild.id });
 });
 
 router.delete("/:id", async (req: Request, res: Response) => {