[MM-28694] Add MM User information in the CWS request headers (#15824)
* Include user data in the cloud endpoints Those headers will include the user ID and Email so we can use them in CWS * Removed AppError from enterprise/cloud We're removing the AppError from all the places that don't belong to the app or api4 packages. * Remove unused i18n strings * Move it to the server init of enterprise Also moved the initialization of the enterprise part in the server after the store is initialized * Initialize after the store is set in NewServer The ideal way to do it should be to move the initEnterprise call after the store is set but that would lead to undesired side-effects so we initialize the cloud part alone. Signed-off-by: Mario de Frutos <mario@defrutos.org>
Этот коммит содержится в:
Mario de Frutos Dieguez
коммит произвёл
GitHub
GitHub
родитель
633d82f0ac
Коммит
5203fc8608
@@ -8,16 +8,16 @@ import (
|
||||
)
|
||||
|
||||
type CloudInterface interface {
|
||||
GetCloudProducts() ([]*model.Product, *model.AppError)
|
||||
GetCloudProducts(userID string) ([]*model.Product, error)
|
||||
|
||||
CreateCustomerPayment() (*model.StripeSetupIntent, *model.AppError)
|
||||
ConfirmCustomerPayment(*model.ConfirmPaymentMethodRequest) *model.AppError
|
||||
CreateCustomerPayment(userID string) (*model.StripeSetupIntent, error)
|
||||
ConfirmCustomerPayment(userID string, confirmRequest *model.ConfirmPaymentMethodRequest) error
|
||||
|
||||
GetCloudCustomer() (*model.CloudCustomer, *model.AppError)
|
||||
UpdateCloudCustomer(customerInfo *model.CloudCustomerInfo) (*model.CloudCustomer, *model.AppError)
|
||||
UpdateCloudCustomerAddress(address *model.Address) (*model.CloudCustomer, *model.AppError)
|
||||
GetCloudCustomer(userID string) (*model.CloudCustomer, error)
|
||||
UpdateCloudCustomer(userID string, customerInfo *model.CloudCustomerInfo) (*model.CloudCustomer, error)
|
||||
UpdateCloudCustomerAddress(userID string, address *model.Address) (*model.CloudCustomer, error)
|
||||
|
||||
GetSubscription() (*model.Subscription, *model.AppError)
|
||||
GetInvoicesForSubscription() ([]*model.Invoice, *model.AppError)
|
||||
GetInvoicePDF(invoiceID string) ([]byte, string, *model.AppError)
|
||||
GetSubscription(userID string) (*model.Subscription, error)
|
||||
GetInvoicesForSubscription(userID string) ([]*model.Invoice, error)
|
||||
GetInvoicePDF(userID, invoiceID string) ([]byte, string, error)
|
||||
}
|
||||
|
||||
@@ -14,104 +14,96 @@ type CloudInterface struct {
|
||||
mock.Mock
|
||||
}
|
||||
|
||||
// ConfirmCustomerPayment provides a mock function with given fields: _a0
|
||||
func (_m *CloudInterface) ConfirmCustomerPayment(_a0 *model.ConfirmPaymentMethodRequest) *model.AppError {
|
||||
ret := _m.Called(_a0)
|
||||
// ConfirmCustomerPayment provides a mock function with given fields: userID, confirmRequest
|
||||
func (_m *CloudInterface) ConfirmCustomerPayment(userID string, confirmRequest *model.ConfirmPaymentMethodRequest) error {
|
||||
ret := _m.Called(userID, confirmRequest)
|
||||
|
||||
var r0 *model.AppError
|
||||
if rf, ok := ret.Get(0).(func(*model.ConfirmPaymentMethodRequest) *model.AppError); ok {
|
||||
r0 = rf(_a0)
|
||||
var r0 error
|
||||
if rf, ok := ret.Get(0).(func(string, *model.ConfirmPaymentMethodRequest) error); ok {
|
||||
r0 = rf(userID, confirmRequest)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.AppError)
|
||||
}
|
||||
r0 = ret.Error(0)
|
||||
}
|
||||
|
||||
return r0
|
||||
}
|
||||
|
||||
// CreateCustomerPayment provides a mock function with given fields:
|
||||
func (_m *CloudInterface) CreateCustomerPayment() (*model.StripeSetupIntent, *model.AppError) {
|
||||
ret := _m.Called()
|
||||
// CreateCustomerPayment provides a mock function with given fields: userID
|
||||
func (_m *CloudInterface) CreateCustomerPayment(userID string) (*model.StripeSetupIntent, error) {
|
||||
ret := _m.Called(userID)
|
||||
|
||||
var r0 *model.StripeSetupIntent
|
||||
if rf, ok := ret.Get(0).(func() *model.StripeSetupIntent); ok {
|
||||
r0 = rf()
|
||||
if rf, ok := ret.Get(0).(func(string) *model.StripeSetupIntent); ok {
|
||||
r0 = rf(userID)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.StripeSetupIntent)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
|
||||
r1 = rf()
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func(string) error); ok {
|
||||
r1 = rf(userID)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// GetCloudCustomer provides a mock function with given fields:
|
||||
func (_m *CloudInterface) GetCloudCustomer() (*model.CloudCustomer, *model.AppError) {
|
||||
ret := _m.Called()
|
||||
// GetCloudCustomer provides a mock function with given fields: userID
|
||||
func (_m *CloudInterface) GetCloudCustomer(userID string) (*model.CloudCustomer, error) {
|
||||
ret := _m.Called(userID)
|
||||
|
||||
var r0 *model.CloudCustomer
|
||||
if rf, ok := ret.Get(0).(func() *model.CloudCustomer); ok {
|
||||
r0 = rf()
|
||||
if rf, ok := ret.Get(0).(func(string) *model.CloudCustomer); ok {
|
||||
r0 = rf(userID)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.CloudCustomer)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
|
||||
r1 = rf()
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func(string) error); ok {
|
||||
r1 = rf(userID)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// GetCloudProducts provides a mock function with given fields:
|
||||
func (_m *CloudInterface) GetCloudProducts() ([]*model.Product, *model.AppError) {
|
||||
ret := _m.Called()
|
||||
// GetCloudProducts provides a mock function with given fields: userID
|
||||
func (_m *CloudInterface) GetCloudProducts(userID string) ([]*model.Product, error) {
|
||||
ret := _m.Called(userID)
|
||||
|
||||
var r0 []*model.Product
|
||||
if rf, ok := ret.Get(0).(func() []*model.Product); ok {
|
||||
r0 = rf()
|
||||
if rf, ok := ret.Get(0).(func(string) []*model.Product); ok {
|
||||
r0 = rf(userID)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]*model.Product)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
|
||||
r1 = rf()
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func(string) error); ok {
|
||||
r1 = rf(userID)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// GetInvoicePDF provides a mock function with given fields: invoiceID
|
||||
func (_m *CloudInterface) GetInvoicePDF(invoiceID string) ([]byte, string, *model.AppError) {
|
||||
ret := _m.Called(invoiceID)
|
||||
// GetInvoicePDF provides a mock function with given fields: userID, invoiceID
|
||||
func (_m *CloudInterface) GetInvoicePDF(userID string, invoiceID string) ([]byte, string, error) {
|
||||
ret := _m.Called(userID, invoiceID)
|
||||
|
||||
var r0 []byte
|
||||
if rf, ok := ret.Get(0).(func(string) []byte); ok {
|
||||
r0 = rf(invoiceID)
|
||||
if rf, ok := ret.Get(0).(func(string, string) []byte); ok {
|
||||
r0 = rf(userID, invoiceID)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]byte)
|
||||
@@ -119,119 +111,109 @@ func (_m *CloudInterface) GetInvoicePDF(invoiceID string) ([]byte, string, *mode
|
||||
}
|
||||
|
||||
var r1 string
|
||||
if rf, ok := ret.Get(1).(func(string) string); ok {
|
||||
r1 = rf(invoiceID)
|
||||
if rf, ok := ret.Get(1).(func(string, string) string); ok {
|
||||
r1 = rf(userID, invoiceID)
|
||||
} else {
|
||||
r1 = ret.Get(1).(string)
|
||||
}
|
||||
|
||||
var r2 *model.AppError
|
||||
if rf, ok := ret.Get(2).(func(string) *model.AppError); ok {
|
||||
r2 = rf(invoiceID)
|
||||
var r2 error
|
||||
if rf, ok := ret.Get(2).(func(string, string) error); ok {
|
||||
r2 = rf(userID, invoiceID)
|
||||
} else {
|
||||
if ret.Get(2) != nil {
|
||||
r2 = ret.Get(2).(*model.AppError)
|
||||
}
|
||||
r2 = ret.Error(2)
|
||||
}
|
||||
|
||||
return r0, r1, r2
|
||||
}
|
||||
|
||||
// GetInvoicesForSubscription provides a mock function with given fields:
|
||||
func (_m *CloudInterface) GetInvoicesForSubscription() ([]*model.Invoice, *model.AppError) {
|
||||
ret := _m.Called()
|
||||
// GetInvoicesForSubscription provides a mock function with given fields: userID
|
||||
func (_m *CloudInterface) GetInvoicesForSubscription(userID string) ([]*model.Invoice, error) {
|
||||
ret := _m.Called(userID)
|
||||
|
||||
var r0 []*model.Invoice
|
||||
if rf, ok := ret.Get(0).(func() []*model.Invoice); ok {
|
||||
r0 = rf()
|
||||
if rf, ok := ret.Get(0).(func(string) []*model.Invoice); ok {
|
||||
r0 = rf(userID)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).([]*model.Invoice)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
|
||||
r1 = rf()
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func(string) error); ok {
|
||||
r1 = rf(userID)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// GetSubscription provides a mock function with given fields:
|
||||
func (_m *CloudInterface) GetSubscription() (*model.Subscription, *model.AppError) {
|
||||
ret := _m.Called()
|
||||
// GetSubscription provides a mock function with given fields: userID
|
||||
func (_m *CloudInterface) GetSubscription(userID string) (*model.Subscription, error) {
|
||||
ret := _m.Called(userID)
|
||||
|
||||
var r0 *model.Subscription
|
||||
if rf, ok := ret.Get(0).(func() *model.Subscription); ok {
|
||||
r0 = rf()
|
||||
if rf, ok := ret.Get(0).(func(string) *model.Subscription); ok {
|
||||
r0 = rf(userID)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.Subscription)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func() *model.AppError); ok {
|
||||
r1 = rf()
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func(string) error); ok {
|
||||
r1 = rf(userID)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// UpdateCloudCustomer provides a mock function with given fields: customerInfo
|
||||
func (_m *CloudInterface) UpdateCloudCustomer(customerInfo *model.CloudCustomerInfo) (*model.CloudCustomer, *model.AppError) {
|
||||
ret := _m.Called(customerInfo)
|
||||
// UpdateCloudCustomer provides a mock function with given fields: userID, customerInfo
|
||||
func (_m *CloudInterface) UpdateCloudCustomer(userID string, customerInfo *model.CloudCustomerInfo) (*model.CloudCustomer, error) {
|
||||
ret := _m.Called(userID, customerInfo)
|
||||
|
||||
var r0 *model.CloudCustomer
|
||||
if rf, ok := ret.Get(0).(func(*model.CloudCustomerInfo) *model.CloudCustomer); ok {
|
||||
r0 = rf(customerInfo)
|
||||
if rf, ok := ret.Get(0).(func(string, *model.CloudCustomerInfo) *model.CloudCustomer); ok {
|
||||
r0 = rf(userID, customerInfo)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.CloudCustomer)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func(*model.CloudCustomerInfo) *model.AppError); ok {
|
||||
r1 = rf(customerInfo)
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func(string, *model.CloudCustomerInfo) error); ok {
|
||||
r1 = rf(userID, customerInfo)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
}
|
||||
|
||||
// UpdateCloudCustomerAddress provides a mock function with given fields: address
|
||||
func (_m *CloudInterface) UpdateCloudCustomerAddress(address *model.Address) (*model.CloudCustomer, *model.AppError) {
|
||||
ret := _m.Called(address)
|
||||
// UpdateCloudCustomerAddress provides a mock function with given fields: userID, address
|
||||
func (_m *CloudInterface) UpdateCloudCustomerAddress(userID string, address *model.Address) (*model.CloudCustomer, error) {
|
||||
ret := _m.Called(userID, address)
|
||||
|
||||
var r0 *model.CloudCustomer
|
||||
if rf, ok := ret.Get(0).(func(*model.Address) *model.CloudCustomer); ok {
|
||||
r0 = rf(address)
|
||||
if rf, ok := ret.Get(0).(func(string, *model.Address) *model.CloudCustomer); ok {
|
||||
r0 = rf(userID, address)
|
||||
} else {
|
||||
if ret.Get(0) != nil {
|
||||
r0 = ret.Get(0).(*model.CloudCustomer)
|
||||
}
|
||||
}
|
||||
|
||||
var r1 *model.AppError
|
||||
if rf, ok := ret.Get(1).(func(*model.Address) *model.AppError); ok {
|
||||
r1 = rf(address)
|
||||
var r1 error
|
||||
if rf, ok := ret.Get(1).(func(string, *model.Address) error); ok {
|
||||
r1 = rf(userID, address)
|
||||
} else {
|
||||
if ret.Get(1) != nil {
|
||||
r1 = ret.Get(1).(*model.AppError)
|
||||
}
|
||||
r1 = ret.Error(1)
|
||||
}
|
||||
|
||||
return r0, r1
|
||||
|
||||
Ссылка в новой задаче
Block a user