Commit 98046bb

martinhpedersenunknwon

authored and

committed

Backward compatibility (username vs. login)

Reintroduce the username field for user object on JSON marshal to fix backward compatibility. Fixes Drone 0.4 compatibility issues.

1 parent 3693f6a commit 98046bbCopy full SHA for 98046bb

File tree

+12

-1

lines changed

+12

-1

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.4"`
	`17`	`+ return "0.12.5"`
`18`	`18`	`}`
`19`	`19`
`20`	`20`	`// Client represents a Gogs API client.`

Lines changed: 11 additions & 0 deletions

Original file line number	Diff line number	Diff line change
`@@ -5,6 +5,7 @@`
`5`	`5`	`package gogs`
`6`	`6`
`7`	`7`	`import (`
	`8`	`+ "encoding/json"`
`8`	`9`	`"fmt"`
`9`	`10`	`)`
`10`	`11`
`@@ -17,6 +18,16 @@ type User struct {`
`17`	`18`	AvatarUrl string `json:"avatar_url"`
`18`	`19`	`}`
`19`	`20`
	`21`	`+// MarshalJSON implements the json.Marshaler interface for User, adding field(s) for backward compatibility`
	`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`	+ CompatUserName string `json:"username"`
	`28`	`+ }{shadow(u), u.UserName})`
	`29`	`+}`
	`30`	`+`
`20`	`31`	`func (c Client) GetUserInfo(user string) (User, error) {`
`21`	`32`	`u := new(User)`
`22`	`33`	`err := c.getParsedResponse("GET", fmt.Sprintf("/users/%s", user), nil, nil, u)`

Comments

(0)