Fixed compile and test issues.

Author: michaelgburton

package.json

@@ -25,6 +25,7 @@
   "dependencies": {
     "@auth0/auth0-spa-js": "^1.13.6",
     "@google-cloud/firestore": "^4.9.9",
+    "@types/hashring": "^3.2.1",
     "@types/node-fetch": "^2.5.8",
     "body-parser": "^1.19.0",
     "fastify": "^3.5.1",

src/auth0.ts

@@ -43,10 +43,14 @@ async function verifyJwtFromAuth0(authHeader: string, getUserInfo: (token: strin
 
 async function verifyJwt(request: MinimalRequest, userCache: Memcached, getUserInfo: (token: string) => Promise<string>, getUserRole: (userId: string) => Promise<string>) {
   let authHeader = !!request.headers && !!request.headers.authorization ? request.headers.authorization : "";
-  let userData =  await verifyJwtCached(authHeader, userCache);
-  if(!userData) {
-    userData = await verifyJwtFromAuth0(authHeader, getUserInfo, getUserRole)
-    await userCache.add(authHeader, userData, {expires: LIFETIME_SECONDS});
+  if (!authHeader) {
+    return {userAppId: null, role: null, admin: false}
+  } else {
+    let userData =  await verifyJwtCached(authHeader, userCache);
+    if(!userData) {
+      userData = await verifyJwtFromAuth0(authHeader, getUserInfo, getUserRole)
+      await userCache.add(authHeader, userData, {expires: LIFETIME_SECONDS});
+    }
+    return userData;
   }
-  return userData;
 }

src/endpoints/businesses.ts

@@ -56,8 +56,8 @@ export function createBusinessesEndpoint(app: FastifyInstance, dataLayer: DataLa
     {schema: getBizSchema},
     async (request  , reply) => {
 
-      let {userAppId, admin} = await verifyJwt(request)
-      if(!(admin || await isRegionManager(userAppId, request.params.regionId, dataLayer))) {
+      let {userAppId, admin} = await verifyJwt(request);
+      if (!(admin || await isRegionManager(userAppId, request.params.regionId, dataLayer))) {
         reply.unauthorized("User does not have access to region");
         return;
       } else {

src/endpoints/cache.ts

@@ -2,9 +2,9 @@ import {FastifyInstance} from "fastify";
 import {Auth0JwtVerifier} from "../auth0";
 import {AuthenticatedRequest} from "./endpointUtils";
 import {emptyCacheSchema} from "./docs/cacheSchemas";
-import {Client} from "memjs";
+import {Memcached} from "memcached-node";
 
-export function createCacheEndpoint(app: FastifyInstance, verifyJwt: Auth0JwtVerifier, cache: Client) {
+export function createCacheEndpoint(app: FastifyInstance, verifyJwt: Auth0JwtVerifier, cache: Memcached) {
   app.post<AuthenticatedRequest>(
     "/cache/empty",
     {schema: emptyCacheSchema},
@@ -14,7 +14,7 @@ export function createCacheEndpoint(app: FastifyInstance, verifyJwt: Auth0JwtVer
         reply.unauthorized("Must be logged in to use this endpoint");
         return;
       } else {
-        await cache.flush();
+        await cache.clean();
         return {
           status: "Cache emptied",
           date: Date.now()

src/endpoints/users.ts

@@ -1,6 +1,6 @@
 import {FastifyInstance} from "fastify";
-import {Auth0JwtVerifier, Auth0UserInfo, UserInfoPatch} from "../auth0";
-import {getAllUsers, getUserById, updateUser} from "../dependencies/auth0Api"
+import {Auth0JwtVerifier} from "../auth0";
+import {Auth0UserInfo, getAllUsers, getUserById, updateUser, UserInfoPatch} from "../dependencies/auth0Api"
 import {AuthenticatedRequest, AuthenticatedRequestById} from "./endpointUtils";
 import {getAllUsersRequestSchema, getUserInfoRequestSchema, updateUserRequestSchema} from "./docs/userSchema";
 

src/index.ts

@@ -1,6 +1,5 @@
 import fastify, {FastifyInstance} from 'fastify';
 import fastifySensible from "fastify-sensible";
-import MemcachePlus from "memcache-plus";
 
 import createPingEndpoint from './endpoints/ping';
 import { addRoutes } from './utils';
@@ -15,6 +14,7 @@ import {createEditEndpoint} from "./endpoints/editRequest";
 import {productionFirestore} from "./database/firestore";
 import createUsersEndpoint from "./endpoints/users";
 import {createCacheEndpoint} from "./endpoints/cache";
+import {Memcached} from "memcached-node";
 
 let productionDataLayer = new ProductionDataLayer(productionFirestore)
 const port = Number(process.env.PORT || 8080);
@@ -23,7 +23,7 @@ server.register(fastifySensible);
 registerSwagger(server);
 registerCorsHandler(server);
 
-let productionCache = new MemcachePlus();
+let productionCache = new Memcached("127.0.0.1:11211");
 let prodJwtVerifier = getJwtVerifier(productionCache);
 addRoutes(
   server,

tests/auth0.test.ts

@@ -1,18 +1,19 @@
+import fastify, {FastifyInstance} from "fastify";
+import fastifySensible from "fastify-sensible";
+import {Memcached, ResponseCode} from "memcached-node";
+import {IMock, It, Mock, Times} from "typemoq"
+
 import {addRoutes} from "../src/utils";
 import createRegionsEndpoint from "../src/endpoints/regions";
 import {DummyDatalayer} from "./testUtils/testDataLayer";
 import {createBusinessesEndpoint} from "../src/endpoints/businesses";
-import fastifySensible from "fastify-sensible";
-import {authenticateToTestDomain, setupAuth0TestEnv} from "./testUtils/testify";
+import {authenticateToTestDomain, getEmptyCacheJwtVerifier, setupAuth0TestEnv} from "./testUtils/testify";
 import {DummyRegion} from "./testUtils/dummyData";
 import {DataLayer} from "../src/database/productionDataLayer";
 import {Auth0JwtVerifier, getJwtVerifier, LIFETIME_SECONDS} from "../src/auth0";
-
-import fastify, {FastifyInstance} from "fastify";
-import {IMock, It, Mock, Times} from "typemoq"
-import {Memcached, ResponseCode} from "memcached-node";
 import {getUserIdFromAuth0} from "../src/dependencies/auth0Api";
 
+
 describe("Auth0 unit tests", () => {
   const TEST_AUTH_HEADER = "Test";
   const TEST_USER_ID = "testUser";
@@ -37,17 +38,17 @@ describe("Auth0 unit tests", () => {
 
   it("Pulls cached credentials first", async () => {
     mockCache.setup(c => c.get(It.isAnyString()))
-      .returns((_: string) => Promise.resolve(
-        {
+      .returns((_: string) =>
+        Promise.resolve({
           code: ResponseCode.EXISTS,
           data: {
             [TEST_AUTH_HEADER]: {
               key: TEST_AUTH_HEADER,
               value: JSON.stringify(testData)
             }
           }
-        }
-      ));
+        })
+      );
     mockIdGetter.setup(g => g(It.isAnyString())).returns(_ => Promise.resolve(TEST_AUTH0_ID));
     mockRoleGetter.setup(g => g(It.isAnyString())).returns(_ => Promise.resolve(TEST_ROLE));
 
@@ -101,9 +102,7 @@ describe("Auth0 integration tests", () => {
   describe("Region Tests", () => {
     let verifyJwt: Auth0JwtVerifier;
     beforeEach(() => {
-      let dummyCache = Mock.ofType(Memcached);
-      dummyCache.setup(c => c.get(It.isAnyString())).returns(_ => Promise.resolve({code: ResponseCode.NOT_FOUND}));
-      verifyJwt = getJwtVerifier(dummyCache.object);
+      verifyJwt = getEmptyCacheJwtVerifier();
       addRoutes(
         sut,
         () => createRegionsEndpoint(sut, new DummyDatalayer(), verifyJwt)
@@ -144,9 +143,7 @@ describe("Auth0 integration tests", () => {
     let testDataLayer: DataLayer;
     let verifyJwt: Auth0JwtVerifier;
     beforeEach(() => {
-      let dummyCache = Mock.ofType(Memcached);
-      dummyCache.setup(c => c.get(It.isAnyString())).returns(_ => Promise.resolve({code: ResponseCode.NOT_FOUND}))
-      verifyJwt = getJwtVerifier(dummyCache.object);
+      verifyJwt = getEmptyCacheJwtVerifier();
       testDataLayer = new DummyDatalayer();
       addRoutes(sut,
         () => createBusinessesEndpoint(sut, testDataLayer, verifyJwt),

tests/testUtils/dummyData.ts

@@ -1,7 +1,8 @@
-import {FastifyInstance, FastifyRequest} from "fastify";
+import {FastifyInstance} from "fastify";
 import {Business, BusinessUpdate} from "../../src/endpoints/businesses";
 import {Region} from "../../src/database/productionDataLayer";
 import {getMockToken} from "./testify";
+import {MinimalRequest} from "../../src/auth0";
 
 const dummyManager = "DummyManagerId";
 export const dummyAdminId = "admin";
@@ -30,8 +31,8 @@ export const DummyBizUpdate: BusinessUpdate = {
 };
 
 
-export async function dummyTokenVerifier (req: FastifyRequest) {
-  if(!req.headers.authorization || !req.headers.authorization.split("Bearer")[1].trim()) {
+export async function dummyTokenVerifier (req: MinimalRequest) {
+  if(!req.headers || !req.headers.authorization || !req.headers.authorization.split("Bearer")[1].trim()) {
     return {userAppId: "", admin: false, role: ""};
   }
   if(req.headers.authorization.indexOf(dummyAdminToken) > 0) {

tests/testUtils/testify.ts

@@ -1,8 +1,12 @@
-import fastify, {FastifyRequest} from "fastify";
+import fastify from "fastify";
 import fastifyJWT, {FastifyJWTOptions} from "fastify-jwt";
 import jwt from "jsonwebtoken";
 import fastifySensible from "fastify-sensible";
 import fetch from "node-fetch";
+import {It, Mock} from "typemoq";
+import {Memcached, ResponseCode} from "memcached-node";
+
+import {getJwtVerifier, MinimalRequest} from "../../src/auth0";
 
 export const AUTH0_CLAIMS_NAMESPACE = "https://mun.ca";
 export const mockSecret = 'dummy';
@@ -61,9 +65,18 @@ export function getMockToken(payload: {userAppId: string, admin: boolean  }) {
 }
 
 export function getTestJwtVerifier(userAppId: string, admin: boolean) {
-  return async(_: FastifyRequest) => ({userAppId, admin, role: admin ? "admin" : "region" });
+  return async(_: MinimalRequest) => ({userAppId, admin, role: admin ? "admin" : "region" });
 }
 
+
+export function getEmptyCacheJwtVerifier() {
+  let cachePrototype = new Memcached("127.0.0.1:11211");
+  let dummyCache = Mock.ofInstance(cachePrototype);
+  dummyCache.setup(c => c.get(It.isAnyString())).returns(_ => Promise.resolve({code: ResponseCode.NOT_FOUND}));
+  return getJwtVerifier(dummyCache.object);
+}
+
+
 export const testify = () => {
   const f = fastify({logger: {level: "debug"}});
   f.register(fastifyJWT, <FastifyJWTOptions>{

tests/users.test.ts

@@ -1,6 +1,5 @@
-import {authenticateToTestDomain, setupAuth0TestEnv, testify} from "./testUtils/testify";
+import {authenticateToTestDomain, getEmptyCacheJwtVerifier, setupAuth0TestEnv, testify} from "./testUtils/testify";
 import createUsersEndpoint from "../src/endpoints/users";
-import { verifyJwt } from "../src/auth0";
 
 describe("Auth0 user endpoint tests", () => {
   let userAccessToken: string;
@@ -15,7 +14,7 @@ describe("Auth0 user endpoint tests", () => {
       });
     }
     let server = testify();
-    let userApp = createUsersEndpoint(server, verifyJwt, cache);
+    let userApp = createUsersEndpoint(server, getEmptyCacheJwtVerifier());
     setupAuth0TestEnv();
     let authTokens = await authenticateToTestDomain();
     userAccessToken = authTokens.userAccessToken;
@@ -46,7 +45,7 @@ describe("Auth0 user endpoint tests", () => {
       });
     }
     let server = testify();
-    let userApp = createUsersEndpoint(server, verifyJwt);
+    let userApp = createUsersEndpoint(server, getEmptyCacheJwtVerifier());
     setupAuth0TestEnv();
     let authTokens = await authenticateToTestDomain();
     userAccessToken = authTokens.userAccessToken;
@@ -76,7 +75,7 @@ describe("Auth0 user endpoint tests", () => {
       });
     }
     let server = testify();
-    let userApp = createUsersEndpoint(server, verifyJwt);
+    let userApp = createUsersEndpoint(server, getEmptyCacheJwtVerifier());
     setupAuth0TestEnv();
     let authTokens = await authenticateToTestDomain();
     userAccessToken = authTokens.userAccessToken;