overflow_backup_2018_0455/overflow_proxy_service
4
0
Fork 0
Code Issues Pull Requests Packages Projects Releases Wiki Activity

login logic has added

Browse Source
This commit is contained in:
insanity@loafle.com 2017-05-27 14:57:13 +09:00
parent dc92bff913
commit ef5ecee286
2 changed files with 60 additions and 56 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

80
proxy/member_service.go
View File

@ -1,20 +1,19 @@
package proxy package proxy
import ( import (
"log"
"encoding/json" "encoding/json"
//"loafle.com/overflow/encryption_go/src/loafle.com/overflow/encryption" "loafle.com/overflow/encryption_go"
//"strings" "log"
) )
type MemberService struct { type MemberService struct {
Id string `json:"id"` Id json.Number `json:"id,Number,omitempty"`
Email string `json:"email"` Email string `json:"email"`
PwSalt string `json:"pwSalt"` PwSalt string `json:"pwSalt"`
Digest string `json:"digest"` Digest string `json:"digest"`
Name string `json:"name"` Name string `json:"name"`
Company string `json:"company"` Company string `json:"company"`
Phone string `json:"phone"` Phone string `json:"phone"`
} }
var TARGET_DAO = "member" var TARGET_DAO = "member"
@ -24,7 +23,7 @@ func NewMember() *MemberService {
return &m return &m
} }
func (m *MemberService) getMemberMap() (map[string]string) { func (m *MemberService) getMemberMap() map[string]string {
memMap := make(map[string]string) memMap := make(map[string]string)
str, err := json.Marshal(m) str, err := json.Marshal(m)
@ -39,69 +38,64 @@ func (m *MemberService) getMemberMap() (map[string]string) {
} }
func (m *MemberService) Login() string { func (m *MemberService) Login() string {
log.Println("Call Login", m.Email, m.PwSalt)
mStr := m.Read() result := m.ReadByEmail()
if result == "" {
return "login reject"
}
temp := MemberService{}
err := json.Unmarshal([]byte(result), &temp)
if err != nil {
return err.Error()
}
mTemp := &MemberService{} b := encryption.Check(m.PwSalt, temp.PwSalt, temp.Digest)
json.Unmarshal([]byte(mStr), mTemp) if !b {
//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 reject"
} }
return "login success" return "login success"
} }
func (m *MemberService) Regist() (string){ func (m *MemberService) Regist() string {
log.Println("Call Regist", m.Email, m.PwSalt) log.Println("Call Regist", m.Email, m.PwSalt)
// Todo Call DB Gateway
m.Digest = "qwer5795" pwSalt, digest, err := encryption.Encrypt(m.PwSalt)
if err != nil {
log.Fatal("encryption Encrypt Error: ", err)
}
m.PwSalt = pwSalt
m.Digest = digest
memMap := m.getMemberMap() 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) re := invokeDB(TARGET_DAO, "create", memMap)
return re return re
} }
func (m *MemberService) ReadByEmail() (string) { func (m *MemberService) ReadByEmail() string {
log.Println("Call ReadByEmail", m.Email) log.Println("Call ReadByEmail", m.Email)
memMap := m.getMemberMap() memMap := m.getMemberMap()
re := invokeDB(TARGET_DAO, "findByEmail", memMap) re := invokeDB(TARGET_DAO, "findByEmail", memMap)
return "" return re
} }
func (m *MemberService) Read() (string){ func (m *MemberService) Read() string {
log.Println("Call Read", m.Email) log.Println("Call Read", m.Email)
// Todo Call DB Gateway // Todo Call DB Gateway
m.Digest = "qwer5795" m.Digest = "qwer5795"
//memMap := m.getMemberMap() //memMap := m.getMemberMap()
mm := make(map[string]string) mm := make(map[string]string)
mm["id"] = m.Id mm["id"] = string(m.Id)
log.Println("Read Member", m) log.Println("Read Member", m)
re := invokeDB(TARGET_DAO, "find", mm) re := invokeDB(TARGET_DAO, "find", mm)
return re return re
} }
func (m *MemberService) Modify() (string){ func (m *MemberService) Modify() string {
log.Println("Call Modify", m.Email, "::", m.PwSalt) log.Println("Call Modify", m.Email, "::", m.PwSalt)
// Todo Call DB Gateway // Todo Call DB Gateway
m.Digest = "read" m.Digest = "read"
memMap := m.getMemberMap() memMap := m.getMemberMap()
@ -111,7 +105,7 @@ func (m *MemberService) Modify() (string){
return re return re
} }
func (m *MemberService) Remove() (string){ func (m *MemberService) Remove() string {
log.Println("Call Remove", m.Email) log.Println("Call Remove", m.Email)
// Todo Call DB Gateway // Todo Call DB Gateway
m.Digest = "read" m.Digest = "read"

36
proxy/member_service_test.go
View File

@ -3,7 +3,6 @@ package proxy
import ( import (
"testing" "testing"
"log" "log"
"loafle.com/overflow/encryption_go"
) )
func TestMemberService_Login(t *testing.T) { func TestMemberService_Login(t *testing.T) {
@ -12,29 +11,29 @@ func TestMemberService_Login(t *testing.T) {
func TestMemberService_Regist(t *testing.T) { func TestMemberService_Regist(t *testing.T) {
m := &MemberService{ m := &MemberService{
Email:"geek@loafle.com", Email:"geek2@loafle.com",
PwSalt:"qwer5795", PwSalt:"qwer5795",
Digest:"Digest",
Company:"Loafle", Company:"Loafle",
Name:"Geek", Name:"Geek",
Phone:"010-4055-6699", Phone:"010-4055-6699",
} }
encryption.Encrypt(m.PwSalt) retMem := m.Regist()
mm := m.getMemberMap() t.Log(retMem)
}
rr := invokeDB(TARGET_DAO, "create", mm) func TestMemberLogin(t *testing.T) {
log.Println(rr) m := &MemberService{
Email:"geek@loafle.com",
PwSalt:"qwer5795",
}
b := m.Login()
t.Log("LOGIN RESULT : ", b)
} }
func TestMemberService_Read(t *testing.T) { func TestMemberService_Read(t *testing.T) {
//m := &MemberService{
// Id:"3",
//}
//mm := m.getMemberMap()
mm := make(map[string] string) mm := make(map[string] string)
mm["id"] = "4" mm["id"] = "12"
rr := invokeDB(TARGET_DAO, "find", mm) rr := invokeDB(TARGET_DAO, "find", mm)
log.Println(rr) log.Println(rr)
@ -49,3 +48,14 @@ func TestMemberService_ReadByEmail(t *testing.T) {
rr := invokeDB(TARGET_DAO, "findByEmail", mm) rr := invokeDB(TARGET_DAO, "findByEmail", mm)
log.Println(rr) log.Println(rr)
} }
func TestMemberUpdate(t *testing.T) {
m := &MemberService{
Id: "11",
Email:"keeg@loafle.com",
}
mm := m.getMemberMap()
rr := invokeDB(TARGET_DAO, "update", mm)
log.Println(rr)
}