Skip to content

Update isUCB to account for staging site #3

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Open
wants to merge 2 commits into
base: main
Choose a base branch
from
Open

Update isUCB to account for staging site #3

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
bda89d9
Update isUCB to account for staging site.
medelbou Aug 5, 2023
46f77f5
fix TypeError: User.findById is not a function error
medelbou Aug 31, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
3 changes: 3 additions & 0 deletions .gitignore
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -34,3 +34,6 @@ npm-debug.log
!.yarn/releases
!.yarn/sdks
!.yarn/versions


cypress/videos
2 changes: 1 addition & 1 deletion client/src/config/config.js
View file
Open in desktop
Original file line number Diff line number Diff line change
@@ -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 =
Expand Down
4 changes: 2 additions & 2 deletions server/config/passport.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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);
})
Expand All @@ -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);
Expand Down