From 448f1d54b4719ee23edadcc29a95d7a8ef0d5dc1 Mon Sep 17 00:00:00 2001 From: techknowlogick Date: Wed, 5 Jun 2019 17:36:10 -0400 Subject: [PATCH] rm basic auth option from Gitea --- cmd/drone-server/inject_login.go | 24 ++++++++---------------- 1 file changed, 8 insertions(+), 16 deletions(-) diff --git a/cmd/drone-server/inject_login.go b/cmd/drone-server/inject_login.go index caadae391..691a8ac85 100644 --- a/cmd/drone-server/inject_login.go +++ b/cmd/drone-server/inject_login.go @@ -92,22 +92,14 @@ func provideGiteaLogin(config config.Config) login.Middleware { if config.Gitea.Server == "" { return nil } - if config.Gitea.ClientID != "" { - 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", - Scope: config.Gitea.Scope, - } - } - return &gogs.Config{ - Label: "drone", - Login: "/login/form", - Server: config.Gitea.Server, - Client: defaultClient(config.Gitea.SkipVerify), + 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", + Scope: config.Gitea.Scope, } }