From 678463c1351780ac1af0f546b86f9a0beb434271 Mon Sep 17 00:00:00 2001 From: jackHay22 Date: Wed, 6 Sep 2023 10:39:43 -0400 Subject: [PATCH 1/2] if registration disabled, invite link should be for login --- services/mailer/mail_team_invite.go | 4 ++-- 1 file changed, 2 insertions(+), 2 deletions(-) diff --git a/services/mailer/mail_team_invite.go b/services/mailer/mail_team_invite.go index 1403923c79543..536be2db70c2b 100644 --- a/services/mailer/mail_team_invite.go +++ b/services/mailer/mail_team_invite.go @@ -46,8 +46,8 @@ func MailTeamInvite(ctx context.Context, inviter *user_model.User, team *org_mod inviteRedirect := url.QueryEscape(fmt.Sprintf("/org/invite/%s", invite.Token)) inviteURL := fmt.Sprintf("%suser/sign_up?redirect_to=%s", setting.AppURL, inviteRedirect) - if err == nil && user != nil { - // user account exists + if (err == nil && user != nil) || setting.Service.AllowOnlyExternalRegistration { + // user account exists or registration disabled inviteURL = fmt.Sprintf("%suser/login?redirect_to=%s", setting.AppURL, inviteRedirect) } From 769ad7c95e4a680b9032dee0e8c3881d8b5ccf62 Mon Sep 17 00:00:00 2001 From: jackHay22 Date: Wed, 6 Sep 2023 10:59:39 -0400 Subject: [PATCH 2/2] include other setting --- services/mailer/mail_team_invite.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/services/mailer/mail_team_invite.go b/services/mailer/mail_team_invite.go index 536be2db70c2b..88ad0c9836560 100644 --- a/services/mailer/mail_team_invite.go +++ b/services/mailer/mail_team_invite.go @@ -46,7 +46,7 @@ func MailTeamInvite(ctx context.Context, inviter *user_model.User, team *org_mod inviteRedirect := url.QueryEscape(fmt.Sprintf("/org/invite/%s", invite.Token)) inviteURL := fmt.Sprintf("%suser/sign_up?redirect_to=%s", setting.AppURL, inviteRedirect) - if (err == nil && user != nil) || setting.Service.AllowOnlyExternalRegistration { + if (err == nil && user != nil) || setting.Service.DisableRegistration || setting.Service.AllowOnlyExternalRegistration { // user account exists or registration disabled inviteURL = fmt.Sprintf("%suser/login?redirect_to=%s", setting.AppURL, inviteRedirect) }