From 4e54a40a219c2d27026b81ebe0e4236313be5b67 Mon Sep 17 00:00:00 2001
From: Conor Macpherson <conor.macpherson@mattermost.com>
Date: Thu, 29 Dec 2022 15:07:06 -0500
Subject: [PATCH] Add cws availability check.

---
 api4/cloud.go                       |  2 +-
 einterfaces/cloud.go                |  2 +-
 einterfaces/mocks/CloudInterface.go | 10 +++++-----
 model/client4.go                    |  2 +-
 4 files changed, 8 insertions(+), 8 deletions(-)

diff --git a/api4/cloud.go b/api4/cloud.go
index b9beec397b..e9493a32d4 100644
--- a/api4/cloud.go
+++ b/api4/cloud.go
@@ -751,7 +751,7 @@ func handleCWSWebhook(c *Context, w http.ResponseWriter, r *http.Request) {
 }
 
 func handleCheckCWSConnection(c *Context, w http.ResponseWriter, r *http.Request) {
-	if err := c.App.Cloud().CheckCWSConnection(); err != nil {
+	if err := c.App.Cloud().CheckCWSConnection(c.AppContext.Session().UserId); err != nil {
 		c.Err = model.NewAppError("Api4.handleCWSHealthCheck", "api.server.cws.health_check.app_error", nil, "CWS Server is not available.", http.StatusInternalServerError)
 		return
 	}
diff --git a/einterfaces/cloud.go b/einterfaces/cloud.go
index dadca484ff..bfaabae67e 100644
--- a/einterfaces/cloud.go
+++ b/einterfaces/cloud.go
@@ -46,5 +46,5 @@ type CloudInterface interface {
 	CreateOrUpdateSubscriptionHistoryEvent(userID string, userCount int) (*model.SubscriptionHistory, error)
 	HandleLicenseChange() error
 
-	CheckCWSConnection() error
+	CheckCWSConnection(userId string) error
 }
diff --git a/einterfaces/mocks/CloudInterface.go b/einterfaces/mocks/CloudInterface.go
index b0ef53c14f..4b19465161 100644
--- a/einterfaces/mocks/CloudInterface.go
+++ b/einterfaces/mocks/CloudInterface.go
@@ -60,13 +60,13 @@ func (_m *CloudInterface) ChangeSubscription(userID string, subscriptionID strin
 	return r0, r1
 }
 
-// CheckCWSConnection provides a mock function with given fields:
-func (_m *CloudInterface) CheckCWSConnection() error {
-	ret := _m.Called()
+// CheckCWSConnection provides a mock function with given fields: userId
+func (_m *CloudInterface) CheckCWSConnection(userId string) error {
+	ret := _m.Called(userId)
 
 	var r0 error
-	if rf, ok := ret.Get(0).(func() error); ok {
-		r0 = rf()
+	if rf, ok := ret.Get(0).(func(string) error); ok {
+		r0 = rf(userId)
 	} else {
 		r0 = ret.Error(0)
 	}
diff --git a/model/client4.go b/model/client4.go
index 85699eac6c..64bf163312 100644
--- a/model/client4.go
+++ b/model/client4.go
@@ -8700,7 +8700,7 @@ func (c *Client4) AddUserToGroupSyncables(userID string) (*Response, error) {
 	return BuildResponse(r), nil
 }
 
-func (c *Client4) CheckCWSConnection() (*Response, error) {
+func (c *Client4) CheckCWSConnection(userId string) (*Response, error) {
 	r, err := c.DoAPIGet(c.cloudRoute()+"/healthz", "")
 
 	if err != nil {