[MM-37760] Reduce export surface of client4 (#18102)

api4/bot_test.go

@@ -458,7 +458,7 @@ func TestPatchBot(t *testing.T) {
 		CheckCreatedStatus(t, resp)
 		defer th.App.PermanentDeleteBot(createdBot.UserId)
 
-		r, err := th.Client.DoApiPut(th.Client.GetBotRoute(createdBot.UserId), `{"creator_id":"`+th.BasicUser2.Id+`"}`)
+		r, err := th.Client.DoApiPut("/bots/"+createdBot.UserId, `{"creator_id":"`+th.BasicUser2.Id+`"}`)
 		require.NoError(t, err)
 		defer func() {
 			_, _ = ioutil.ReadAll(r.Body)

api4/config_test.go

@@ -170,7 +170,7 @@ func TestUpdateConfig(t *testing.T) {
 		require.Equal(t, SiteName, cfg.TeamSettings.SiteName, "It should update the SiteName")
 
 		t.Run("Should set defaults for missing fields", func(t *testing.T) {
-			_, err = th.SystemAdminClient.DoApiPut(th.SystemAdminClient.GetConfigRoute(), "{}")
+			_, err = th.SystemAdminClient.DoApiPut("/config", "{}")
 			require.NoError(t, err)
 		})
 

api4/file_test.go

@@ -60,7 +60,7 @@ func fileBytes(t *testing.T, path string) []byte {
 
 func testDoUploadFileRequest(t testing.TB, c *model.Client4, url string, blob []byte, contentType string,
 	contentLength int64) (*model.FileUploadResponse, *model.Response, error) {
-	req, err := http.NewRequest("POST", c.ApiUrl+c.GetFilesRoute()+url, bytes.NewReader(blob))
+	req, err := http.NewRequest("POST", c.ApiUrl+"/files"+url, bytes.NewReader(blob))
 	require.NoError(t, err)
 
 	if contentLength != 0 {

api4/system_test.go

@@ -71,7 +71,7 @@ func TestGetPing(t *testing.T) {
 
 	th.TestForAllClients(t, func(t *testing.T, client *model.Client4) {
 		th.App.ReloadConfig()
-		resp, err := client.DoApiGet(client.GetSystemRoute()+"/ping", "")
+		resp, err := client.DoApiGet("/system/ping", "")
 		require.NoError(t, err)
 		require.Equal(t, http.StatusOK, resp.StatusCode)
 		respBytes, err := ioutil.ReadAll(resp.Body)
@@ -84,7 +84,7 @@ func TestGetPing(t *testing.T) {
 		defer os.Unsetenv("MM_FEATUREFLAGS_TESTFEATURE")
 		th.App.ReloadConfig()
 
-		resp, err = client.DoApiGet(client.GetSystemRoute()+"/ping", "")
+		resp, err = client.DoApiGet("/system/ping", "")
 		require.NoError(t, err)
 		require.Equal(t, http.StatusOK, resp.StatusCode)
 		respBytes, err = ioutil.ReadAll(resp.Body)

api4/team_test.go

@@ -343,7 +343,7 @@ func TestUpdateTeam(t *testing.T) {
 		originalTeamId := team.Id
 		team.Id = model.NewId()
 
-		r, err := th.Client.DoApiPut(client.GetTeamRoute(originalTeamId), team.ToJson())
+		r, err := th.Client.DoApiPut("/teams/"+originalTeamId, team.ToJson())
 		assert.Error(t, err)
 		assert.Equal(t, http.StatusBadRequest, r.StatusCode)
 
@@ -3138,7 +3138,7 @@ func TestInviteGuestsToTeam(t *testing.T) {
 	require.NoError(t, err)
 
 	t.Run("invalid data in request body", func(t *testing.T) {
-		res, err := th.SystemAdminClient.DoApiPost(th.SystemAdminClient.GetTeamRoute(th.BasicTeam.Id)+"/invite-guests/email", "bad data")
+		res, err := th.SystemAdminClient.DoApiPost("/teams/"+th.BasicTeam.Id+"/invite-guests/email", "bad data")
 		require.Error(t, err)
 		CheckErrorID(t, err, "api.team.invite_guests_to_channels.invalid_body.app_error")
 		require.Equal(t, http.StatusBadRequest, res.StatusCode)

model/client4_test.go

@@ -94,26 +94,3 @@ func TestClient4SetToken(t *testing.T) {
 	assert.NoError(t, err)
 	assert.Equal(t, http.StatusOK, resp.StatusCode)
 }
-
-func TestClient4MockSession(t *testing.T) {
-	expected := NewId()
-
-	server := httptest.NewServer(http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
-		authHeader := r.Header.Get(HeaderAuth)
-
-		token := strings.Split(authHeader, HeaderBearer)
-
-		if len(token) < 2 {
-			t.Errorf("wrong authorization header format, got %s, expected: %s %s", authHeader, HeaderBearer, expected)
-		}
-
-		assert.Equal(t, expected, strings.TrimSpace(token[1]))
-	}))
-
-	client := NewAPIv4Client(server.URL)
-	client.MockSession(expected)
-
-	_, resp, err := client.GetMe("")
-	assert.NoError(t, err)
-	assert.Equal(t, http.StatusOK, resp.StatusCode)
-}