Merge branch 'main' into pr/4861

server/api/login.go

@@ -160,13 +160,29 @@ func HandleAuth(c *gin.Context) {
 		}
 	}
 
+	var user *model.User
+
 	// get the user from the database
-	user, err := _store.GetUserRemoteID(userFromForge.ForgeRemoteID, userFromForge.Login)
+	user, err = _store.GetUserByRemoteID(forgeID, userFromForge.ForgeRemoteID)
 	if err != nil && !errors.Is(err, types.RecordNotExist) {
 		log.Error().Err(err).Msgf("cannot get user %s", userFromForge.Login)
 		c.Redirect(http.StatusSeeOther, server.Config.Server.RootPath+"/login?error=internal_error")
 		return
 	}
+	// update user login (in case forge supports renaming)
+	if user != nil {
+		user.Login = userFromForge.Login
+	}
+
+	// re-try with login name
+	if user == nil || errors.Is(err, types.RecordNotExist) {
+		user, err = _store.GetUserByLogin(forgeID, userFromForge.Login)
+		if err != nil && !errors.Is(err, types.RecordNotExist) {
+			log.Error().Err(err).Msgf("cannot get user %s", userFromForge.Login)
+			c.Redirect(http.StatusSeeOther, server.Config.Server.RootPath+"/login?error=internal_error")
+			return
+		}
+	}
 
 	if user == nil || errors.Is(err, types.RecordNotExist) {
 		// if self-registration is disabled we should return a not authorized error

server/api/login_test.go

@@ -158,7 +158,8 @@ func TestHandleAuth(t *testing.T) {
 
 		_manager.On("ForgeByID", int64(1)).Return(_forge, nil)
 		_forge.On("Login", mock.Anything, mock.Anything).Return(user, "", nil)
-		_store.On("GetUserRemoteID", user.ForgeRemoteID, user.Login).Return(nil, types.RecordNotExist)
+		_store.On("GetUserByRemoteID", user.ForgeID, user.ForgeRemoteID).Return(nil, types.RecordNotExist)
+		_store.On("GetUserByLogin", user.ForgeID, user.Login).Return(nil, types.RecordNotExist)
 		_store.On("CreateUser", mock.Anything).Return(nil)
 		_store.On("OrgFindByName", user.Login, user.ForgeID).Return(nil, nil)
 		_store.On("OrgCreate", mock.Anything).Return(nil)
@@ -192,7 +193,7 @@ func TestHandleAuth(t *testing.T) {
 
 		_manager.On("ForgeByID", int64(1)).Return(_forge, nil)
 		_forge.On("Login", mock.Anything, mock.Anything).Return(user, "", nil)
-		_store.On("GetUserRemoteID", user.ForgeRemoteID, user.Login).Return(user, nil)
+		_store.On("GetUserByRemoteID", user.ForgeID, user.ForgeRemoteID).Return(user, nil)
 		_store.On("OrgGet", org.ID).Return(org, nil)
 		_store.On("UpdateUser", mock.Anything).Return(nil)
 		_forge.On("Repos", mock.Anything, mock.Anything, mock.Anything).Return(nil, nil)
@@ -224,7 +225,8 @@ func TestHandleAuth(t *testing.T) {
 
 		_manager.On("ForgeByID", int64(1)).Return(_forge, nil)
 		_forge.On("Login", mock.Anything, mock.Anything).Return(user, "", nil)
-		_store.On("GetUserRemoteID", user.ForgeRemoteID, user.Login).Return(nil, types.RecordNotExist)
+		_store.On("GetUserByRemoteID", user.ForgeID, user.ForgeRemoteID).Return(nil, types.RecordNotExist)
+		_store.On("GetUserByLogin", user.ForgeID, user.Login).Return(nil, types.RecordNotExist)
 
 		api.HandleAuth(c)
 
@@ -285,7 +287,7 @@ func TestHandleAuth(t *testing.T) {
 
 		_manager.On("ForgeByID", int64(1)).Return(_forge, nil)
 		_forge.On("Login", mock.Anything, mock.Anything).Return(user, "", nil)
-		_store.On("GetUserRemoteID", user.ForgeRemoteID, user.Login).Return(user, nil)
+		_store.On("GetUserByRemoteID", user.ForgeID, user.ForgeRemoteID).Return(user, nil)
 		_store.On("OrgFindByName", user.Login, user.ForgeID).Return(nil, types.RecordNotExist)
 		_store.On("OrgCreate", mock.Anything).Return(nil)
 		_store.On("UpdateUser", mock.Anything).Return(nil)
@@ -319,7 +321,7 @@ func TestHandleAuth(t *testing.T) {
 
 		_manager.On("ForgeByID", int64(1)).Return(_forge, nil)
 		_forge.On("Login", mock.Anything, mock.Anything).Return(user, "", nil)
-		_store.On("GetUserRemoteID", user.ForgeRemoteID, user.Login).Return(user, nil)
+		_store.On("GetUserByRemoteID", user.ForgeID, user.ForgeRemoteID).Return(user, nil)
 		_store.On("OrgFindByName", user.Login, user.ForgeID).Return(org, nil)
 		_store.On("OrgUpdate", mock.Anything).Return(nil)
 		_store.On("UpdateUser", mock.Anything).Return(nil)
@@ -353,7 +355,7 @@ func TestHandleAuth(t *testing.T) {
 
 		_manager.On("ForgeByID", int64(1)).Return(_forge, nil)
 		_forge.On("Login", mock.Anything, mock.Anything).Return(user, "", nil)
-		_store.On("GetUserRemoteID", user.ForgeRemoteID, user.Login).Return(user, nil)
+		_store.On("GetUserByRemoteID", user.ForgeID, user.ForgeRemoteID).Return(user, nil)
 		_store.On("OrgGet", user.OrgID).Return(org, nil)
 		_store.On("OrgUpdate", mock.Anything).Return(nil)
 		_store.On("UpdateUser", mock.Anything).Return(nil)

server/api/users.go

@@ -16,7 +16,10 @@ package api
 
 import (
 	"encoding/base32"
+	"errors"
+	"fmt"
 	"net/http"
+	"strconv"
 
 	"github.com/gin-gonic/gin"
 	"github.com/google/tink/go/subtle/random"
@@ -24,8 +27,11 @@ import (
 	"go.woodpecker-ci.org/woodpecker/v3/server/model"
 	"go.woodpecker-ci.org/woodpecker/v3/server/router/middleware/session"
 	"go.woodpecker-ci.org/woodpecker/v3/server/store"
+	"go.woodpecker-ci.org/woodpecker/v3/server/store/types"
 )
 
+const defaultForgeID = 1
+
 // GetUsers
 //
 //	@Summary		List users
@@ -56,8 +62,23 @@ func GetUsers(c *gin.Context) {
 //	@Tags			Users
 //	@Param			Authorization	header	string	true	"Insert your personal access token"	default(Bearer <personal access token>)
 //	@Param			login			path	string	true	"the user's login name"
+//	@Param			forge_id		query	string	true	"specify forge (else default will be used)"
+//	@Param			forge_remote_id	query	string	false	"specify user id at forge (else fallback to login)"
 func GetUser(c *gin.Context) {
-	user, err := store.FromContext(c).GetUserLogin(c.Param("login"))
+	forgeID, err := strconv.ParseInt(c.DefaultQuery("forge_id", fmt.Sprint(defaultForgeID)), 10, 64)
+	if err != nil {
+		c.AbortWithStatus(http.StatusBadRequest)
+		return
+	}
+	forgeRemoteID := model.ForgeRemoteID(c.Query("forge_remote_id"))
+
+	var user *model.User
+
+	if forgeRemoteID.IsValid() {
+		user, err = store.FromContext(c).GetUserByRemoteID(forgeID, forgeRemoteID)
+	} else {
+		user, err = store.FromContext(c).GetUserByLogin(forgeID, c.Param("login"))
+	}
 	if err != nil {
 		handleDBError(c, err)
 		return
@@ -87,14 +108,26 @@ func PatchUser(c *gin.Context) {
 		return
 	}
 
-	user, err := _store.GetUserLogin(c.Param("login"))
-	if err != nil {
+	if in.ForgeID < defaultForgeID {
+		in.ForgeID = defaultForgeID
+	}
+
+	user, err := store.FromContext(c).GetUserByRemoteID(in.ForgeID, in.ForgeRemoteID)
+	if err != nil && !errors.Is(err, types.RecordNotExist) {
 		handleDBError(c, err)
 		return
 	}
 
-	// TODO: allow to change login (currently used as primary key)
+	if user == nil {
+		user, err = _store.GetUserByLogin(in.ForgeID, c.Param("login"))
+		if err != nil {
+			handleDBError(c, err)
+			return
+		}
+	}
+
 	// TODO: disallow to change login, email, avatar if the user is using oauth
+	user.Login = in.Login
 	user.Email = in.Email
 	user.Avatar = in.Avatar
 	user.Admin = in.Admin
@@ -132,7 +165,7 @@ func PostUser(c *gin.Context) {
 		Hash: base32.StdEncoding.EncodeToString(
 			random.GetRandomBytes(32),
 		),
-		ForgeID:       1,                        // TODO: replace with forge id when multiple forges are supported
+		ForgeID:       in.ForgeID,
 		ForgeRemoteID: model.ForgeRemoteID("0"), // TODO: search for the user in the forge and get the remote id
 	}
 	if err = user.Validate(); err != nil {
@@ -156,10 +189,25 @@ func PostUser(c *gin.Context) {
 //	@Tags			Users
 //	@Param			Authorization	header	string	true	"Insert your personal access token"	default(Bearer <personal access token>)
 //	@Param			login			path	string	true	"the user's login name"
+//	@Param			forge_id		query	string	true	"specify forge (else default will be used)"
+//	@Param			forge_remote_id	query	string	false	"specify user id at forge (else fallback to login)"
 func DeleteUser(c *gin.Context) {
 	_store := store.FromContext(c)
 
-	user, err := _store.GetUserLogin(c.Param("login"))
+	forgeID, err := strconv.ParseInt(c.DefaultQuery("forge_id", fmt.Sprint(defaultForgeID)), 10, 64)
+	if err != nil {
+		c.AbortWithStatus(http.StatusBadRequest)
+		return
+	}
+	forgeRemoteID := model.ForgeRemoteID(c.Query("forge_remote_id"))
+
+	var user *model.User
+
+	if forgeRemoteID.IsValid() {
+		user, err = store.FromContext(c).GetUserByRemoteID(forgeID, forgeRemoteID)
+	} else {
+		user, err = store.FromContext(c).GetUserByLogin(forgeID, c.Param("login"))
+	}
 	if err != nil {
 		handleDBError(c, err)
 		return