Auth tweaks
All checks were successful
Publish Docker Image / Publish Docker Image (push) Successful in 26s
All checks were successful
Publish Docker Image / Publish Docker Image (push) Successful in 26s
This commit is contained in:
@ -111,9 +111,7 @@ ${domain}/reset-password?resetToken=${resetToken}
|
|||||||
// the database. Returning anything truthy will automatically log the user
|
// the database. Returning anything truthy will automatically log the user
|
||||||
// in. Return `false` otherwise, and in the Reset Password page redirect the
|
// in. Return `false` otherwise, and in the Reset Password page redirect the
|
||||||
// user to the login page.
|
// user to the login page.
|
||||||
handler: (_user) => {
|
handler: (_user) => false,
|
||||||
return true
|
|
||||||
},
|
|
||||||
|
|
||||||
// If `false` then the new password MUST be different from the current one
|
// If `false` then the new password MUST be different from the current one
|
||||||
allowReusedPassword: true,
|
allowReusedPassword: true,
|
||||||
|
@ -15,15 +15,14 @@ const transporter = nodemailer.createTransport({
|
|||||||
},
|
},
|
||||||
})
|
})
|
||||||
|
|
||||||
export const sendEmail = async ({ to, subject, text, html }: Options) => {
|
export const sendEmail = async ({ to, subject, text, html }: Options) =>
|
||||||
return await transporter.sendMail({
|
await transporter.sendMail({
|
||||||
from: `"${process.env.FIRST_NAME} ${process.env.LAST_NAME} (noreply)" <${process.env.GMAIL}>`,
|
from: `"${process.env.FIRST_NAME} ${process.env.LAST_NAME} (noreply)" <${process.env.GMAIL}>`,
|
||||||
to: Array.isArray(to) ? to : [to],
|
to: Array.isArray(to) ? to : [to],
|
||||||
subject,
|
subject,
|
||||||
text,
|
text,
|
||||||
html,
|
html,
|
||||||
})
|
})
|
||||||
}
|
|
||||||
|
|
||||||
export const censorEmail = (email: string): string => {
|
export const censorEmail = (email: string): string => {
|
||||||
const [localPart, domain] = email.split('@')
|
const [localPart, domain] = email.split('@')
|
||||||
|
@ -13,45 +13,6 @@ import { DevFatalErrorPage } from '@redwoodjs/web/dist/components/DevFatalErrorP
|
|||||||
export default DevFatalErrorPage ||
|
export default DevFatalErrorPage ||
|
||||||
(() => (
|
(() => (
|
||||||
<main>
|
<main>
|
||||||
<style
|
|
||||||
dangerouslySetInnerHTML={{
|
|
||||||
__html: `
|
|
||||||
html, body {
|
|
||||||
margin: 0;
|
|
||||||
}
|
|
||||||
html * {
|
|
||||||
box-sizing: border-box;
|
|
||||||
}
|
|
||||||
main {
|
|
||||||
display: flex;
|
|
||||||
align-items: center;
|
|
||||||
font-family: -apple-system, BlinkMacSystemFont, "Segoe UI", Roboto, "Helvetica Neue", Arial, "Noto Sans", sans-serif;
|
|
||||||
text-align: center;
|
|
||||||
background-color: #E2E8F0;
|
|
||||||
height: 100vh;
|
|
||||||
}
|
|
||||||
section {
|
|
||||||
background-color: white;
|
|
||||||
border-radius: 0.25rem;
|
|
||||||
width: 32rem;
|
|
||||||
padding: 1rem;
|
|
||||||
margin: 0 auto;
|
|
||||||
box-shadow: 0 1px 3px 0 rgba(0, 0, 0, 0.1), 0 1px 2px 0 rgba(0, 0, 0, 0.06);
|
|
||||||
}
|
|
||||||
h1 {
|
|
||||||
font-size: 2rem;
|
|
||||||
margin: 0;
|
|
||||||
font-weight: 500;
|
|
||||||
line-height: 1;
|
|
||||||
color: #2D3748;
|
|
||||||
}
|
|
||||||
`,
|
|
||||||
}}
|
|
||||||
/>
|
|
||||||
<section>
|
|
||||||
<h1>
|
|
||||||
<span>Something went wrong</span>
|
<span>Something went wrong</span>
|
||||||
</h1>
|
|
||||||
</section>
|
|
||||||
</main>
|
</main>
|
||||||
))
|
))
|
||||||
|
@ -72,7 +72,9 @@ const ForgotPasswordPage = () => {
|
|||||||
<FieldError name="username" className="text-sm text-error" />
|
<FieldError name="username" className="text-sm text-error" />
|
||||||
|
|
||||||
<div className="flex w-full">
|
<div className="flex w-full">
|
||||||
<Submit className="btn btn-primary btn-sm mx-auto">Submit</Submit>
|
<Submit className="btn btn-primary btn-sm mx-auto uppercase">
|
||||||
|
Submit
|
||||||
|
</Submit>
|
||||||
</div>
|
</div>
|
||||||
</Form>
|
</Form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -103,7 +103,9 @@ const LoginPage = () => {
|
|||||||
<FieldError name="password" className="text-sm text-error" />
|
<FieldError name="password" className="text-sm text-error" />
|
||||||
|
|
||||||
<div className="flex w-full">
|
<div className="flex w-full">
|
||||||
<Submit className="btn btn-primary btn-sm mx-auto">Log In</Submit>
|
<Submit className="btn btn-primary btn-sm mx-auto uppercase">
|
||||||
|
Log In
|
||||||
|
</Submit>
|
||||||
</div>
|
</div>
|
||||||
</Form>
|
</Form>
|
||||||
</div>
|
</div>
|
||||||
|
@ -102,7 +102,7 @@ const ResetPasswordPage = ({ resetToken }: { resetToken: string }) => {
|
|||||||
|
|
||||||
<div className="flex w-full">
|
<div className="flex w-full">
|
||||||
<Submit
|
<Submit
|
||||||
className={`btn btn-primary btn-sm mx-auto ${
|
className={`btn btn-primary btn-sm uppercase mx-auto ${
|
||||||
!enabled ? 'btn-disabled' : ''
|
!enabled ? 'btn-disabled' : ''
|
||||||
}`}
|
}`}
|
||||||
disabled={!enabled}
|
disabled={!enabled}
|
||||||
|
Reference in New Issue
Block a user