diff --git a/backend/src/schema/resolvers/passwordReset.js b/backend/src/schema/resolvers/passwordReset.js index 13789662b..0cfcd74e7 100644 --- a/backend/src/schema/resolvers/passwordReset.js +++ b/backend/src/schema/resolvers/passwordReset.js @@ -13,7 +13,10 @@ const transporter = () => { } const { SMTP_USERNAME: user, SMTP_PASSWORD: pass } = CONFIG if (user && pass) { - configs.auth = { user, pass } + configs.auth = { + user, + pass, + } } return nodemailer.createTransport(configs) } @@ -41,11 +44,21 @@ export default { Mutation: { requestPasswordReset: async (_, { email }, { driver }) => { const code = uuid().substring(0, 6) - const [user] = await createPasswordReset({ driver, code, email }) + const [user] = await createPasswordReset({ + driver, + code, + email, + }) if (CONFIG.SMTP_HOST && CONFIG.SMTP_PORT) { const name = (user && user.name) || '' const mailTemplate = user ? resetPasswordMail : wrongAccountMail - await transporter().sendMail(mailTemplate({ email, code, name })) + await transporter().sendMail( + mailTemplate({ + email, + code, + name, + }), + ) } return true }, @@ -62,7 +75,12 @@ export default { SET u.password = $newHashedPassword RETURN pr ` - let transactionRes = await session.run(cypher, { stillValid, email, code, newHashedPassword }) + let transactionRes = await session.run(cypher, { + stillValid, + email, + code, + newHashedPassword, + }) const [reset] = transactionRes.records.map(record => record.get('pr')) const result = !!(reset && reset.properties.usedAt) session.close() diff --git a/webapp/components/FilterMenu/FilterMenu.vue b/webapp/components/FilterMenu/FilterMenu.vue index 16009b6eb..9bfb3ddba 100644 --- a/webapp/components/FilterMenu/FilterMenu.vue +++ b/webapp/components/FilterMenu/FilterMenu.vue @@ -1,5 +1,5 @@ @@ -27,6 +49,7 @@ export default { props: { user: { type: Object, required: true }, + hashtag: { type: Object, default: null }, }, data() { return { @@ -50,11 +73,18 @@ export default { : { author: { followedBy_some: { id: this.user.id } } } this.$emit('changeFilterBubble', this.filter) }, + clearSearch() { + this.$emit('clearSearch') + }, }, }