OpenNeo/impress-2020
OpenNeo/impress-2020
1
0
Fork 0
Code Pull requests Activity

oops, fix build errors from using future syntax

Browse source 
worked in some local contexts, but the prod build failed!
This commit is contained in:
Emi Matchu 2020-09-02 23:07:44 -07:00
parent 12b87ee7d1
commit ba004ae656
2 changed files with 8 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
src/server/index.js
View file

@ -1313,12 +1313,12 @@ async function getUserIdFromToken(token) {
return null; return null;
} }
const userId = payload.sub.match(/auth0\|impress-([0-9]+)/)?.[1]; const subMatch = payload.sub.match(/auth0\|impress-([0-9]+)/);
if (!userId) { if (!subMatch) {
console.log("Unexpected auth token sub format", payload.sub); console.log("Unexpected auth token sub format", payload.sub);
return null; return null;
} }
const userId = subMatch[1];
return userId; return userId;
} }
@ -1335,7 +1335,8 @@ const config = {
}; };
lastSvgLogger = svgLogger; lastSvgLogger = svgLogger;
const token = req.headers.authorization?.match(/^Bearer (.+)$/)?.[1]; const tokenMatch = (req.headers.authorization || "").match(/^Bearer (.+)$/);
const token = tokenMatch && tokenMatch[1];
const currentUserId = await getUserIdFromToken(token); const currentUserId = await getUserIdFromToken(token);
return { return {

3
src/server/query-tests/User.test.js
View file

@ -3,6 +3,9 @@ const { query, getDbCalls, logInAsTestUser } = require("./setup.js");
describe("User", () => { describe("User", () => {
it("looks up a user", async () => { it("looks up a user", async () => {
// TODO: I'm not sure why this is taking extra time, maybe the db conn?
jest.setTimeout(10000);
const res = await query({ const res = await query({
query: gql` query: gql`
query { query {