From bda89d9ff7da35a3f5b342994df52c76b9734a17 Mon Sep 17 00:00:00 2001 From: Mohamed A Elbou Date: Sat, 5 Aug 2023 15:18:00 -0500 Subject: [PATCH 1/2] Update isUCB to account for staging site. --- client/src/config/config.js | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/client/src/config/config.js b/client/src/config/config.js index c53398e..0888e01 100644 --- a/client/src/config/config.js +++ b/client/src/config/config.js @@ -1,4 +1,4 @@ -export const isUCB = document.location.hostname === 'waamd.lib.berkeley.edu'; +export const isUCB = ['waamd.ucblib.org', 'waamd.lib.berkeley.edu'].includes(document.location.hostname); export const GOOGLE_ANALYTICS_ACCOUNT_ID = process.env.REACT_APP_GOOGLE_ANALYTICS_ACCOUNT_ID || 'G-3H4T9L018E'; export const GOOGLE_MAPS_API_KEY = From 46f77f561f2febd1ffcab37e07a1488f4bd481ba Mon Sep 17 00:00:00 2001 From: Mohamed A Elbou Date: Thu, 31 Aug 2023 18:11:28 -0500 Subject: [PATCH 2/2] fix TypeError: User.findById is not a function error --- .gitignore | 3 +++ server/config/passport.js | 4 ++-- 2 files changed, 5 insertions(+), 2 deletions(-) diff --git a/.gitignore b/.gitignore index 2eefa39..3657296 100644 --- a/.gitignore +++ b/.gitignore @@ -34,3 +34,6 @@ npm-debug.log !.yarn/releases !.yarn/sdks !.yarn/versions + + +cypress/videos \ No newline at end of file diff --git a/server/config/passport.js b/server/config/passport.js index 1c46763..9dd9d3c 100644 --- a/server/config/passport.js +++ b/server/config/passport.js @@ -33,7 +33,7 @@ module.exports = function(passport) { // used to deserialize the user passport.deserializeUser(function(id, done) { - User.findById(id) + User.findByPk(id) .then(user => { done(null, user); }) @@ -52,7 +52,7 @@ module.exports = function(passport) { return done(null, false); } - User.findById(uid) + User.findByPk(uid) .then(user => { if (!user) { return done(null, false);