member modify

This commit is contained in:
geek 2017-06-27 11:58:10 +09:00
parent 51430e1329
commit 15b5dc5985

View File

@ -5,10 +5,10 @@ import (
"errors" "errors"
"git.loafle.net/overflow/encryption_go" "git.loafle.net/overflow/encryption_go"
"git.loafle.net/overflow/overflow_service/proxy/apikey" "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/keystore"
"git.loafle.net/overflow/overflow_service/proxy/utils" "git.loafle.net/overflow/overflow_service/proxy/utils"
"log" "log"
"git.loafle.net/overflow/overflow_service/proxy/email"
) )
type Member struct { type Member struct {
@ -47,14 +47,16 @@ func (m *MemberService) Login(mem *Member) (string, error) {
if result == "" { if result == "" {
return "", errors.New("login reject") return "", errors.New("login reject")
} }
temp := Member{} temp := Member{}
err = json.Unmarshal([]byte(result), &temp) err = json.Unmarshal([]byte(result), &temp)
if err != nil { if err != nil {
return "", err 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) b := encryption.Check(mem.PwSalt, temp.PwSalt, temp.Pw)
if !b { if !b {
@ -83,10 +85,24 @@ func (m *MemberService) Regist(mem *Member) (string, error) {
} }
// Todo EmailAuth Send // 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 := email.NewEmailService()
es.SendEmailForAuth(e) es.SendEmailForAuth(e)
return re, nil
} }
func (m *MemberService) ReadByEmail(mem *Member) (string, error) { func (m *MemberService) ReadByEmail(mem *Member) (string, error) {