From f6a2b34a7f98ac975dff996da42c3f989ff16ade Mon Sep 17 00:00:00 2001 From: Tue Date: Mon, 31 Oct 2022 10:04:13 +0700 Subject: [PATCH 1/8] build authsms --- client/supplier_permission.go | 79 +++++++++++++++++++++++++++ client/supplier_role.go | 44 ++++++++++++++- model/supplier_permission_request.go | 24 ++++++++ model/supplier_permission_response.go | 19 +++++++ model/supplier_role_request.go | 11 ++++ model/supplier_role_response.go | 14 +++++ subject/config.go | 2 + subject/supplier_permission.go | 17 ++++++ subject/supplier_role.go | 14 +++-- 9 files changed, 219 insertions(+), 5 deletions(-) create mode 100644 client/supplier_permission.go create mode 100644 model/supplier_permission_request.go create mode 100644 model/supplier_permission_response.go create mode 100644 subject/supplier_permission.go diff --git a/client/supplier_permission.go b/client/supplier_permission.go new file mode 100644 index 0000000..86ac1ba --- /dev/null +++ b/client/supplier_permission.go @@ -0,0 +1,79 @@ +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" +) + +// SupplierPermission ... +type SupplierPermission struct{} + +// GetSupplierPermission ... +func GetSupplierPermission() SupplierPermission { + return SupplierPermission{} +} + +func (s SupplierPermission) GetListPermission(p model.GetListPermissionRequest) (*model.GetListPermissionResponse, error) { + msg, err := natsio.GetServer().Request(subject.SupplierPermission.GetList, toBytes(p)) + if err != nil { + return nil, err + } + + var r struct { + Data *model.GetListPermissionResponse `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 +} + +func (s SupplierPermission) CreatePermission(p model.CreatePermissionRequest) (*model.CreatePermissionResponse, error) { + msg, err := natsio.GetServer().Request(subject.SupplierPermission.Create, toBytes(p)) + if err != nil { + return nil, err + } + + var r struct { + Data *model.CreatePermissionResponse `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 +} + +func (s SupplierPermission) UpdatePermission(p model.UpdatePermissionRequest) error { + msg, err := natsio.GetServer().Request(subject.SupplierPermission.Update, toBytes(p)) + if err != nil { + return err + } + + var r struct { + Error string `json:"error"` + } + + if err = json.Unmarshal(msg.Data, &r); err != nil { + return err + } + if r.Error != "" { + return errors.New(r.Error) + } + + return nil +} diff --git a/client/supplier_role.go b/client/supplier_role.go index 3bf068d..1fe6d9d 100644 --- a/client/supplier_role.go +++ b/client/supplier_role.go @@ -16,8 +16,29 @@ func GetSupplierRole() SupplierRole { return SupplierRole{} } +func (s SupplierRole) GetListRole(p model.GetListRoleRequest) (*model.GetListRoleResponse, error) { + msg, err := natsio.GetServer().Request(subject.SupplierRole.GetList, toBytes(p)) + if err != nil { + return nil, err + } + + var r struct { + Data *model.GetListRoleResponse `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 +} + func (s SupplierRole) CreateRole(p model.CreateRoleRequest) (*model.CreateRoleResponse, error) { - msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateOwner, toBytes(p)) + msg, err := natsio.GetServer().Request(subject.SupplierRole.Create, toBytes(p)) if err != nil { return nil, err } @@ -56,3 +77,24 @@ func (s SupplierRole) UpdateRole(p model.UpdateRoleRequest) error { return nil } + +func (s SupplierRole) DetailRole(p model.DetailRoleRequest) (*model.RoleBrief, error) { + msg, err := natsio.GetServer().Request(subject.SupplierRole.Detail, toBytes(p)) + if err != nil { + return nil, err + } + + var r struct { + Data *model.RoleBrief `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/supplier_permission_request.go b/model/supplier_permission_request.go new file mode 100644 index 0000000..e3d63c7 --- /dev/null +++ b/model/supplier_permission_request.go @@ -0,0 +1,24 @@ +package model + +type GetListPermissionRequest struct { + Page int `json:"page"` + Limit int `json:"limit"` + Group string `json:"group"` +} + +type DetailPermissionRequest struct { + ID string `json:"_id"` +} + +type CreatePermissionRequest struct { + Name string `json:"name"` + Code string `json:"code"` + Group string `json:"group"` +} + +type UpdatePermissionRequest struct { + ID string `json:"_id"` + Name string `json:"name"` + Code string `json:"code"` + Group string `json:"group"` +} diff --git a/model/supplier_permission_response.go b/model/supplier_permission_response.go new file mode 100644 index 0000000..cbbb019 --- /dev/null +++ b/model/supplier_permission_response.go @@ -0,0 +1,19 @@ +package model + +type GetListPermissionResponse struct { + Permissions []PermissionBrief `json:"permissions"` + Total int64 `json:"total"` +} + +type PermissionBrief struct { + ID string `json:"_id"` + Name string `json:"name"` + Code string `json:"code"` + Group string `json:"group"` + CreatedAt string `json:"createdAt"` + UpdatedAt string `json:"updatedAt"` +} + +type CreatePermissionResponse struct { + ID string `json:"_id"` +} diff --git a/model/supplier_role_request.go b/model/supplier_role_request.go index 6402622..dce6112 100644 --- a/model/supplier_role_request.go +++ b/model/supplier_role_request.go @@ -1,5 +1,16 @@ package model +type GetListRoleRequest struct { + Page int `json:"page"` + Limit int `json:"limit"` + Type string `json:"type"` + SupplierID string `json:"supplierId"` +} + +type DetailRoleRequest struct { + ID string `json:"_id"` +} + type CreateRoleRequest struct { Name string `json:"name"` Code string `json:"code"` diff --git a/model/supplier_role_response.go b/model/supplier_role_response.go index d7b68fc..24fc4be 100644 --- a/model/supplier_role_response.go +++ b/model/supplier_role_response.go @@ -1,5 +1,19 @@ package model +type GetListRoleResponse struct { + Roles []RoleBrief `json:"roles"` + Total int64 `json:"total"` +} + +type RoleBrief struct { + ID string `json:"_id"` + Name string `json:"name"` + Code string `json:"code"` + Type string `json:"type"` + CreatedAt string `json:"createdAt"` + UpdatedAt string `json:"updatedAt"` +} + type CreateRoleResponse struct { ID string `json:"_id"` } diff --git a/subject/config.go b/subject/config.go index 90a014f..37e3055 100644 --- a/subject/config.go +++ b/subject/config.go @@ -11,6 +11,7 @@ var prefixes = struct { Seller string SupplierUser string SupplierRole string + SupplierPermission string }{ Communication: "communication", Order: "order", @@ -22,4 +23,5 @@ var prefixes = struct { Seller: "seller", SupplierUser: "supplier_user", SupplierRole: "supplier_role", + SupplierPermission: "supplier_permission", } diff --git a/subject/supplier_permission.go b/subject/supplier_permission.go new file mode 100644 index 0000000..f759a0c --- /dev/null +++ b/subject/supplier_permission.go @@ -0,0 +1,17 @@ +package subject + +import "fmt" + +func getPermissionValue(val string) string { + return fmt.Sprintf("%s.%s", prefixes.SupplierPermission, val) +} + +var SupplierPermission = struct { + GetList string + Create string + Update string +}{ + GetList: getPermissionValue("get_list"), + Create: getPermissionValue("create"), + Update: getPermissionValue("update"), +} diff --git a/subject/supplier_role.go b/subject/supplier_role.go index 8915759..83389da 100644 --- a/subject/supplier_role.go +++ b/subject/supplier_role.go @@ -7,9 +7,15 @@ func getRoleValue(val string) string { } var SupplierRole = struct { - Create string - Update string + GetList string + Detail string + Create string + Update string + GetListBySupplierID string }{ - Create: getRoleValue("create"), - Update: getRoleValue("update"), + GetList: getRoleValue("get_list"), + Detail: getRoleValue("detail"), + Create: getRoleValue("create"), + Update: getRoleValue("update"), + GetListBySupplierID: getRoleValue("get_list_by_supplierId"), } From 0d8e3969dbeee65d40b016638a440e720008d78a Mon Sep 17 00:00:00 2001 From: Tue Date: Mon, 31 Oct 2022 16:59:38 +0700 Subject: [PATCH 2/8] build auth sms --- model/supplier_role_request.go | 16 +++++++++------- 1 file changed, 9 insertions(+), 7 deletions(-) diff --git a/model/supplier_role_request.go b/model/supplier_role_request.go index dce6112..3629643 100644 --- a/model/supplier_role_request.go +++ b/model/supplier_role_request.go @@ -12,14 +12,16 @@ type DetailRoleRequest struct { } type CreateRoleRequest struct { - Name string `json:"name"` - Code string `json:"code"` - Type string `json:"type"` + Name string `json:"name"` + Code string `json:"code"` + Type string `json:"type"` + Permissions []string `json:"permissions"` } type UpdateRoleRequest struct { - ID string `json:"_id"` - Name string `json:"name"` - Code string `json:"code"` - Type string `json:"type"` + ID string `json:"_id"` + Name string `json:"name"` + Code string `json:"code"` + Type string `json:"type"` + Permissions []string `json:"permissions"` } From 56d210bf2d2fffc0e3d5a34bc1f8b042e818d194 Mon Sep 17 00:00:00 2001 From: Tue Date: Tue, 1 Nov 2022 10:43:20 +0700 Subject: [PATCH 3/8] build auth sms --- client/supplier_user.go | 21 +++++++++++++++++++++ model/supplier_response.go | 6 ++++++ model/supplier_user_request.go | 7 +++++++ model/supplier_user_response.go | 19 +++++++++++++++++++ subject/supplier_user.go | 2 ++ 5 files changed, 55 insertions(+) diff --git a/client/supplier_user.go b/client/supplier_user.go index fb6a2db..16eb55a 100644 --- a/client/supplier_user.go +++ b/client/supplier_user.go @@ -16,6 +16,27 @@ func GetSupplierUser() SupplierUser { return SupplierUser{} } +func (s SupplierUser) GetListOwner(p model.GetListOwnerRequest) (*model.GetListOwnerResponse, error) { + msg, err := natsio.GetServer().Request(subject.SupplierUser.GetListOwner, toBytes(p)) + if err != nil { + return nil, err + } + + var r struct { + Data *model.GetListOwnerResponse `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 +} + func (s SupplierUser) CreateSupplierOwnerUsers(p model.CreateOwnerRequest) (*model.CreateOwnerResponse, error) { msg, err := natsio.GetServer().Request(subject.SupplierUser.CreateOwner, toBytes(p)) if err != nil { diff --git a/model/supplier_response.go b/model/supplier_response.go index 975a8de..4df67b7 100644 --- a/model/supplier_response.go +++ b/model/supplier_response.go @@ -29,3 +29,9 @@ type SupplierAll struct { Suppliers []SupplierBrief `json:"suppliers"` Total int64 `json:"total"` } + +type SupplierShort struct { + ID string `json:"_id"` + Name string `json:"name"` + Logo interface{} `json:"logo"` +} \ No newline at end of file diff --git a/model/supplier_user_request.go b/model/supplier_user_request.go index 66ccb17..9c6aca1 100644 --- a/model/supplier_user_request.go +++ b/model/supplier_user_request.go @@ -1,5 +1,12 @@ package model +type GetListOwnerRequest struct { + Page int `json:"page"` + Limit int `json:"limit"` + Status string `json:"status"` + SupplierID string `json:"supplierId"` +} + type CreateOwnerRequest struct { Name string `json:"name"` Phone string `json:"phone"` diff --git a/model/supplier_user_response.go b/model/supplier_user_response.go index 38a1d0c..a70957a 100644 --- a/model/supplier_user_response.go +++ b/model/supplier_user_response.go @@ -1,5 +1,24 @@ package model +type GetListOwnerResponse struct { + SupplierUsers []SupplierUserBrief `json:"supplierUsers"` + Total int64 `json:"total"` +} + +type SupplierUserBrief struct { + ID string `json:"_id"` + Role RoleBrief `json:"role"` + Supplier SupplierShort `json:"supplier"` + Name string `json:"name"` + Phone string `json:"phone"` + Email string `json:"email"` + Status string `json:"status"` + Avatar interface{} `json:"avatar"` + Type string `json:"type"` + CreatedAt string `json:"createdAt"` + UpdatedAt string `json:"updatedAt"` +} + type CreateOwnerResponse struct { ID string `json:"_id"` } diff --git a/subject/supplier_user.go b/subject/supplier_user.go index adc2f1f..2f0e166 100644 --- a/subject/supplier_user.go +++ b/subject/supplier_user.go @@ -8,6 +8,7 @@ func getSupplierUserValue(val string) string { var SupplierUser = struct { // Users + GetListOwner string CreateOwner string UpdateOwner string CreateStaff string @@ -16,6 +17,7 @@ var SupplierUser = struct { ResetPassword string }{ // Users + GetListOwner: getSupplierUserValue("get_list_owner"), CreateOwner: getSupplierUserValue("create_owner"), UpdateOwner: getSupplierUserValue("update_owner"), CreateStaff: getSupplierUserValue("create_staff"), From 285ddb75e7958c72debff933d2549ebf27b8da98 Mon Sep 17 00:00:00 2001 From: Tue Date: Tue, 1 Nov 2022 11:40:37 +0700 Subject: [PATCH 4/8] build auth sms --- model/supplier_role_response.go | 7 +++++++ model/supplier_user_response.go | 22 +++++++++++----------- 2 files changed, 18 insertions(+), 11 deletions(-) diff --git a/model/supplier_role_response.go b/model/supplier_role_response.go index 24fc4be..cebc081 100644 --- a/model/supplier_role_response.go +++ b/model/supplier_role_response.go @@ -17,3 +17,10 @@ type RoleBrief struct { type CreateRoleResponse struct { ID string `json:"_id"` } + +type RoleShort struct { + ID string `json:"_id"` + Name string `json:"name"` + Code string `json:"code"` + Type string `json:"type"` +} diff --git a/model/supplier_user_response.go b/model/supplier_user_response.go index a70957a..40549bc 100644 --- a/model/supplier_user_response.go +++ b/model/supplier_user_response.go @@ -6,17 +6,17 @@ type GetListOwnerResponse struct { } type SupplierUserBrief struct { - ID string `json:"_id"` - Role RoleBrief `json:"role"` - Supplier SupplierShort `json:"supplier"` - Name string `json:"name"` - Phone string `json:"phone"` - Email string `json:"email"` - Status string `json:"status"` - Avatar interface{} `json:"avatar"` - Type string `json:"type"` - CreatedAt string `json:"createdAt"` - UpdatedAt string `json:"updatedAt"` + ID string `json:"_id"` + Role RoleShort `json:"role"` + SupplierID string `json:"supplierId"` + Name string `json:"name"` + Phone string `json:"phone"` + Email string `json:"email"` + Status string `json:"status"` + Avatar interface{} `json:"avatar"` + Type string `json:"type"` + CreatedAt string `json:"createdAt"` + UpdatedAt string `json:"updatedAt"` } type CreateOwnerResponse struct { From 19349b9813208d90ccc861129c778d290e08a695 Mon Sep 17 00:00:00 2001 From: Tue Date: Wed, 2 Nov 2022 14:56:58 +0700 Subject: [PATCH 5/8] build auth sms --- client/supplier_role.go | 1 - model/supplier_permission_response.go | 7 +++++++ model/supplier_role_request.go | 2 ++ model/supplier_role_response.go | 23 +++++++++++++---------- model/supplier_user_request.go | 1 + 5 files changed, 23 insertions(+), 11 deletions(-) diff --git a/client/supplier_role.go b/client/supplier_role.go index 1fe6d9d..095f3e9 100644 --- a/client/supplier_role.go +++ b/client/supplier_role.go @@ -26,7 +26,6 @@ func (s SupplierRole) GetListRole(p model.GetListRoleRequest) (*model.GetListRol Data *model.GetListRoleResponse `json:"data"` Error string `json:"error"` } - if err = json.Unmarshal(msg.Data, &r); err != nil { return nil, err } diff --git a/model/supplier_permission_response.go b/model/supplier_permission_response.go index cbbb019..8134201 100644 --- a/model/supplier_permission_response.go +++ b/model/supplier_permission_response.go @@ -17,3 +17,10 @@ type PermissionBrief struct { type CreatePermissionResponse struct { ID string `json:"_id"` } + +type PermissionShort struct { + ID string `json:"_id"` + Name string `json:"name"` + Code string `json:"code"` + Group string `json:"group"` +} diff --git a/model/supplier_role_request.go b/model/supplier_role_request.go index 3629643..ee12d59 100644 --- a/model/supplier_role_request.go +++ b/model/supplier_role_request.go @@ -15,6 +15,7 @@ type CreateRoleRequest struct { Name string `json:"name"` Code string `json:"code"` Type string `json:"type"` + SupplierID string `json:"supplierId"` Permissions []string `json:"permissions"` } @@ -23,5 +24,6 @@ type UpdateRoleRequest struct { Name string `json:"name"` Code string `json:"code"` Type string `json:"type"` + SupplierID string `json:"supplierId"` Permissions []string `json:"permissions"` } diff --git a/model/supplier_role_response.go b/model/supplier_role_response.go index cebc081..b67a0c6 100644 --- a/model/supplier_role_response.go +++ b/model/supplier_role_response.go @@ -6,12 +6,14 @@ type GetListRoleResponse struct { } type RoleBrief struct { - ID string `json:"_id"` - Name string `json:"name"` - Code string `json:"code"` - Type string `json:"type"` - CreatedAt string `json:"createdAt"` - UpdatedAt string `json:"updatedAt"` + ID string `json:"_id"` + Name string `json:"name"` + Code string `json:"code"` + Type string `json:"type"` + Permissions []PermissionShort `json:"permissions"` + SupplierId string `json:"supplierId"` + CreatedAt string `json:"createdAt"` + UpdatedAt string `json:"updatedAt"` } type CreateRoleResponse struct { @@ -19,8 +21,9 @@ type CreateRoleResponse struct { } type RoleShort struct { - ID string `json:"_id"` - Name string `json:"name"` - Code string `json:"code"` - Type string `json:"type"` + ID string `json:"_id"` + Name string `json:"name"` + Code string `json:"code"` + Type string `json:"type"` + SupplierId string `json:"supplierId"` } diff --git a/model/supplier_user_request.go b/model/supplier_user_request.go index 9c6aca1..6bb81a0 100644 --- a/model/supplier_user_request.go +++ b/model/supplier_user_request.go @@ -4,6 +4,7 @@ type GetListOwnerRequest struct { Page int `json:"page"` Limit int `json:"limit"` Status string `json:"status"` + Type string `json:"type"` SupplierID string `json:"supplierId"` } From 55e3c07cf6e8a3da9a9c944dc49018ba6bb0b959 Mon Sep 17 00:00:00 2001 From: Tue Date: Wed, 2 Nov 2022 16:49:12 +0700 Subject: [PATCH 6/8] build auth sms --- client/supplier_user.go | 21 +++++++++++++++++++++ model/supplier_user_request.go | 17 +++++++++++++++++ model/supplier_user_response.go | 8 ++++++++ subject/supplier_user.go | 2 ++ 4 files changed, 48 insertions(+) diff --git a/client/supplier_user.go b/client/supplier_user.go index 16eb55a..d2cf98d 100644 --- a/client/supplier_user.go +++ b/client/supplier_user.go @@ -16,6 +16,27 @@ func GetSupplierUser() SupplierUser { return SupplierUser{} } +func (s SupplierUser) LoginUser(p model.LoginUserRequest) (*model.LoginUserResponse, error) { + msg, err := natsio.GetServer().Request(subject.SupplierUser.LoginUser, toBytes(p)) + if err != nil { + return nil, err + } + + var r struct { + Data *model.LoginUserResponse `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 +} + func (s SupplierUser) GetListOwner(p model.GetListOwnerRequest) (*model.GetListOwnerResponse, error) { msg, err := natsio.GetServer().Request(subject.SupplierUser.GetListOwner, toBytes(p)) if err != nil { diff --git a/model/supplier_user_request.go b/model/supplier_user_request.go index 6bb81a0..0c5f69a 100644 --- a/model/supplier_user_request.go +++ b/model/supplier_user_request.go @@ -1,5 +1,22 @@ package model +type LoginUserRequest struct { + Email string `json:"email"` + Password string `json:"password"` + DeviceID string `json:"deviceId"` + AppVersion string `json:"appVersion"` + UserAgent string `json:"userAgent"` + Model string `json:"model"` + Manufacturer string `json:"manufacturer"` + IP string `json:"ip"` + Language string `json:"language"` + FCMToken string `json:"FCMToken"` + AuthToken string `json:"authToken"` + OsName string `json:"osName"` + OsVersion string `json:"osVersion"` + IsMobile bool `json:"isMobile"` +} + type GetListOwnerRequest struct { Page int `json:"page"` Limit int `json:"limit"` diff --git a/model/supplier_user_response.go b/model/supplier_user_response.go index 40549bc..5ccd787 100644 --- a/model/supplier_user_response.go +++ b/model/supplier_user_response.go @@ -1,5 +1,13 @@ package model +// LoginUserResponse ... +type LoginUserResponse struct { + ID string `json:"_id"` + Token string `json:"token"` + RequireToChangePassword bool `json:"requireToChangePassword"` + SupplierID string `json:"supplierId"` +} + type GetListOwnerResponse struct { SupplierUsers []SupplierUserBrief `json:"supplierUsers"` Total int64 `json:"total"` diff --git a/subject/supplier_user.go b/subject/supplier_user.go index 2f0e166..d7b21fa 100644 --- a/subject/supplier_user.go +++ b/subject/supplier_user.go @@ -8,6 +8,7 @@ func getSupplierUserValue(val string) string { var SupplierUser = struct { // Users + LoginUser string GetListOwner string CreateOwner string UpdateOwner string @@ -17,6 +18,7 @@ var SupplierUser = struct { ResetPassword string }{ // Users + LoginUser: getSupplierUserValue("login_user"), GetListOwner: getSupplierUserValue("get_list_owner"), CreateOwner: getSupplierUserValue("create_owner"), UpdateOwner: getSupplierUserValue("update_owner"), From 49426e322ceab645a6167aaab6fb46ce68feeac0 Mon Sep 17 00:00:00 2001 From: Tue Date: Thu, 3 Nov 2022 00:17:49 +0700 Subject: [PATCH 7/8] build auth sms --- model/supplier_device_request.go | 1 + model/supplier_device_response.go | 1 + model/supplier_user_response.go | 1 - 3 files changed, 2 insertions(+), 1 deletion(-) create mode 100644 model/supplier_device_request.go create mode 100644 model/supplier_device_response.go diff --git a/model/supplier_device_request.go b/model/supplier_device_request.go new file mode 100644 index 0000000..8b53790 --- /dev/null +++ b/model/supplier_device_request.go @@ -0,0 +1 @@ +package model diff --git a/model/supplier_device_response.go b/model/supplier_device_response.go new file mode 100644 index 0000000..8b53790 --- /dev/null +++ b/model/supplier_device_response.go @@ -0,0 +1 @@ +package model diff --git a/model/supplier_user_response.go b/model/supplier_user_response.go index 5ccd787..5f59100 100644 --- a/model/supplier_user_response.go +++ b/model/supplier_user_response.go @@ -3,7 +3,6 @@ package model // LoginUserResponse ... type LoginUserResponse struct { ID string `json:"_id"` - Token string `json:"token"` RequireToChangePassword bool `json:"requireToChangePassword"` SupplierID string `json:"supplierId"` } From 9407b2df6bf257cb9317340080b77e566d02e6b8 Mon Sep 17 00:00:00 2001 From: Tue Date: Thu, 3 Nov 2022 10:46:56 +0700 Subject: [PATCH 8/8] build auth sms --- client/supplier_user.go | 10 +++++----- model/supplier_user_request.go | 5 ++--- model/supplier_user_response.go | 2 +- subject/supplier_user.go | 4 ++-- 4 files changed, 10 insertions(+), 11 deletions(-) diff --git a/client/supplier_user.go b/client/supplier_user.go index d2cf98d..2a1939a 100644 --- a/client/supplier_user.go +++ b/client/supplier_user.go @@ -37,15 +37,15 @@ func (s SupplierUser) LoginUser(p model.LoginUserRequest) (*model.LoginUserRespo return r.Data, nil } -func (s SupplierUser) GetListOwner(p model.GetListOwnerRequest) (*model.GetListOwnerResponse, error) { - msg, err := natsio.GetServer().Request(subject.SupplierUser.GetListOwner, toBytes(p)) +func (s SupplierUser) GetListUser(p model.GetListUserRequest) (*model.GetListUserResponse, error) { + msg, err := natsio.GetServer().Request(subject.SupplierUser.GetListUser, toBytes(p)) if err != nil { return nil, err } var r struct { - Data *model.GetListOwnerResponse `json:"data"` - Error string `json:"error"` + Data *model.GetListUserResponse `json:"data"` + Error string `json:"error"` } if err = json.Unmarshal(msg.Data, &r); err != nil { @@ -141,7 +141,7 @@ func (s SupplierUser) UpdateSupplierStaffUsers(p model.UpdateStaffRequest) error } func (s SupplierUser) UpdateStatus(p model.UpdateStatusRequest) error { - msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateStaff, toBytes(p)) + msg, err := natsio.GetServer().Request(subject.SupplierUser.UpdateStatus, toBytes(p)) if err != nil { return err } diff --git a/model/supplier_user_request.go b/model/supplier_user_request.go index 0c5f69a..32c148f 100644 --- a/model/supplier_user_request.go +++ b/model/supplier_user_request.go @@ -17,7 +17,7 @@ type LoginUserRequest struct { IsMobile bool `json:"isMobile"` } -type GetListOwnerRequest struct { +type GetListUserRequest struct { Page int `json:"page"` Limit int `json:"limit"` Status string `json:"status"` @@ -71,6 +71,5 @@ type UpdateStatusRequest struct { } type ResetPasswordRequest struct { - ID string `json:"_id"` - Password string `json:"password"` + ID string `json:"_id"` } diff --git a/model/supplier_user_response.go b/model/supplier_user_response.go index 5f59100..01826ce 100644 --- a/model/supplier_user_response.go +++ b/model/supplier_user_response.go @@ -7,7 +7,7 @@ type LoginUserResponse struct { SupplierID string `json:"supplierId"` } -type GetListOwnerResponse struct { +type GetListUserResponse struct { SupplierUsers []SupplierUserBrief `json:"supplierUsers"` Total int64 `json:"total"` } diff --git a/subject/supplier_user.go b/subject/supplier_user.go index d7b21fa..2ad5b4d 100644 --- a/subject/supplier_user.go +++ b/subject/supplier_user.go @@ -9,7 +9,7 @@ func getSupplierUserValue(val string) string { var SupplierUser = struct { // Users LoginUser string - GetListOwner string + GetListUser string CreateOwner string UpdateOwner string CreateStaff string @@ -19,7 +19,7 @@ var SupplierUser = struct { }{ // Users LoginUser: getSupplierUserValue("login_user"), - GetListOwner: getSupplierUserValue("get_list_owner"), + GetListUser: getSupplierUserValue("get_list_user"), CreateOwner: getSupplierUserValue("create_owner"), UpdateOwner: getSupplierUserValue("update_owner"), CreateStaff: getSupplierUserValue("create_staff"),