diff --git a/proxy/member/member_service.go b/proxy/member/member_service.go index 83902ee..c76593c 100644 --- a/proxy/member/member_service.go +++ b/proxy/member/member_service.go @@ -2,27 +2,30 @@ package member import ( "encoding/json" + "errors" + "git.loafle.net/overflow/encryption_go" "git.loafle.net/overflow/overflow_service/proxy" - "log" "git.loafle.net/overflow/overflow_service/proxy/apikey" "git.loafle.net/overflow/overflow_service/proxy/keystore" - "git.loafle.net/overflow/encryption_go" - "errors" + "log" ) type Member struct { - Id json.Number `json:"id,Number,omitempty"` - Email string `json:"email"` - PwSalt string `json:"pwSalt"` - Digest string `json:"digest"` - Name string `json:"name"` - Company string `json:"company"` - Phone string `json:"phone"` - AuthorizedDate json.Number `json:"authorizedDate,Number"` + Id json.Number `json:"id,Number,omitempty"` + Email string `json:"email"` + PwSalt string `json:"pwSalt"` + Pw string `json:"pw"` + Name string `json:"name"` + CompanyName string `json:"companyName"` + Phone string `json:"phone"` + Status *MetaMemberStatus `json:"status"` } +type MetaMemberStatus struct { + Id json.Number `json:"id,Number,omitempty"` + Name string `json:"name"` +} type MemberService struct { - } var TARGET_DAO = "member" @@ -43,14 +46,14 @@ func (m *MemberService) getMemberMap(mem *Member) map[string]string { log.Fatal("Json Marshal Error: ", err) } - memMap["com.loafle.overflow.member.model.Member"] = string(str) + memMap["com.loafle.overflow.module.member.model.Member"] = string(str) return memMap } -func (m *MemberService) Login(mem *Member) (string,error) { +func (m *MemberService) Login(mem *Member) (string, error) { - result,err := m.ReadByEmail(mem) + result, err := m.ReadByEmail(mem) if err != nil { return "", err } @@ -60,13 +63,13 @@ func (m *MemberService) Login(mem *Member) (string,error) { temp := Member{} err = json.Unmarshal([]byte(result), &temp) if err != nil { - return "", err - } - if temp.AuthorizedDate == "" { - return "", errors.New("Not authenticated.") + return "", err } + //if temp.AuthorizedDate == "" { + // return "", errors.New("Not authenticated.") + //} - b := encryption.Check(mem.PwSalt, temp.PwSalt, temp.Digest) + b := encryption.Check(mem.PwSalt, temp.PwSalt, temp.Pw) if !b { return "", errors.New("login reject") } @@ -74,7 +77,7 @@ func (m *MemberService) Login(mem *Member) (string,error) { return "login success", nil } -func (m *MemberService) Regist(mem *Member) (string, error ){ +func (m *MemberService) Regist(mem *Member) (string, error) { log.Println("Call Regist", mem.Email, mem.PwSalt) pwSalt, digest, err := encryption.Encrypt(mem.PwSalt) @@ -84,10 +87,10 @@ func (m *MemberService) Regist(mem *Member) (string, error ){ } mem.PwSalt = pwSalt - mem.Digest = digest + mem.Pw = digest memMap := m.getMemberMap(mem) - re, err := proxy.InvokeDB(TARGET_DAO, "create", memMap) + re, err := proxy.InvokeDB(TARGET_DAO, "save", memMap) if err != nil { return "", err } @@ -95,7 +98,7 @@ func (m *MemberService) Regist(mem *Member) (string, error ){ return re, nil } -func (m *MemberService) ReadByEmail(mem *Member) (string, error){ +func (m *MemberService) ReadByEmail(mem *Member) (string, error) { log.Println("Call ReadByEmail", mem.Email) memMap := m.getMemberMap(mem) re, err := proxy.InvokeDB(TARGET_DAO, "findByEmail", memMap) @@ -110,7 +113,7 @@ func (m *MemberService) ReadByEmail(mem *Member) (string, error){ func (m *MemberService) Read(mem *Member) (string, error) { log.Println("Call Read", mem.Email) // Todo Call DB Gateway - mem.Digest = "qwer5795" + mem.Pw = "qwer5795" //memMap := m.getMemberMap() mm := make(map[string]string) mm["id"] = string(mem.Id) @@ -127,7 +130,7 @@ func (m *MemberService) Read(mem *Member) (string, error) { func (m *MemberService) Modify(mem *Member) (string, error) { log.Println("Call Modify", mem.Email, "::", mem.PwSalt) // Todo Call DB Gateway - mem.Digest = "read" + mem.Pw = "read" memMap := m.getMemberMap(mem) re, err := proxy.InvokeDB(TARGET_DAO, "update", memMap) @@ -154,7 +157,6 @@ func (m *MemberService) Remove(mem *Member) (string, error) { return re, nil } - func (m *MemberService) EmailConfirm() (string, error) { ks := keystore.NewKeyStoreSerivce() @@ -173,6 +175,5 @@ func (m *MemberService) EmailConfirm() (string, error) { } //log.Println(out) - return "", nil -} \ No newline at end of file +} diff --git a/proxy/member/member_service_test.go b/proxy/member/member_service_test.go index b549ccb..47955e3 100644 --- a/proxy/member/member_service_test.go +++ b/proxy/member/member_service_test.go @@ -30,9 +30,11 @@ func TestMemberService_Regist(t *testing.T) { m := &Member{ Email:"geek2@loafle.com", PwSalt:"qwer5795", - Company:"Loafle", + Pw:"qwer5795", + CompanyName:"Loafle", Name:"Geek", Phone:"010-4055-6699", + Status:&MetaMemberStatus{Id:"1"}, } retMem, _ := ms.Regist(m) t.Log(retMem)