Commit 2040be8

committed

user: replace MarshalJSON with a legacy field

MarshalJSON causes side effect when use *User as embeded struct gogs/gogs#5538.

1 parent 0c04027 commit 2040be8Copy full SHA for 2040be8

File tree

-14

lines changed

-14

lines changed

Lines changed: 1 addition & 1 deletion

Original file line number	Diff line number	Diff line change
`@@ -14,7 +14,7 @@ import (`
`14`	`14`	`)`
`15`	`15`
`16`	`16`	`func Version() string {`
`17`		`- return "0.12.13"`
	`17`	`+ return "0.12.14"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`// Client represents a Gogs API client.`

Lines changed: 2 additions & 13 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,30 +5,19 @@`
`5`	`5`	`package gogs`
`6`	`6`
`7`	`7`	`import (`
`8`		`- "encoding/json"`
`9`	`8`	`"fmt"`
`10`	`9`	`)`
`11`	`10`
`12`	`11`	`// User represents a API user.`
`13`	`12`	`type User struct {`
`14`	`13`	ID int64 `json:"id"`
`15`		- UserName string `json:"login"`
	`14`	+ UserName string `json:"username"` // LEGACY [Gogs 1.0]: remove field(s) for backward compatibility
	`15`	+ Login string `json:"login"`
`16`	`16`	FullName string `json:"full_name"`
`17`	`17`	Email string `json:"email"`
`18`	`18`	AvatarUrl string `json:"avatar_url"`
`19`	`19`	`}`
`20`	`20`
`21`		`-// MarshalJSON implements the json.Marshaler interface for User`
`22`		`-func (u User) MarshalJSON() ([]byte, error) {`
`23`		`- // Re-declaring User to avoid recursion`
`24`		`- type shadow User`
`25`		`- return json.Marshal(struct {`
`26`		`- shadow`
`27`		`- // LEGACY [Gogs 1.0]: remove field(s) for backward compatibility`
`28`		- CompatUserName string `json:"username"`
`29`		`- }{shadow(u), u.UserName})`
`30`		`-}`
`31`		`-`
`32`	`21`	`func (c Client) GetUserInfo(user string) (User, error) {`
`33`	`22`	`u := new(User)`
`34`	`23`	`err := c.getParsedResponse("GET", fmt.Sprintf("/users/%s", user), nil, nil, u)`

Comments

(0)