From 4abe6192dc56bf7bb2f30d56a61afdbabae0e04c Mon Sep 17 00:00:00 2001
From: Martin McKeaveney <martin@shogunsystems.co.uk>
Date: Thu, 8 Apr 2021 11:53:40 +0100
Subject: [PATCH] further simplification of jwt auth

---
 .../worker/src/middleware/authenticated.js    | 22 ++++---------------
 1 file changed, 4 insertions(+), 18 deletions(-)

diff --git a/packages/worker/src/middleware/authenticated.js b/packages/worker/src/middleware/authenticated.js
index dd7e1d974d..751e10ee9a 100644
--- a/packages/worker/src/middleware/authenticated.js
+++ b/packages/worker/src/middleware/authenticated.js
@@ -11,29 +11,15 @@ module.exports = async (ctx, next) => {
     appId = cookieAppId
   }
 
-  let token
-  if (appId) {
-    token = ctx.cookies.get(Cookies.Auth)
-  }
-
-  if (!token) {
-    ctx.auth = {
-      authenticated: false,
-    }
-    ctx.appId = appId
-    // ctx.user = {
-    //   // TODO: introduce roles again
-    //   // role: builtinRoles.PUBLIC,
-    // }
-    return await next()
-  }
-
   return passport.authenticate("jwt", async (err, user) => {
     if (err) {
-      return ctx.throw(err)
+      return ctx.throw(err.status || 403, err)
     }
 
     try {
+      ctx.appId = appId
+      ctx.isAuthenticated = true
+      // TODO: introduce roles again
       ctx.user = user
       await next()
     } catch (err) {