Merge pull request #11 from icefoganalytics/main

Refix

Dockerfile

@@ -65,9 +65,6 @@ COPY --from=web-build-stage --chown=node:node /usr/src/web/dist ./dist/web/
 RUN echo "RELEASE_TAG=${RELEASE_TAG}" >> VERSION
 RUN echo "GIT_COMMIT_HASH=${GIT_COMMIT_HASH}" >> VERSION
 
-ENV NODE_TLS_REJECT_UNAUTHORIZED=0
-ENV NODE_OPTIONS=--openssl-legacy-provider
-
 EXPOSE 3000
 
 CMD ["node", "./dist/index.js"]

api/src/index.ts

@@ -56,7 +56,7 @@ app.use("/migrate", migrator.migrationRouter);
 app.use("/api/documents", documentsRouter);
 app.use("/api/department", checkJwt, loadUser, departmentRouter);
 app.use("/api/documentation", checkJwt, loadUser, documentationRouter);
-app.use("/api/user", checkJwt,  userRouter);
+app.use("/api/user", checkJwt, loadUser, userRouter);
 
 // serves the static files generated by the front-end
 app.use(express.static(path.join(__dirname, "web")));

api/src/middleware/authz.middleware.ts

@@ -22,25 +22,16 @@ export const checkJwt = jwt({
 });
 
 export async function loadUser(req: Request, res: Response, next: NextFunction) {
-  console.log("H0")
-
   const db = new UserService();
 
-  console.log("H1")
-
   let sub = req.auth.sub;
   const token = req.headers.authorization || "";
   let u = await db.getBySub(sub);
 
-
-  console.log("H2")
-
   if (u) {
     req.user = { ...req.auth, ...u };
     return next();
   }
-  console.log("H3",`${AUTH0_DOMAIN}/userinfo`)
-
   await axios
     .get(`${AUTH0_DOMAIN}/userinfo`, { headers: { authorization: token } })
     .then(async (resp: any) => {
@@ -52,15 +43,12 @@ export async function loadUser(req: Request, res: Response, next: NextFunction)
 
         let u = await db.getBySub(sub);
 
-        console.log("SUB", sub, u);
-
         if (u) {
           req.user = { ...req.auth, ...u };
         } else {
           if (!email) email = `${first_name}.${last_name}@yukon-no-email.ca`;
 
           let e = await db.getByEmail(email);
-          console.log("EMAIL", email, e);
 
           if (e && e.auth_subject == "SUB_MISSING") {
             req.user = { ...req.auth, ...e };