From 3e74e30845d1d0d03df80cf6babe7a2bc9a5ad6a Mon Sep 17 00:00:00 2001 From: cmj Date: Fri, 14 Feb 2020 16:01:48 +0800 Subject: [PATCH 1/2] Fix bug when refresh gitea access token When the URI has extra '/' in DRONE_GITEA_SERVER, the drone will not pull the repo since it cannot refresh the access token. The log in gitea shows the drone try to access '//login/oauth/access_token' Related to commit 5414bb75f --- cmd/drone-server/inject_login.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/cmd/drone-server/inject_login.go b/cmd/drone-server/inject_login.go index f9c84f9ab..27f35b7a4 100644 --- a/cmd/drone-server/inject_login.go +++ b/cmd/drone-server/inject_login.go @@ -169,7 +169,7 @@ func provideRefresher(config config.Config) *oauth2.Refresher { return &oauth2.Refresher{ ClientID: config.Gitea.ClientID, ClientSecret: config.Gitea.ClientSecret, - Endpoint: config.Gitea.Server + "/login/oauth/access_token", + Endpoint: strings.TrimSuffix(config.Gitea.Server, "/") + "/login/oauth/access_token", Source: oauth2.ContextTokenSource(), Client: defaultClient(config.Gitea.SkipVerify), } From 74423bfacd30ae159f58e052311b48ce5a720316 Mon Sep 17 00:00:00 2001 From: cmj Date: Fri, 14 Feb 2020 16:08:08 +0800 Subject: [PATCH 2/2] Missing the strings library --- cmd/drone-server/inject_login.go | 1 + 1 file changed, 1 insertion(+) diff --git a/cmd/drone-server/inject_login.go b/cmd/drone-server/inject_login.go index 27f35b7a4..c80cf09fa 100644 --- a/cmd/drone-server/inject_login.go +++ b/cmd/drone-server/inject_login.go @@ -24,6 +24,7 @@ import ( "github.com/drone/go-login/login/gogs" "github.com/drone/go-login/login/stash" "github.com/drone/go-scm/scm/transport/oauth2" + "strings" "github.com/google/wire" "github.com/sirupsen/logrus"