Content-Type fixes in client4.ts and remote_cluster.go (#27887)

Co-authored-by: Mattermost Build <build@mattermost.com>
Co-authored-by: Miguel de la Cruz <miguel@mcrx.me>

server/channels/api4/remote_cluster.go

@@ -539,7 +539,9 @@ func generateRemoteClusterInvite(c *Context, w http.ResponseWriter, r *http.Requ
 	}
 
 	w.WriteHeader(http.StatusCreated)
-	w.Write([]byte(inviteCode))
+	if err := json.NewEncoder(w).Encode(inviteCode); err != nil {
+		c.Logger.Warn("Error while writing response", mlog.Err(err))
+	}
 }
 
 func getRemoteCluster(c *Context, w http.ResponseWriter, r *http.Request) {
@@ -663,5 +665,5 @@ func deleteRemoteCluster(c *Context, w http.ResponseWriter, r *http.Request) {
 	}
 
 	auditRec.Success()
-	w.WriteHeader(http.StatusNoContent)
+	ReturnStatusOK(w)
 }

server/channels/api4/remote_cluster_test.go

@@ -605,7 +605,7 @@ func TestDeleteRemoteCluster(t *testing.T) {
 		require.Zero(t, initialRC.DeleteAt)
 
 		resp, err := th.SystemAdminClient.DeleteRemoteCluster(context.Background(), rc.RemoteId)
-		CheckNoContentStatus(t, resp)
+		CheckOKStatus(t, resp)
 		require.NoError(t, err)
 
 		deletedRC, appErr := th.App.GetRemoteCluster(rc.RemoteId)

server/public/model/client4.go

@@ -8848,11 +8848,12 @@ func (c *Client4) GenerateRemoteClusterInvite(ctx context.Context, remoteCluster
 	}
 	defer closeBody(r)
 
-	b, err := io.ReadAll(r.Body)
-	if err != nil {
-		return "", nil, NewAppError("GenerateRemoteClusterInvite", "api.read_error", nil, "", http.StatusInternalServerError).Wrap(err)
+	var inviteCode string
+	if err := json.NewDecoder(r.Body).Decode(&inviteCode); err != nil {
+		return "", nil, NewAppError("GenerateRemoteClusterInvite", "api.unmarshall_error", nil, "", http.StatusInternalServerError).Wrap(err)
 	}
-	return string(b), BuildResponse(r), nil
+
+	return inviteCode, BuildResponse(r), nil
 }
 
 func (c *Client4) GetRemoteCluster(ctx context.Context, remoteClusterId string) (*RemoteCluster, *Response, error) {
@@ -8863,7 +8864,9 @@ func (c *Client4) GetRemoteCluster(ctx context.Context, remoteClusterId string)
 	defer closeBody(r)
 
 	var rc *RemoteCluster
-	json.NewDecoder(r.Body).Decode(&rc)
+	if err := json.NewDecoder(r.Body).Decode(&rc); err != nil {
+		return nil, nil, NewAppError("GetRemoteCluster", "api.unmarshall_error", nil, "", http.StatusInternalServerError).Wrap(err)
+	}
 
 	return rc, BuildResponse(r), nil
 }

webapp/platform/client/src/client4.ts

@@ -4179,7 +4179,11 @@ export default class Client4 {
 
         let data;
         try {
-            data = await response.json();
+            if (headers.get('Content-Type') === 'application/json') {
+                data = await response.json();
+            } else {
+                data = await response.text();
+            }
         } catch (err) {
             throw new ClientError(this.getUrl(), {
                 message: 'Received invalid response from the server.',