diff options
Diffstat (limited to 'services/auth/source/oauth2/source_sync_test.go')
| -rw-r--r-- | services/auth/source/oauth2/source_sync_test.go | 39 |
1 files changed, 20 insertions, 19 deletions
diff --git a/services/auth/source/oauth2/source_sync_test.go b/services/auth/source/oauth2/source_sync_test.go index 893ed62502..2927f3634b 100644 --- a/services/auth/source/oauth2/source_sync_test.go +++ b/services/auth/source/oauth2/source_sync_test.go @@ -4,7 +4,6 @@ package oauth2 import ( - "context" "testing" "code.gitea.io/gitea/models/auth" @@ -19,24 +18,26 @@ func TestSource(t *testing.T) { source := &Source{ Provider: "fake", - authSource: &auth.Source{ - ID: 12, - Type: auth.OAuth2, - Name: "fake", - IsActive: true, - IsSyncEnabled: true, + ConfigBase: auth.ConfigBase{ + AuthSource: &auth.Source{ + ID: 12, + Type: auth.OAuth2, + Name: "fake", + IsActive: true, + IsSyncEnabled: true, + }, }, } user := &user_model.User{ LoginName: "external", LoginType: auth.OAuth2, - LoginSource: source.authSource.ID, + LoginSource: source.AuthSource.ID, Name: "test", Email: "external@example.com", } - err := user_model.CreateUser(context.Background(), user, &user_model.Meta{}, &user_model.CreateUserOverwriteOptions{}) + err := user_model.CreateUser(t.Context(), user, &user_model.Meta{}, &user_model.CreateUserOverwriteOptions{}) assert.NoError(t, err) e := &user_model.ExternalLoginUser{ @@ -45,15 +46,15 @@ func TestSource(t *testing.T) { LoginSourceID: user.LoginSource, RefreshToken: "valid", } - err = user_model.LinkExternalToUser(context.Background(), user, e) + err = user_model.LinkExternalToUser(t.Context(), user, e) assert.NoError(t, err) - provider, err := createProvider(source.authSource.Name, source) + provider, err := createProvider(source.AuthSource.Name, source) assert.NoError(t, err) t.Run("refresh", func(t *testing.T) { t.Run("valid", func(t *testing.T) { - err := source.refresh(context.Background(), provider, e) + err := source.refresh(t.Context(), provider, e) assert.NoError(t, err) e := &user_model.ExternalLoginUser{ @@ -61,19 +62,19 @@ func TestSource(t *testing.T) { LoginSourceID: e.LoginSourceID, } - ok, err := user_model.GetExternalLogin(context.Background(), e) + ok, err := user_model.GetExternalLogin(t.Context(), e) assert.NoError(t, err) assert.True(t, ok) assert.Equal(t, "refresh", e.RefreshToken) assert.Equal(t, "token", e.AccessToken) - u, err := user_model.GetUserByID(context.Background(), user.ID) + u, err := user_model.GetUserByID(t.Context(), user.ID) assert.NoError(t, err) assert.True(t, u.IsActive) }) t.Run("expired", func(t *testing.T) { - err := source.refresh(context.Background(), provider, &user_model.ExternalLoginUser{ + err := source.refresh(t.Context(), provider, &user_model.ExternalLoginUser{ ExternalID: "external", UserID: user.ID, LoginSourceID: user.LoginSource, @@ -86,13 +87,13 @@ func TestSource(t *testing.T) { LoginSourceID: e.LoginSourceID, } - ok, err := user_model.GetExternalLogin(context.Background(), e) + ok, err := user_model.GetExternalLogin(t.Context(), e) assert.NoError(t, err) assert.True(t, ok) - assert.Equal(t, "", e.RefreshToken) - assert.Equal(t, "", e.AccessToken) + assert.Empty(t, e.RefreshToken) + assert.Empty(t, e.AccessToken) - u, err := user_model.GetUserByID(context.Background(), user.ID) + u, err := user_model.GetUserByID(t.Context(), user.ID) assert.NoError(t, err) assert.False(t, u.IsActive) }) |