patchii/forgejo
1
0
Fork 0
Code Issues Pull requests Projects Releases Packages Wiki Activity Actions

remove global actionUser

Browse source
This commit is contained in:
Michael Jerger 2023-12-13 16:49:23 +01:00
parent a0c008b880
commit 42854c9003
1 changed files with 6 additions and 9 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

15
routers/api/v1/activitypub/repository.go
View file

@ -26,12 +26,9 @@ import (
pwd_gen "github.com/sethvargo/go-password/password" pwd_gen "github.com/sethvargo/go-password/password"
) )
// TODO: remove this global var!
var actionsUser = user_model.NewActionsUser()
// TODO: Move this to model.user.search ? or to model.user.externalLoginUser ? // TODO: Move this to model.user.search ? or to model.user.externalLoginUser ?
func SearchUsersByLoginName(loginName string) ([]*user_model.User, error) { func SearchUsersByLoginName(loginName string) ([]*user_model.User, error) {
var actionsUser = user_model.NewActionsUser()
actionsUser.IsAdmin = true actionsUser.IsAdmin = true
options := &user_model.SearchUserOptions{ options := &user_model.SearchUserOptions{
@ -150,18 +147,17 @@ func RepositoryInbox(ctx *context.APIContext) {
ctx.ServerError(fmt.Sprintf("Searching for user failed: %v"), err) ctx.ServerError(fmt.Sprintf("Searching for user failed: %v"), err)
return return
} }
log.Info("created user from ap: %v", user)
} }
case 1: case 1:
{ {
user = users[0] user = users[0]
log.Info("Found user full name was: %v", user.FullName) log.Info("found user: %v", user)
log.Info("Found user name was: %v", user.Name)
log.Info("Found user loginname was: %v", user.LoginName)
log.Info("%v", user)
} }
default: default:
{ {
panic(fmt.Errorf("found more than one matches for federated users")) ctx.Error(http.StatusInternalServerError, "StarRepo", fmt.Errorf("found more than one matches for federated users"))
return
} }
} }
@ -201,6 +197,7 @@ func RepositoryInbox(ctx *context.APIContext) {
func createUserFromAP(ctx *context.APIContext, actorId forgefed.PersonId) (*user_model.User, error) { func createUserFromAP(ctx *context.APIContext, actorId forgefed.PersonId) (*user_model.User, error) {
// ToDo: Do we get a publicKeyId from server, repo or owner or repo? // ToDo: Do we get a publicKeyId from server, repo or owner or repo?
var actionsUser = user_model.NewActionsUser()
client, err := api.NewClient(ctx, actionsUser, "no ide where to get key material.") client, err := api.NewClient(ctx, actionsUser, "no ide where to get key material.")
if err != nil { if err != nil {
return &user_model.User{}, err return &user_model.User{}, err