mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-03-30 16:09:40 +00:00
Code Issues Projects Releases Wiki Activity

Fix addon nil values (#4666)

Browse source
This commit is contained in:
qwerty287 2025-01-05 13:45:53 +02:00 committed by GitHub
parent 02bb4a12a7
commit ba68b446c0
No known key found for this signature in database
GPG key ID: B5690EEEBB952194
1 changed files with 12 additions and 0 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

12
server/forge/addon/args.go
View file

@ -110,6 +110,9 @@ type modelUser struct {
} }
func (m *modelUser) asModel() *model.User { func (m *modelUser) asModel() *model.User {
if m == nil {
return nil
}
m.User.ForgeRemoteID = m.ForgeRemoteID m.User.ForgeRemoteID = m.ForgeRemoteID
m.User.AccessToken = m.Token m.User.AccessToken = m.Token
m.User.RefreshToken = m.Secret m.User.RefreshToken = m.Secret
@ -119,6 +122,9 @@ func (m *modelUser) asModel() *model.User {
} }
func modelUserFromModel(u *model.User) *modelUser { func modelUserFromModel(u *model.User) *modelUser {
if u == nil {
return nil
}
return &modelUser{ return &modelUser{
User: u, User: u,
ForgeRemoteID: u.ForgeRemoteID, ForgeRemoteID: u.ForgeRemoteID,
@ -138,6 +144,9 @@ type modelRepo struct {
} }
func (m *modelRepo) asModel() *model.Repo { func (m *modelRepo) asModel() *model.Repo {
if m == nil {
return nil
}
m.Repo.UserID = m.UserID m.Repo.UserID = m.UserID
m.Repo.Hash = m.Hash m.Repo.Hash = m.Hash
m.Repo.Perm = m.Perm m.Repo.Perm = m.Perm
@ -145,6 +154,9 @@ func (m *modelRepo) asModel() *model.Repo {
} }
func modelRepoFromModel(r *model.Repo) *modelRepo { func modelRepoFromModel(r *model.Repo) *modelRepo {
if r == nil {
return nil
}
return &modelRepo{ return &modelRepo{
Repo: r, Repo: r,
UserID: r.UserID, UserID: r.UserID,