From 9297f2d9bd8cf81f695d898568a1b8a6fca68c5c Mon Sep 17 00:00:00 2001 From: Tue Date: Thu, 20 Oct 2022 14:32:32 +0700 Subject: [PATCH 1/4] update auth sms --- client/authsms.go | 38 ++++++++++++++++++++++++++++++++++++++ model/authsms_request.go | 8 ++++++++ model/authsms_response.go | 5 +++++ subject/authsms.go | 13 +++++++++++++ subject/config.go | 2 ++ 5 files changed, 66 insertions(+) create mode 100644 client/authsms.go create mode 100644 model/authsms_request.go create mode 100644 model/authsms_response.go create mode 100644 subject/authsms.go diff --git a/client/authsms.go b/client/authsms.go new file mode 100644 index 0000000..d98be55 --- /dev/null +++ b/client/authsms.go @@ -0,0 +1,38 @@ +package client + +import ( + "encoding/json" + "errors" + "git.selly.red/Selly-Modules/natsio" + "git.selly.red/Selly-Modules/natsio/model" + "git.selly.red/Selly-Modules/natsio/subject" +) + +// AuthSMS ... +type AuthSMS struct{} + +// GetAutSMS ... +func GetAutSMS() AuthSMS { + return AuthSMS{} +} + +func (s AuthSMS) CreateUserSMSViaAuthSMS(p model.CreateUserSMSRequest) (*model.CreateUserSMSResponse, error) { + msg, err := natsio.GetServer().Request(subject.AuthSMS.CreateUserSMS, toBytes(p)) + if err != nil { + return nil, err + } + + var r struct { + Data *model.CreateUserSMSResponse `json:"data"` + Error string `json:"error"` + } + + if err = json.Unmarshal(msg.Data, &r); err != nil { + return nil, err + } + if r.Error != "" { + return nil, errors.New(r.Error) + } + + return r.Data, nil +} diff --git a/model/authsms_request.go b/model/authsms_request.go new file mode 100644 index 0000000..c0b3078 --- /dev/null +++ b/model/authsms_request.go @@ -0,0 +1,8 @@ +package model + +type CreateUserSMSRequest struct { + Name string `json:"name"` + Phone string `json:"phone"` + Email string `json:"email"` + Supplier string `json:"supplier"` +} diff --git a/model/authsms_response.go b/model/authsms_response.go new file mode 100644 index 0000000..0effbbc --- /dev/null +++ b/model/authsms_response.go @@ -0,0 +1,5 @@ +package model + +type CreateUserSMSResponse struct { + ID string `json:"_id"` +} diff --git a/subject/authsms.go b/subject/authsms.go new file mode 100644 index 0000000..4b7a0ad --- /dev/null +++ b/subject/authsms.go @@ -0,0 +1,13 @@ +package subject + +import "fmt" + +func getAuthSMSValue(val string) string { + return fmt.Sprintf("%s.%s", prefixes.AuthSMS, val) +} + +var AuthSMS = struct { + CreateUserSMS string +}{ + CreateUserSMS: getAuthSMSValue("create_user_sms"), +} diff --git a/subject/config.go b/subject/config.go index 4a2f9f3..ccc480e 100644 --- a/subject/config.go +++ b/subject/config.go @@ -9,6 +9,7 @@ var prefixes = struct { Bank string Supplier string Seller string + AuthSMS string }{ Communication: "communication", Order: "order", @@ -18,4 +19,5 @@ var prefixes = struct { Supplier: "supplier", Bank: "bank", Seller: "seller", + AuthSMS: "auth_sms", } From 546592f8ceaa2dbe42bbbfd6e7c4f8d7b3ffd7f4 Mon Sep 17 00:00:00 2001 From: Tue Date: Thu, 20 Oct 2022 15:10:42 +0700 Subject: [PATCH 2/4] update auth sms --- model/authsms_request.go | 2 ++ 1 file changed, 2 insertions(+) diff --git a/model/authsms_request.go b/model/authsms_request.go index c0b3078..4053ea9 100644 --- a/model/authsms_request.go +++ b/model/authsms_request.go @@ -5,4 +5,6 @@ type CreateUserSMSRequest struct { Phone string `json:"phone"` Email string `json:"email"` Supplier string `json:"supplier"` + RoleID string `json:"roleId"` + Password string `json:"password"` } From 25cb392d936dcea5c95935df52f3d471c326f660 Mon Sep 17 00:00:00 2001 From: Tue Date: Thu, 20 Oct 2022 15:17:50 +0700 Subject: [PATCH 3/4] update auth sms --- model/authsms_request.go | 2 +- 1 file changed, 1 insertion(+), 1 deletion(-) diff --git a/model/authsms_request.go b/model/authsms_request.go index 4053ea9..df718bd 100644 --- a/model/authsms_request.go +++ b/model/authsms_request.go @@ -5,6 +5,6 @@ type CreateUserSMSRequest struct { Phone string `json:"phone"` Email string `json:"email"` Supplier string `json:"supplier"` - RoleID string `json:"roleId"` + Role string `json:"role"` Password string `json:"password"` } From 9a2bd21534926fd23efc35ff8847543273d98f56 Mon Sep 17 00:00:00 2001 From: Tue Date: Tue, 25 Oct 2022 15:27:05 +0700 Subject: [PATCH 4/4] build auth sms --- client/authsms.go | 38 ------------------- client/supplier_user.go | 38 +++++++++++++++++++ ...ms_request.go => supplier_user_request.go} | 2 +- ..._response.go => supplier_user_response.go} | 2 +- subject/authsms.go | 8 ++-- subject/config.go | 4 +- 6 files changed, 46 insertions(+), 46 deletions(-) delete mode 100644 client/authsms.go create mode 100644 client/supplier_user.go rename model/{authsms_request.go => supplier_user_request.go} (84%) rename model/{authsms_response.go => supplier_user_response.go} (50%) diff --git a/client/authsms.go b/client/authsms.go deleted file mode 100644 index d98be55..0000000 --- a/client/authsms.go +++ /dev/null @@ -1,38 +0,0 @@ -package client - -import ( - "encoding/json" - "errors" - "git.selly.red/Selly-Modules/natsio" - "git.selly.red/Selly-Modules/natsio/model" - "git.selly.red/Selly-Modules/natsio/subject" -) - -// AuthSMS ... -type AuthSMS struct{} - -// GetAutSMS ... -func GetAutSMS() AuthSMS { - return AuthSMS{} -} - -func (s AuthSMS) CreateUserSMSViaAuthSMS(p model.CreateUserSMSRequest) (*model.CreateUserSMSResponse, error) { - msg, err := natsio.GetServer().Request(subject.AuthSMS.CreateUserSMS, toBytes(p)) - if err != nil { - return nil, err - } - - var r struct { - Data *model.CreateUserSMSResponse `json:"data"` - Error string `json:"error"` - } - - if err = json.Unmarshal(msg.Data, &r); err != nil { - return nil, err - } - if r.Error != "" { - return nil, errors.New(r.Error) - } - - return r.Data, nil -} diff --git a/client/supplier_user.go b/client/supplier_user.go new file mode 100644 index 0000000..f5abc1f --- /dev/null +++ b/client/supplier_user.go @@ -0,0 +1,38 @@ +package client + +import ( + "encoding/json" + "errors" + "git.selly.red/Selly-Modules/natsio" + "git.selly.red/Selly-Modules/natsio/model" + "git.selly.red/Selly-Modules/natsio/subject" +) + +// SupplierUser ... +type SupplierUser struct{} + +// GetSupplierUser ... +func GetSupplierUser() SupplierUser { + return SupplierUser{} +} + +func (s SupplierUser) CreateSupplierUserS(p model.CreateSupplierUserRequest) (*model.CreateSupplierUserResponse, error) { + msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateSupplierUser, toBytes(p)) + if err != nil { + return nil, err + } + + var r struct { + Data *model.CreateSupplierUserResponse `json:"data"` + Error string `json:"error"` + } + + if err = json.Unmarshal(msg.Data, &r); err != nil { + return nil, err + } + if r.Error != "" { + return nil, errors.New(r.Error) + } + + return r.Data, nil +} diff --git a/model/authsms_request.go b/model/supplier_user_request.go similarity index 84% rename from model/authsms_request.go rename to model/supplier_user_request.go index df718bd..6dc9df8 100644 --- a/model/authsms_request.go +++ b/model/supplier_user_request.go @@ -1,6 +1,6 @@ package model -type CreateUserSMSRequest struct { +type CreateSupplierUserRequest struct { Name string `json:"name"` Phone string `json:"phone"` Email string `json:"email"` diff --git a/model/authsms_response.go b/model/supplier_user_response.go similarity index 50% rename from model/authsms_response.go rename to model/supplier_user_response.go index 0effbbc..9583b76 100644 --- a/model/authsms_response.go +++ b/model/supplier_user_response.go @@ -1,5 +1,5 @@ package model -type CreateUserSMSResponse struct { +type CreateSupplierUserResponse struct { ID string `json:"_id"` } diff --git a/subject/authsms.go b/subject/authsms.go index 4b7a0ad..fd63148 100644 --- a/subject/authsms.go +++ b/subject/authsms.go @@ -3,11 +3,11 @@ package subject import "fmt" func getAuthSMSValue(val string) string { - return fmt.Sprintf("%s.%s", prefixes.AuthSMS, val) + return fmt.Sprintf("%s.%s", prefixes.SupplierUser, val) } -var AuthSMS = struct { - CreateUserSMS string +var SupplierUser = struct { + CreateSupplierUser string }{ - CreateUserSMS: getAuthSMSValue("create_user_sms"), + CreateSupplierUser: getAuthSMSValue("create_supplier_user"), } diff --git a/subject/config.go b/subject/config.go index ccc480e..d50d9d4 100644 --- a/subject/config.go +++ b/subject/config.go @@ -9,7 +9,7 @@ var prefixes = struct { Bank string Supplier string Seller string - AuthSMS string + SupplierUser string }{ Communication: "communication", Order: "order", @@ -19,5 +19,5 @@ var prefixes = struct { Supplier: "supplier", Bank: "bank", Seller: "seller", - AuthSMS: "auth_sms", + SupplierUser: "supplier_user", }