Merge pull request harness#3319 from fireinice/master

+ sync gitea redirecturl config from gitee for customize login redire…
eltociear · Aug 17, 2023 · 890c626 · 890c626
2 parents 7082fe9 + 78dc857
commit 890c626
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 1 deletion.
diff --git a/cmd/drone-server/config/config.go b/cmd/drone-server/config/config.go
@@ -353,6 +353,7 @@ type (
  Server string `envconfig:"DRONE_GITEA_SERVER"`
  ClientID string `envconfig:"DRONE_GITEA_CLIENT_ID"`
  ClientSecret string `envconfig:"DRONE_GITEA_CLIENT_SECRET"`
+ RedirectURL string `envconfig:"DRONE_GITEA_REDIRECT_URL"`
  SkipVerify bool `envconfig:"DRONE_GITEA_SKIP_VERIFY"`
  Scope []string `envconfig:"DRONE_GITEA_SCOPE" default:"repo,repo:status,user:email,read:org"`
  Debug bool `envconfig:"DRONE_GITEA_DEBUG"`

diff --git a/cmd/drone-server/inject_login.go b/cmd/drone-server/inject_login.go
@@ -116,13 +116,17 @@ func provideGiteaLogin(config config.Config) login.Middleware {
  if config.Gitea.Server == "" {
  return nil
  }
+ redirectURL := config.Gitea.RedirectURL
+ if redirectURL == "" {
+ redirectURL = config.Server.Addr + "/login"
+ }
  return &gitea.Config{
  ClientID: config.Gitea.ClientID,
  ClientSecret: config.Gitea.ClientSecret,
  Server: config.Gitea.Server,
  Client: defaultClient(config.Gitea.SkipVerify),
  Logger: logrus.StandardLogger(),
- RedirectURL: config.Server.Addr + "/login",
+ RedirectURL: redirectURL,
  Scope: config.Gitea.Scope,
  }
 }