Fix session problems, misc changes

Author: JeDaYoshi

logo.txt

@@ -1,16 +1,16 @@
-            ██████████████████████            
-            ██████████████████████            
-        ██████████████████████████████        
+            ██████████████████████
+            ██████████████████████
+        ██████████████████████████████
         ██████████████████████████████           Welcome to the Cryb API!
-    ██████████████████████████████████████       
+    ██████████████████████████████████████
     ██████████████████████████████████████       This server runs on port :PORT and requires the following:
 ████████████                      ████████████
 ████████████                      ████████████   * MongoDB (:27017)
         ████                      ████           * Redis (:6379)
-        ████     ████████         ████           * @cryb/portals (:1337)
-        ████     ████████         ████        
+        ████     ████████         ████           * @cryb/portals (:5000)
+        ████     ████████         ████
         ████     ████████         ████           Have any issues? Open them at https://github.com/crybapp/api/issues
         ████     ████████         ████           Working on new features? Merge them in at https://github.com/crybapp/api/merge_requests
-        ████     ████████         ████           
+        ████     ████████         ████
         ██████████████████████████████
         ██████████████████████████████

package.json

@@ -2,13 +2,13 @@
   "name": "@cryb/api",
   "version": "1.0.0",
   "description": "The core service used to handle REST and WS events from clients",
-  "main": "index.js",
+  "main": "dist/index.js",
   "repository": "https://github.com/crybapp/api",
   "author": "William Gibson <w.gibbo3@icloud.com>",
   "license": "MIT",
   "scripts": {
     "start": "node dist",
-    "dev": "tsc-watch --outDir ./dist --onSuccess \"yarn start\" --compiler typescript/bin/tsc",
+    "dev": "tsc-watch --compiler typescript/bin/tsc --onSuccess \"yarn start\"",
     "build": "tsc",
     "lint": "tslint src/**/*.ts{,x}"
   },
@@ -33,8 +33,6 @@
     "qs": "^6.8.0",
     "query-string": "^6.8.2",
     "supertest": "^4.0.2",
-    "tsc-watch": "^2.2.1",
-    "typescript": "^3.5.3",
     "ws": "^7.1.1"
   },
   "devDependencies": {
@@ -51,6 +49,8 @@
     "@types/passport-discord": "^0.1.3",
     "@types/passport-jwt": "^3.0.1",
     "@types/ws": "^6.0.1",
-    "tslint": "^5.20.1"
+    "tsc-watch": "^2.2.1",
+    "tslint": "^5.20.1",
+    "typescript": "^3.5.3"
   }
 }

src/config/passport.config.ts

@@ -13,11 +13,16 @@ passport.use(new Strategy({
 	jwtFromRequest: ExtractJwt.fromAuthHeaderAsBearerToken(),
 	secretOrKey: process.env.JWT_KEY
 }, async ({ id }, done) => {
+	const noSessionResponses = ['USER_NO_AUTH', 'USER_NOT_FOUND']
+
 	try {
 		const user = await new User().load(id)
 
 		return done(null, user)
 	} catch (error) {
+		if (error.response.indexOf(noSessionResponses))
+			return done(UserNoAuth)
+
 		done(error)
 	}
 }))
@@ -44,7 +49,7 @@ const fetchUser = async (
 		} else
 			passport.authenticate('jwt', { session: false }, async (err, user: User) => {
 				if (err)
-					return res.sendStatus(500)
+					return handleError(err, res)
 
 				if (!user)
 					return handleError(UserNoAuth, res)

src/controllers/internal.controller.ts

@@ -54,13 +54,13 @@ app.put('/portal', authenticate, async (req, res) => {
 			 * Broadcast allocation to all online clients
 			 */
 			const updateMessage = new WSMessage(0, allocation, 'PORTAL_UPDATE')
-			updateMessage.broadcast(online)
+			await updateMessage.broadcast(online)
 
 			if (status === 'open') {
 				const token = signApertureToken(id),
 					apertureMessage = new WSMessage(0, { ws: process.env.APERTURE_WS_URL, t: token }, 'APERTURE_CONFIG')
 
-				apertureMessage.broadcast(online)
+				await apertureMessage.broadcast(online)
 			}
 		}
 
@@ -73,12 +73,12 @@ app.put('/portal', authenticate, async (req, res) => {
 app.post('/queue', authenticate, (req, res) => {
 	const { queue } = req.body as { queue: string[] }
 
-	queue.forEach((id, i) => {
+	queue.forEach(async (id, i) => {
 		try {
 			const op = 0, d = { pos: i, len: queue.length }, t = 'PORTAL_QUEUE_UPDATE',
 				message = new WSMessage(op, d, t)
 
-			message.broadcastRoom(id)
+			await message.broadcastRoom(id)
 		} catch (error) {
 			handleError(error, res)
 		}

src/utils/errors.utils.ts

@@ -217,10 +217,13 @@ export const PortalNotOpen: IAPIResponse = {
 }
 
 export const handleError = (error: any, res: Response) => {
-	console.error(error)
-
-	if (!error) res.sendStatus(500)
-	else if (error.response && error.error && error.status) res.status(error.status).send(error)
-	else if (error.status) res.sendStatus(error.status)
-	else res.sendStatus(500)
+	if (process.env.NODE_ENV === 'development')
+		console.error(error)
+
+	if (error)
+		if (error.response && error.error && error.status)
+			return res.status(error.status).send(error)
+		else if (error.status)
+			return res.sendStatus(error.status)
+	res.sendStatus(500)
 }