mirrors/woodpecker
1
0
Fork 0
mirror of https://github.com/woodpecker-ci/woodpecker.git synced 2025-01-24 16:18:42 +00:00
Code Issues Projects Releases Wiki Activity

save forge at the beginning and use it (#1939)

Browse source 
fly-by refactor ...
This commit is contained in:
6543 2023-07-07 15:43:11 +02:00 committed by GitHub
parent 2961aaf72b
commit b4acbafffc
No known key found for this signature in database
GPG key ID: 4AEE18F83AFDEB23
1 changed files with 5 additions and 4 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

9
server/api/login.go
View file

@ -46,12 +46,13 @@ func HandleLogin(c *gin.Context) {
func HandleAuth(c *gin.Context) { func HandleAuth(c *gin.Context) {
_store := store.FromContext(c) _store := store.FromContext(c)
_forge := server.Config.Services.Forge
// when dealing with redirects we may need to adjust the content type. I // when dealing with redirects we may need to adjust the content type. I
// cannot, however, remember why, so need to revisit this line. // cannot, however, remember why, so need to revisit this line.
c.Writer.Header().Del("Content-Type") c.Writer.Header().Del("Content-Type")
tmpuser, err := server.Config.Services.Forge.Login(c, c.Writer, c.Request) tmpuser, err := _forge.Login(c, c.Writer, c.Request)
if err != nil { if err != nil {
log.Error().Msgf("cannot authenticate user. %s", err) log.Error().Msgf("cannot authenticate user. %s", err)
c.Redirect(http.StatusSeeOther, "/login?error=oauth_error") c.Redirect(http.StatusSeeOther, "/login?error=oauth_error")
@ -82,7 +83,7 @@ func HandleAuth(c *gin.Context) {
// if self-registration is enabled for whitelisted organizations we need to // if self-registration is enabled for whitelisted organizations we need to
// check the user's organization membership. // check the user's organization membership.
if len(config.Orgs) != 0 { if len(config.Orgs) != 0 {
teams, terr := server.Config.Services.Forge.Teams(c, tmpuser) teams, terr := _forge.Teams(c, tmpuser)
if terr != nil || !config.IsMember(teams) { if terr != nil || !config.IsMember(teams) {
log.Error().Msgf("cannot verify team membership for %s.", u.Login) log.Error().Msgf("cannot verify team membership for %s.", u.Login)
c.Redirect(303, "/login?error=access_denied") c.Redirect(303, "/login?error=access_denied")
@ -123,7 +124,7 @@ func HandleAuth(c *gin.Context) {
// if self-registration is enabled for whitelisted organizations we need to // if self-registration is enabled for whitelisted organizations we need to
// check the user's organization membership. // check the user's organization membership.
if len(config.Orgs) != 0 { if len(config.Orgs) != 0 {
teams, terr := server.Config.Services.Forge.Teams(c, u) teams, terr := _forge.Teams(c, u)
if terr != nil || !config.IsMember(teams) { if terr != nil || !config.IsMember(teams) {
log.Error().Msgf("cannot verify team membership for %s.", u.Login) log.Error().Msgf("cannot verify team membership for %s.", u.Login)
c.Redirect(http.StatusSeeOther, "/login?error=access_denied") c.Redirect(http.StatusSeeOther, "/login?error=access_denied")
@ -145,7 +146,7 @@ func HandleAuth(c *gin.Context) {
return return
} }
repos, _ := server.Config.Services.Forge.Repos(c, u) repos, _ := _forge.Repos(c, u)
for _, forgeRepo := range repos { for _, forgeRepo := range repos {
dbRepo, err := _store.GetRepoForgeID(forgeRepo.ForgeRemoteID) dbRepo, err := _store.GetRepoForgeID(forgeRepo.ForgeRemoteID)
if err != nil && errors.Is(err, types.RecordNotExist) { if err != nil && errors.Is(err, types.RecordNotExist) {