feat: password reset, activate token resend
This commit is contained in:
@@ -29,6 +29,7 @@ func (app *application) routes() http.Handler {
|
|||||||
|
|
||||||
router.HandlerFunc(http.MethodPost, "/v1/tokens/authentication", app.createAuthenticationTokenHandler)
|
router.HandlerFunc(http.MethodPost, "/v1/tokens/authentication", app.createAuthenticationTokenHandler)
|
||||||
router.HandlerFunc(http.MethodPost, "/v1/tokens/password-reset", app.createPasswordResetTokenHandler)
|
router.HandlerFunc(http.MethodPost, "/v1/tokens/password-reset", app.createPasswordResetTokenHandler)
|
||||||
|
router.HandlerFunc(http.MethodPost, "/v1/tokens/activation", app.createActivationTokenHandler)
|
||||||
|
|
||||||
router.Handler(http.MethodGet, "/debug/vars", expvar.Handler())
|
router.Handler(http.MethodGet, "/debug/vars", expvar.Handler())
|
||||||
|
|
||||||
|
|||||||
@@ -148,3 +148,73 @@ func (app *application) createPasswordResetTokenHandler(w http.ResponseWriter, r
|
|||||||
app.serverErrorResponse(w, r, err)
|
app.serverErrorResponse(w, r, err)
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
|
func (app *application) createActivationTokenHandler(w http.ResponseWriter, r *http.Request) {
|
||||||
|
// Parse and validate the user's email address.
|
||||||
|
var input struct {
|
||||||
|
Email string `json:"email"`
|
||||||
|
}
|
||||||
|
err := app.readJSON(w, r, &input)
|
||||||
|
if err != nil {
|
||||||
|
app.badRequestResponse(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
v := validator.New()
|
||||||
|
|
||||||
|
if data.ValidateEmail(v, input.Email); !v.Valid() {
|
||||||
|
app.failedValidationResponse(w, r, v.Errors)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Try to retrieve the corresponding user record for the email address. If it can't
|
||||||
|
// be found, return an error message to the client.
|
||||||
|
user, err := app.models.Users.GetByEmail(input.Email)
|
||||||
|
if err != nil {
|
||||||
|
switch {
|
||||||
|
case errors.Is(err, data.ErrRecordNotFound):
|
||||||
|
v.AddError("email", "no matching email address found")
|
||||||
|
app.failedValidationResponse(w, r, v.Errors)
|
||||||
|
default:
|
||||||
|
app.serverErrorResponse(w, r, err)
|
||||||
|
}
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Return an error if the user has already been activated.
|
||||||
|
if user.Activated {
|
||||||
|
v.AddError("email", "user has already been activated")
|
||||||
|
app.failedValidationResponse(w, r, v.Errors)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Otherwise, create a new activation token.
|
||||||
|
token, err := app.models.Tokens.New(user.ID, 3*24*time.Hour, data.ScopeActivation)
|
||||||
|
if err != nil {
|
||||||
|
app.serverErrorResponse(w, r, err)
|
||||||
|
return
|
||||||
|
}
|
||||||
|
|
||||||
|
// Email the user with their additional activation token.
|
||||||
|
app.background(func() {
|
||||||
|
data := map[string]interface{}{
|
||||||
|
"activationToken": token.Plaintext,
|
||||||
|
}
|
||||||
|
|
||||||
|
// Since email addresses MAY be case sensitive, notice that we are sending this
|
||||||
|
// email using the address stored in our database for the user --- not to the
|
||||||
|
// input.Email address provided by the client in this request.
|
||||||
|
err = app.mailer.Send(user.Email, "token_activation.tmpl", data)
|
||||||
|
if err != nil {
|
||||||
|
app.logger.PrintError(err, nil)
|
||||||
|
}
|
||||||
|
})
|
||||||
|
|
||||||
|
// Send a 202 Accepted response and confirmation message to the client.
|
||||||
|
env := envelope{"message": "an email will be sent to you containing activation instructions"}
|
||||||
|
|
||||||
|
err = app.writeJSON(w, http.StatusAccepted, env, nil)
|
||||||
|
if err != nil {
|
||||||
|
app.serverErrorResponse(w, r, err)
|
||||||
|
}
|
||||||
|
}
|
||||||
|
|||||||
@@ -11,7 +11,11 @@ http:
|
|||||||
data: |-
|
data: |-
|
||||||
{
|
{
|
||||||
"email": "alice@example.com",
|
"email": "alice@example.com",
|
||||||
"password": "pa55word"
|
"password": "pa44word"
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
|
|
||||||
}
|
}
|
||||||
auth: inherit
|
auth: inherit
|
||||||
|
|
||||||
|
|||||||
@@ -0,0 +1,21 @@
|
|||||||
|
info:
|
||||||
|
name: Activation
|
||||||
|
type: http
|
||||||
|
seq: 2
|
||||||
|
|
||||||
|
http:
|
||||||
|
method: POST
|
||||||
|
url: "{{URL}}/v1/tokens/activation"
|
||||||
|
body:
|
||||||
|
type: json
|
||||||
|
data: |-
|
||||||
|
{
|
||||||
|
"email": "alice@example.com"
|
||||||
|
}
|
||||||
|
auth: inherit
|
||||||
|
|
||||||
|
settings:
|
||||||
|
encodeUrl: true
|
||||||
|
timeout: 0
|
||||||
|
followRedirects: true
|
||||||
|
maxRedirects: 5
|
||||||
@@ -0,0 +1,22 @@
|
|||||||
|
info:
|
||||||
|
name: Password Reset
|
||||||
|
type: http
|
||||||
|
seq: 2
|
||||||
|
|
||||||
|
http:
|
||||||
|
method: POST
|
||||||
|
url: "{{URL}}/v1/tokens/password-reset"
|
||||||
|
body:
|
||||||
|
type: json
|
||||||
|
data: |+
|
||||||
|
{
|
||||||
|
"email": "alice@example.com"
|
||||||
|
}
|
||||||
|
|
||||||
|
auth: inherit
|
||||||
|
|
||||||
|
settings:
|
||||||
|
encodeUrl: true
|
||||||
|
timeout: 0
|
||||||
|
followRedirects: true
|
||||||
|
maxRedirects: 5
|
||||||
@@ -0,0 +1,7 @@
|
|||||||
|
info:
|
||||||
|
name: Tokens
|
||||||
|
type: folder
|
||||||
|
seq: 5
|
||||||
|
|
||||||
|
request:
|
||||||
|
auth: inherit
|
||||||
@@ -0,0 +1,23 @@
|
|||||||
|
info:
|
||||||
|
name: Update Password
|
||||||
|
type: http
|
||||||
|
seq: 3
|
||||||
|
|
||||||
|
http:
|
||||||
|
method: PUT
|
||||||
|
url: "{{URL}}/v1/users/password"
|
||||||
|
body:
|
||||||
|
type: json
|
||||||
|
data: |-
|
||||||
|
{
|
||||||
|
"token": "3JWV7KEAYAMEFQMONXKVNIFYSY",
|
||||||
|
"password": "pa44word"
|
||||||
|
|
||||||
|
}
|
||||||
|
auth: inherit
|
||||||
|
|
||||||
|
settings:
|
||||||
|
encodeUrl: true
|
||||||
|
timeout: 0
|
||||||
|
followRedirects: true
|
||||||
|
maxRedirects: 5
|
||||||
@@ -0,0 +1,36 @@
|
|||||||
|
{{define "subject"}}Activate your Greenlight account{{end}}
|
||||||
|
|
||||||
|
{{define "plainBody"}}
|
||||||
|
Hi,
|
||||||
|
|
||||||
|
Please send a `PUT /v1/users/activated` request with the following JSON body to activate your account:
|
||||||
|
|
||||||
|
{"token": "{{.activationToken}}"}
|
||||||
|
|
||||||
|
Please note that this is a one-time use token and it will expire in 3 days.
|
||||||
|
|
||||||
|
Thanks,
|
||||||
|
|
||||||
|
The Greenlight Team
|
||||||
|
{{end}}
|
||||||
|
|
||||||
|
{{define "htmlBody"}}
|
||||||
|
<!doctype html>
|
||||||
|
<html>
|
||||||
|
<head>
|
||||||
|
<meta name="viewport" content="width=device-width" />
|
||||||
|
<meta http-equiv="Content-Type" content="text/html; charset=UTF-8" />
|
||||||
|
</head>
|
||||||
|
<body>
|
||||||
|
<p>Hi,</p>
|
||||||
|
<p>Please send a <code>PUT /v1/users/activated</code> request with the following JSON body to activate your account:</p>
|
||||||
|
<pre><code>
|
||||||
|
{"token": "{{.activationToken}}"}
|
||||||
|
</code></pre>
|
||||||
|
<p>Please note that this is a one-time use token and it will expire in 3 days.</p>
|
||||||
|
<p>Thanks,</p>
|
||||||
|
<p>The Greenlight Team</p>
|
||||||
|
</body>
|
||||||
|
</html>
|
||||||
|
{{end}}
|
||||||
|
|
||||||
Reference in New Issue
Block a user