Skip to content

Team invite url fix when registration disabled #26950

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

Sign up for GitHub

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 7 commits into from
Sep 7, 2023
Merged

Team invite url fix when registration disabled #26950

Changes from all commits
Commits
Show all changes
7 commits
Select commit Hold shift + click to select a range
678463c
if registration disabled, invite link should be for login
jackHay22 Sep 6, 2023
769ad7c
include other setting
jackHay22 Sep 6, 2023
2b3ca25
Merge branch 'main' into jh/fix-invite-registration-disabled
GiteaBot Sep 7, 2023
3aef6cd
Merge branch 'main' into jh/fix-invite-registration-disabled
GiteaBot Sep 7, 2023
b599c75
Merge branch 'main' into jh/fix-invite-registration-disabled
GiteaBot Sep 7, 2023
0983da5
Merge branch 'main' into jh/fix-invite-registration-disabled
GiteaBot Sep 7, 2023
9e8ef33
Merge branch 'main' into jh/fix-invite-registration-disabled
GiteaBot Sep 7, 2023
File filter

Filter by extension

Filter by extension
Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
4 changes: 2 additions & 2 deletions services/mailer/mail_team_invite.go
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -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.DisableRegistration || setting.Service.AllowOnlyExternalRegistration {
// user account exists or registration disabled
inviteURL = fmt.Sprintf("%suser/login?redirect_to=%s", setting.AppURL, inviteRedirect)
}

Expand Down