diff --git a/client/supplier.go b/client/supplier.go index 480d73e..02bf82d 100644 --- a/client/supplier.go +++ b/client/supplier.go @@ -274,23 +274,3 @@ func (s Supplier) DeleteCashflow(p model.SupplierDeleteCashflowReq) error { } return nil } - -// CheckTokenSupplier ... -func (s Supplier) CheckTokenSupplier(p model.CheckTokenSupplierPayload) (*model.ResponseCheckTokenSupplier, error) { - msg, err := natsio.GetServer().Request(subject.Supplier.CheckTokenSupplier, toBytes(p)) - if err != nil { - return nil, err - } - - var r struct { - Error string `json:"error"` - Data *model.ResponseCheckTokenSupplier `json:"data"` - } - 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 index f7b52ad..54eb7b5 100644 --- a/client/supplier_user.go +++ b/client/supplier_user.go @@ -241,3 +241,23 @@ func (s SupplierUser) ChangePassword(p model.ChangePasswordRequest) error { return nil } + +// CheckTokenSupplier ... +func (s SupplierUser) CheckTokenSupplier(p model.CheckTokenSupplierUserPayload) (*model.ResponseCheckTokenSupplierUser, error) { + msg, err := natsio.GetServer().Request(subject.SupplierUser.CheckToken, toBytes(p)) + if err != nil { + return nil, err + } + + var r struct { + Error string `json:"error"` + Data *model.ResponseCheckTokenSupplierUser `json:"data"` + } + 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_request.go b/model/supplier_request.go index 98e613b..d4ca0a4 100644 --- a/model/supplier_request.go +++ b/model/supplier_request.go @@ -62,9 +62,3 @@ type SupplierCountReq struct { IDs []string `json:"ids"` Status string `json:"status"` // active,inactive } - -// CheckTokenSupplierPayload ... -type CheckTokenSupplierPayload struct { - Token string `json:"token"` - Permissions []string `json:"permissions"` -} diff --git a/model/supplier_response.go b/model/supplier_response.go index 8147992..9e20e27 100644 --- a/model/supplier_response.go +++ b/model/supplier_response.go @@ -84,10 +84,3 @@ type SyncSupplierWarehousePayload struct { type SupplierCountRes struct { Total int64 `json:"total"` } - -// ResponseCheckTokenSupplier ... -type ResponseCheckTokenSupplier struct { - IsValid bool `json:"isValid"` - Reason string `json:"reason"` - Supplier ResponseSupplierInfo `json:"supplier"` -} diff --git a/model/supplier_user_request.go b/model/supplier_user_request.go index 401a1d1..db9f16a 100644 --- a/model/supplier_user_request.go +++ b/model/supplier_user_request.go @@ -84,3 +84,9 @@ type ChangePasswordRequest struct { ID string `json:"_id"` Password string `json:"password"` } + +// CheckTokenSupplierUserPayload ... +type CheckTokenSupplierUserPayload struct { + Token string `json:"token"` + Permissions []string `json:"permissions"` +} diff --git a/model/supplier_user_response.go b/model/supplier_user_response.go index 3df1ea0..cecbde1 100644 --- a/model/supplier_user_response.go +++ b/model/supplier_user_response.go @@ -39,3 +39,16 @@ type CreateStaffResponse struct { type ResetPasswordResponse struct { Password string `json:"password"` } + +// ResponseCheckTokenSupplierUser ... +type ResponseCheckTokenSupplierUser struct { + IsValid bool `json:"isValid"` + Reason string `json:"reason"` + User ResponseSupplierUserInfo `json:"supplier"` +} + +type ResponseSupplierUserInfo struct { + ID string `json:"_id"` + Name string `json:"name"` + SupplierID string `json:"supplierId"` +} diff --git a/subject/supplier.go b/subject/supplier.go index 890d89f..931a3e7 100644 --- a/subject/supplier.go +++ b/subject/supplier.go @@ -18,7 +18,6 @@ var Supplier = struct { GetFreeShipInfo string FindAllOld string Count string - CheckTokenSupplier string }{ GetListSupplierInfo: getSupplierValue("get_list_supplier_info"), GetSupplierContractBySupplierID: getSupplierValue("get_supplier_contract_by_supplier_id"), @@ -31,5 +30,4 @@ var Supplier = struct { GetFreeShipInfo: getSupplierValue("get_free_ship_info"), FindAllOld: getSupplierValue("find_all_old"), Count: getSupplierValue("count"), - CheckTokenSupplier: getSupplierValue("check_token_supplier"), } diff --git a/subject/supplier_user.go b/subject/supplier_user.go index 49d186c..2292f43 100644 --- a/subject/supplier_user.go +++ b/subject/supplier_user.go @@ -19,6 +19,7 @@ var SupplierUser = struct { UpdateStatus string ResetPassword string ChangePassword string + CheckToken string }{ // Users LoginUser: getSupplierUserValue("login_user"), @@ -32,4 +33,5 @@ var SupplierUser = struct { UpdateStatus: getSupplierUserValue("update_status"), ResetPassword: getSupplierUserValue("reset_password"), ChangePassword: getSupplierUserValue("change_password"), + CheckToken: getSupplierUserValue("check_token"), }