Revert "added token refresh function"

This reverts commit 7463104.

scm/client.go

@@ -93,7 +93,6 @@ type (
  PullRequests PullRequestService
  Repositories RepositoryService
  Reviews ReviewService
- Tokens TokenService
  Users UserService
  Webhooks WebhookService
 

scm/driver/bitbucket/bitbucket.go

@@ -14,35 +14,17 @@ import (
  "strings"
 
  "github.com/drone/go-scm/scm"
- "github.com/drone/go-scm/scm/transport/oauth2"
 )
 
-// ClientID string
-// ClientSecret string
-// Endpoint string
-
-// Source scm.TokenSource
-// Client *http.Client
-
 // New returns a new Bitbucket API client.
-func New(uri string, opt ...Option) (*scm.Client, error) {
+func New(uri string) (*scm.Client, error) {
  base, err := url.Parse(uri)
  if err != nil {
  return nil, err
  }
  if !strings.HasSuffix(base.Path, "/") {
  base.Path = base.Path + "/"
  }
- opts := new(Options)
- for _, o := range opt {
- o(opts)
- }
- refresher := &oauth2.Refresher{
- Endpoint: tokenEndpoint,
- ClientID: opts.clientID,
- ClientSecret: opts.clientSecret,
- Client: opts.client,
- }
  client := &wrapper{new(scm.Client)}
  client.BaseURL = base
  // initialize services
@@ -54,16 +36,15 @@ func New(uri string, opt ...Option) (*scm.Client, error) {
  client.PullRequests = &pullService{&issueService{client}}
  client.Repositories = &repositoryService{client}
  client.Reviews = &reviewService{client}
- client.Tokens = &tokenService{refresher}
  client.Users = &userService{client}
  client.Webhooks = &webhookService{client}
  return client.Client, nil
 }
 
 // NewDefault returns a new Bitbucket API client using the
 // default api.bitbucket.org address.
-func NewDefault(opt ...Option) *scm.Client {
- client, _ := New("https://api.bitbucket.org", opt...)
+func NewDefault() *scm.Client {
+ client, _ := New("https://api.bitbucket.org")
  return client
 }
 

scm/driver/gitea/gitea.go

@@ -38,7 +38,6 @@ func New(uri string) (*scm.Client, error) {
  client.PullRequests = &pullService{client}
  client.Repositories = &repositoryService{client}
  client.Reviews = &reviewService{client}
- client.Tokens = &tokenService{}
  client.Users = &userService{client}
  client.Webhooks = &webhookService{client}
  return client.Client, nil

scm/driver/github/github.go

@@ -36,7 +36,6 @@ func New(uri string) (*scm.Client, error) {
  client.PullRequests = &pullService{&issueService{client}}
  client.Repositories = &repositoryService{client}
  client.Reviews = &reviewService{client}
- client.Tokens = &tokenService{}
  client.Users = &userService{client}
  client.Webhooks = &webhookService{client}
  return client.Client, nil

scm/driver/gitlab/gitlab.go

@@ -35,9 +35,7 @@ func New(uri string) (*scm.Client, error) {
  client.PullRequests = &pullService{client}
  client.Repositories = &repositoryService{client}
  client.Reviews = &reviewService{client}
- client.Tokens = &tokenService{}
  client.Users = &userService{client}
- client.Webhooks = &webhookService{client}
  return client.Client, nil
 }
 

scm/driver/gogs/gogs.go

@@ -38,7 +38,6 @@ func New(uri string) (*scm.Client, error) {
  client.PullRequests = &pullService{client}
  client.Repositories = &repositoryService{client}
  client.Reviews = &reviewService{client}
- client.Tokens = &tokenService{}
  client.Users = &userService{client}
  client.Webhooks = &webhookService{client}
  return client.Client, nil

scm/driver/stash/stash.go

@@ -40,7 +40,6 @@ func New(uri string) (*scm.Client, error) {
  client.PullRequests = &pullService{client}
  client.Repositories = &repositoryService{client}
  client.Reviews = &reviewService{client}
- client.Tokens = &tokenService{}
  client.Users = &userService{client}
  client.Webhooks = &webhookService{client}
  return client.Client, nil

scm/token.go

@@ -23,20 +23,12 @@ type (
  Token(context.Context) (*Token, error)
  }
 
- // TokenService provides token refresh capabilities.
- TokenService interface {
- // Refresh refreshes the token if necessary. The
- // function returns a boolean value indicating
- // whether or not the token is refreshed.
- Refresh(context.Context, *Token) (bool, error)
- }
-
  // TokenKey is the key to use with the context.WithValue
  // function to associate an Token value with a context.
  TokenKey struct{}
 )
 
-// WithToken returns a copy of parent in which the token value is set
-func WithToken(parent context.Context, token *Token) context.Context {
+// WithContext returns a copy of parent in which the token value is set
+func WithContext(parent context.Context, token *Token) context.Context {
  return context.WithValue(parent, TokenKey{}, token)
 }