Skip to content

Commit

Permalink
Clean up string constants.
Browse files Browse the repository at this point in the history
  • Loading branch information
@zyro
zyro committed Feb 5, 2025
1 parent 202eedc commit e4b25df
Show file tree
Hide file tree
Showing 3 changed files with 18 additions and 19 deletions.
14 changes: 7 additions & 7 deletions iap/iap.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -188,7 +188,7 @@ func ValidateReceiptAppleWithUrl(ctx context.Context, httpc *http.Client, url, r
return nil, nil, err
}

req, err := http.NewRequestWithContext(ctx, "POST", url, &w)
req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, &w)
if err != nil {
return nil, nil, err
}
Expand Down Expand Up @@ -354,7 +354,7 @@ func getGoogleAccessToken(ctx context.Context, httpc *http.Client, email, privat
data.Set("assertion", signed)
body := data.Encode()

req, err := http.NewRequestWithContext(ctx, "POST", authUrl, strings.NewReader(body))
req, err := http.NewRequestWithContext(ctx, http.MethodPost, authUrl, strings.NewReader(body))
if err != nil {
return "", err
}
Expand Down Expand Up @@ -433,7 +433,7 @@ func validateReceiptGoogleWithIDs(ctx context.Context, httpc *http.Client, token
RawQuery: fmt.Sprintf("access_token=%s", token),
Scheme: "https",
}
req, err := http.NewRequestWithContext(ctx, "GET", u.String(), nil)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
if err != nil {
return nil, nil, nil, err
}
Expand Down Expand Up @@ -548,7 +548,7 @@ func requestVoidedTransactionsGoogle(ctx context.Context, httpc *http.Client, pa
if nextPageToken != "" {
u.RawQuery = fmt.Sprintf("access_token=%s&type=1&pageSelection.token=%s", token, nextPageToken)
}
req, err := http.NewRequestWithContext(ctx, "GET", u.String(), nil)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
if err != nil {
return nil, "", err
}
Expand Down Expand Up @@ -661,7 +661,7 @@ func ValidateSubscriptionReceiptGoogleWithIDs(ctx context.Context, httpc *http.C
RawQuery: fmt.Sprintf("access_token=%s", token),
Scheme: "https",
}
req, err := http.NewRequestWithContext(ctx, "GET", u.String(), nil)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, u.String(), nil)
if err != nil {
return nil, nil, nil, err
}
Expand Down Expand Up @@ -758,7 +758,7 @@ func getHuaweiAccessToken(ctx context.Context, httpc *http.Client, clientID, cli
}
urlValue := url.Values{"grant_type": {"client_credentials"}, "client_id": {clientID}, "client_secret": {clientSecret}}
body := urlValue.Encode()
req, err := http.NewRequestWithContext(ctx, "POST", authUrl, strings.NewReader(body))
req, err := http.NewRequestWithContext(ctx, http.MethodPost, authUrl, strings.NewReader(body))
if err != nil {
return "", err
}
Expand Down Expand Up @@ -837,7 +837,7 @@ func ValidateReceiptHuawei(ctx context.Context, httpc *http.Client, pubKey, clie
return nil, nil, nil, err
}

req, err := http.NewRequestWithContext(ctx, "POST", u.String(), bytes.NewBuffer(reqBody))
req, err := http.NewRequestWithContext(ctx, http.MethodPost, u.String(), bytes.NewBuffer(reqBody))
if err != nil {
return nil, nil, nil, err
}
Expand Down
20 changes: 10 additions & 10 deletions internal/satori/satori.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -280,7 +280,7 @@ func (s *SatoriClient) Authenticate(ctx context.Context, id string, defaultPrope
return nil, err
}

req, err := http.NewRequestWithContext(ctx, "POST", url, bytes.NewReader(jsonBody))
req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(jsonBody))
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -350,7 +350,7 @@ func (s *SatoriClient) PropertiesGet(ctx context.Context, id string) (*runtime.P
return nil, err
}

req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -411,7 +411,7 @@ func (s *SatoriClient) PropertiesUpdate(ctx context.Context, id string, properti
return err
}

req, err := http.NewRequestWithContext(ctx, "PUT", url, bytes.NewReader(json))
req, err := http.NewRequestWithContext(ctx, http.MethodPut, url, bytes.NewReader(json))
if err != nil {
return err
}
Expand Down Expand Up @@ -478,7 +478,7 @@ func (s *SatoriClient) EventsPublish(ctx context.Context, id string, events []*r
return err
}

req, err := http.NewRequestWithContext(ctx, "POST", url, bytes.NewReader(json))
req, err := http.NewRequestWithContext(ctx, http.MethodPost, url, bytes.NewReader(json))
if err != nil {
return err
}
Expand Down Expand Up @@ -535,7 +535,7 @@ func (s *SatoriClient) ExperimentsList(ctx context.Context, id string, names ...
return nil, err
}

req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -614,7 +614,7 @@ func (s *SatoriClient) FlagsList(ctx context.Context, id string, names ...string
return nil, err
}

req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -705,7 +705,7 @@ func (s *SatoriClient) LiveEventsList(ctx context.Context, id string, names ...s
return nil, err
}

req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -778,7 +778,7 @@ func (s *SatoriClient) MessagesList(ctx context.Context, id string, limit int, f
return nil, err
}

req, err := http.NewRequestWithContext(ctx, "GET", url, nil)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, url, nil)
if err != nil {
return nil, err
}
Expand Down Expand Up @@ -845,7 +845,7 @@ func (s *SatoriClient) MessageUpdate(ctx context.Context, id, messageId string,
return err
}

req, err := http.NewRequestWithContext(ctx, "PUT", url, bytes.NewReader(json))
req, err := http.NewRequestWithContext(ctx, http.MethodPut, url, bytes.NewReader(json))
if err != nil {
return err
}
Expand Down Expand Up @@ -893,7 +893,7 @@ func (s *SatoriClient) MessageDelete(ctx context.Context, id, messageId string)
return err
}

req, err := http.NewRequestWithContext(ctx, "DELETE", url, nil)
req, err := http.NewRequestWithContext(ctx, http.MethodDelete, url, nil)
if err != nil {
return err
}
Expand Down
3 changes: 1 addition & 2 deletions social/social.go
View file
Original file line number Diff line number Diff line change
Expand Up @@ -948,12 +948,11 @@ func (c *Client) request(ctx context.Context, provider, path string, headers map
}

func (c *Client) requestRaw(ctx context.Context, provider, path string, headers map[string]string) ([]byte, error) {
req, err := http.NewRequest("GET", path, nil)
req, err := http.NewRequestWithContext(ctx, http.MethodGet, path, nil)
if err != nil {
c.logger.Warn("error constructing social request", zap.String("provider", provider), zap.Error(err))
return nil, err
}
req = req.WithContext(ctx)
for k, v := range headers {
req.Header.Add(k, v)
}
Expand Down

0 comments on commit e4b25df

Please sign in to comment.