refactor: clarify pre-refresh response naming

Author: shepilov

model/sharing/member.go

@@ -389,12 +389,12 @@ func (s *Sharing) SendDelegated(inst *instance.Instance, api *APIDelegateAddCont
 		ParseError: ParseRequestError,
 	}
 	res, err := request.Req(opts)
-	originalRes, originalErr := res, err
+	preRefreshRes, preRefreshErr := res, err
 	if res != nil && res.StatusCode/100 == 4 {
 		res, err = RefreshToken(inst, res, err, s, &s.Members[0], c, opts, body)
 	}
 	if err != nil {
-		return preserveDelegatedResponseError(res, err, originalRes, originalErr)
+		return preserveDelegatedResponseError(res, err, preRefreshRes, preRefreshErr)
 	}
 	defer res.Body.Close()
 	if res.StatusCode != http.StatusOK {
@@ -468,14 +468,14 @@ func delegatedMemberStateKey(m Member) string {
 func preserveDelegatedResponseError(
 	res *http.Response,
 	err error,
-	originalRes *http.Response,
-	originalErr error,
+	preRefreshRes *http.Response,
+	preRefreshErr error,
 ) error {
 	if res != nil && res.StatusCode/100 == 4 {
 		return preserveDelegatedRequestError(res.StatusCode, err)
 	}
-	if originalRes != nil && originalRes.StatusCode/100 == 4 {
-		return preserveDelegatedRequestError(originalRes.StatusCode, originalErr)
+	if preRefreshRes != nil && preRefreshRes.StatusCode/100 == 4 {
+		return preserveDelegatedRequestError(preRefreshRes.StatusCode, preRefreshErr)
 	}
 	return err
 }
@@ -1131,13 +1131,13 @@ func (s *Sharing) DelegateRevokeRecipient(inst *instance.Instance, index int) er
 		ParseError: ParseRequestError,
 	}
 	res, err := request.Req(opts)
-	originalRes, originalErr := res, err
+	preRefreshRes, preRefreshErr := res, err
 	if res != nil && res.StatusCode/100 == 4 {
 		res, err = RefreshToken(inst, res, err, s, &s.Members[0], c, opts, nil)
 	}
 	if err != nil {
-		if originalRes != nil && originalRes.StatusCode == http.StatusForbidden {
-			return preserveDelegatedRequestError(originalRes.StatusCode, originalErr)
+		if preRefreshRes != nil && preRefreshRes.StatusCode == http.StatusForbidden {
+			return preserveDelegatedRequestError(preRefreshRes.StatusCode, preRefreshErr)
 		}
 		return err
 	}

model/sharing/member_test.go

@@ -22,25 +22,25 @@ import (
 
 func TestPreserveDelegatedResponseError(t *testing.T) {
 	t.Run("prefers the response returned after token refresh", func(t *testing.T) {
-		originalRes := &http.Response{StatusCode: http.StatusUnauthorized}
-		originalErr := &request.Error{Detail: `{"errors":[{"status":"401","title":"Unauthorized"}]}`}
+		preRefreshRes := &http.Response{StatusCode: http.StatusUnauthorized}
+		preRefreshErr := &request.Error{Detail: `{"errors":[{"status":"401","title":"Unauthorized"}]}`}
 		res := &http.Response{StatusCode: http.StatusConflict}
 		err := &request.Error{Detail: `{"errors":[{"status":"409","title":"Conflict","detail":"already active"}]}`}
 
-		got := preserveDelegatedResponseError(res, err, originalRes, originalErr)
+		got := preserveDelegatedResponseError(res, err, preRefreshRes, preRefreshErr)
 
 		var apiErr *jsonapi.Error
 		require.ErrorAs(t, got, &apiErr)
 		require.Equal(t, http.StatusConflict, apiErr.Status)
 		require.Equal(t, "already active", apiErr.Detail)
 	})
 
-	t.Run("falls back to the original response when refresh fails", func(t *testing.T) {
-		originalRes := &http.Response{StatusCode: http.StatusForbidden}
-		originalErr := &request.Error{Detail: `{"errors":[{"status":"403","title":"Forbidden","detail":"read only"}]}`}
+	t.Run("falls back to the pre-refresh response when refresh fails", func(t *testing.T) {
+		preRefreshRes := &http.Response{StatusCode: http.StatusForbidden}
+		preRefreshErr := &request.Error{Detail: `{"errors":[{"status":"403","title":"Forbidden","detail":"read only"}]}`}
 		refreshErr := fmt.Errorf("refresh failed")
 
-		got := preserveDelegatedResponseError(nil, refreshErr, originalRes, originalErr)
+		got := preserveDelegatedResponseError(nil, refreshErr, preRefreshRes, preRefreshErr)
 
 		var apiErr *jsonapi.Error
 		require.ErrorAs(t, got, &apiErr)