diff --git a/proxy/apikey/apikey_service.go b/proxy/apikey/apikey_service.go new file mode 100644 index 0000000..d4f673e --- /dev/null +++ b/proxy/apikey/apikey_service.go @@ -0,0 +1,70 @@ +package apikey + +import ( + "encoding/json" + "git.loafle.net/overflow/commons_go/model/timestamp" + "git.loafle.net/overflow/overflow_proxy_service/proxy" + "log" +) + +type ApiKeyService struct { + +} + +type ApiKey struct { + Id json.Number `json:"id,Number,omitempty"` + Apikey string `json:"apiKey,omitempty"` + CreateDAte timestamp.Timestamp`json:"createDate,omitempty"` + HostName string `json:"hostName,omitempty"` +} + + +func NewApiKeyService() *ApiKeyService { + return &ApiKeyService{} +} + + +func(k *ApiKeyService)SaveApikey(key *ApiKey) (string, error) { + + + bytes, err := json.Marshal(key) + + if err != nil { + return "", err + } + + m := make(map[string]string) + + m["com.loafle.overflow.keystore.model.Apikey"] = string(bytes) + + out := proxy.InvokeDB("apiKey", "create", m) + + log.Print(out) + + return "", nil + +} + +func(k *ApiKeyService)CheckApikey(apikey string) (bool, error) { + + ak := ApiKey{ + Apikey:apikey, + } + + bytes, err := json.Marshal(ak) + + if err != nil { + return false, err + } + + m := make(map[string]string) + + m["com.loafle.overflow.keystore.model.Apikey"] = string(bytes) + + out := proxy.InvokeDB("apiKey", "findByApiKey", m) + + log.Print(out) + + return true, nil + +} \ No newline at end of file diff --git a/proxy/apikey/apikey_service_test.go b/proxy/apikey/apikey_service_test.go new file mode 100644 index 0000000..699d98a --- /dev/null +++ b/proxy/apikey/apikey_service_test.go @@ -0,0 +1 @@ +package apikey diff --git a/proxy/keystore/keystore_service.go b/proxy/keystore/keystore_service.go index 02716a6..747171b 100644 --- a/proxy/keystore/keystore_service.go +++ b/proxy/keystore/keystore_service.go @@ -2,10 +2,6 @@ package keystore import ( "github.com/google/uuid" - "encoding/json" - "git.loafle.net/overflow/commons_go/model/timestamp" - "git.loafle.net/overflow/overflow_proxy_service/proxy" - "log" ) type KeyStoreService struct { @@ -13,11 +9,8 @@ type KeyStoreService struct { } -type ApiKey struct { - Id json.Number `json:"id,Number,omitempty"` - Apikey string `json:"apiKey,omitempty"` - CreateDAte timestamp.Timestamp`json:"createDate,omitempty"` - HostName string `json:"hostName,omitempty"` +func NewKeyStoreSerivce() *KeyStoreService { + return &KeyStoreService{} } func(k *KeyStoreService)CreateKey() (string,error) { @@ -29,48 +22,3 @@ func(k *KeyStoreService)CreateKey() (string,error) { return uu.String(), nil } - -func(k *KeyStoreService)SaveApikey(key *ApiKey) (string, error) { - - - bytes, err := json.Marshal(key) - - if err != nil { - return "", err - } - - m := make(map[string]string) - - m["com.loafle.overflow.keystore.model.Apikey"] = string(bytes) - - out := proxy.InvokeDB("apiKey", "create", m) - - log.Print(out) - - return "", nil - -} - -func(k *KeyStoreService)CheckApikey(apikey string) (bool, error) { - - ak := ApiKey{ - Apikey:apikey, - } - - bytes, err := json.Marshal(ak) - - if err != nil { - return false, err - } - - m := make(map[string]string) - - m["com.loafle.overflow.keystore.model.Apikey"] = string(bytes) - - out := proxy.InvokeDB("apiKey", "findByApiKey", m) - - log.Print(out) - - return true, nil - -} \ No newline at end of file diff --git a/proxy/member/member_service.go b/proxy/member/member_service.go index a8694ff..9aae1da 100644 --- a/proxy/member/member_service.go +++ b/proxy/member/member_service.go @@ -5,6 +5,8 @@ import ( "git.loafle.net/overflow/encryption_go" "git.loafle.net/overflow/overflow_proxy_service/proxy" "log" + "git.loafle.net/overflow/overflow_proxy_service/proxy/apikey" + "git.loafle.net/overflow/overflow_proxy_service/proxy/keystore" ) type MemberService struct { @@ -120,3 +122,29 @@ func (m *MemberService) Remove() string { return re } + +func (m *MemberService) EmailConfirm() string { + + + + + + ks := keystore.NewKeyStoreSerivce() + + key, err := ks.CreateKey() + if err != nil { + return "" + } + + log.Println(key) + + ak := apikey.NewApiKeyService() + out, err := ak.SaveApikey(nil) + if err != nil { + return "" + } + log.Println(out) + + + return ""; +} \ No newline at end of file