Skip to content

Fix user update before consents to terms #1481

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

Merged
merged 5 commits into from
Oct 17, 2025
Merged

Fix user update before consents to terms #1481

Show file tree
Hide file tree
Changes from 1 commit
Commits
Show all changes
5 commits
Select commit Hold shift + click to select a range
1c400c6
Fix user update before consents to terms
amy-corson-ibigroup Oct 9, 2025
c8a1858
Merge branch 'dev' into fix-language-on-reload
amy-corson-ibigroup Oct 13, 2025
aba5b28
Fix incorrectly named variable and fix bug
amy-corson-ibigroup Oct 13, 2025
319eee1
Merge branch 'fix-language-on-reload' of https://github.com/opentripp…
amy-corson-ibigroup Oct 13, 2025
41c9097
Merge branch 'dev' into fix-language-on-reload
josh-willis-arcadis Oct 17, 2025
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
6 changes: 3 additions & 3 deletions lib/actions/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,10 +10,10 @@ import {
convertToPlace,
getPersistenceMode,
isHomeOrWork,
isNewUser,
positionHomeAndWorkFirst,
setAtLeastNoMobilityDevice,
tidyRecentSearches
tidyRecentSearches,
userExistsInDatabase
} from '../util/user'
import {
formattedToastSuccessMessage,
Expand Down Expand Up @@ -391,7 +391,7 @@ export function createOrUpdateUser(userData, intl) {
)

// Determine URL and method to use.
const isCreatingUser = isNewUser(loggedInUser)
const isCreatingUser = userExistsInDatabase(loggedInUser)
if (isCreatingUser) {
requestUrl = `${apiBaseUrl}${API_OTPUSER_PATH}`
method = 'POST'
Expand Down
4 changes: 4 additions & 0 deletions lib/util/user.js
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -22,6 +22,10 @@ export function isNewUser(loggedInUser) {
return !loggedInUser.hasConsentedToTerms
}

export function userExistsInDatabase(loggedInUser) {
return !loggedInUser.id
}

// Helper functions to determine if
// a location is home or work.
export const isHome = (loc) => loc.type === 'home'
Expand Down
Loading