gamzinav/forgejo
1
0
Fork 0
Code Issues Pull Requests Actions Packages Projects Releases Wiki Activity

Revert "Prevent a user with a different email from accepting the team invite" (#24531)

Browse Source 
Reverts go-gitea/gitea#24491
This commit is contained in:
Lunny Xiao 2023-05-05 15:59:12 +08:00 committed by GitHub
parent 421840486f
commit 3ee7f27341
No known key found for this signature in database
GPG Key ID: 4AEE18F83AFDEB23
3 changed files with 11 additions and 26 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

1
options/locale/locale_en-US.ini
View File

@ -2561,7 +2561,6 @@ teams.all_repositories_admin_permission_desc = This team grants <strong>Admin</s
teams.invite.title = You've been invited to join team <strong>%s</strong> in organization <strong>%s</strong>. teams.invite.title = You've been invited to join team <strong>%s</strong> in organization <strong>%s</strong>.
teams.invite.by = Invited by %s teams.invite.by = Invited by %s
teams.invite.description = Please click the button below to join the team. teams.invite.description = Please click the button below to join the team.
teams.invite.email_mismatch = Your email address does not match this invite.
[admin] [admin]
dashboard = Dashboard dashboard = Dashboard

8
routers/web/org/teams.go
View File

@ -552,7 +552,6 @@ func TeamInvite(ctx *context.Context) {
ctx.Data["Organization"] = org ctx.Data["Organization"] = org
ctx.Data["Team"] = team ctx.Data["Team"] = team
ctx.Data["Inviter"] = inviter ctx.Data["Inviter"] = inviter
ctx.Data["EmailMismatch"] = ctx.Doer.Email != invite.Email
ctx.HTML(http.StatusOK, tplTeamInvite) ctx.HTML(http.StatusOK, tplTeamInvite)
} }
@ -569,13 +568,6 @@ func TeamInvitePost(ctx *context.Context) {
return return
} }
// check that the Doer is the invitee
if ctx.Doer.Email != invite.Email {
log.Info("invite %d does not apply to the current user %d", invite.ID, ctx.Doer.ID)
ctx.NotFound("ErrTeamInviteNotFound", err)
return
}
if err := models.AddTeamMember(team, ctx.Doer.ID); err != nil { if err := models.AddTeamMember(team, ctx.Doer.ID); err != nil {
ctx.ServerError("AddTeamMember", err) ctx.ServerError("AddTeamMember", err)
return return

28
templates/org/team/invite.tmpl
View File

@ -6,23 +6,17 @@
<div class="image"> <div class="image">
{{avatar $.Context .Organization 140}} {{avatar $.Context .Organization 140}}
</div> </div>
{{if .EmailMismatch}} <div class="content">
<div class="content"> <div class="header">{{.locale.Tr "org.teams.invite.title" .Team.Name .Organization.Name | Str2html}}</div>
<div class="header">{{.locale.Tr "org.teams.invite.email_mismatch"}}</div> <div class="meta">{{.locale.Tr "org.teams.invite.by" .Inviter.Name}}</div>
</div> <div class="description">{{.locale.Tr "org.teams.invite.description"}}</div>
{{else}} </div>
<div class="content"> <div class="extra content">
<div class="header">{{.locale.Tr "org.teams.invite.title" .Team.Name .Organization.Name | Str2html}}</div> <form class="ui form" action="" method="post">
<div class="meta">{{.locale.Tr "org.teams.invite.by" .Inviter.Name}}</div> {{.CsrfTokenHtml}}
<div class="description">{{.locale.Tr "org.teams.invite.description"}}</div> <button class="fluid ui green button">{{.locale.Tr "org.teams.join"}}</button>
</div> </form>
<div class="extra content"> </div>
<form class="ui form" action="" method="post">
{{.CsrfTokenHtml}}
<button class="fluid ui green button">{{.locale.Tr "org.teams.join"}}</button>
</form>
</div>
{{end}}
</div> </div>
</div> </div>
</div> </div>