diff --git a/models/user/email_address_test.go b/models/user/email_address_test.go index 7cd82a95fa..b00b91c5f2 100644 --- a/models/user/email_address_test.go +++ b/models/user/email_address_test.go @@ -129,6 +129,7 @@ func TestListEmails(t *testing.T) { assert.Len(t, emails, 5) assert.Greater(t, count, int64(len(emails))) } + func TestGetActivatedEmailAddresses(t *testing.T) { require.NoError(t, unittest.PrepareTestDatabase()) diff --git a/models/user/user_test.go b/models/user/user_test.go index a705b87bd3..082c21063c 100644 --- a/models/user/user_test.go +++ b/models/user/user_test.go @@ -7,7 +7,6 @@ package user_test import ( "context" "crypto/rand" - "encoding/hex" "fmt" "strings" "testing" @@ -22,9 +21,7 @@ import ( "code.gitea.io/gitea/modules/optional" "code.gitea.io/gitea/modules/setting" "code.gitea.io/gitea/modules/structs" - "code.gitea.io/gitea/modules/test" "code.gitea.io/gitea/modules/timeutil" - "code.gitea.io/gitea/modules/util" "code.gitea.io/gitea/modules/validation" "code.gitea.io/gitea/tests" @@ -324,7 +321,6 @@ func TestCreateUserInvalidEmail(t *testing.T) { err := user_model.CreateUser(db.DefaultContext, user) require.Error(t, err) - assert.True(t, validation.IsErrEmailCharIsNotSupported(err)) } @@ -607,69 +603,6 @@ func Test_ValidateUser(t *testing.T) { } } -func TestGenerateEmailAuthorizationCode(t *testing.T) { - defer test.MockVariableValue(&setting.Service.ActiveCodeLives, 2)() - require.NoError(t, unittest.PrepareTestDatabase()) - - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - - code, err := user.GenerateEmailAuthorizationCode(db.DefaultContext, auth.UserActivation) - require.NoError(t, err) - - lookupKey, validator, ok := strings.Cut(code, ":") - assert.True(t, ok) - - rawValidator, err := hex.DecodeString(validator) - require.NoError(t, err) - - authToken, err := auth.FindAuthToken(db.DefaultContext, lookupKey, auth.UserActivation) - require.NoError(t, err) - assert.False(t, authToken.IsExpired()) - assert.EqualValues(t, authToken.HashedValidator, auth.HashValidator(rawValidator)) - - authToken.Expiry = authToken.Expiry.Add(-int64(setting.Service.ActiveCodeLives) * 60) - assert.True(t, authToken.IsExpired()) -} - -func TestVerifyUserAuthorizationToken(t *testing.T) { - defer test.MockVariableValue(&setting.Service.ActiveCodeLives, 2)() - require.NoError(t, unittest.PrepareTestDatabase()) - - user := unittest.AssertExistsAndLoadBean(t, &user_model.User{ID: 2}) - - code, err := user.GenerateEmailAuthorizationCode(db.DefaultContext, auth.UserActivation) - require.NoError(t, err) - - lookupKey, _, ok := strings.Cut(code, ":") - assert.True(t, ok) - - t.Run("Wrong purpose", func(t *testing.T) { - u, err := user_model.VerifyUserAuthorizationToken(db.DefaultContext, code, auth.PasswordReset, false) - require.NoError(t, err) - assert.Nil(t, u) - }) - - t.Run("No delete", func(t *testing.T) { - u, err := user_model.VerifyUserAuthorizationToken(db.DefaultContext, code, auth.UserActivation, false) - require.NoError(t, err) - assert.EqualValues(t, user.ID, u.ID) - - authToken, err := auth.FindAuthToken(db.DefaultContext, lookupKey, auth.UserActivation) - require.NoError(t, err) - assert.NotNil(t, authToken) - }) - - t.Run("Delete", func(t *testing.T) { - u, err := user_model.VerifyUserAuthorizationToken(db.DefaultContext, code, auth.UserActivation, true) - require.NoError(t, err) - assert.EqualValues(t, user.ID, u.ID) - - authToken, err := auth.FindAuthToken(db.DefaultContext, lookupKey, auth.UserActivation) - require.ErrorIs(t, err, util.ErrNotExist) - assert.Nil(t, authToken) - }) -} - func Test_NormalizeUserFromEmail(t *testing.T) { oldSetting := setting.Service.AllowDotsInUsernames defer func() {