From 4c967682be4ddbf5ce099794ab2d7306ce5752fb Mon Sep 17 00:00:00 2001 From: zouap Date: Mon, 5 Sep 2022 16:46:26 +0800 Subject: [PATCH] =?UTF-8?q?=E4=BB=A3=E7=A0=81=E6=8F=90=E4=BA=A4=E3=80=82?= MIME-Version: 1.0 Content-Type: text/plain; charset=UTF-8 Content-Transfer-Encoding: 8bit Signed-off-by: zouap --- routers/user/Invitation.go | 26 ++++++++++++++++---------- 1 file changed, 16 insertions(+), 10 deletions(-) diff --git a/routers/user/Invitation.go b/routers/user/Invitation.go index 370631bb9..ab5e7d466 100644 --- a/routers/user/Invitation.go +++ b/routers/user/Invitation.go @@ -5,7 +5,6 @@ import ( "strings" "code.gitea.io/gitea/models" - "code.gitea.io/gitea/modules/auth" "code.gitea.io/gitea/modules/base" "code.gitea.io/gitea/modules/context" "code.gitea.io/gitea/modules/log" @@ -55,23 +54,30 @@ func InviationTpl(ctx *context.Context) { ctx.HTML(200, tplInvitation) } -func RegisteUserByInvitaionCode(form auth.RegisterForm, newUserId int64) error { - invitationcode := form.InvitaionCode +func RegisteUserByInvitaionCode(invitationcode string, newUserId int64) error { + user := parseInvitaionCode(invitationcode) + if user == nil { + return errors.New("The invitated user not existed.") + } - re := models.QueryInvitaionByPhone(form.PhoneNumber) - if re != nil { - if len(re) > 0 { - log.Info("The phone has been invitated. so ingore it.") - return errors.New("The phone has been invitated.") + if user.PhoneNumber != "" { + re := models.QueryInvitaionByPhone(user.PhoneNumber) + if re != nil { + if len(re) > 0 { + log.Info("The phone has been invitated. so ingore it.") + return errors.New("The phone has been invitated.") + } } + } else { + log.Info("the phone number is null. user name=" + user.Name) } - user := parseInvitaionCode(invitationcode) invitation := &models.Invitation{ SrcUserID: user.ID, UserID: newUserId, - Phone: form.PhoneNumber, + Phone: user.PhoneNumber, } + err := models.InsertInvitaion(invitation) if err != nil { log.Info("insert error," + err.Error())