diff --git a/proxy/member_service.go b/proxy/member_service.go index a95f100..1ab86c0 100644 --- a/proxy/member_service.go +++ b/proxy/member_service.go @@ -3,9 +3,12 @@ package proxy import ( "log" "encoding/json" + //"loafle.com/overflow/encryption_go/src/loafle.com/overflow/encryption" + //"strings" ) type MemberService struct { + Id string `json:"id"` Email string `json:"email"` PwSalt string `json:"pwSalt"` Digest string `json:"digest"` @@ -35,26 +38,64 @@ func (m *MemberService) getMemberMap() (map[string]string) { return memMap } +func (m *MemberService) Login() string { + log.Println("Call Login", m.Email, m.PwSalt) + + mStr := m.Read() + + mTemp := &MemberService{} + json.Unmarshal([]byte(mStr), mTemp) + + //pwSalt, digest, err := encryption.Encrypt(m.PwSalt) + //if { + // + //} + log.Println("member Pw: ", m.PwSalt) + log.Println("member Temp Pw: ", mTemp.PwSalt) + + if m.PwSalt != mTemp.PwSalt { + return "login reject" + } + + return "login success" +} + func (m *MemberService) Regist() (string){ log.Println("Call Regist", m.Email, m.PwSalt) // Todo Call DB Gateway - - m.Digest = "dddddddd" - + m.Digest = "qwer5795" memMap := m.getMemberMap() + //pwSalt, digest, err := encryption.Encrypt(m.PwSalt) + + //if err != nil { + // log.Fatal("encryption Encrypt Error: ", err) + //} + // + //m.PwSalt = string(pwSalt) + //m.Digest = string(digest) + re := invokeDB(TARGET_DAO, "create", memMap) return re } +func (m *MemberService) ReadByEmail() (string) { + log.Println("Call ReadByEmail", m.Email) + memMap := m.getMemberMap() + re := invokeDB(TARGET_DAO, "findByEmail", memMap) + return "" +} + func (m *MemberService) Read() (string){ log.Println("Call Read", m.Email) // Todo Call DB Gateway - m.Digest = "read" - memMap := m.getMemberMap() - - re := invokeDB(TARGET_DAO, "find", memMap) + m.Digest = "qwer5795" + //memMap := m.getMemberMap() + mm := make(map[string]string) + mm["id"] = m.Id + log.Println("Read Member", m) + re := invokeDB(TARGET_DAO, "find", mm) return re } diff --git a/proxy/member_service_test.go b/proxy/member_service_test.go new file mode 100644 index 0000000..02e4938 --- /dev/null +++ b/proxy/member_service_test.go @@ -0,0 +1,51 @@ +package proxy + +import ( + "testing" + "log" + "loafle.com/overflow/encryption_go" +) + +func TestMemberService_Login(t *testing.T) { + +} + +func TestMemberService_Regist(t *testing.T) { + m := &MemberService{ + Email:"geek@loafle.com", + PwSalt:"qwer5795", + Digest:"Digest", + Company:"Loafle", + Name:"Geek", + Phone:"010-4055-6699", + } + + encryption.Encrypt(m.PwSalt) + mm := m.getMemberMap() + + rr := invokeDB(TARGET_DAO, "create", mm) + log.Println(rr) +} + +func TestMemberService_Read(t *testing.T) { + //m := &MemberService{ + // Id:"3", + //} + + //mm := m.getMemberMap() + mm := make(map[string] string) + mm["id"] = "4" + rr := invokeDB(TARGET_DAO, "find", mm) + + log.Println(rr) +} + +func TestMemberService_ReadByEmail(t *testing.T) { + m := &MemberService{ + Email:"geek@loafle.com", + } + + mm := m.getMemberMap() + rr := invokeDB(TARGET_DAO, "findByEmail", mm) + log.Println(rr) +} \ No newline at end of file