From 3ee7f273417c09c3b54ffd317184739c76f41064 Mon Sep 17 00:00:00 2001 From: Lunny Xiao Date: Fri, 5 May 2023 15:59:12 +0800 Subject: [PATCH] Revert "Prevent a user with a different email from accepting the team invite" (#24531) Reverts go-gitea/gitea#24491 --- options/locale/locale_en-US.ini | 1 - routers/web/org/teams.go | 8 -------- templates/org/team/invite.tmpl | 28 +++++++++++----------------- 3 files changed, 11 insertions(+), 26 deletions(-) diff --git a/options/locale/locale_en-US.ini b/options/locale/locale_en-US.ini index ee8ec1a3ad..fc5eccb2db 100644 --- a/options/locale/locale_en-US.ini +++ b/options/locale/locale_en-US.ini @@ -2561,7 +2561,6 @@ teams.all_repositories_admin_permission_desc = This team grants Admin%s in organization %s. teams.invite.by = Invited by %s 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] dashboard = Dashboard diff --git a/routers/web/org/teams.go b/routers/web/org/teams.go index 9a0f49b688..2ce4bf5322 100644 --- a/routers/web/org/teams.go +++ b/routers/web/org/teams.go @@ -552,7 +552,6 @@ func TeamInvite(ctx *context.Context) { ctx.Data["Organization"] = org ctx.Data["Team"] = team ctx.Data["Inviter"] = inviter - ctx.Data["EmailMismatch"] = ctx.Doer.Email != invite.Email ctx.HTML(http.StatusOK, tplTeamInvite) } @@ -569,13 +568,6 @@ func TeamInvitePost(ctx *context.Context) { 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 { ctx.ServerError("AddTeamMember", err) return diff --git a/templates/org/team/invite.tmpl b/templates/org/team/invite.tmpl index 8d1fad0141..55ecd049b3 100644 --- a/templates/org/team/invite.tmpl +++ b/templates/org/team/invite.tmpl @@ -6,23 +6,17 @@
{{avatar $.Context .Organization 140}}
- {{if .EmailMismatch}} -
-
{{.locale.Tr "org.teams.invite.email_mismatch"}}
-
- {{else}} -
-
{{.locale.Tr "org.teams.invite.title" .Team.Name .Organization.Name | Str2html}}
-
{{.locale.Tr "org.teams.invite.by" .Inviter.Name}}
-
{{.locale.Tr "org.teams.invite.description"}}
-
-
-
- {{.CsrfTokenHtml}} - -
-
- {{end}} +
+
{{.locale.Tr "org.teams.invite.title" .Team.Name .Organization.Name | Str2html}}
+
{{.locale.Tr "org.teams.invite.by" .Inviter.Name}}
+
{{.locale.Tr "org.teams.invite.description"}}
+
+
+
+ {{.CsrfTokenHtml}} + +
+