mirror of
https://codeberg.org/forgejo/forgejo.git
synced 2024-11-23 22:01:22 +00:00
ac889d4290
## Changes:
1. Use absolute URL in the admin panel link sent on new registrations
2. Include absolute URL of the newly signed-up user's profile.
New email looks like this:
<details><summary>Please click to expand</summary>
```
--153937b1864f158f4fd145c4b5d4a513568681dd489021dd466a8ad7b770
Content-Transfer-Encoding: quoted-printable
Content-Type: text/plain; charset=UTF-8
User Information: @realaravinth ( http://localhost:3000/realaravinth )
----------------------------------------------------------------------
* Created: 2023-12-13 19:36:50 +05:30
Please click here ( http://localhost:3000/admin/users/9 ) to manage the use=
r from the admin panel.
--153937b1864f158f4fd145c4b5d4a513568681dd489021dd466a8ad7b770
Content-Transfer-Encoding: quoted-printable
Content-Type: text/html; charset=UTF-8
<!DOCTYPE html>
<html>
<head>
<meta http-equiv=3D"Content-Type" content=3D"text/html; charset=3Dutf-8">
<title>New user realaravinth just signed up</title>
<style>
blockquote { padding-left: 1em; margin: 1em 0; border-left: 1px solid gre=
y; color: #777}
.footer { font-size:small; color:#666;}
</style>
</head>
<body>
<ul>
<h3>User Information: <a href=3D"http://localhost:3000/realaravinth">@rea=
laravinth</a></h3>
<li>Created: <relative-time format=3D"datetime" weekday=3D"" year=3D"nume=
ric" month=3D"short" day=3D"numeric" hour=3D"numeric" minute=3D"numeric" se=
cond=3D"numeric" datetime=3D"2023-12-13T19:36:50+05:30">2023-12-13 19:36:50=
+05:30</relative-time></li>
</ul>
<p> Please <a href=3D"http://localhost:3000/admin/users/9" rel=3D"nofollow=
">click here</a> to manage the user from the admin panel. </p>
</body>
</html>
--153937b1864f158f4fd145c4b5d4a513568681dd489021dd466a8ad7b770--
```
</details>
fixes: https://codeberg.org/forgejo/forgejo/issues/1927
Reviewed-on: https://codeberg.org/forgejo/forgejo/pulls/1940
Reviewed-by: Earl Warren <earl-warren@noreply.codeberg.org>
Reviewed-by: Gusted <gusted@noreply.codeberg.org>
Co-authored-by: Aravinth Manivannan <realaravinth@batsense.net>
Co-committed-by: Aravinth Manivannan <realaravinth@batsense.net>
(cherry picked from commit b8d764e36a)
99 lines
2.9 KiB
Go
99 lines
2.9 KiB
Go
// Copyright 2023 The Gitea Authors. All rights reserved.
|
|
// SPDX-License-Identifier: MIT
|
|
|
|
package mailer
|
|
|
|
import (
|
|
"context"
|
|
"strconv"
|
|
"testing"
|
|
|
|
"code.gitea.io/gitea/models/db"
|
|
user_model "code.gitea.io/gitea/models/user"
|
|
"code.gitea.io/gitea/modules/setting"
|
|
"code.gitea.io/gitea/modules/translation"
|
|
|
|
"github.com/stretchr/testify/assert"
|
|
"github.com/stretchr/testify/require"
|
|
)
|
|
|
|
func getTestUsers(t *testing.T) []*user_model.User {
|
|
t.Helper()
|
|
admin := new(user_model.User)
|
|
admin.Name = "testadmin"
|
|
admin.IsAdmin = true
|
|
admin.Language = "en_US"
|
|
admin.Email = "admin@example.com"
|
|
require.NoError(t, user_model.CreateUser(db.DefaultContext, admin))
|
|
|
|
newUser := new(user_model.User)
|
|
newUser.Name = "new_user"
|
|
newUser.Language = "en_US"
|
|
newUser.IsAdmin = false
|
|
newUser.Email = "new_user@example.com"
|
|
newUser.LastLoginUnix = 1693648327
|
|
newUser.CreatedUnix = 1693648027
|
|
require.NoError(t, user_model.CreateUser(db.DefaultContext, newUser))
|
|
|
|
return []*user_model.User{admin, newUser}
|
|
}
|
|
|
|
func cleanUpUsers(ctx context.Context, users []*user_model.User) {
|
|
for _, u := range users {
|
|
db.DeleteByID(ctx, u.ID, new(user_model.User))
|
|
}
|
|
}
|
|
|
|
func TestAdminNotificationMail_test(t *testing.T) {
|
|
translation.InitLocales(context.Background())
|
|
locale := translation.NewLocale("")
|
|
key := "mail.admin.new_user.user_info"
|
|
translatedKey := locale.Tr(key)
|
|
require.NotEqualValues(t, key, translatedKey)
|
|
|
|
mailService := setting.Mailer{
|
|
From: "test@example.com",
|
|
Protocol: "dummy",
|
|
}
|
|
|
|
setting.MailService = &mailService
|
|
|
|
// test with SEND_NOTIFICATION_EMAIL_ON_NEW_USER enabled
|
|
setting.Admin.SendNotificationEmailOnNewUser = true
|
|
|
|
ctx := context.Background()
|
|
NewContext(ctx)
|
|
|
|
users := getTestUsers(t)
|
|
oldSendAsync := sa
|
|
defer func() {
|
|
sa = oldSendAsync
|
|
cleanUpUsers(ctx, users)
|
|
}()
|
|
|
|
called := false
|
|
sa = func(msgs ...*Message) {
|
|
assert.Equal(t, len(msgs), 1, "Test provides only one admin user, so only one email must be sent")
|
|
assert.Equal(t, msgs[0].To, users[0].Email, "checks if the recipient is the admin of the instance")
|
|
manageUserURL := setting.AppURL + "admin/users/" + strconv.FormatInt(users[1].ID, 10)
|
|
assert.Contains(t, msgs[0].Body, manageUserURL)
|
|
assert.Contains(t, msgs[0].Body, users[1].HTMLURL())
|
|
assert.Contains(t, msgs[0].Body, translatedKey, "the .Locale translates to nothing")
|
|
assert.Contains(t, msgs[0].Body, users[1].Name, "user name of the newly created user")
|
|
for _, untranslated := range []string{"mail.admin", "admin.users"} {
|
|
assert.NotContains(t, msgs[0].Body, untranslated, "this is an untranslated placeholder prefix")
|
|
}
|
|
called = true
|
|
}
|
|
MailNewUser(ctx, users[1])
|
|
assert.True(t, called)
|
|
|
|
// test with SEND_NOTIFICATION_EMAIL_ON_NEW_USER disabled; emails shouldn't be sent
|
|
setting.Admin.SendNotificationEmailOnNewUser = false
|
|
sa = func(msgs ...*Message) {
|
|
assert.Equal(t, 1, 0, "this shouldn't execute. MailNewUser must exit early since SEND_NOTIFICATION_EMAIL_ON_NEW_USER is disabled")
|
|
}
|
|
|
|
MailNewUser(ctx, users[1])
|
|
}
|