a_adli/colouring-montreal
1
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

Merge pull request #504 from mz8i/fix/forgotten-password-error

Browse Source 
Fix forgotten password error
This commit is contained in:
Maciej Ziarkowski 2019-11-14 16:33:52 +00:00 committed by GitHub
commit a8ae8510b2
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
2 changed files with 3 additions and 3 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

4
app/src/api/services/user.ts
View File

@ -106,7 +106,7 @@ async function getUserById(id: string) {
async function getUserByEmail(email: string) { async function getUserByEmail(email: string) {
try { try {
return db.one( return await db.one(
`SELECT `SELECT
user_id, username, email user_id, username, email
FROM FROM
@ -123,7 +123,7 @@ async function getUserByEmail(email: string) {
async function getNewUserAPIKey(id: string) { async function getNewUserAPIKey(id: string) {
try{ try{
return db.one( return await db.one(
`UPDATE `UPDATE
users users
SET SET

2
app/src/frontend/user/forgotten-password.tsx
View File

@ -62,7 +62,7 @@ export default class ForgottenPassword extends React.Component<{}, ForgottenPass
<ErrorBox msg={this.state.error} /> <ErrorBox msg={this.state.error} />
<InfoBox msg=""> <InfoBox msg="">
{this.state.success ? {this.state.success ?
`A password reset link has been sent to ${this.state.emailUsed}. Please check your inbox.` : `If the email address is registered on Colouring London, a password reset link will be sent to ${this.state.emailUsed}. Please check your inbox.` :
null null
} }
</InfoBox> </InfoBox>