diff options
author | Chocobozzz <me@florianbigard.com> | 2020-07-20 17:00:58 +0200 |
---|---|---|
committer | Chocobozzz <me@florianbigard.com> | 2020-07-20 17:00:58 +0200 |
commit | ec903c010ecc54ec2acad0bf2cf10e7fbf6a0fa2 (patch) | |
tree | 255a1f176f5f18a9205d2c7c8ce5f562f0e5ab31 /server/controllers/api | |
parent | 677ea3c084508a1c3949b9f4b3da3c21bac8ff52 (diff) | |
parent | 2170f1db6ee40531f9d08b711d8b7b00254c0031 (diff) | |
download | PeerTube-ec903c010ecc54ec2acad0bf2cf10e7fbf6a0fa2.tar.gz PeerTube-ec903c010ecc54ec2acad0bf2cf10e7fbf6a0fa2.tar.zst PeerTube-ec903c010ecc54ec2acad0bf2cf10e7fbf6a0fa2.zip |
Merge branch 'release/2.3.0' into develop
Diffstat (limited to 'server/controllers/api')
-rw-r--r-- | server/controllers/api/users/index.ts | 2 |
1 files changed, 1 insertions, 1 deletions
diff --git a/server/controllers/api/users/index.ts b/server/controllers/api/users/index.ts index fcd828ae3..5939f6125 100644 --- a/server/controllers/api/users/index.ts +++ b/server/controllers/api/users/index.ts | |||
@@ -340,7 +340,7 @@ async function askResetUserPassword (req: express.Request, res: express.Response | |||
340 | 340 | ||
341 | const verificationString = await Redis.Instance.setResetPasswordVerificationString(user.id) | 341 | const verificationString = await Redis.Instance.setResetPasswordVerificationString(user.id) |
342 | const url = WEBSERVER.URL + '/reset-password?userId=' + user.id + '&verificationString=' + verificationString | 342 | const url = WEBSERVER.URL + '/reset-password?userId=' + user.id + '&verificationString=' + verificationString |
343 | await Emailer.Instance.addPasswordResetEmailJob(user.email, url) | 343 | await Emailer.Instance.addPasswordResetEmailJob(user.username, user.email, url) |
344 | 344 | ||
345 | return res.status(204).end() | 345 | return res.status(204).end() |
346 | } | 346 | } |