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

Merge remote-tracking branch 'origin/master'

Browse Source
This commit is contained in:
snoop 2017-06-23 16:45:41 +09:00
commit 530e56cfe2
2 changed files with 33 additions and 30 deletions
Show Stats Download Patch File Download Diff File Expand all files Collapse all files

45
proxy/member/member_service.go
View File

@ -2,27 +2,30 @@ package member
import ( import (
"encoding/json" "encoding/json"
"errors"
"git.loafle.net/overflow/encryption_go"
"git.loafle.net/overflow/overflow_service/proxy" "git.loafle.net/overflow/overflow_service/proxy"
"log"
"git.loafle.net/overflow/overflow_service/proxy/apikey" "git.loafle.net/overflow/overflow_service/proxy/apikey"
"git.loafle.net/overflow/overflow_service/proxy/keystore" "git.loafle.net/overflow/overflow_service/proxy/keystore"
"git.loafle.net/overflow/encryption_go" "log"
"errors"
) )
type Member struct { type Member struct {
Id json.Number `json:"id,Number,omitempty"` 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"` Pw string `json:"pw"`
Name string `json:"name"` Name string `json:"name"`
Company string `json:"company"` CompanyName string `json:"companyName"`
Phone string `json:"phone"` Phone string `json:"phone"`
AuthorizedDate json.Number `json:"authorizedDate,Number"` Status *MetaMemberStatus `json:"status"`
} }
type MetaMemberStatus struct {
Id json.Number `json:"id,Number,omitempty"`
Name string `json:"name"`
}
type MemberService struct { type MemberService struct {
} }
var TARGET_DAO = "member" var TARGET_DAO = "member"
@ -43,14 +46,14 @@ func (m *MemberService) getMemberMap(mem *Member) map[string]string {
log.Fatal("Json Marshal Error: ", err) 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 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 { if err != nil {
return "", err return "", err
} }
@ -62,11 +65,11 @@ func (m *MemberService) Login(mem *Member) (string,error) {
if err != nil { if err != nil {
return "", err return "", err
} }
if temp.AuthorizedDate == "" { //if temp.AuthorizedDate == "" {
return "", errors.New("Not authenticated.") // 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 { if !b {
return "", errors.New("login reject") return "", errors.New("login reject")
} }
@ -74,7 +77,7 @@ func (m *MemberService) Login(mem *Member) (string,error) {
return "login success", nil 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) log.Println("Call Regist", mem.Email, mem.PwSalt)
pwSalt, digest, err := encryption.Encrypt(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.PwSalt = pwSalt
mem.Digest = digest mem.Pw = digest
memMap := m.getMemberMap(mem) memMap := m.getMemberMap(mem)
re, err := proxy.InvokeDB(TARGET_DAO, "create", memMap) re, err := proxy.InvokeDB(TARGET_DAO, "save", memMap)
if err != nil { if err != nil {
return "", err return "", err
} }
@ -95,7 +98,7 @@ func (m *MemberService) Regist(mem *Member) (string, error ){
return re, nil 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) log.Println("Call ReadByEmail", mem.Email)
memMap := m.getMemberMap(mem) memMap := m.getMemberMap(mem)
re, err := proxy.InvokeDB(TARGET_DAO, "findByEmail", memMap) 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) { func (m *MemberService) Read(mem *Member) (string, error) {
log.Println("Call Read", mem.Email) log.Println("Call Read", mem.Email)
// Todo Call DB Gateway // Todo Call DB Gateway
mem.Digest = "qwer5795" mem.Pw = "qwer5795"
//memMap := m.getMemberMap() //memMap := m.getMemberMap()
mm := make(map[string]string) mm := make(map[string]string)
mm["id"] = string(mem.Id) 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) { func (m *MemberService) Modify(mem *Member) (string, error) {
log.Println("Call Modify", mem.Email, "::", mem.PwSalt) log.Println("Call Modify", mem.Email, "::", mem.PwSalt)
// Todo Call DB Gateway // Todo Call DB Gateway
mem.Digest = "read" mem.Pw = "read"
memMap := m.getMemberMap(mem) memMap := m.getMemberMap(mem)
re, err := proxy.InvokeDB(TARGET_DAO, "update", memMap) re, err := proxy.InvokeDB(TARGET_DAO, "update", memMap)
@ -154,7 +157,6 @@ func (m *MemberService) Remove(mem *Member) (string, error) {
return re, nil return re, nil
} }
func (m *MemberService) EmailConfirm() (string, error) { func (m *MemberService) EmailConfirm() (string, error) {
ks := keystore.NewKeyStoreSerivce() ks := keystore.NewKeyStoreSerivce()
@ -173,6 +175,5 @@ func (m *MemberService) EmailConfirm() (string, error) {
} }
//log.Println(out) //log.Println(out)
return "", nil return "", nil
} }

4
proxy/member/member_service_test.go
View File

@ -30,9 +30,11 @@ func TestMemberService_Regist(t *testing.T) {
m := &Member{ m := &Member{
Email:"geek2@loafle.com", Email:"geek2@loafle.com",
PwSalt:"qwer5795", PwSalt:"qwer5795",
Company:"Loafle", Pw:"qwer5795",
CompanyName:"Loafle",
Name:"Geek", Name:"Geek",
Phone:"010-4055-6699", Phone:"010-4055-6699",
Status:&MetaMemberStatus{Id:"1"},
} }
retMem, _ := ms.Regist(m) retMem, _ := ms.Regist(m)
t.Log(retMem) t.Log(retMem)