diff --git a/proxy/member/member_service.go b/proxy/member/member_service.go index 85f0590..18b521d 100644 --- a/proxy/member/member_service.go +++ b/proxy/member/member_service.go @@ -5,10 +5,10 @@ import ( "errors" "git.loafle.net/overflow/encryption_go" "git.loafle.net/overflow/overflow_service/proxy/apikey" + "git.loafle.net/overflow/overflow_service/proxy/email" "git.loafle.net/overflow/overflow_service/proxy/keystore" "git.loafle.net/overflow/overflow_service/proxy/utils" "log" - "git.loafle.net/overflow/overflow_service/proxy/email" ) type Member struct { @@ -47,14 +47,16 @@ func (m *MemberService) Login(mem *Member) (string, error) { if result == "" { return "", errors.New("login reject") } + temp := Member{} err = json.Unmarshal([]byte(result), &temp) if err != nil { return "", err } - //if temp.AuthorizedDate == "" { - // return "", errors.New("Not authenticated.") - //} + + if temp.Status.Id == "1" { + return result, errors.New("Email Auth Confirm") + } b := encryption.Check(mem.PwSalt, temp.PwSalt, temp.Pw) if !b { @@ -83,10 +85,24 @@ func (m *MemberService) Regist(mem *Member) (string, error) { } // Todo EmailAuth Send - e := email.NewEmail(mem ,"") + m.sendEmail(re) + + return re, nil +} + +func (ms *MemberService) sendEmail(memberStr string) { + + tm := &Member{} + + err := json.Unmarshal([]byte(memberStr), tm) + + if err != nil { + log.Fatal(err) + } + e := email.NewEmail(tm.Id, tm.Email, tm.CompanyName, tm.Name, "") + es := email.NewEmailService() es.SendEmailForAuth(e) - return re, nil } func (m *MemberService) ReadByEmail(mem *Member) (string, error) {