Refactor: remove Auth() from Forge interface

server/forge/addon/args.go

@@ -18,11 +18,6 @@ import (
 	"go.woodpecker-ci.org/woodpecker/v3/server/model"
 )
 
-type argumentsAuth struct {
-	Token  string `json:"token"`
-	Secret string `json:"secret"`
-}
-
 type argumentsRepo struct {
 	U        *modelUser          `json:"u"`
 	RemoteID model.ForgeRemoteID `json:"remote_id"`

server/forge/addon/client.go

@@ -103,18 +103,6 @@ func (g *RPC) Login(_ context.Context, r *types.OAuthRequest) (*model.User, stri
 	return resp.User.asModel(), resp.RedirectURL, nil
 }
 
-func (g *RPC) Auth(_ context.Context, token, secret string) (string, error) {
-	args, err := json.Marshal(&argumentsAuth{
-		Token:  token,
-		Secret: secret,
-	})
-	if err != nil {
-		return "", err
-	}
-	var resp string
-	return resp, g.client.Call("Plugin.Auth", args, &resp)
-}
-
 func (g *RPC) Teams(_ context.Context, u *model.User, p *model.ListOptions) ([]*model.Team, error) {
 	args, err := json.Marshal(&argumentsTeams{
 		U: modelUserFromModel(u),

server/forge/bitbucket/bitbucket.go

@@ -119,17 +119,6 @@ func (c *config) Login(ctx context.Context, req *forge_types.OAuthRequest) (*mod
 	return convertUser(curr, token, primaryEmail), redirectURL, nil
 }
 
-// Auth uses the Bitbucket oauth2 access token and refresh token to authenticate
-// a session and return the Bitbucket account login.
-func (c *config) Auth(ctx context.Context, token, secret string) (string, error) {
-	client := c.newClientToken(ctx, token, secret)
-	user, err := client.FindCurrent()
-	if err != nil {
-		return "", err
-	}
-	return user.Login, nil
-}
-
 // Refresh refreshes the Bitbucket oauth2 access token. If the token is
 // refreshed the user is updated and a true value is returned.
 func (c *config) Refresh(ctx context.Context, user *model.User) (bool, error) {

server/forge/bitbucket/bitbucket_test.go

@@ -81,13 +81,6 @@ func TestBitbucket(t *testing.T) {
 	})
 	assert.Error(t, err)
 
-	login, err := c.Auth(ctx, fakeUser.AccessToken, fakeUser.RefreshToken)
-	assert.NoError(t, err)
-	assert.Equal(t, fakeUser.Login, login)
-
-	_, err = c.Auth(ctx, fakeUserNotFound.AccessToken, fakeUserNotFound.RefreshToken)
-	assert.Error(t, err)
-
 	ok, err := c.Refresh(ctx, fakeUserRefresh)
 	assert.NoError(t, err)
 	assert.True(t, ok)
@@ -241,11 +234,6 @@ var (
 		RefreshToken: "refresh_token_is_empty",
 	}
 
-	fakeUserNotFound = &model.User{
-		Login:       "superman",
-		AccessToken: "user_not_found",
-	}
-
 	fakeUserNoTeams = &model.User{
 		Login:       "superman",
 		AccessToken: "teams_not_found",

server/forge/bitbucketdatacenter/bitbucketdatacenter.go

@@ -142,15 +142,6 @@ func (c *client) Login(ctx context.Context, req *forge_types.OAuthRequest) (*mod
 	return u, "", nil
 }
 
-func (c *client) Auth(ctx context.Context, accessToken, _ string) (string, error) {
-	config := c.newOAuth2Config()
-	token := &oauth2.Token{
-		AccessToken: accessToken,
-	}
-	client := internal.NewClientWithToken(ctx, config.TokenSource(ctx, token), c.url)
-	return client.FindCurrentUser(ctx)
-}
-
 func (c *client) Refresh(ctx context.Context, u *model.User) (bool, error) {
 	config := c.newOAuth2Config()
 	t := &oauth2.Token{

server/forge/forge.go

@@ -73,9 +73,6 @@ type Forge interface {
 	// Returned User must contain: Login, Email, Avatar, AccessToken, RefreshToken, Expiry, ForgeRemoteID
 	Login(ctx context.Context, r *types.OAuthRequest) (*model.User, string, error)
 
-	// Auth validates an access token and returns the associated username.
-	Auth(ctx context.Context, token, secret string) (string, error)
-
 	// Teams fetches all team/organization memberships for a user.
 	// Used to determine if an user is member of an team/organization.
 	// Should support pagination via ListOptions.

server/forge/forgejo/forgejo.go

@@ -144,20 +144,6 @@ func (c *Forgejo) Login(ctx context.Context, req *forge_types.OAuthRequest) (*mo
 	}, redirectURL, nil
 }
 
-// Auth uses the Forgejo oauth2 access token and refresh token to authenticate
-// a session and return the Forgejo account login.
-func (c *Forgejo) Auth(ctx context.Context, token, _ string) (string, error) {
-	client, err := c.newClientToken(ctx, token)
-	if err != nil {
-		return "", err
-	}
-	user, _, err := client.GetMyUserInfo()
-	if err != nil {
-		return "", err
-	}
-	return user.UserName, nil
-}
-
 // Refresh refreshes the Forgejo oauth2 access token. If the token is
 // refreshed, the user is updated and a true value is returned.
 func (c *Forgejo) Refresh(ctx context.Context, user *model.User) (bool, error) {

server/forge/gitea/gitea.go

@@ -146,20 +146,6 @@ func (c *Gitea) Login(ctx context.Context, req *forge_types.OAuthRequest) (*mode
 	}, redirectURL, nil
 }
 
-// Auth uses the Gitea oauth2 access token and refresh token to authenticate
-// a session and return the Gitea account login.
-func (c *Gitea) Auth(ctx context.Context, token, _ string) (string, error) {
-	client, err := c.newClientToken(ctx, token)
-	if err != nil {
-		return "", err
-	}
-	user, _, err := client.GetMyUserInfo()
-	if err != nil {
-		return "", err
-	}
-	return user.UserName, nil
-}
-
 // Refresh refreshes the Gitea oauth2 access token. If the token is
 // refreshed, the user is updated and a true value is returned.
 func (c *Gitea) Refresh(ctx context.Context, user *model.User) (bool, error) {

server/forge/github/github.go

@@ -149,16 +149,6 @@ func (c *client) Login(ctx context.Context, req *forge_types.OAuthRequest) (*mod
 	}, redirectURL, nil
 }
 
-// Auth returns the GitHub user login for the given access token.
-func (c *client) Auth(ctx context.Context, token, _ string) (string, error) {
-	client := c.newClientToken(ctx, token)
-	user, _, err := client.Users.Get(ctx, "")
-	if err != nil {
-		return "", err
-	}
-	return *user.Login, nil
-}
-
 // Refresh refreshes the Gitlab oauth2 access token. If the token is
 // refreshed the user is updated and a true value is returned.
 func (c *client) Refresh(ctx context.Context, user *model.User) (bool, error) {

server/forge/gitlab/gitlab.go

@@ -178,20 +178,6 @@ func (g *GitLab) Refresh(ctx context.Context, user *model.User) (bool, error) {
 	return true, nil
 }
 
-// Auth authenticates the session and returns the forge user login for the given token.
-func (g *GitLab) Auth(ctx context.Context, token, _ string) (string, error) {
-	client, err := newClient(g.url, token, g.skipVerify)
-	if err != nil {
-		return "", err
-	}
-
-	login, _, err := client.Users.CurrentUser(gitlab.WithContext(ctx))
-	if err != nil {
-		return "", err
-	}
-	return login.Username, nil
-}
-
 // Teams fetches a list of team memberships from the forge.
 func (g *GitLab) Teams(ctx context.Context, user *model.User, p *model.ListOptions) ([]*model.Team, error) {
 	client, err := newClient(g.url, user.AccessToken, g.skipVerify)