mirror of
https://github.com/woodpecker-ci/woodpecker.git
synced 2024-11-27 04:11:03 +00:00
migrate
This commit is contained in:
parent
4e28420a64
commit
eb8e2fd2f2
1 changed files with 15 additions and 17 deletions
|
@ -138,30 +138,28 @@ func (c *client) Login(res http.ResponseWriter, req *http.Request) (*model.User,
|
||||||
|
|
||||||
client := c.newClient()
|
client := c.newClient()
|
||||||
|
|
||||||
// try to fetch drone token if it exists
|
// since api does not return token secret, if drone token exists create new one
|
||||||
var accessToken string
|
var accessToken string
|
||||||
tokens, err := client.ListAccessTokens(username, password)
|
client.SetBasicAuth(username, password)
|
||||||
|
tokens, err := client.ListAccessTokens(gitea.ListAccessTokensOptions{})
|
||||||
if err == nil {
|
if err == nil {
|
||||||
for _, token := range tokens {
|
for _, token := range tokens {
|
||||||
if token.Name == "drone" {
|
if token.Name == "drone" {
|
||||||
accessToken = token.Sha1
|
if err := client.DeleteAccessToken(token.ID); err != nil {
|
||||||
|
return nil, err
|
||||||
|
}
|
||||||
break
|
break
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
}
|
}
|
||||||
|
|
||||||
// if drone token not found, create it
|
token, terr := client.CreateAccessToken(
|
||||||
if accessToken == "" {
|
gitea.CreateAccessTokenOption{Name: "drone"},
|
||||||
token, terr := client.CreateAccessToken(
|
)
|
||||||
username,
|
if terr != nil {
|
||||||
password,
|
return nil, terr
|
||||||
gitea.CreateAccessTokenOption{Name: "drone"},
|
|
||||||
)
|
|
||||||
if terr != nil {
|
|
||||||
return nil, terr
|
|
||||||
}
|
|
||||||
accessToken = token.Sha1
|
|
||||||
}
|
}
|
||||||
|
accessToken = token.Token
|
||||||
|
|
||||||
client = c.newClientToken(accessToken)
|
client = c.newClientToken(accessToken)
|
||||||
account, err := client.GetUserInfo(username)
|
account, err := client.GetUserInfo(username)
|
||||||
|
@ -185,7 +183,7 @@ func (c *client) Auth(token, secret string) (string, error) {
|
||||||
// Teams is supported by the Gitea driver.
|
// Teams is supported by the Gitea driver.
|
||||||
func (c *client) Teams(u *model.User) ([]*model.Team, error) {
|
func (c *client) Teams(u *model.User) ([]*model.Team, error) {
|
||||||
client := c.newClientToken(u.Token)
|
client := c.newClientToken(u.Token)
|
||||||
orgs, err := client.ListMyOrgs()
|
orgs, err := client.ListMyOrgs(gitea.ListOrgsOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return nil, err
|
return nil, err
|
||||||
}
|
}
|
||||||
|
@ -221,7 +219,7 @@ func (c *client) Repos(u *model.User) ([]*model.Repo, error) {
|
||||||
repos := []*model.Repo{}
|
repos := []*model.Repo{}
|
||||||
|
|
||||||
client := c.newClientToken(u.Token)
|
client := c.newClientToken(u.Token)
|
||||||
all, err := client.ListMyRepos()
|
all, err := client.ListMyRepos(gitea.ListReposOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return repos, err
|
return repos, err
|
||||||
}
|
}
|
||||||
|
@ -318,7 +316,7 @@ func (c *client) Activate(u *model.User, r *model.Repo, link string) error {
|
||||||
func (c *client) Deactivate(u *model.User, r *model.Repo, link string) error {
|
func (c *client) Deactivate(u *model.User, r *model.Repo, link string) error {
|
||||||
client := c.newClientToken(u.Token)
|
client := c.newClientToken(u.Token)
|
||||||
|
|
||||||
hooks, err := client.ListRepoHooks(r.Owner, r.Name)
|
hooks, err := client.ListRepoHooks(r.Owner, r.Name, gitea.ListHooksOptions{})
|
||||||
if err != nil {
|
if err != nil {
|
||||||
return err
|
return err
|
||||||
}
|
}
|
||||||
|
|
Loading…
Reference in a new issue