MM-44509 - subscription change not reflected after trial (#20352)

* MM-44509 - subscription change not reflected after trial

* fix the tests

* receive the subscription id as param, defer the cache invalidation

* validate business email with body request

* update api request to accept json body payload

* fix unit tests

* fix tests after merge conflict fixes

Co-authored-by: Pablo Velez Vidal <pablo.velez@mattermost.com>
Co-authored-by: Mattermod <mattermod@users.noreply.github.com>
Этот коммит содержится в:
Pablo Andrés Vélez Vidal
2022-06-21 01:40:27 +02:00
коммит произвёл GitHub
родитель f1ddd3ad38
Коммит 2b8d63b606
4 изменённых файлов: 46 добавлений и 16 удалений

Просмотреть файл

@@ -7838,7 +7838,7 @@ func (c *Client4) ConfirmCustomerPayment(confirmRequest *ConfirmPaymentMethodReq
return BuildResponse(r), nil
}
func (c *Client4) RequestCloudTrial(email *ValidateBusinessEmailRequest) (*Subscription, *Response, error) {
func (c *Client4) RequestCloudTrial(email *StartCloudTrialRequest) (*Subscription, *Response, error) {
payload, _ := json.Marshal(email)
r, err := c.DoAPIPutBytes(c.cloudRoute()+"/request-trial", payload)
if err != nil {
@@ -7852,8 +7852,9 @@ func (c *Client4) RequestCloudTrial(email *ValidateBusinessEmailRequest) (*Subsc
return subscription, BuildResponse(r), nil
}
func (c *Client4) ValidateBusinessEmail() (*Response, error) {
r, err := c.DoAPIPost(c.cloudRoute()+"/validate-business-email", "")
func (c *Client4) ValidateBusinessEmail(email *ValidateBusinessEmailRequest) (*Response, error) {
payload, _ := json.Marshal(email)
r, err := c.DoAPIPostBytes(c.cloudRoute()+"/validate-business-email", payload)
if err != nil {
return BuildResponse(r), err
}