-
-go-twitter is a Go client library for the [Twitter API](https://dev.twitter.com/rest/public). Check the [usage](#usage) section or try the [examples](/examples) to see how to access the Twitter API.
-
-### Features
-
-* Twitter REST API:
- * Accounts
- * Direct Messages
- * Favorites
- * Friends
- * Friendships
- * Followers
- * Search
- * Statuses
- * Timelines
- * Users
-* Twitter Streaming API
- * Public Streams
- * User Streams
- * Site Streams
- * Firehose Streams
-
-## Install
-
- go get github.com/dghubble/go-twitter/twitter
-
-## Documentation
-
-Read [GoDoc](https://godoc.org/github.com/dghubble/go-twitter/twitter)
-
-## Usage
-
-### REST API
-
-The `twitter` package provides a `Client` for accessing the Twitter API. Here are some example requests.
-
-```go
-config := oauth1.NewConfig("consumerKey", "consumerSecret")
-token := oauth1.NewToken("accessToken", "accessSecret")
-httpClient := config.Client(oauth1.NoContext, token)
-
-// Twitter client
-client := twitter.NewClient(httpClient)
-
-// Home Timeline
-tweets, resp, err := client.Timelines.HomeTimeline(&twitter.HomeTimelineParams{
- Count: 20,
-})
-
-// Send a Tweet
-tweet, resp, err := client.Statuses.Update("just setting up my twttr", nil)
-
-// Status Show
-tweet, resp, err := client.Statuses.Show(585613041028431872, nil)
-
-// Search Tweets
-search, resp, err := client.Search.Tweets(&twitter.SearchTweetParams{
- Query: "gopher",
-})
-
-// User Show
-user, resp, err := client.Users.Show(&twitter.UserShowParams{
- ScreenName: "dghubble",
-})
-
-// Followers
-followers, resp, err := client.Followers.List(&twitter.FollowerListParams{})
-```
-
-Authentication is handled by the `http.Client` passed to `NewClient` to handle user auth (OAuth1) or application auth (OAuth2). See the [Authentication](#authentication) section.
-
-Required parameters are passed as positional arguments. Optional parameters are passed typed params structs (or nil).
-
-## Streaming API
-
-The Twitter Public, User, Site, and Firehose Streaming APIs can be accessed through the `Client` `StreamService` which provides methods `Filter`, `Sample`, `User`, `Site`, and `Firehose`.
-
-Create a `Client` with an authenticated `http.Client`. All stream endpoints require a user auth context so choose an OAuth1 `http.Client`.
-
- client := twitter.NewClient(httpClient)
-
-Next, request a managed `Stream` be started.
-
-#### Filter
-
-Filter Streams return Tweets that match one or more filtering predicates such as `Track`, `Follow`, and `Locations`.
-
-```go
-params := &twitter.StreamFilterParams{
- Track: []string{"kitten"},
- StallWarnings: twitter.Bool(true),
-}
-stream, err := client.Streams.Filter(params)
-```
-
-#### User
-
-User Streams provide messages specific to the authenticate User and possibly those they follow.
-
-```go
-params := &twitter.StreamUserParams{
- With: "followings",
- StallWarnings: twitter.Bool(true),
-}
-stream, err := client.Streams.User(params)
-```
-
-*Note* To see Direct Message events, your consumer application must ask Users for read/write/DM access to their account.
-
-#### Sample
-
-Sample Streams return a small sample of public Tweets.
-
-```go
-params := &twitter.StreamSampleParams{
- StallWarnings: twitter.Bool(true),
-}
-stream, err := client.Streams.Sample(params)
-```
-
-#### Site, Firehose
-
-Site and Firehose Streams require your application to have special permissions, but their API works the same way.
-
-### Receiving Messages
-
-Each `Stream` maintains the connection to the Twitter Streaming API endpoint, receives messages, and sends them on the `Stream.Messages` channel.
-
-Go channels support range iterations which allow you to read the messages which are of type `interface{}`.
-
-```go
-for message := range stream.Messages {
- fmt.Println(message)
-}
-```
-
-If you run this in your main goroutine, it will receive messages forever unless the stream stops. To continue execution, receive messages using a separate goroutine.
-
-### Demux
-
-Receiving messages of type `interface{}` isn't very nice, it means you'll have to type switch and probably filter out message types you don't care about.
-
-For this, try a `Demux`, like `SwitchDemux`, which receives messages and type switches them to call functions with typed messages.
-
-For example, say you're only interested in Tweets and Direct Messages.
-
-```go
-demux := twitter.NewSwitchDemux()
-demux.Tweet = func(tweet *twitter.Tweet) {
- fmt.Println(tweet.Text)
-}
-demux.DM = func(dm *twitter.DirectMessage) {
- fmt.Println(dm.SenderID)
-}
-```
-
-Pass the `Demux` each message or give it the entire `Stream.Message` channel.
-
-```go
-for message := range stream.Messages {
- demux.Handle(message)
-}
-// or pass the channel
-demux.HandleChan(stream.Messages)
-```
-
-### Stopping
-
-The `Stream` will stop itself if the stream disconnects and retrying produces unrecoverable errors. When this occurs, `Stream` will close the `stream.Messages` channel, so execution will break out of any message *for range* loops.
-
-When you are finished receiving from a `Stream`, call `Stop()` which closes the connection, channels, and stops the goroutine **before** returning. This ensures resources are properly cleaned up.
-
-### Pitfalls
-
-**Bad**: In this example, `Stop()` is unlikely to be reached. Control stays in the message loop unless the `Stream` becomes disconnected and cannot retry.
-
-```go
-// program does not terminate :(
-stream, _ := client.Streams.Sample(params)
-for message := range stream.Messages {
- demux.Handle(message)
-}
-stream.Stop()
-```
-
-**Bad**: Here, messages are received on a non-main goroutine, but then `Stop()` is called immediately. The `Stream` is stopped and the program exits.
-
-```go
-// got no messages :(
-stream, _ := client.Streams.Sample(params)
-go demux.HandleChan(stream.Messages)
-stream.Stop()
-```
-
-**Good**: For main package scripts, one option is to receive messages in a goroutine and wait for CTRL-C to be pressed, then explicitly stop the `Stream`.
-
-```go
-stream, err := client.Streams.Sample(params)
-go demux.HandleChan(stream.Messages)
-
-// Wait for SIGINT and SIGTERM (HIT CTRL-C)
-ch := make(chan os.Signal)
-signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM)
-log.Println(<-ch)
-
-stream.Stop()
-```
-
-## Authentication
-
-The API client accepts an any `http.Client` capable of making user auth (OAuth1) or application auth (OAuth2) authorized requests. See the [dghubble/oauth1](https://github.com/dghubble/oauth1) and [golang/oauth2](https://github.com/golang/oauth2/) packages which can provide such agnostic clients.
-
-Passing an `http.Client` directly grants you control over the underlying transport, avoids dependencies on particular OAuth1 or OAuth2 packages, and keeps client APIs separate from authentication protocols.
-
-See the [google/go-github](https://github.com/google/go-github) client which takes the same approach.
-
-For example, make requests as a consumer application on behalf of a user who has granted access, with OAuth1.
-
-```go
-// OAuth1
-import (
- "github.com/dghubble/go-twitter/twitter"
- "github.com/dghubble/oauth1"
-)
-
-config := oauth1.NewConfig("consumerKey", "consumerSecret")
-token := oauth1.NewToken("accessToken", "accessSecret")
-// http.Client will automatically authorize Requests
-httpClient := config.Client(oauth1.NoContext, token)
-
-// Twitter client
-client := twitter.NewClient(httpClient)
-```
-
-If no user auth context is needed, make requests as your application with application auth.
-
-```go
-// OAuth2
-import (
- "github.com/dghubble/go-twitter/twitter"
- "golang.org/x/oauth2"
-)
-
-config := &oauth2.Config{}
-token := &oauth2.Token{AccessToken: accessToken}
-// http.Client will automatically authorize Requests
-httpClient := config.Client(oauth2.NoContext, token)
-
-// Twitter client
-client := twitter.NewClient(httpClient)
-```
-
-To implement Login with Twitter for web or mobile, see the gologin [package](https://github.com/dghubble/gologin) and [examples](https://github.com/dghubble/gologin/tree/master/examples/twitter).
-
-## Roadmap
-
-* Support gzipped streams
-* Auto-stop streams in the event of long stalls
-
-## Contributing
-
-See the [Contributing Guide](https://gist.github.com/dghubble/be682c123727f70bcfe7).
-
-## License
-
-[MIT License](LICENSE)
diff --git a/vendor/github.com/dghubble/go-twitter/examples/README.md b/vendor/github.com/dghubble/go-twitter/examples/README.md
deleted file mode 100644
index 1e291e22b..000000000
--- a/vendor/github.com/dghubble/go-twitter/examples/README.md
+++ /dev/null
@@ -1,42 +0,0 @@
-
-# Examples
-
-Get the dependencies and examples
-
- cd examples
- go get .
-
-## User Auth (OAuth1)
-
-A user access token (OAuth1) grants a consumer application access to a user's Twitter resources.
-
-Setup an OAuth1 `http.Client` with the consumer key and secret and oauth token and secret.
-
- export TWITTER_CONSUMER_KEY=xxx
- export TWITTER_CONSUMER_SECRET=xxx
- export TWITTER_ACCESS_TOKEN=xxx
- export TWITTER_ACCESS_SECRET=xxx
-
-To make requests as an application, on behalf of a user, create a `twitter` `Client` to get the home timeline, mention timeline, and more (example will **not** post Tweets).
-
- go run user-auth.go
-
-## App Auth (OAuth2)
-
-An application access token (OAuth2) allows an application to make Twitter API requests for public content, with rate limits counting against the app itself. App auth requests can be made to API endpoints which do not require a user context.
-
-Setup an OAuth2 `http.Client` with the Twitter application access token.
-
- export TWITTER_APP_ACCESS_TOKEN=xxx
-
-To make requests as an application, create a `twitter` `Client` and get public Tweets or timelines or other public content.
-
- go run app-auth.go
-
-## Streaming API
-
-A user access token (OAuth1) is required for Streaming API requests. See above.
-
- go run streaming.go
-
-Hit CTRL-C to stop streaming. Uncomment different examples in code to try different streams.
\ No newline at end of file
diff --git a/vendor/github.com/dghubble/go-twitter/examples/app-auth.go b/vendor/github.com/dghubble/go-twitter/examples/app-auth.go
deleted file mode 100644
index a9223f11a..000000000
--- a/vendor/github.com/dghubble/go-twitter/examples/app-auth.go
+++ /dev/null
@@ -1,71 +0,0 @@
-package main
-
-import (
- "flag"
- "fmt"
- "log"
- "os"
-
- "github.com/coreos/pkg/flagutil"
- "github.com/dghubble/go-twitter/twitter"
- "golang.org/x/oauth2"
-)
-
-func main() {
- flags := flag.NewFlagSet("app-auth", flag.ExitOnError)
- accessToken := flags.String("app-access-token", "", "Twitter Application Access Token")
- flags.Parse(os.Args[1:])
- flagutil.SetFlagsFromEnv(flags, "TWITTER")
-
- if *accessToken == "" {
- log.Fatal("Application Access Token required")
- }
-
- config := &oauth2.Config{}
- token := &oauth2.Token{AccessToken: *accessToken}
- // OAuth2 http.Client will automatically authorize Requests
- httpClient := config.Client(oauth2.NoContext, token)
-
- // Twitter client
- client := twitter.NewClient(httpClient)
-
- // user show
- userShowParams := &twitter.UserShowParams{ScreenName: "golang"}
- user, _, _ := client.Users.Show(userShowParams)
- fmt.Printf("USERS SHOW:\n%+v\n", user)
-
- // users lookup
- userLookupParams := &twitter.UserLookupParams{ScreenName: []string{"golang", "gophercon"}}
- users, _, _ := client.Users.Lookup(userLookupParams)
- fmt.Printf("USERS LOOKUP:\n%+v\n", users)
-
- // status show
- statusShowParams := &twitter.StatusShowParams{}
- tweet, _, _ := client.Statuses.Show(584077528026849280, statusShowParams)
- fmt.Printf("STATUSES SHOW:\n%+v\n", tweet)
-
- // statuses lookup
- statusLookupParams := &twitter.StatusLookupParams{ID: []int64{20}, TweetMode: "extended"}
- tweets, _, _ := client.Statuses.Lookup([]int64{573893817000140800}, statusLookupParams)
- fmt.Printf("STATUSES LOOKUP:\n%+v\n", tweets)
-
- // oEmbed status
- statusOembedParams := &twitter.StatusOEmbedParams{ID: 691076766878691329, MaxWidth: 500}
- oembed, _, _ := client.Statuses.OEmbed(statusOembedParams)
- fmt.Printf("OEMBED TWEET:\n%+v\n", oembed)
-
- // user timeline
- userTimelineParams := &twitter.UserTimelineParams{ScreenName: "golang", Count: 2}
- tweets, _, _ = client.Timelines.UserTimeline(userTimelineParams)
- fmt.Printf("USER TIMELINE:\n%+v\n", tweets)
-
- // search tweets
- searchTweetParams := &twitter.SearchTweetParams{
- Query: "happy birthday",
- TweetMode: "extended",
- Count: 3,
- }
- search, _, _ := client.Search.Tweets(searchTweetParams)
- fmt.Printf("SEARCH TWEETS:\n%+v\n", search)
- fmt.Printf("SEARCH METADATA:\n%+v\n", search.Metadata)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/examples/streaming.go b/vendor/github.com/dghubble/go-twitter/examples/streaming.go
deleted file mode 100644
index d37585e7b..000000000
--- a/vendor/github.com/dghubble/go-twitter/examples/streaming.go
+++ /dev/null
@@ -1,91 +0,0 @@
-package main
-
-import (
- "flag"
- "fmt"
- "log"
- "os"
- "os/signal"
- "syscall"
-
- "github.com/coreos/pkg/flagutil"
- "github.com/dghubble/go-twitter/twitter"
- "github.com/dghubble/oauth1"
-)
-
-func main() {
- flags := flag.NewFlagSet("user-auth", flag.ExitOnError)
- consumerKey := flags.String("consumer-key", "", "Twitter Consumer Key")
- consumerSecret := flags.String("consumer-secret", "", "Twitter Consumer Secret")
- accessToken := flags.String("access-token", "", "Twitter Access Token")
- accessSecret := flags.String("access-secret", "", "Twitter Access Secret")
- flags.Parse(os.Args[1:])
- flagutil.SetFlagsFromEnv(flags, "TWITTER")
-
- if *consumerKey == "" || *consumerSecret == "" || *accessToken == "" || *accessSecret == "" {
- log.Fatal("Consumer key/secret and Access token/secret required")
- }
-
- config := oauth1.NewConfig(*consumerKey, *consumerSecret)
- token := oauth1.NewToken(*accessToken, *accessSecret)
- // OAuth1 http.Client will automatically authorize Requests
- httpClient := config.Client(oauth1.NoContext, token)
-
- // Twitter Client
- client := twitter.NewClient(httpClient)
-
- // Convenience Demux demultiplexed stream messages
- demux := twitter.NewSwitchDemux()
- demux.Tweet = func(tweet *twitter.Tweet) {
- fmt.Println(tweet.Text)
- }
- demux.DM = func(dm *twitter.DirectMessage) {
- fmt.Println(dm.SenderID)
- }
- demux.Event = func(event *twitter.Event) {
- fmt.Printf("%#v\n", event)
- }
-
- fmt.Println("Starting Stream...")
-
- // FILTER
- filterParams := &twitter.StreamFilterParams{
- Track: []string{"cat"},
- StallWarnings: twitter.Bool(true),
- }
- stream, err := client.Streams.Filter(filterParams)
- if err != nil {
- log.Fatal(err)
- }
-
- // USER (quick test: auth'd user likes a tweet -> event)
- // userParams := &twitter.StreamUserParams{
- // StallWarnings: twitter.Bool(true),
- // With: "followings",
- // Language: []string{"en"},
- // }
- // stream, err := client.Streams.User(userParams)
- // if err != nil {
- // log.Fatal(err)
- // }
-
- // SAMPLE
- // sampleParams := &twitter.StreamSampleParams{
- // StallWarnings: twitter.Bool(true),
- // }
- // stream, err := client.Streams.Sample(sampleParams)
- // if err != nil {
- // log.Fatal(err)
- // }
-
- // Receive messages until stopped or stream quits
- go demux.HandleChan(stream.Messages)
-
- // Wait for SIGINT and SIGTERM (HIT CTRL-C)
- ch := make(chan os.Signal)
- signal.Notify(ch, syscall.SIGINT, syscall.SIGTERM)
- log.Println(<-ch)
-
- fmt.Println("Stopping Stream...")
- stream.Stop()
-}
diff --git a/vendor/github.com/dghubble/go-twitter/examples/user-auth.go b/vendor/github.com/dghubble/go-twitter/examples/user-auth.go
deleted file mode 100644
index e04e37d20..000000000
--- a/vendor/github.com/dghubble/go-twitter/examples/user-auth.go
+++ /dev/null
@@ -1,70 +0,0 @@
-package main
-
-import (
- "flag"
- "fmt"
- "log"
- "os"
-
- "github.com/coreos/pkg/flagutil"
- "github.com/dghubble/go-twitter/twitter"
- "github.com/dghubble/oauth1"
-)
-
-func main() {
- flags := flag.NewFlagSet("user-auth", flag.ExitOnError)
- consumerKey := flags.String("consumer-key", "", "Twitter Consumer Key")
- consumerSecret := flags.String("consumer-secret", "", "Twitter Consumer Secret")
- accessToken := flags.String("access-token", "", "Twitter Access Token")
- accessSecret := flags.String("access-secret", "", "Twitter Access Secret")
- flags.Parse(os.Args[1:])
- flagutil.SetFlagsFromEnv(flags, "TWITTER")
-
- if *consumerKey == "" || *consumerSecret == "" || *accessToken == "" || *accessSecret == "" {
- log.Fatal("Consumer key/secret and Access token/secret required")
- }
-
- config := oauth1.NewConfig(*consumerKey, *consumerSecret)
- token := oauth1.NewToken(*accessToken, *accessSecret)
- // OAuth1 http.Client will automatically authorize Requests
- httpClient := config.Client(oauth1.NoContext, token)
-
- // Twitter client
- client := twitter.NewClient(httpClient)
-
- // Verify Credentials
- verifyParams := &twitter.AccountVerifyParams{
- SkipStatus: twitter.Bool(true),
- IncludeEmail: twitter.Bool(true),
- }
- user, _, _ := client.Accounts.VerifyCredentials(verifyParams)
- fmt.Printf("User's ACCOUNT:\n%+v\n", user)
-
- // Home Timeline
- homeTimelineParams := &twitter.HomeTimelineParams{
- Count: 2,
- TweetMode: "extended",
- }
- tweets, _, _ := client.Timelines.HomeTimeline(homeTimelineParams)
- fmt.Printf("User's HOME TIMELINE:\n%+v\n", tweets)
-
- // Mention Timeline
- mentionTimelineParams := &twitter.MentionTimelineParams{
- Count: 2,
- TweetMode: "extended",
- }
- tweets, _, _ = client.Timelines.MentionTimeline(mentionTimelineParams)
- fmt.Printf("User's MENTION TIMELINE:\n%+v\n", tweets)
-
- // Retweets of Me Timeline
- retweetTimelineParams := &twitter.RetweetsOfMeTimelineParams{
- Count: 2,
- TweetMode: "extended",
- }
- tweets, _, _ = client.Timelines.RetweetsOfMeTimeline(retweetTimelineParams)
- fmt.Printf("User's 'RETWEETS OF ME' TIMELINE:\n%+v\n", tweets)
-
- // Update (POST!) Tweet (uncomment to run)
- // tweet, _, _ := client.Statuses.Update("just setting up my twttr", nil)
- // fmt.Printf("Posted Tweet\n%v\n", tweet)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/test b/vendor/github.com/dghubble/go-twitter/test
deleted file mode 100755
index 6bc268742..000000000
--- a/vendor/github.com/dghubble/go-twitter/test
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-PKGS=$(go list ./... | grep -v /examples)
-FORMATTABLE="$(ls -d */)"
-LINTABLE=$(go list ./...)
-
-go test $PKGS -cover
-go vet $PKGS
-
-echo "Checking gofmt..."
-fmtRes=$(gofmt -l $FORMATTABLE)
-if [ -n "${fmtRes}" ]; then
- echo -e "gofmt checking failed:\n${fmtRes}"
- exit 2
-fi
-
-echo "Checking golint..."
-lintRes=$(echo $LINTABLE | xargs -n 1 golint)
-if [ -n "${lintRes}" ]; then
- echo -e "golint checking failed:\n${lintRes}"
- exit 2
-fi
\ No newline at end of file
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/accounts.go b/vendor/github.com/dghubble/go-twitter/twitter/accounts.go
deleted file mode 100644
index b5e6ef75a..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/accounts.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package twitter
-
-import (
- "net/http"
-
- "github.com/dghubble/sling"
-)
-
-// AccountService provides a method for account credential verification.
-type AccountService struct {
- sling *sling.Sling
-}
-
-// newAccountService returns a new AccountService.
-func newAccountService(sling *sling.Sling) *AccountService {
- return &AccountService{
- sling: sling.Path("account/"),
- }
-}
-
-// AccountVerifyParams are the params for AccountService.VerifyCredentials.
-type AccountVerifyParams struct {
- IncludeEntities *bool `url:"include_entities,omitempty"`
- SkipStatus *bool `url:"skip_status,omitempty"`
- IncludeEmail *bool `url:"include_email,omitempty"`
-}
-
-// VerifyCredentials returns the authorized user if credentials are valid and
-// returns an error otherwise.
-// Requires a user auth context.
-// https://dev.twitter.com/rest/reference/get/account/verify_credentials
-func (s *AccountService) VerifyCredentials(params *AccountVerifyParams) (*User, *http.Response, error) {
- user := new(User)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("verify_credentials.json").QueryStruct(params).Receive(user, apiError)
- return user, resp, relevantError(err, *apiError)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/accounts_test.go b/vendor/github.com/dghubble/go-twitter/twitter/accounts_test.go
deleted file mode 100644
index a98680f97..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/accounts_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "net/http"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestAccountService_VerifyCredentials(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/account/verify_credentials.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"include_entities": "false", "include_email": "true"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"name": "Dalton Hubble", "id": 623265148}`)
- })
-
- client := NewClient(httpClient)
- user, _, err := client.Accounts.VerifyCredentials(&AccountVerifyParams{IncludeEntities: Bool(false), IncludeEmail: Bool(true)})
- expected := &User{Name: "Dalton Hubble", ID: 623265148}
- assert.Nil(t, err)
- assert.Equal(t, expected, user)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/backoffs.go b/vendor/github.com/dghubble/go-twitter/twitter/backoffs.go
deleted file mode 100644
index d3a5321c6..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/backoffs.go
+++ /dev/null
@@ -1,25 +0,0 @@
-package twitter
-
-import (
- "time"
-
- "github.com/cenkalti/backoff"
-)
-
-func newExponentialBackOff() *backoff.ExponentialBackOff {
- b := backoff.NewExponentialBackOff()
- b.InitialInterval = 5 * time.Second
- b.Multiplier = 2.0
- b.MaxInterval = 320 * time.Second
- b.Reset()
- return b
-}
-
-func newAggressiveExponentialBackOff() *backoff.ExponentialBackOff {
- b := backoff.NewExponentialBackOff()
- b.InitialInterval = 1 * time.Minute
- b.Multiplier = 2.0
- b.MaxInterval = 16 * time.Minute
- b.Reset()
- return b
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/backoffs_test.go b/vendor/github.com/dghubble/go-twitter/twitter/backoffs_test.go
deleted file mode 100644
index 49bfd0306..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/backoffs_test.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package twitter
-
-import (
- "testing"
- "time"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestNewExponentialBackOff(t *testing.T) {
- b := newExponentialBackOff()
- assert.Equal(t, 5*time.Second, b.InitialInterval)
- assert.Equal(t, 2.0, b.Multiplier)
- assert.Equal(t, 320*time.Second, b.MaxInterval)
-}
-
-func TestNewAggressiveExponentialBackOff(t *testing.T) {
- b := newAggressiveExponentialBackOff()
- assert.Equal(t, 1*time.Minute, b.InitialInterval)
- assert.Equal(t, 2.0, b.Multiplier)
- assert.Equal(t, 16*time.Minute, b.MaxInterval)
-}
-
-// BackoffRecorder is an implementation of backoff.BackOff that records
-// calls to NextBackOff and Reset for later inspection in tests.
-type BackOffRecorder struct {
- Count int
-}
-
-func (b *BackOffRecorder) NextBackOff() time.Duration {
- b.Count++
- return 1 * time.Nanosecond
-}
-
-func (b *BackOffRecorder) Reset() {
- b.Count = 0
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/demux.go b/vendor/github.com/dghubble/go-twitter/twitter/demux.go
deleted file mode 100644
index 29e21f2f1..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/demux.go
+++ /dev/null
@@ -1,88 +0,0 @@
-package twitter
-
-// A Demux receives interface{} messages individually or from a channel and
-// sends those messages to one or more outputs determined by the
-// implementation.
-type Demux interface {
- Handle(message interface{})
- HandleChan(messages <-chan interface{})
-}
-
-// SwitchDemux receives messages and uses a type switch to send each typed
-// message to a handler function.
-type SwitchDemux struct {
- All func(message interface{})
- Tweet func(tweet *Tweet)
- DM func(dm *DirectMessage)
- StatusDeletion func(deletion *StatusDeletion)
- LocationDeletion func(LocationDeletion *LocationDeletion)
- StreamLimit func(limit *StreamLimit)
- StatusWithheld func(statusWithheld *StatusWithheld)
- UserWithheld func(userWithheld *UserWithheld)
- StreamDisconnect func(disconnect *StreamDisconnect)
- Warning func(warning *StallWarning)
- FriendsList func(friendsList *FriendsList)
- Event func(event *Event)
- Other func(message interface{})
-}
-
-// NewSwitchDemux returns a new SwitchMux which has NoOp handler functions.
-func NewSwitchDemux() SwitchDemux {
- return SwitchDemux{
- All: func(message interface{}) {},
- Tweet: func(tweet *Tweet) {},
- DM: func(dm *DirectMessage) {},
- StatusDeletion: func(deletion *StatusDeletion) {},
- LocationDeletion: func(LocationDeletion *LocationDeletion) {},
- StreamLimit: func(limit *StreamLimit) {},
- StatusWithheld: func(statusWithheld *StatusWithheld) {},
- UserWithheld: func(userWithheld *UserWithheld) {},
- StreamDisconnect: func(disconnect *StreamDisconnect) {},
- Warning: func(warning *StallWarning) {},
- FriendsList: func(friendsList *FriendsList) {},
- Event: func(event *Event) {},
- Other: func(message interface{}) {},
- }
-}
-
-// Handle determines the type of a message and calls the corresponding receiver
-// function with the typed message. All messages are passed to the All func.
-// Messages with unmatched types are passed to the Other func.
-func (d SwitchDemux) Handle(message interface{}) {
- d.All(message)
- switch msg := message.(type) {
- case *Tweet:
- d.Tweet(msg)
- case *DirectMessage:
- d.DM(msg)
- case *StatusDeletion:
- d.StatusDeletion(msg)
- case *LocationDeletion:
- d.LocationDeletion(msg)
- case *StreamLimit:
- d.StreamLimit(msg)
- case *StatusWithheld:
- d.StatusWithheld(msg)
- case *UserWithheld:
- d.UserWithheld(msg)
- case *StreamDisconnect:
- d.StreamDisconnect(msg)
- case *StallWarning:
- d.Warning(msg)
- case *FriendsList:
- d.FriendsList(msg)
- case *Event:
- d.Event(msg)
- default:
- d.Other(msg)
- }
-}
-
-// HandleChan receives messages and calls the corresponding receiver function
-// with the typed message. All messages are passed to the All func. Messages
-// with unmatched type are passed to the Other func.
-func (d SwitchDemux) HandleChan(messages <-chan interface{}) {
- for message := range messages {
- d.Handle(message)
- }
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/demux_test.go b/vendor/github.com/dghubble/go-twitter/twitter/demux_test.go
deleted file mode 100644
index ccdce52a9..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/demux_test.go
+++ /dev/null
@@ -1,135 +0,0 @@
-package twitter
-
-import (
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestDemux_Handle(t *testing.T) {
- messages, expectedCounts := exampleMessages()
- counts := &counter{}
- demux := newCounterDemux(counts)
- for _, message := range messages {
- demux.Handle(message)
- }
- assert.Equal(t, expectedCounts, counts)
-}
-
-func TestDemux_HandleChan(t *testing.T) {
- messages, expectedCounts := exampleMessages()
- counts := &counter{}
- demux := newCounterDemux(counts)
- ch := make(chan interface{})
- // stream messages into channel
- go func() {
- for _, msg := range messages {
- ch <- msg
- }
- close(ch)
- }()
- // handle channel messages until exhausted
- demux.HandleChan(ch)
- assert.Equal(t, expectedCounts, counts)
-}
-
-// counter counts stream messages by type for testing.
-type counter struct {
- all int
- tweet int
- dm int
- statusDeletion int
- locationDeletion int
- streamLimit int
- statusWithheld int
- userWithheld int
- streamDisconnect int
- stallWarning int
- friendsList int
- event int
- other int
-}
-
-// newCounterDemux returns a Demux which counts message types.
-func newCounterDemux(counter *counter) Demux {
- demux := NewSwitchDemux()
- demux.All = func(interface{}) {
- counter.all++
- }
- demux.Tweet = func(*Tweet) {
- counter.tweet++
- }
- demux.DM = func(*DirectMessage) {
- counter.dm++
- }
- demux.StatusDeletion = func(*StatusDeletion) {
- counter.statusDeletion++
- }
- demux.LocationDeletion = func(*LocationDeletion) {
- counter.locationDeletion++
- }
- demux.StreamLimit = func(*StreamLimit) {
- counter.streamLimit++
- }
- demux.StatusWithheld = func(*StatusWithheld) {
- counter.statusWithheld++
- }
- demux.UserWithheld = func(*UserWithheld) {
- counter.userWithheld++
- }
- demux.StreamDisconnect = func(*StreamDisconnect) {
- counter.streamDisconnect++
- }
- demux.Warning = func(*StallWarning) {
- counter.stallWarning++
- }
- demux.FriendsList = func(*FriendsList) {
- counter.friendsList++
- }
- demux.Event = func(*Event) {
- counter.event++
- }
- demux.Other = func(interface{}) {
- counter.other++
- }
- return demux
-}
-
-// examples messages returns a test stream of messages and the expected
-// counts of each message type.
-func exampleMessages() (messages []interface{}, expectedCounts *counter) {
- var (
- tweet = &Tweet{}
- dm = &DirectMessage{}
- statusDeletion = &StatusDeletion{}
- locationDeletion = &LocationDeletion{}
- streamLimit = &StreamLimit{}
- statusWithheld = &StatusWithheld{}
- userWithheld = &UserWithheld{}
- streamDisconnect = &StreamDisconnect{}
- stallWarning = &StallWarning{}
- friendsList = &FriendsList{}
- event = &Event{}
- otherA = func() {}
- otherB = struct{}{}
- )
- messages = []interface{}{tweet, dm, statusDeletion, locationDeletion,
- streamLimit, statusWithheld, userWithheld, streamDisconnect,
- stallWarning, friendsList, event, otherA, otherB}
- expectedCounts = &counter{
- all: len(messages),
- tweet: 1,
- dm: 1,
- statusDeletion: 1,
- locationDeletion: 1,
- streamLimit: 1,
- statusWithheld: 1,
- userWithheld: 1,
- streamDisconnect: 1,
- stallWarning: 1,
- friendsList: 1,
- event: 1,
- other: 2,
- }
- return messages, expectedCounts
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/direct_messages.go b/vendor/github.com/dghubble/go-twitter/twitter/direct_messages.go
deleted file mode 100644
index 3d91ec5a0..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/direct_messages.go
+++ /dev/null
@@ -1,130 +0,0 @@
-package twitter
-
-import (
- "net/http"
-
- "github.com/dghubble/sling"
-)
-
-// DirectMessage is a direct message to a single recipient.
-type DirectMessage struct {
- CreatedAt string `json:"created_at"`
- Entities *Entities `json:"entities"`
- ID int64 `json:"id"`
- IDStr string `json:"id_str"`
- Recipient *User `json:"recipient"`
- RecipientID int64 `json:"recipient_id"`
- RecipientScreenName string `json:"recipient_screen_name"`
- Sender *User `json:"sender"`
- SenderID int64 `json:"sender_id"`
- SenderScreenName string `json:"sender_screen_name"`
- Text string `json:"text"`
-}
-
-// DirectMessageService provides methods for accessing Twitter direct message
-// API endpoints.
-type DirectMessageService struct {
- baseSling *sling.Sling
- sling *sling.Sling
-}
-
-// newDirectMessageService returns a new DirectMessageService.
-func newDirectMessageService(sling *sling.Sling) *DirectMessageService {
- return &DirectMessageService{
- baseSling: sling.New(),
- sling: sling.Path("direct_messages/"),
- }
-}
-
-// directMessageShowParams are the parameters for DirectMessageService.Show
-type directMessageShowParams struct {
- ID int64 `url:"id,omitempty"`
-}
-
-// Show returns the requested Direct Message.
-// Requires a user auth context with DM scope.
-// https://dev.twitter.com/rest/reference/get/direct_messages/show
-func (s *DirectMessageService) Show(id int64) (*DirectMessage, *http.Response, error) {
- params := &directMessageShowParams{ID: id}
- dm := new(DirectMessage)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("show.json").QueryStruct(params).Receive(dm, apiError)
- return dm, resp, relevantError(err, *apiError)
-}
-
-// DirectMessageGetParams are the parameters for DirectMessageService.Get
-type DirectMessageGetParams struct {
- SinceID int64 `url:"since_id,omitempty"`
- MaxID int64 `url:"max_id,omitempty"`
- Count int `url:"count,omitempty"`
- IncludeEntities *bool `url:"include_entities,omitempty"`
- SkipStatus *bool `url:"skip_status,omitempty"`
-}
-
-// Get returns recent Direct Messages received by the authenticated user.
-// Requires a user auth context with DM scope.
-// https://dev.twitter.com/rest/reference/get/direct_messages
-func (s *DirectMessageService) Get(params *DirectMessageGetParams) ([]DirectMessage, *http.Response, error) {
- dms := new([]DirectMessage)
- apiError := new(APIError)
- resp, err := s.baseSling.New().Get("direct_messages.json").QueryStruct(params).Receive(dms, apiError)
- return *dms, resp, relevantError(err, *apiError)
-}
-
-// DirectMessageSentParams are the parameters for DirectMessageService.Sent
-type DirectMessageSentParams struct {
- SinceID int64 `url:"since_id,omitempty"`
- MaxID int64 `url:"max_id,omitempty"`
- Count int `url:"count,omitempty"`
- Page int `url:"page,omitempty"`
- IncludeEntities *bool `url:"include_entities,omitempty"`
-}
-
-// Sent returns recent Direct Messages sent by the authenticated user.
-// Requires a user auth context with DM scope.
-// https://dev.twitter.com/rest/reference/get/direct_messages/sent
-func (s *DirectMessageService) Sent(params *DirectMessageSentParams) ([]DirectMessage, *http.Response, error) {
- dms := new([]DirectMessage)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("sent.json").QueryStruct(params).Receive(dms, apiError)
- return *dms, resp, relevantError(err, *apiError)
-}
-
-// DirectMessageNewParams are the parameters for DirectMessageService.New
-type DirectMessageNewParams struct {
- UserID int64 `url:"user_id,omitempty"`
- ScreenName string `url:"screen_name,omitempty"`
- Text string `url:"text"`
-}
-
-// New sends a new Direct Message to a specified user as the authenticated
-// user.
-// Requires a user auth context with DM scope.
-// https://dev.twitter.com/rest/reference/post/direct_messages/new
-func (s *DirectMessageService) New(params *DirectMessageNewParams) (*DirectMessage, *http.Response, error) {
- dm := new(DirectMessage)
- apiError := new(APIError)
- resp, err := s.sling.New().Post("new.json").BodyForm(params).Receive(dm, apiError)
- return dm, resp, relevantError(err, *apiError)
-}
-
-// DirectMessageDestroyParams are the parameters for DirectMessageService.Destroy
-type DirectMessageDestroyParams struct {
- ID int64 `url:"id,omitempty"`
- IncludeEntities *bool `url:"include_entities,omitempty"`
-}
-
-// Destroy deletes the Direct Message with the given id and returns it if
-// successful.
-// Requires a user auth context with DM scope.
-// https://dev.twitter.com/rest/reference/post/direct_messages/destroy
-func (s *DirectMessageService) Destroy(id int64, params *DirectMessageDestroyParams) (*DirectMessage, *http.Response, error) {
- if params == nil {
- params = &DirectMessageDestroyParams{}
- }
- params.ID = id
- dm := new(DirectMessage)
- apiError := new(APIError)
- resp, err := s.sling.New().Post("destroy.json").BodyForm(params).Receive(dm, apiError)
- return dm, resp, relevantError(err, *apiError)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/direct_messages_test.go b/vendor/github.com/dghubble/go-twitter/twitter/direct_messages_test.go
deleted file mode 100644
index c0ea24238..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/direct_messages_test.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "net/http"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-var (
- testDM = DirectMessage{
- ID: 240136858829479936,
- Recipient: &User{ScreenName: "theSeanCook"},
- Sender: &User{ScreenName: "s0c1alm3dia"},
- Text: "hello world",
- }
- testDMIDStr = "240136858829479936"
- testDMJSON = `{"id": 240136858829479936,"recipient": {"screen_name": "theSeanCook"},"sender": {"screen_name": "s0c1alm3dia"},"text": "hello world"}`
-)
-
-func TestDirectMessageService_Show(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/direct_messages/show.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"id": testDMIDStr}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, testDMJSON)
- })
-
- client := NewClient(httpClient)
- dms, _, err := client.DirectMessages.Show(testDM.ID)
- assert.Nil(t, err)
- assert.Equal(t, &testDM, dms)
-}
-
-func TestDirectMessageService_Get(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/direct_messages.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"since_id": "589147592367431680", "count": "1"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[`+testDMJSON+`]`)
- })
-
- client := NewClient(httpClient)
- params := &DirectMessageGetParams{SinceID: 589147592367431680, Count: 1}
- dms, _, err := client.DirectMessages.Get(params)
- expected := []DirectMessage{testDM}
- assert.Nil(t, err)
- assert.Equal(t, expected, dms)
-}
-
-func TestDirectMessageService_Sent(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/direct_messages/sent.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"since_id": "589147592367431680", "count": "1"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[`+testDMJSON+`]`)
- })
-
- client := NewClient(httpClient)
- params := &DirectMessageSentParams{SinceID: 589147592367431680, Count: 1}
- dms, _, err := client.DirectMessages.Sent(params)
- expected := []DirectMessage{testDM}
- assert.Nil(t, err)
- assert.Equal(t, expected, dms)
-}
-
-func TestDirectMessageService_New(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/direct_messages/new.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "POST", r)
- assertPostForm(t, map[string]string{"screen_name": "theseancook", "text": "hello world"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, testDMJSON)
- })
-
- client := NewClient(httpClient)
- params := &DirectMessageNewParams{ScreenName: "theseancook", Text: "hello world"}
- dm, _, err := client.DirectMessages.New(params)
- assert.Nil(t, err)
- assert.Equal(t, &testDM, dm)
-}
-
-func TestDirectMessageService_Destroy(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/direct_messages/destroy.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "POST", r)
- assertPostForm(t, map[string]string{"id": testDMIDStr}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, testDMJSON)
- })
-
- client := NewClient(httpClient)
- dm, _, err := client.DirectMessages.Destroy(testDM.ID, nil)
- assert.Nil(t, err)
- assert.Equal(t, &testDM, dm)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/doc.go b/vendor/github.com/dghubble/go-twitter/twitter/doc.go
deleted file mode 100644
index 47136c596..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/doc.go
+++ /dev/null
@@ -1,70 +0,0 @@
-/*
-Package twitter provides a Client for the Twitter API.
-
-
-The twitter package provides a Client for accessing the Twitter API. Here are
-some example requests.
-
- // Twitter client
- client := twitter.NewClient(httpClient)
- // Home Timeline
- tweets, resp, err := client.Timelines.HomeTimeline(&HomeTimelineParams{})
- // Send a Tweet
- tweet, resp, err := client.Statuses.Update("just setting up my twttr", nil)
- // Status Show
- tweet, resp, err := client.Statuses.Show(585613041028431872, nil)
- // User Show
- params := &twitter.UserShowParams{ScreenName: "dghubble"}
- user, resp, err := client.Users.Show(params)
- // Followers
- followers, resp, err := client.Followers.List(&FollowerListParams{})
-
-Required parameters are passed as positional arguments. Optional parameters
-are passed in a typed params struct (or pass nil).
-
-Authentication
-
-By design, the Twitter Client accepts any http.Client so user auth (OAuth1) or
-application auth (OAuth2) requests can be made by using the appropriate
-authenticated client. Use the https://github.com/dghubble/oauth1 and
-https://github.com/golang/oauth2 packages to obtain an http.Client which
-transparently authorizes requests.
-
-For example, make requests as a consumer application on behalf of a user who
-has granted access, with OAuth1.
-
- // OAuth1
- import (
- "github.com/dghubble/go-twitter/twitter"
- "github.com/dghubble/oauth1"
- )
-
- config := oauth1.NewConfig("consumerKey", "consumerSecret")
- token := oauth1.NewToken("accessToken", "accessSecret")
- // http.Client will automatically authorize Requests
- httpClient := config.Client(oauth1.NoContext, token)
-
- // twitter client
- client := twitter.NewClient(httpClient)
-
-If no user auth context is needed, make requests as your application with
-application auth.
-
- // OAuth2
- import (
- "github.com/dghubble/go-twitter/twitter"
- "golang.org/x/oauth2"
- )
-
- config := &oauth2.Config{}
- token := &oauth2.Token{AccessToken: accessToken}
- // http.Client will automatically authorize Requests
- httpClient := config.Client(oauth2.NoContext, token)
-
- // twitter client
- client := twitter.NewClient(httpClient)
-
-To implement Login with Twitter, see https://github.com/dghubble/gologin.
-
-*/
-package twitter
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/entities.go b/vendor/github.com/dghubble/go-twitter/twitter/entities.go
deleted file mode 100644
index 85b617ab6..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/entities.go
+++ /dev/null
@@ -1,104 +0,0 @@
-package twitter
-
-// Entities represent metadata and context info parsed from Twitter components.
-// https://dev.twitter.com/overview/api/entities
-// TODO: symbols
-type Entities struct {
- Hashtags []HashtagEntity `json:"hashtags"`
- Media []MediaEntity `json:"media"`
- Urls []URLEntity `json:"urls"`
- UserMentions []MentionEntity `json:"user_mentions"`
-}
-
-// HashtagEntity represents a hashtag which has been parsed from text.
-type HashtagEntity struct {
- Indices Indices `json:"indices"`
- Text string `json:"text"`
-}
-
-// URLEntity represents a URL which has been parsed from text.
-type URLEntity struct {
- Indices Indices `json:"indices"`
- DisplayURL string `json:"display_url"`
- ExpandedURL string `json:"expanded_url"`
- URL string `json:"url"`
-}
-
-// MediaEntity represents media elements associated with a Tweet.
-type MediaEntity struct {
- URLEntity
- ID int64 `json:"id"`
- IDStr string `json:"id_str"`
- MediaURL string `json:"media_url"`
- MediaURLHttps string `json:"media_url_https"`
- SourceStatusID int64 `json:"source_status_id"`
- SourceStatusIDStr string `json:"source_status_id_str"`
- Type string `json:"type"`
- Sizes MediaSizes `json:"sizes"`
- VideoInfo VideoInfo `json:"video_info"`
-}
-
-// MentionEntity represents Twitter user mentions parsed from text.
-type MentionEntity struct {
- Indices Indices `json:"indices"`
- ID int64 `json:"id"`
- IDStr string `json:"id_str"`
- Name string `json:"name"`
- ScreenName string `json:"screen_name"`
-}
-
-// UserEntities contain Entities parsed from User url and description fields.
-// https://dev.twitter.com/overview/api/entities-in-twitter-objects#users
-type UserEntities struct {
- URL Entities `json:"url"`
- Description Entities `json:"description"`
-}
-
-// ExtendedEntity contains media information.
-// https://dev.twitter.com/overview/api/entities-in-twitter-objects#extended_entities
-type ExtendedEntity struct {
- Media []MediaEntity `json:"media"`
-}
-
-// Indices represent the start and end offsets within text.
-type Indices [2]int
-
-// Start returns the index at which an entity starts, inclusive.
-func (i Indices) Start() int {
- return i[0]
-}
-
-// End returns the index at which an entity ends, exclusive.
-func (i Indices) End() int {
- return i[1]
-}
-
-// MediaSizes contain the different size media that are available.
-// https://dev.twitter.com/overview/api/entities#obj-sizes
-type MediaSizes struct {
- Thumb MediaSize `json:"thumb"`
- Large MediaSize `json:"large"`
- Medium MediaSize `json:"medium"`
- Small MediaSize `json:"small"`
-}
-
-// MediaSize describes the height, width, and resizing method used.
-type MediaSize struct {
- Width int `json:"w"`
- Height int `json:"h"`
- Resize string `json:"resize"`
-}
-
-// VideoInfo is available on video media objects.
-type VideoInfo struct {
- AspectRatio [2]int `json:"aspect_ratio"`
- DurationMillis int `json:"duration_millis"`
- Variants []VideoVariant `json:"variants"`
-}
-
-// VideoVariant describes one of the available video formats.
-type VideoVariant struct {
- ContentType string `json:"content_type"`
- Bitrate int `json:"bitrate"`
- URL string `json:"url"`
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/entities_test.go b/vendor/github.com/dghubble/go-twitter/twitter/entities_test.go
deleted file mode 100644
index fdfde94ec..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/entities_test.go
+++ /dev/null
@@ -1,22 +0,0 @@
-package twitter
-
-import (
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestIndices(t *testing.T) {
- cases := []struct {
- pair Indices
- expectedStart int
- expectedEnd int
- }{
- {Indices{}, 0, 0},
- {Indices{25, 47}, 25, 47},
- }
- for _, c := range cases {
- assert.Equal(t, c.expectedStart, c.pair.Start())
- assert.Equal(t, c.expectedEnd, c.pair.End())
- }
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/errors.go b/vendor/github.com/dghubble/go-twitter/twitter/errors.go
deleted file mode 100644
index 9208a1a6b..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/errors.go
+++ /dev/null
@@ -1,47 +0,0 @@
-package twitter
-
-import (
- "fmt"
-)
-
-// APIError represents a Twitter API Error response
-// https://dev.twitter.com/overview/api/response-codes
-type APIError struct {
- Errors []ErrorDetail `json:"errors"`
-}
-
-// ErrorDetail represents an individual item in an APIError.
-type ErrorDetail struct {
- Message string `json:"message"`
- Code int `json:"code"`
-}
-
-func (e APIError) Error() string {
- if len(e.Errors) > 0 {
- err := e.Errors[0]
- return fmt.Sprintf("twitter: %d %v", err.Code, err.Message)
- }
- return ""
-}
-
-// Empty returns true if empty. Otherwise, at least 1 error message/code is
-// present and false is returned.
-func (e APIError) Empty() bool {
- if len(e.Errors) == 0 {
- return true
- }
- return false
-}
-
-// relevantError returns any non-nil http-related error (creating the request,
-// getting the response, decoding) if any. If the decoded apiError is non-zero
-// the apiError is returned. Otherwise, no errors occurred, returns nil.
-func relevantError(httpError error, apiError APIError) error {
- if httpError != nil {
- return httpError
- }
- if apiError.Empty() {
- return nil
- }
- return apiError
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/errors_test.go b/vendor/github.com/dghubble/go-twitter/twitter/errors_test.go
deleted file mode 100644
index 806db7559..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/errors_test.go
+++ /dev/null
@@ -1,48 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-var errAPI = APIError{
- Errors: []ErrorDetail{
- ErrorDetail{Message: "Status is a duplicate", Code: 187},
- },
-}
-var errHTTP = fmt.Errorf("unknown host")
-
-func TestAPIError_Error(t *testing.T) {
- err := APIError{}
- if assert.Error(t, err) {
- assert.Equal(t, "", err.Error())
- }
- if assert.Error(t, errAPI) {
- assert.Equal(t, "twitter: 187 Status is a duplicate", errAPI.Error())
- }
-}
-
-func TestAPIError_Empty(t *testing.T) {
- err := APIError{}
- assert.True(t, err.Empty())
- assert.False(t, errAPI.Empty())
-}
-
-func TestRelevantError(t *testing.T) {
- cases := []struct {
- httpError error
- apiError APIError
- expected error
- }{
- {nil, APIError{}, nil},
- {nil, errAPI, errAPI},
- {errHTTP, APIError{}, errHTTP},
- {errHTTP, errAPI, errHTTP},
- }
- for _, c := range cases {
- err := relevantError(c.httpError, c.apiError)
- assert.Equal(t, c.expected, err)
- }
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/favorites.go b/vendor/github.com/dghubble/go-twitter/twitter/favorites.go
deleted file mode 100644
index 9cdcf686f..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/favorites.go
+++ /dev/null
@@ -1,72 +0,0 @@
-package twitter
-
-import (
- "net/http"
-
- "github.com/dghubble/sling"
-)
-
-// FavoriteService provides methods for accessing Twitter favorite API endpoints.
-//
-// Note: the like action was known as favorite before November 3, 2015; the
-// historical naming remains in API methods and object properties.
-type FavoriteService struct {
- sling *sling.Sling
-}
-
-// newFavoriteService returns a new FavoriteService.
-func newFavoriteService(sling *sling.Sling) *FavoriteService {
- return &FavoriteService{
- sling: sling.Path("favorites/"),
- }
-}
-
-// FavoriteListParams are the parameters for FavoriteService.List.
-type FavoriteListParams struct {
- UserID int64 `url:"user_id,omitempty"`
- ScreenName string `url:"screen_name,omitempty"`
- Count int `url:"count,omitempty"`
- SinceID int64 `url:"since_id,omitempty"`
- MaxID int64 `url:"max_id,omitempty"`
- IncludeEntities *bool `url:"include_entities,omitempty"`
- TweetMode string `url:"tweet_mode,omitempty"`
-}
-
-// List returns liked Tweets from the specified user.
-// https://dev.twitter.com/rest/reference/get/favorites/list
-func (s *FavoriteService) List(params *FavoriteListParams) ([]Tweet, *http.Response, error) {
- favorites := new([]Tweet)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("list.json").QueryStruct(params).Receive(favorites, apiError)
- return *favorites, resp, relevantError(err, *apiError)
-}
-
-// FavoriteCreateParams are the parameters for FavoriteService.Create.
-type FavoriteCreateParams struct {
- ID int64 `url:"id,omitempty"`
-}
-
-// Create favorites the specified tweet.
-// Requires a user auth context.
-// https://dev.twitter.com/rest/reference/post/favorites/create
-func (s *FavoriteService) Create(params *FavoriteCreateParams) (*Tweet, *http.Response, error) {
- tweet := new(Tweet)
- apiError := new(APIError)
- resp, err := s.sling.New().Post("create.json").QueryStruct(params).Receive(tweet, apiError)
- return tweet, resp, relevantError(err, *apiError)
-}
-
-// FavoriteDestroyParams are the parameters for FavoriteService.Destroy.
-type FavoriteDestroyParams struct {
- ID int64 `url:"id,omitempty"`
-}
-
-// Destroy un-favorites the specified tweet.
-// Requires a user auth context.
-// https://dev.twitter.com/rest/reference/post/favorites/destroy
-func (s *FavoriteService) Destroy(params *FavoriteDestroyParams) (*Tweet, *http.Response, error) {
- tweet := new(Tweet)
- apiError := new(APIError)
- resp, err := s.sling.New().Post("destroy.json").QueryStruct(params).Receive(tweet, apiError)
- return tweet, resp, relevantError(err, *apiError)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/favorites_test.go b/vendor/github.com/dghubble/go-twitter/twitter/favorites_test.go
deleted file mode 100644
index e546cd642..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/favorites_test.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "net/http"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestFavoriteService_List(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/favorites/list.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"user_id": "113419064", "since_id": "101492475", "include_entities": "false"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[{"text": "Gophercon talks!"}, {"text": "Why gophers are so adorable"}]`)
- })
-
- client := NewClient(httpClient)
- tweets, _, err := client.Favorites.List(&FavoriteListParams{UserID: 113419064, SinceID: 101492475, IncludeEntities: Bool(false)})
- expected := []Tweet{Tweet{Text: "Gophercon talks!"}, Tweet{Text: "Why gophers are so adorable"}}
- assert.Nil(t, err)
- assert.Equal(t, expected, tweets)
-}
-
-func TestFavoriteService_Create(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/favorites/create.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "POST", r)
- assertPostForm(t, map[string]string{"id": "12345"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"id": 581980947630845953, "text": "very informative tweet"}`)
- })
-
- client := NewClient(httpClient)
- params := &FavoriteCreateParams{ID: 12345}
- tweet, _, err := client.Favorites.Create(params)
- assert.Nil(t, err)
- expected := &Tweet{ID: 581980947630845953, Text: "very informative tweet"}
- assert.Equal(t, expected, tweet)
-}
-
-func TestFavoriteService_Destroy(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/favorites/destroy.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "POST", r)
- assertPostForm(t, map[string]string{"id": "12345"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"id": 581980947630845953, "text": "very unhappy tweet"}`)
- })
-
- client := NewClient(httpClient)
- params := &FavoriteDestroyParams{ID: 12345}
- tweet, _, err := client.Favorites.Destroy(params)
- assert.Nil(t, err)
- expected := &Tweet{ID: 581980947630845953, Text: "very unhappy tweet"}
- assert.Equal(t, expected, tweet)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/followers.go b/vendor/github.com/dghubble/go-twitter/twitter/followers.go
deleted file mode 100644
index 19ed4ef60..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/followers.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package twitter
-
-import (
- "net/http"
-
- "github.com/dghubble/sling"
-)
-
-// FollowerIDs is a cursored collection of follower ids.
-type FollowerIDs struct {
- IDs []int64 `json:"ids"`
- NextCursor int64 `json:"next_cursor"`
- NextCursorStr string `json:"next_cursor_str"`
- PreviousCursor int64 `json:"previous_cursor"`
- PreviousCursorStr string `json:"previous_cursor_str"`
-}
-
-// Followers is a cursored collection of followers.
-type Followers struct {
- Users []User `json:"users"`
- NextCursor int64 `json:"next_cursor"`
- NextCursorStr string `json:"next_cursor_str"`
- PreviousCursor int64 `json:"previous_cursor"`
- PreviousCursorStr string `json:"previous_cursor_str"`
-}
-
-// FollowerService provides methods for accessing Twitter followers endpoints.
-type FollowerService struct {
- sling *sling.Sling
-}
-
-// newFollowerService returns a new FollowerService.
-func newFollowerService(sling *sling.Sling) *FollowerService {
- return &FollowerService{
- sling: sling.Path("followers/"),
- }
-}
-
-// FollowerIDParams are the parameters for FollowerService.Ids
-type FollowerIDParams struct {
- UserID int64 `url:"user_id,omitempty"`
- ScreenName string `url:"screen_name,omitempty"`
- Cursor int64 `url:"cursor,omitempty"`
- Count int `url:"count,omitempty"`
-}
-
-// IDs returns a cursored collection of user ids following the specified user.
-// https://dev.twitter.com/rest/reference/get/followers/ids
-func (s *FollowerService) IDs(params *FollowerIDParams) (*FollowerIDs, *http.Response, error) {
- ids := new(FollowerIDs)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("ids.json").QueryStruct(params).Receive(ids, apiError)
- return ids, resp, relevantError(err, *apiError)
-}
-
-// FollowerListParams are the parameters for FollowerService.List
-type FollowerListParams struct {
- UserID int64 `url:"user_id,omitempty"`
- ScreenName string `url:"screen_name,omitempty"`
- Cursor int64 `url:"cursor,omitempty"`
- Count int `url:"count,omitempty"`
- SkipStatus *bool `url:"skip_status,omitempty"`
- IncludeUserEntities *bool `url:"include_user_entities,omitempty"`
-}
-
-// List returns a cursored collection of Users following the specified user.
-// https://dev.twitter.com/rest/reference/get/followers/list
-func (s *FollowerService) List(params *FollowerListParams) (*Followers, *http.Response, error) {
- followers := new(Followers)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("list.json").QueryStruct(params).Receive(followers, apiError)
- return followers, resp, relevantError(err, *apiError)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/followers_test.go b/vendor/github.com/dghubble/go-twitter/twitter/followers_test.go
deleted file mode 100644
index cab8472be..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/followers_test.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "net/http"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestFollowerService_Ids(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/followers/ids.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"user_id": "623265148", "count": "5", "cursor": "1516933260114270762"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"ids":[178082406,3318241001,1318020818,191714329,376703838],"next_cursor":1516837838944119498,"next_cursor_str":"1516837838944119498","previous_cursor":-1516924983503961435,"previous_cursor_str":"-1516924983503961435"}`)
- })
- expected := &FollowerIDs{
- IDs: []int64{178082406, 3318241001, 1318020818, 191714329, 376703838},
- NextCursor: 1516837838944119498,
- NextCursorStr: "1516837838944119498",
- PreviousCursor: -1516924983503961435,
- PreviousCursorStr: "-1516924983503961435",
- }
-
- client := NewClient(httpClient)
- params := &FollowerIDParams{
- UserID: 623265148,
- Count: 5,
- Cursor: 1516933260114270762,
- }
- followerIDs, _, err := client.Followers.IDs(params)
- assert.Nil(t, err)
- assert.Equal(t, expected, followerIDs)
-}
-
-func TestFollowerService_List(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/followers/list.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"screen_name": "dghubble", "count": "5", "cursor": "1516933260114270762", "skip_status": "true", "include_user_entities": "false"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"users": [{"id": 123}], "next_cursor":1516837838944119498,"next_cursor_str":"1516837838944119498","previous_cursor":-1516924983503961435,"previous_cursor_str":"-1516924983503961435"}`)
- })
- expected := &Followers{
- Users: []User{User{ID: 123}},
- NextCursor: 1516837838944119498,
- NextCursorStr: "1516837838944119498",
- PreviousCursor: -1516924983503961435,
- PreviousCursorStr: "-1516924983503961435",
- }
-
- client := NewClient(httpClient)
- params := &FollowerListParams{
- ScreenName: "dghubble",
- Count: 5,
- Cursor: 1516933260114270762,
- SkipStatus: Bool(true),
- IncludeUserEntities: Bool(false),
- }
- followers, _, err := client.Followers.List(params)
- assert.Nil(t, err)
- assert.Equal(t, expected, followers)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/friends.go b/vendor/github.com/dghubble/go-twitter/twitter/friends.go
deleted file mode 100644
index 32847435c..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/friends.go
+++ /dev/null
@@ -1,73 +0,0 @@
-package twitter
-
-import (
- "net/http"
-
- "github.com/dghubble/sling"
-)
-
-// FriendIDs is a cursored collection of friend ids.
-type FriendIDs struct {
- IDs []int64 `json:"ids"`
- NextCursor int64 `json:"next_cursor"`
- NextCursorStr string `json:"next_cursor_str"`
- PreviousCursor int64 `json:"previous_cursor"`
- PreviousCursorStr string `json:"previous_cursor_str"`
-}
-
-// Friends is a cursored collection of friends.
-type Friends struct {
- Users []User `json:"users"`
- NextCursor int64 `json:"next_cursor"`
- NextCursorStr string `json:"next_cursor_str"`
- PreviousCursor int64 `json:"previous_cursor"`
- PreviousCursorStr string `json:"previous_cursor_str"`
-}
-
-// FriendService provides methods for accessing Twitter friends endpoints.
-type FriendService struct {
- sling *sling.Sling
-}
-
-// newFriendService returns a new FriendService.
-func newFriendService(sling *sling.Sling) *FriendService {
- return &FriendService{
- sling: sling.Path("friends/"),
- }
-}
-
-// FriendIDParams are the parameters for FriendService.Ids
-type FriendIDParams struct {
- UserID int64 `url:"user_id,omitempty"`
- ScreenName string `url:"screen_name,omitempty"`
- Cursor int64 `url:"cursor,omitempty"`
- Count int `url:"count,omitempty"`
-}
-
-// IDs returns a cursored collection of user ids that the specified user is following.
-// https://dev.twitter.com/rest/reference/get/friends/ids
-func (s *FriendService) IDs(params *FriendIDParams) (*FriendIDs, *http.Response, error) {
- ids := new(FriendIDs)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("ids.json").QueryStruct(params).Receive(ids, apiError)
- return ids, resp, relevantError(err, *apiError)
-}
-
-// FriendListParams are the parameters for FriendService.List
-type FriendListParams struct {
- UserID int64 `url:"user_id,omitempty"`
- ScreenName string `url:"screen_name,omitempty"`
- Cursor int64 `url:"cursor,omitempty"`
- Count int `url:"count,omitempty"`
- SkipStatus *bool `url:"skip_status,omitempty"`
- IncludeUserEntities *bool `url:"include_user_entities,omitempty"`
-}
-
-// List returns a cursored collection of Users that the specified user is following.
-// https://dev.twitter.com/rest/reference/get/friends/list
-func (s *FriendService) List(params *FriendListParams) (*Friends, *http.Response, error) {
- friends := new(Friends)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("list.json").QueryStruct(params).Receive(friends, apiError)
- return friends, resp, relevantError(err, *apiError)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/friends_test.go b/vendor/github.com/dghubble/go-twitter/twitter/friends_test.go
deleted file mode 100644
index cf0c0a714..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/friends_test.go
+++ /dev/null
@@ -1,69 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "net/http"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestFriendService_Ids(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/friends/ids.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"user_id": "623265148", "count": "5", "cursor": "1516933260114270762"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"ids":[178082406,3318241001,1318020818,191714329,376703838],"next_cursor":1516837838944119498,"next_cursor_str":"1516837838944119498","previous_cursor":-1516924983503961435,"previous_cursor_str":"-1516924983503961435"}`)
- })
- expected := &FriendIDs{
- IDs: []int64{178082406, 3318241001, 1318020818, 191714329, 376703838},
- NextCursor: 1516837838944119498,
- NextCursorStr: "1516837838944119498",
- PreviousCursor: -1516924983503961435,
- PreviousCursorStr: "-1516924983503961435",
- }
-
- client := NewClient(httpClient)
- params := &FriendIDParams{
- UserID: 623265148,
- Count: 5,
- Cursor: 1516933260114270762,
- }
- friendIDs, _, err := client.Friends.IDs(params)
- assert.Nil(t, err)
- assert.Equal(t, expected, friendIDs)
-}
-
-func TestFriendService_List(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/friends/list.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"screen_name": "dghubble", "count": "5", "cursor": "1516933260114270762", "skip_status": "true", "include_user_entities": "false"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"users": [{"id": 123}], "next_cursor":1516837838944119498,"next_cursor_str":"1516837838944119498","previous_cursor":-1516924983503961435,"previous_cursor_str":"-1516924983503961435"}`)
- })
- expected := &Friends{
- Users: []User{User{ID: 123}},
- NextCursor: 1516837838944119498,
- NextCursorStr: "1516837838944119498",
- PreviousCursor: -1516924983503961435,
- PreviousCursorStr: "-1516924983503961435",
- }
-
- client := NewClient(httpClient)
- params := &FriendListParams{
- ScreenName: "dghubble",
- Count: 5,
- Cursor: 1516933260114270762,
- SkipStatus: Bool(true),
- IncludeUserEntities: Bool(false),
- }
- friends, _, err := client.Friends.List(params)
- assert.Nil(t, err)
- assert.Equal(t, expected, friends)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/friendships.go b/vendor/github.com/dghubble/go-twitter/twitter/friendships.go
deleted file mode 100644
index 51d7278a6..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/friendships.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package twitter
-
-import (
- "net/http"
-
- "github.com/dghubble/sling"
-)
-
-// FriendshipService provides methods for accessing Twitter friendship API
-// endpoints.
-type FriendshipService struct {
- sling *sling.Sling
-}
-
-// newFriendshipService returns a new FriendshipService.
-func newFriendshipService(sling *sling.Sling) *FriendshipService {
- return &FriendshipService{
- sling: sling.Path("friendships/"),
- }
-}
-
-// FriendshipCreateParams are parameters for FriendshipService.Create
-type FriendshipCreateParams struct {
- ScreenName string `url:"screen_name,omitempty"`
- UserID int64 `url:"user_id,omitempty"`
- Follow *bool `url:"follow,omitempty"`
-}
-
-// Create creates a friendship to (i.e. follows) the specified user and
-// returns the followed user.
-// Requires a user auth context.
-// https://dev.twitter.com/rest/reference/post/friendships/create
-func (s *FriendshipService) Create(params *FriendshipCreateParams) (*User, *http.Response, error) {
- user := new(User)
- apiError := new(APIError)
- resp, err := s.sling.New().Post("create.json").QueryStruct(params).Receive(user, apiError)
- return user, resp, relevantError(err, *apiError)
-}
-
-// FriendshipShowParams are paramenters for FriendshipService.Show
-type FriendshipShowParams struct {
- SourceID int64 `url:"source_id,omitempty"`
- SourceScreenName string `url:"source_screen_name,omitempty"`
- TargetID int64 `url:"target_id,omitempty"`
- TargetScreenName string `url:"target_screen_name,omitempty"`
-}
-
-// Show returns the relationship between two arbitrary users.
-// Requires a user auth or an app context.
-// https://dev.twitter.com/rest/reference/get/friendships/show
-func (s *FriendshipService) Show(params *FriendshipShowParams) (*Relationship, *http.Response, error) {
- response := new(RelationshipResponse)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("show.json").QueryStruct(params).Receive(response, apiError)
- return response.Relationship, resp, relevantError(err, *apiError)
-}
-
-// RelationshipResponse contains a relationship.
-type RelationshipResponse struct {
- Relationship *Relationship `json:"relationship"`
-}
-
-// Relationship represents the relation between a source user and target user.
-type Relationship struct {
- Source RelationshipSource `json:"source"`
- Target RelationshipTarget `json:"target"`
-}
-
-// RelationshipSource represents the source user.
-type RelationshipSource struct {
- ID int64 `json:"id"`
- IDStr string `json:"id_str"`
- ScreenName string `json:"screen_name"`
- Following bool `json:"following"`
- FollowedBy bool `json:"followed_by"`
- CanDM bool `json:"can_dm"`
- Blocking bool `json:"blocking"`
- Muting bool `json:"muting"`
- AllReplies bool `json:"all_replies"`
- WantRetweets bool `json:"want_retweets"`
- MarkedSpam bool `json:"marked_spam"`
- NotificationsEnabled bool `json:"notifications_enabled"`
-}
-
-// RelationshipTarget represents the target user.
-type RelationshipTarget struct {
- ID int64 `json:"id"`
- IDStr string `json:"id_str"`
- ScreenName string `json:"screen_name"`
- Following bool `json:"following"`
- FollowedBy bool `json:"followed_by"`
-}
-
-// FriendshipDestroyParams are paramenters for FriendshipService.Destroy
-type FriendshipDestroyParams struct {
- ScreenName string `url:"screen_name,omitempty"`
- UserID int64 `url:"user_id,omitempty"`
-}
-
-// Destroy destroys a friendship to (i.e. unfollows) the specified user and
-// returns the unfollowed user.
-// Requires a user auth context.
-// https://dev.twitter.com/rest/reference/post/friendships/destroy
-func (s *FriendshipService) Destroy(params *FriendshipDestroyParams) (*User, *http.Response, error) {
- user := new(User)
- apiError := new(APIError)
- resp, err := s.sling.New().Post("destroy.json").QueryStruct(params).Receive(user, apiError)
- return user, resp, relevantError(err, *apiError)
-}
-
-// FriendshipPendingParams are paramenters for FriendshipService.Outgoing
-type FriendshipPendingParams struct {
- Cursor int64 `url:"cursor,omitempty"`
-}
-
-// Outgoing returns a collection of numeric IDs for every protected user for whom the authenticating
-// user has a pending follow request.
-// https://dev.twitter.com/rest/reference/get/friendships/outgoing
-func (s *FriendshipService) Outgoing(params *FriendshipPendingParams) (*FriendIDs, *http.Response, error) {
- ids := new(FriendIDs)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("outgoing.json").QueryStruct(params).Receive(ids, apiError)
- return ids, resp, relevantError(err, *apiError)
-}
-
-// Incoming returns a collection of numeric IDs for every user who has a pending request to
-// follow the authenticating user.
-// https://dev.twitter.com/rest/reference/get/friendships/incoming
-func (s *FriendshipService) Incoming(params *FriendshipPendingParams) (*FriendIDs, *http.Response, error) {
- ids := new(FriendIDs)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("incoming.json").QueryStruct(params).Receive(ids, apiError)
- return ids, resp, relevantError(err, *apiError)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/friendships_test.go b/vendor/github.com/dghubble/go-twitter/twitter/friendships_test.go
deleted file mode 100644
index 82892bbf3..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/friendships_test.go
+++ /dev/null
@@ -1,123 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "net/http"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestFriendshipService_Create(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/friendships/create.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "POST", r)
- assertPostForm(t, map[string]string{"user_id": "12345"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"id": 12345, "name": "Doug Williams"}`)
- })
-
- client := NewClient(httpClient)
- params := &FriendshipCreateParams{UserID: 12345}
- user, _, err := client.Friendships.Create(params)
- assert.Nil(t, err)
- expected := &User{ID: 12345, Name: "Doug Williams"}
- assert.Equal(t, expected, user)
-}
-
-func TestFriendshipService_Show(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/friendships/show.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"source_screen_name": "foo", "target_screen_name": "bar"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{ "relationship": { "source": { "can_dm": false, "muting": true, "id_str": "8649302", "id": 8649302, "screen_name": "foo"}, "target": { "id_str": "12148", "id": 12148, "screen_name": "bar", "following": true, "followed_by": false } } }`)
- })
-
- client := NewClient(httpClient)
- params := &FriendshipShowParams{SourceScreenName: "foo", TargetScreenName: "bar"}
- relationship, _, err := client.Friendships.Show(params)
- assert.Nil(t, err)
- expected := &Relationship{
- Source: RelationshipSource{ID: 8649302, ScreenName: "foo", IDStr: "8649302", CanDM: false, Muting: true, WantRetweets: false},
- Target: RelationshipTarget{ID: 12148, ScreenName: "bar", IDStr: "12148", Following: true, FollowedBy: false},
- }
- assert.Equal(t, expected, relationship)
-}
-
-func TestFriendshipService_Destroy(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/friendships/destroy.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "POST", r)
- assertPostForm(t, map[string]string{"user_id": "12345"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"id": 12345, "name": "Doug Williams"}`)
- })
-
- client := NewClient(httpClient)
- params := &FriendshipDestroyParams{UserID: 12345}
- user, _, err := client.Friendships.Destroy(params)
- assert.Nil(t, err)
- expected := &User{ID: 12345, Name: "Doug Williams"}
- assert.Equal(t, expected, user)
-}
-
-func TestFriendshipService_Outgoing(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/friendships/outgoing.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"cursor": "1516933260114270762"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"ids":[178082406,3318241001,1318020818,191714329,376703838],"next_cursor":1516837838944119498,"next_cursor_str":"1516837838944119498","previous_cursor":-1516924983503961435,"previous_cursor_str":"-1516924983503961435"}`)
- })
- expected := &FriendIDs{
- IDs: []int64{178082406, 3318241001, 1318020818, 191714329, 376703838},
- NextCursor: 1516837838944119498,
- NextCursorStr: "1516837838944119498",
- PreviousCursor: -1516924983503961435,
- PreviousCursorStr: "-1516924983503961435",
- }
-
- client := NewClient(httpClient)
- params := &FriendshipPendingParams{
- Cursor: 1516933260114270762,
- }
- friendIDs, _, err := client.Friendships.Outgoing(params)
- assert.Nil(t, err)
- assert.Equal(t, expected, friendIDs)
-}
-
-func TestFriendshipService_Incoming(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/friendships/incoming.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"cursor": "1516933260114270762"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"ids":[178082406,3318241001,1318020818,191714329,376703838],"next_cursor":1516837838944119498,"next_cursor_str":"1516837838944119498","previous_cursor":-1516924983503961435,"previous_cursor_str":"-1516924983503961435"}`)
- })
- expected := &FriendIDs{
- IDs: []int64{178082406, 3318241001, 1318020818, 191714329, 376703838},
- NextCursor: 1516837838944119498,
- NextCursorStr: "1516837838944119498",
- PreviousCursor: -1516924983503961435,
- PreviousCursorStr: "-1516924983503961435",
- }
-
- client := NewClient(httpClient)
- params := &FriendshipPendingParams{
- Cursor: 1516933260114270762,
- }
- friendIDs, _, err := client.Friendships.Incoming(params)
- assert.Nil(t, err)
- assert.Equal(t, expected, friendIDs)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/search.go b/vendor/github.com/dghubble/go-twitter/twitter/search.go
deleted file mode 100644
index 5bb5071f3..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/search.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package twitter
-
-import (
- "net/http"
-
- "github.com/dghubble/sling"
-)
-
-// Search represents the result of a Tweet search.
-type Search struct {
- Statuses []Tweet `json:"statuses"`
- Metadata *SearchMetadata `json:"search_metadata"`
-}
-
-// SearchMetadata describes a Search result.
-type SearchMetadata struct {
- Count int `json:"count"`
- SinceID int64 `json:"since_id"`
- SinceIDStr string `json:"since_id_str"`
- MaxID int64 `json:"max_id"`
- MaxIDStr string `json:"max_id_str"`
- RefreshURL string `json:"refresh_url"`
- NextResults string `json:"next_results"`
- CompletedIn float64 `json:"completed_in"`
- Query string `json:"query"`
-}
-
-// SearchService provides methods for accessing Twitter search API endpoints.
-type SearchService struct {
- sling *sling.Sling
-}
-
-// newSearchService returns a new SearchService.
-func newSearchService(sling *sling.Sling) *SearchService {
- return &SearchService{
- sling: sling.Path("search/"),
- }
-}
-
-// SearchTweetParams are the parameters for SearchService.Tweets
-type SearchTweetParams struct {
- Query string `url:"q,omitempty"`
- Geocode string `url:"geocode,omitempty"`
- Lang string `url:"lang,omitempty"`
- Locale string `url:"locale,omitempty"`
- ResultType string `url:"result_type,omitempty"`
- Count int `url:"count,omitempty"`
- SinceID int64 `url:"since_id,omitempty"`
- MaxID int64 `url:"max_id,omitempty"`
- Until string `url:"until,omitempty"`
- IncludeEntities *bool `url:"include_entities,omitempty"`
- TweetMode string `url:"tweet_mode,omitempty"`
-}
-
-// Tweets returns a collection of Tweets matching a search query.
-// https://dev.twitter.com/rest/reference/get/search/tweets
-func (s *SearchService) Tweets(params *SearchTweetParams) (*Search, *http.Response, error) {
- search := new(Search)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("tweets.json").QueryStruct(params).Receive(search, apiError)
- return search, resp, relevantError(err, *apiError)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/search_test.go b/vendor/github.com/dghubble/go-twitter/twitter/search_test.go
deleted file mode 100644
index 4c6357407..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/search_test.go
+++ /dev/null
@@ -1,46 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "net/http"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestSearchService_Tweets(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/search/tweets.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"q": "happy birthday", "result_type": "popular", "count": "1"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"statuses":[{"id":781760642139250689}],"search_metadata":{"completed_in":0.043,"max_id":781760642139250689,"max_id_str":"781760642139250689","next_results":"?max_id=781760640104828927&q=happy+birthday&count=1&include_entities=1","query":"happy birthday","refresh_url":"?since_id=781760642139250689&q=happy+birthday&include_entities=1","count":1,"since_id":0,"since_id_str":"0"}}`)
- })
-
- client := NewClient(httpClient)
- search, _, err := client.Search.Tweets(&SearchTweetParams{
- Query: "happy birthday",
- Count: 1,
- ResultType: "popular",
- })
- expected := &Search{
- Statuses: []Tweet{
- Tweet{ID: 781760642139250689},
- },
- Metadata: &SearchMetadata{
- Count: 1,
- SinceID: 0,
- SinceIDStr: "0",
- MaxID: 781760642139250689,
- MaxIDStr: "781760642139250689",
- RefreshURL: "?since_id=781760642139250689&q=happy+birthday&include_entities=1",
- NextResults: "?max_id=781760640104828927&q=happy+birthday&count=1&include_entities=1",
- CompletedIn: 0.043,
- Query: "happy birthday",
- },
- }
- assert.Nil(t, err)
- assert.Equal(t, expected, search)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/statuses.go b/vendor/github.com/dghubble/go-twitter/twitter/statuses.go
deleted file mode 100644
index 6a9046bfd..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/statuses.go
+++ /dev/null
@@ -1,310 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "net/http"
- "time"
-
- "github.com/dghubble/sling"
-)
-
-// Tweet represents a Twitter Tweet, previously called a status.
-// https://dev.twitter.com/overview/api/tweets
-type Tweet struct {
- Coordinates *Coordinates `json:"coordinates"`
- CreatedAt string `json:"created_at"`
- CurrentUserRetweet *TweetIdentifier `json:"current_user_retweet"`
- Entities *Entities `json:"entities"`
- FavoriteCount int `json:"favorite_count"`
- Favorited bool `json:"favorited"`
- FilterLevel string `json:"filter_level"`
- ID int64 `json:"id"`
- IDStr string `json:"id_str"`
- InReplyToScreenName string `json:"in_reply_to_screen_name"`
- InReplyToStatusID int64 `json:"in_reply_to_status_id"`
- InReplyToStatusIDStr string `json:"in_reply_to_status_id_str"`
- InReplyToUserID int64 `json:"in_reply_to_user_id"`
- InReplyToUserIDStr string `json:"in_reply_to_user_id_str"`
- Lang string `json:"lang"`
- PossiblySensitive bool `json:"possibly_sensitive"`
- RetweetCount int `json:"retweet_count"`
- Retweeted bool `json:"retweeted"`
- RetweetedStatus *Tweet `json:"retweeted_status"`
- Source string `json:"source"`
- Scopes map[string]interface{} `json:"scopes"`
- Text string `json:"text"`
- FullText string `json:"full_text"`
- DisplayTextRange Indices `json:"display_text_range"`
- Place *Place `json:"place"`
- Truncated bool `json:"truncated"`
- User *User `json:"user"`
- WithheldCopyright bool `json:"withheld_copyright"`
- WithheldInCountries []string `json:"withheld_in_countries"`
- WithheldScope string `json:"withheld_scope"`
- ExtendedEntities *ExtendedEntity `json:"extended_entities"`
- ExtendedTweet *ExtendedTweet `json:"extended_tweet"`
- QuotedStatusID int64 `json:"quoted_status_id"`
- QuotedStatusIDStr string `json:"quoted_status_id_str"`
- QuotedStatus *Tweet `json:"quoted_status"`
-}
-
-// CreatedAtTime is a convenience wrapper that returns the Created_at time, parsed as a time.Time struct
-func (t Tweet) CreatedAtTime() (time.Time, error) {
- return time.Parse(time.RubyDate, t.CreatedAt)
-}
-
-// ExtendedTweet represents fields embedded in extended Tweets when served in
-// compatibility mode (default).
-// https://dev.twitter.com/overview/api/upcoming-changes-to-tweets
-type ExtendedTweet struct {
- FullText string `json:"full_text"`
- DisplayTextRange Indices `json:"display_text_range"`
- Entities *Entities `json:"entities"`
- ExtendedEntities *ExtendedEntity `json:"extended_entities"`
-}
-
-// Place represents a Twitter Place / Location
-// https://dev.twitter.com/overview/api/places
-type Place struct {
- Attributes map[string]string `json:"attributes"`
- BoundingBox *BoundingBox `json:"bounding_box"`
- Country string `json:"country"`
- CountryCode string `json:"country_code"`
- FullName string `json:"full_name"`
- Geometry *BoundingBox `json:"geometry"`
- ID string `json:"id"`
- Name string `json:"name"`
- PlaceType string `json:"place_type"`
- Polylines []string `json:"polylines"`
- URL string `json:"url"`
-}
-
-// BoundingBox represents the bounding coordinates (longitude, latitutde)
-// defining the bounds of a box containing a Place entity.
-type BoundingBox struct {
- Coordinates [][][2]float64 `json:"coordinates"`
- Type string `json:"type"`
-}
-
-// Coordinates are pairs of longitude and latitude locations.
-type Coordinates struct {
- Coordinates [2]float64 `json:"coordinates"`
- Type string `json:"type"`
-}
-
-// TweetIdentifier represents the id by which a Tweet can be identified.
-type TweetIdentifier struct {
- ID int64 `json:"id"`
- IDStr string `json:"id_str"`
-}
-
-// StatusService provides methods for accessing Twitter status API endpoints.
-type StatusService struct {
- sling *sling.Sling
-}
-
-// newStatusService returns a new StatusService.
-func newStatusService(sling *sling.Sling) *StatusService {
- return &StatusService{
- sling: sling.Path("statuses/"),
- }
-}
-
-// StatusShowParams are the parameters for StatusService.Show
-type StatusShowParams struct {
- ID int64 `url:"id,omitempty"`
- TrimUser *bool `url:"trim_user,omitempty"`
- IncludeMyRetweet *bool `url:"include_my_retweet,omitempty"`
- IncludeEntities *bool `url:"include_entities,omitempty"`
- TweetMode string `url:"tweet_mode,omitempty"`
-}
-
-// Show returns the requested Tweet.
-// https://dev.twitter.com/rest/reference/get/statuses/show/%3Aid
-func (s *StatusService) Show(id int64, params *StatusShowParams) (*Tweet, *http.Response, error) {
- if params == nil {
- params = &StatusShowParams{}
- }
- params.ID = id
- tweet := new(Tweet)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("show.json").QueryStruct(params).Receive(tweet, apiError)
- return tweet, resp, relevantError(err, *apiError)
-}
-
-// StatusLookupParams are the parameters for StatusService.Lookup
-type StatusLookupParams struct {
- ID []int64 `url:"id,omitempty,comma"`
- TrimUser *bool `url:"trim_user,omitempty"`
- IncludeEntities *bool `url:"include_entities,omitempty"`
- Map *bool `url:"map,omitempty"`
- TweetMode string `url:"tweet_mode,omitempty"`
-}
-
-// Lookup returns the requested Tweets as a slice. Combines ids from the
-// required ids argument and from params.Id.
-// https://dev.twitter.com/rest/reference/get/statuses/lookup
-func (s *StatusService) Lookup(ids []int64, params *StatusLookupParams) ([]Tweet, *http.Response, error) {
- if params == nil {
- params = &StatusLookupParams{}
- }
- params.ID = append(params.ID, ids...)
- tweets := new([]Tweet)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("lookup.json").QueryStruct(params).Receive(tweets, apiError)
- return *tweets, resp, relevantError(err, *apiError)
-}
-
-// StatusUpdateParams are the parameters for StatusService.Update
-type StatusUpdateParams struct {
- Status string `url:"status,omitempty"`
- InReplyToStatusID int64 `url:"in_reply_to_status_id,omitempty"`
- PossiblySensitive *bool `url:"possibly_sensitive,omitempty"`
- Lat *float64 `url:"lat,omitempty"`
- Long *float64 `url:"long,omitempty"`
- PlaceID string `url:"place_id,omitempty"`
- DisplayCoordinates *bool `url:"display_coordinates,omitempty"`
- TrimUser *bool `url:"trim_user,omitempty"`
- MediaIds []int64 `url:"media_ids,omitempty,comma"`
- TweetMode string `url:"tweet_mode,omitempty"`
-}
-
-// Update updates the user's status, also known as Tweeting.
-// Requires a user auth context.
-// https://dev.twitter.com/rest/reference/post/statuses/update
-func (s *StatusService) Update(status string, params *StatusUpdateParams) (*Tweet, *http.Response, error) {
- if params == nil {
- params = &StatusUpdateParams{}
- }
- params.Status = status
- tweet := new(Tweet)
- apiError := new(APIError)
- resp, err := s.sling.New().Post("update.json").BodyForm(params).Receive(tweet, apiError)
- return tweet, resp, relevantError(err, *apiError)
-}
-
-// StatusRetweetParams are the parameters for StatusService.Retweet
-type StatusRetweetParams struct {
- ID int64 `url:"id,omitempty"`
- TrimUser *bool `url:"trim_user,omitempty"`
- TweetMode string `url:"tweet_mode,omitempty"`
-}
-
-// Retweet retweets the Tweet with the given id and returns the original Tweet
-// with embedded retweet details.
-// Requires a user auth context.
-// https://dev.twitter.com/rest/reference/post/statuses/retweet/%3Aid
-func (s *StatusService) Retweet(id int64, params *StatusRetweetParams) (*Tweet, *http.Response, error) {
- if params == nil {
- params = &StatusRetweetParams{}
- }
- params.ID = id
- tweet := new(Tweet)
- apiError := new(APIError)
- path := fmt.Sprintf("retweet/%d.json", params.ID)
- resp, err := s.sling.New().Post(path).BodyForm(params).Receive(tweet, apiError)
- return tweet, resp, relevantError(err, *apiError)
-}
-
-// StatusUnretweetParams are the parameters for StatusService.Unretweet
-type StatusUnretweetParams struct {
- ID int64 `url:"id,omitempty"`
- TrimUser *bool `url:"trim_user,omitempty"`
- TweetMode string `url:"tweet_mode,omitempty"`
-}
-
-// Unretweet unretweets the Tweet with the given id and returns the original Tweet.
-// Requires a user auth context.
-// https://dev.twitter.com/rest/reference/post/statuses/unretweet/%3Aid
-func (s *StatusService) Unretweet(id int64, params *StatusUnretweetParams) (*Tweet, *http.Response, error) {
- if params == nil {
- params = &StatusUnretweetParams{}
- }
- params.ID = id
- tweet := new(Tweet)
- apiError := new(APIError)
- path := fmt.Sprintf("unretweet/%d.json", params.ID)
- resp, err := s.sling.New().Post(path).BodyForm(params).Receive(tweet, apiError)
- return tweet, resp, relevantError(err, *apiError)
-}
-
-// StatusRetweetsParams are the parameters for StatusService.Retweets
-type StatusRetweetsParams struct {
- ID int64 `url:"id,omitempty"`
- Count int `url:"count,omitempty"`
- TrimUser *bool `url:"trim_user,omitempty"`
- TweetMode string `url:"tweet_mode,omitempty"`
-}
-
-// Retweets returns the most recent retweets of the Tweet with the given id.
-// https://dev.twitter.com/rest/reference/get/statuses/retweets/%3Aid
-func (s *StatusService) Retweets(id int64, params *StatusRetweetsParams) ([]Tweet, *http.Response, error) {
- if params == nil {
- params = &StatusRetweetsParams{}
- }
- params.ID = id
- tweets := new([]Tweet)
- apiError := new(APIError)
- path := fmt.Sprintf("retweets/%d.json", params.ID)
- resp, err := s.sling.New().Get(path).QueryStruct(params).Receive(tweets, apiError)
- return *tweets, resp, relevantError(err, *apiError)
-}
-
-// StatusDestroyParams are the parameters for StatusService.Destroy
-type StatusDestroyParams struct {
- ID int64 `url:"id,omitempty"`
- TrimUser *bool `url:"trim_user,omitempty"`
- TweetMode string `url:"tweet_mode,omitempty"`
-}
-
-// Destroy deletes the Tweet with the given id and returns it if successful.
-// Requires a user auth context.
-// https://dev.twitter.com/rest/reference/post/statuses/destroy/%3Aid
-func (s *StatusService) Destroy(id int64, params *StatusDestroyParams) (*Tweet, *http.Response, error) {
- if params == nil {
- params = &StatusDestroyParams{}
- }
- params.ID = id
- tweet := new(Tweet)
- apiError := new(APIError)
- path := fmt.Sprintf("destroy/%d.json", params.ID)
- resp, err := s.sling.New().Post(path).BodyForm(params).Receive(tweet, apiError)
- return tweet, resp, relevantError(err, *apiError)
-}
-
-// OEmbedTweet represents a Tweet in oEmbed format.
-type OEmbedTweet struct {
- URL string `json:"url"`
- ProviderURL string `json:"provider_url"`
- ProviderName string `json:"provider_name"`
- AuthorName string `json:"author_name"`
- Version string `json:"version"`
- AuthorURL string `json:"author_url"`
- Type string `json:"type"`
- HTML string `json:"html"`
- Height int64 `json:"height"`
- Width int64 `json:"width"`
- CacheAge string `json:"cache_age"`
-}
-
-// StatusOEmbedParams are the parameters for StatusService.OEmbed
-type StatusOEmbedParams struct {
- ID int64 `url:"id,omitempty"`
- URL string `url:"url,omitempty"`
- Align string `url:"align,omitempty"`
- MaxWidth int64 `url:"maxwidth,omitempty"`
- HideMedia *bool `url:"hide_media,omitempty"`
- HideThread *bool `url:"hide_media,omitempty"`
- OmitScript *bool `url:"hide_media,omitempty"`
- WidgetType string `url:"widget_type,omitempty"`
- HideTweet *bool `url:"hide_tweet,omitempty"`
-}
-
-// OEmbed returns the requested Tweet in oEmbed format.
-// https://dev.twitter.com/rest/reference/get/statuses/oembed
-func (s *StatusService) OEmbed(params *StatusOEmbedParams) (*OEmbedTweet, *http.Response, error) {
- oEmbedTweet := new(OEmbedTweet)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("oembed.json").QueryStruct(params).Receive(oEmbedTweet, apiError)
- return oEmbedTweet, resp, relevantError(err, *apiError)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/statuses_test.go b/vendor/github.com/dghubble/go-twitter/twitter/statuses_test.go
deleted file mode 100644
index 9b583a184..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/statuses_test.go
+++ /dev/null
@@ -1,275 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "net/http"
- "strings"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestStatusService_Show(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/show.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"id": "589488862814076930", "include_entities": "false"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"user": {"screen_name": "dghubble"}, "text": ".@audreyr use a DONTREADME file if you really want people to read it :P"}`)
- })
-
- client := NewClient(httpClient)
- params := &StatusShowParams{ID: 5441, IncludeEntities: Bool(false)}
- tweet, _, err := client.Statuses.Show(589488862814076930, params)
- expected := &Tweet{User: &User{ScreenName: "dghubble"}, Text: ".@audreyr use a DONTREADME file if you really want people to read it :P"}
- assert.Nil(t, err)
- assert.Equal(t, expected, tweet)
-}
-
-func TestStatusService_ShowHandlesNilParams(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/show.json", func(w http.ResponseWriter, r *http.Request) {
- assertQuery(t, map[string]string{"id": "589488862814076930"}, r)
- })
- client := NewClient(httpClient)
- client.Statuses.Show(589488862814076930, nil)
-}
-
-func TestStatusService_Lookup(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/lookup.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"id": "20,573893817000140800", "trim_user": "true"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[{"id": 20, "text": "just setting up my twttr"}, {"id": 573893817000140800, "text": "Don't get lost #PaxEast2015"}]`)
- })
-
- client := NewClient(httpClient)
- params := &StatusLookupParams{ID: []int64{20}, TrimUser: Bool(true)}
- tweets, _, err := client.Statuses.Lookup([]int64{573893817000140800}, params)
- expected := []Tweet{Tweet{ID: 20, Text: "just setting up my twttr"}, Tweet{ID: 573893817000140800, Text: "Don't get lost #PaxEast2015"}}
- assert.Nil(t, err)
- assert.Equal(t, expected, tweets)
-}
-
-func TestStatusService_LookupHandlesNilParams(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
- mux.HandleFunc("/1.1/statuses/lookup.json", func(w http.ResponseWriter, r *http.Request) {
- assertQuery(t, map[string]string{"id": "20,573893817000140800"}, r)
- })
- client := NewClient(httpClient)
- client.Statuses.Lookup([]int64{20, 573893817000140800}, nil)
-}
-
-func TestStatusService_Update(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/update.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "POST", r)
- assertQuery(t, map[string]string{}, r)
- assertPostForm(t, map[string]string{"status": "very informative tweet", "media_ids": "123456789,987654321", "lat": "37.826706", "long": "-122.42219"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"id": 581980947630845953, "text": "very informative tweet"}`)
- })
-
- client := NewClient(httpClient)
- params := &StatusUpdateParams{MediaIds: []int64{123456789, 987654321}, Lat: Float(37.826706), Long: Float(-122.422190)}
- tweet, _, err := client.Statuses.Update("very informative tweet", params)
- expected := &Tweet{ID: 581980947630845953, Text: "very informative tweet"}
- assert.Nil(t, err)
- assert.Equal(t, expected, tweet)
-}
-
-func TestStatusService_UpdateHandlesNilParams(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
- mux.HandleFunc("/1.1/statuses/update.json", func(w http.ResponseWriter, r *http.Request) {
- assertPostForm(t, map[string]string{"status": "very informative tweet"}, r)
- })
- client := NewClient(httpClient)
- client.Statuses.Update("very informative tweet", nil)
-}
-
-func TestStatusService_APIError(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
- mux.HandleFunc("/1.1/statuses/update.json", func(w http.ResponseWriter, r *http.Request) {
- assertPostForm(t, map[string]string{"status": "very informative tweet"}, r)
- w.Header().Set("Content-Type", "application/json")
- w.WriteHeader(403)
- fmt.Fprintf(w, `{"errors": [{"message": "Status is a duplicate", "code": 187}]}`)
- })
-
- client := NewClient(httpClient)
- _, _, err := client.Statuses.Update("very informative tweet", nil)
- expected := APIError{
- Errors: []ErrorDetail{
- ErrorDetail{Message: "Status is a duplicate", Code: 187},
- },
- }
- if assert.Error(t, err) {
- assert.Equal(t, expected, err)
- }
-}
-
-func TestStatusService_HTTPError(t *testing.T) {
- httpClient, _, server := testServer()
- server.Close()
- client := NewClient(httpClient)
- _, _, err := client.Statuses.Update("very informative tweet", nil)
- if err == nil || !strings.Contains(err.Error(), "connection refused") {
- t.Errorf("Statuses.Update error expected connection refused, got: \n %+v", err)
- }
-}
-
-func TestStatusService_Retweet(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/retweet/20.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "POST", r)
- assertQuery(t, map[string]string{}, r)
- assertPostForm(t, map[string]string{"id": "20", "trim_user": "true"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"id": 581980947630202020, "text": "RT @jack: just setting up my twttr", "retweeted_status": {"id": 20, "text": "just setting up my twttr"}}`)
- })
-
- client := NewClient(httpClient)
- params := &StatusRetweetParams{TrimUser: Bool(true)}
- tweet, _, err := client.Statuses.Retweet(20, params)
- expected := &Tweet{ID: 581980947630202020, Text: "RT @jack: just setting up my twttr", RetweetedStatus: &Tweet{ID: 20, Text: "just setting up my twttr"}}
- assert.Nil(t, err)
- assert.Equal(t, expected, tweet)
-}
-
-func TestStatusService_RetweetHandlesNilParams(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/retweet/20.json", func(w http.ResponseWriter, r *http.Request) {
- assertPostForm(t, map[string]string{"id": "20"}, r)
- })
-
- client := NewClient(httpClient)
- client.Statuses.Retweet(20, nil)
-}
-
-func TestStatusService_Unretweet(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/unretweet/20.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "POST", r)
- assertQuery(t, map[string]string{}, r)
- assertPostForm(t, map[string]string{"id": "20", "trim_user": "true"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"id": 581980947630202020, "text":"RT @jack: just setting up my twttr", "retweeted_status": {"id": 20, "text": "just setting up my twttr"}}`)
- })
-
- client := NewClient(httpClient)
- params := &StatusUnretweetParams{TrimUser: Bool(true)}
- tweet, _, err := client.Statuses.Unretweet(20, params)
- expected := &Tweet{ID: 581980947630202020, Text: "RT @jack: just setting up my twttr", RetweetedStatus: &Tweet{ID: 20, Text: "just setting up my twttr"}}
- assert.Nil(t, err)
- assert.Equal(t, expected, tweet)
-}
-
-func TestStatusService_Retweets(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/retweets/20.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"id": "20", "count": "2"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[{"text": "RT @jack: just setting up my twttr"}, {"text": "RT @jack: just setting up my twttr"}]`)
- })
-
- client := NewClient(httpClient)
- params := &StatusRetweetsParams{Count: 2}
- retweets, _, err := client.Statuses.Retweets(20, params)
- expected := []Tweet{Tweet{Text: "RT @jack: just setting up my twttr"}, Tweet{Text: "RT @jack: just setting up my twttr"}}
- assert.Nil(t, err)
- assert.Equal(t, expected, retweets)
-}
-
-func TestStatusService_RetweetsHandlesNilParams(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/retweets/20.json", func(w http.ResponseWriter, r *http.Request) {
- assertQuery(t, map[string]string{"id": "20"}, r)
- })
-
- client := NewClient(httpClient)
- client.Statuses.Retweets(20, nil)
-}
-
-func TestStatusService_Destroy(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/destroy/40.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "POST", r)
- assertQuery(t, map[string]string{}, r)
- assertPostForm(t, map[string]string{"id": "40", "trim_user": "true"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"id": 40, "text": "wishing I had another sammich"}`)
- })
-
- client := NewClient(httpClient)
- params := &StatusDestroyParams{TrimUser: Bool(true)}
- tweet, _, err := client.Statuses.Destroy(40, params)
- // feed Biz Stone a sammich, he deletes sammich Tweet
- expected := &Tweet{ID: 40, Text: "wishing I had another sammich"}
- assert.Nil(t, err)
- assert.Equal(t, expected, tweet)
-}
-
-func TestStatusService_DestroyHandlesNilParams(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/destroy/40.json", func(w http.ResponseWriter, r *http.Request) {
- assertPostForm(t, map[string]string{"id": "40"}, r)
- })
-
- client := NewClient(httpClient)
- client.Statuses.Destroy(40, nil)
-}
-
-func TestStatusService_OEmbed(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/oembed.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"id": "691076766878691329", "maxwidth": "400", "hide_media": "true"}, r)
- w.Header().Set("Content-Type", "application/json")
- // abbreviated oEmbed response
- fmt.Fprintf(w, `{"url": "https://twitter.com/dghubble/statuses/691076766878691329", "width": 400, "html": ""}`)
- })
-
- client := NewClient(httpClient)
- params := &StatusOEmbedParams{
- ID: 691076766878691329,
- MaxWidth: 400,
- HideMedia: Bool(true),
- }
- oembed, _, err := client.Statuses.OEmbed(params)
- expected := &OEmbedTweet{
- URL: "https://twitter.com/dghubble/statuses/691076766878691329",
- Width: 400,
- HTML: "",
- }
- assert.Nil(t, err)
- assert.Equal(t, expected, oembed)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/stream_messages.go b/vendor/github.com/dghubble/go-twitter/twitter/stream_messages.go
deleted file mode 100644
index ad89bad69..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/stream_messages.go
+++ /dev/null
@@ -1,110 +0,0 @@
-package twitter
-
-// StatusDeletion indicates that a given Tweet has been deleted.
-// https://dev.twitter.com/streaming/overview/messages-types#status_deletion_notices_delete
-type StatusDeletion struct {
- ID int64 `json:"id"`
- IDStr string `json:"id_str"`
- UserID int64 `json:"user_id"`
- UserIDStr string `json:"user_id_str"`
-}
-
-type statusDeletionNotice struct {
- Delete struct {
- StatusDeletion *StatusDeletion `json:"status"`
- } `json:"delete"`
-}
-
-// LocationDeletion indicates geolocation data must be stripped from a range
-// of Tweets.
-// https://dev.twitter.com/streaming/overview/messages-types#Location_deletion_notices_scrub_geo
-type LocationDeletion struct {
- UserID int64 `json:"user_id"`
- UserIDStr string `json:"user_id_str"`
- UpToStatusID int64 `json:"up_to_status_id"`
- UpToStatusIDStr string `json:"up_to_status_id_str"`
-}
-
-type locationDeletionNotice struct {
- ScrubGeo *LocationDeletion `json:"scrub_geo"`
-}
-
-// StreamLimit indicates a stream matched more statuses than its rate limit
-// allowed. The track number is the number of undelivered matches.
-// https://dev.twitter.com/streaming/overview/messages-types#limit_notices
-type StreamLimit struct {
- Track int64 `json:"track"`
-}
-
-type streamLimitNotice struct {
- Limit *StreamLimit `json:"limit"`
-}
-
-// StatusWithheld indicates a Tweet with the given ID, belonging to UserId,
-// has been withheld in certain countries.
-// https://dev.twitter.com/streaming/overview/messages-types#withheld_content_notices
-type StatusWithheld struct {
- ID int64 `json:"id"`
- UserID int64 `json:"user_id"`
- WithheldInCountries []string `json:"withheld_in_countries"`
-}
-
-type statusWithheldNotice struct {
- StatusWithheld *StatusWithheld `json:"status_withheld"`
-}
-
-// UserWithheld indicates a User with the given ID has been withheld in
-// certain countries.
-// https://dev.twitter.com/streaming/overview/messages-types#withheld_content_notices
-type UserWithheld struct {
- ID int64 `json:"id"`
- WithheldInCountries []string `json:"withheld_in_countries"`
-}
-type userWithheldNotice struct {
- UserWithheld *UserWithheld `json:"user_withheld"`
-}
-
-// StreamDisconnect indicates the stream has been shutdown for some reason.
-// https://dev.twitter.com/streaming/overview/messages-types#disconnect_messages
-type StreamDisconnect struct {
- Code int64 `json:"code"`
- StreamName string `json:"stream_name"`
- Reason string `json:"reason"`
-}
-
-type streamDisconnectNotice struct {
- StreamDisconnect *StreamDisconnect `json:"disconnect"`
-}
-
-// StallWarning indicates the client is falling behind in the stream.
-// https://dev.twitter.com/streaming/overview/messages-types#stall_warnings
-type StallWarning struct {
- Code string `json:"code"`
- Message string `json:"message"`
- PercentFull int `json:"percent_full"`
-}
-
-type stallWarningNotice struct {
- StallWarning *StallWarning `json:"warning"`
-}
-
-// FriendsList is a list of some of a user's friends.
-// https://dev.twitter.com/streaming/overview/messages-types#friends_list_friends
-type FriendsList struct {
- Friends []int64 `json:"friends"`
-}
-
-type directMessageNotice struct {
- DirectMessage *DirectMessage `json:"direct_message"`
-}
-
-// Event is a non-Tweet notification message (e.g. like, retweet, follow).
-// https://dev.twitter.com/streaming/overview/messages-types#Events_event
-type Event struct {
- Event string `json:"event"`
- CreatedAt string `json:"created_at"`
- Target *User `json:"target"`
- Source *User `json:"source"`
- // TODO: add List or deprecate it
- TargetObject *Tweet `json:"target_object"`
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/stream_utils.go b/vendor/github.com/dghubble/go-twitter/twitter/stream_utils.go
deleted file mode 100644
index 092efa100..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/stream_utils.go
+++ /dev/null
@@ -1,95 +0,0 @@
-package twitter
-
-import (
- "bufio"
- "bytes"
- "io"
- "time"
-)
-
-// stopped returns true if the done channel receives, false otherwise.
-func stopped(done <-chan struct{}) bool {
- select {
- case <-done:
- return true
- default:
- return false
- }
-}
-
-// sleepOrDone pauses the current goroutine until the done channel receives
-// or until at least the duration d has elapsed, whichever comes first. This
-// is similar to time.Sleep(d), except it can be interrupted.
-func sleepOrDone(d time.Duration, done <-chan struct{}) {
- sleep := time.NewTimer(d)
- defer sleep.Stop()
- select {
- case <-sleep.C:
- return
- case <-done:
- return
- }
-}
-
-// streamResponseBodyReader is a buffered reader for Twitter stream response
-// body. It can scan the arbitrary length of response body unlike bufio.Scanner.
-type streamResponseBodyReader struct {
- reader *bufio.Reader
- buf bytes.Buffer
-}
-
-// newStreamResponseBodyReader returns an instance of streamResponseBodyReader
-// for the given Twitter stream response body.
-func newStreamResponseBodyReader(body io.Reader) *streamResponseBodyReader {
- return &streamResponseBodyReader{reader: bufio.NewReader(body)}
-}
-
-// readNext reads Twitter stream response body and returns the next stream
-// content if exists. Returns io.EOF error if we reached the end of the stream
-// and there's no more message to read.
-func (r *streamResponseBodyReader) readNext() ([]byte, error) {
- // Discard all the bytes from buf and continue to use the allocated memory
- // space for reading the next message.
- r.buf.Truncate(0)
- for {
- // Twitter stream messages are separated with "\r\n", and a valid
- // message may sometimes contain '\n' in the middle.
- // bufio.Reader.Read() can accept one byte delimiter only, so we need to
- // first break out each line on '\n' and then check whether the line ends
- // with "\r\n" to find message boundaries.
- // https://dev.twitter.com/streaming/overview/processing
- line, err := r.reader.ReadBytes('\n')
- // Non-EOF error should be propagated to callers immediately.
- if err != nil && err != io.EOF {
- return nil, err
- }
- // EOF error means that we reached the end of the stream body before finding
- // delimiter '\n'. If "line" is empty, it means the reader didn't read any
- // data from the stream before reaching EOF and there's nothing to append to
- // buf.
- if err == io.EOF && len(line) == 0 {
- // if buf has no data, propagate io.EOF to callers and let them know that
- // we've finished processing the stream.
- if r.buf.Len() == 0 {
- return nil, err
- }
- // Otherwise, we still have a remaining stream message to return.
- break
- }
- // If the line ends with "\r\n", it's the end of one stream message data.
- if bytes.HasSuffix(line, []byte("\r\n")) {
- // reader.ReadBytes() returns a slice including the delimiter itself, so
- // we need to trim '\n' as well as '\r' from the end of the slice.
- r.buf.Write(bytes.TrimRight(line, "\r\n"))
- break
- }
- // Otherwise, the line is not the end of a stream message, so we append
- // the line to buf and continue to scan lines.
- r.buf.Write(line)
- }
-
- // Get the stream message bytes from buf. Not that Bytes() won't mark the
- // returned data as "read", and we need to explicitly call Truncate(0) to
- // discard from buf before writing the next stream message to buf.
- return r.buf.Bytes(), nil
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/stream_utils_test.go b/vendor/github.com/dghubble/go-twitter/twitter/stream_utils_test.go
deleted file mode 100644
index 6884d8af3..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/stream_utils_test.go
+++ /dev/null
@@ -1,111 +0,0 @@
-package twitter
-
-import (
- "bufio"
- "bytes"
- "io"
- "strings"
- "testing"
- "time"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestStopped(t *testing.T) {
- done := make(chan struct{})
- assert.False(t, stopped(done))
- close(done)
- assert.True(t, stopped(done))
-}
-
-func TestSleepOrDone_Sleep(t *testing.T) {
- wait := time.Nanosecond * 20
- done := make(chan struct{})
- completed := make(chan struct{})
- go func() {
- sleepOrDone(wait, done)
- close(completed)
- }()
- // wait for goroutine SleepOrDone to sleep
- assertDone(t, completed, defaultTestTimeout)
-}
-
-func TestSleepOrDone_Done(t *testing.T) {
- wait := time.Second * 5
- done := make(chan struct{})
- completed := make(chan struct{})
- go func() {
- sleepOrDone(wait, done)
- close(completed)
- }()
- // close done, interrupting SleepOrDone
- close(done)
- // assert that SleepOrDone exited, closing completed
- assertDone(t, completed, defaultTestTimeout)
-}
-
-func TestStreamResponseBodyReader(t *testing.T) {
- cases := []struct {
- in []byte
- want [][]byte
- }{
- {
- in: []byte("foo\r\nbar\r\n"),
- want: [][]byte{
- []byte("foo"),
- []byte("bar"),
- },
- },
- {
- in: []byte("foo\nbar\r\n"),
- want: [][]byte{
- []byte("foo\nbar"),
- },
- },
- {
- in: []byte("foo\r\n\r\n"),
- want: [][]byte{
- []byte("foo"),
- []byte(""),
- },
- },
- {
- in: []byte("foo\r\nbar"),
- want: [][]byte{
- []byte("foo"),
- []byte("bar"),
- },
- },
- {
- // Message length is more than bufio.MaxScanTokenSize, which can't be
- // parsed by bufio.Scanner with default buffer size.
- in: []byte(strings.Repeat("X", bufio.MaxScanTokenSize+1) + "\r\n"),
- want: [][]byte{
- []byte(strings.Repeat("X", bufio.MaxScanTokenSize+1)),
- },
- },
- }
-
- for _, c := range cases {
- body := bytes.NewReader(c.in)
- reader := newStreamResponseBodyReader(body)
-
- for i, want := range c.want {
- data, err := reader.readNext()
- if err != nil {
- t.Errorf("reader(%q).readNext() * %d: err == %q, want nil", c.in, i, err)
- }
- if !bytes.Equal(data, want) {
- t.Errorf("reader(%q).readNext() * %d: data == %q, want %q", c.in, i, data, want)
- }
- }
-
- data, err := reader.readNext()
- if err != io.EOF {
- t.Errorf("reader(%q).readNext() * %d: err == %q, want io.EOF", c.in, len(c.want), err)
- }
- if len(data) != 0 {
- t.Errorf("reader(%q).readNext() * %d: data == %q, want \"\"", c.in, len(c.want), data)
- }
- }
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/streams.go b/vendor/github.com/dghubble/go-twitter/twitter/streams.go
deleted file mode 100644
index 3ff01ee19..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/streams.go
+++ /dev/null
@@ -1,323 +0,0 @@
-package twitter
-
-import (
- "encoding/json"
- "io"
- "net/http"
- "sync"
- "time"
-
- "github.com/cenkalti/backoff"
- "github.com/dghubble/sling"
-)
-
-const (
- userAgent = "go-twitter v0.1"
- publicStream = "https://stream.twitter.com/1.1/"
- userStream = "https://userstream.twitter.com/1.1/"
- siteStream = "https://sitestream.twitter.com/1.1/"
-)
-
-// StreamService provides methods for accessing the Twitter Streaming API.
-type StreamService struct {
- client *http.Client
- public *sling.Sling
- user *sling.Sling
- site *sling.Sling
-}
-
-// newStreamService returns a new StreamService.
-func newStreamService(client *http.Client, sling *sling.Sling) *StreamService {
- sling.Set("User-Agent", userAgent)
- return &StreamService{
- client: client,
- public: sling.New().Base(publicStream).Path("statuses/"),
- user: sling.New().Base(userStream),
- site: sling.New().Base(siteStream),
- }
-}
-
-// StreamFilterParams are parameters for StreamService.Filter.
-type StreamFilterParams struct {
- FilterLevel string `url:"filter_level,omitempty"`
- Follow []string `url:"follow,omitempty,comma"`
- Language []string `url:"language,omitempty,comma"`
- Locations []string `url:"locations,omitempty,comma"`
- StallWarnings *bool `url:"stall_warnings,omitempty"`
- Track []string `url:"track,omitempty,comma"`
-}
-
-// Filter returns messages that match one or more filter predicates.
-// https://dev.twitter.com/streaming/reference/post/statuses/filter
-func (srv *StreamService) Filter(params *StreamFilterParams) (*Stream, error) {
- req, err := srv.public.New().Post("filter.json").QueryStruct(params).Request()
- if err != nil {
- return nil, err
- }
- return newStream(srv.client, req), nil
-}
-
-// StreamSampleParams are the parameters for StreamService.Sample.
-type StreamSampleParams struct {
- StallWarnings *bool `url:"stall_warnings,omitempty"`
- Language []string `url:"language,omitempty,comma"`
-}
-
-// Sample returns a small sample of public stream messages.
-// https://dev.twitter.com/streaming/reference/get/statuses/sample
-func (srv *StreamService) Sample(params *StreamSampleParams) (*Stream, error) {
- req, err := srv.public.New().Get("sample.json").QueryStruct(params).Request()
- if err != nil {
- return nil, err
- }
- return newStream(srv.client, req), nil
-}
-
-// StreamUserParams are the parameters for StreamService.User.
-type StreamUserParams struct {
- FilterLevel string `url:"filter_level,omitempty"`
- Language []string `url:"language,omitempty,comma"`
- Locations []string `url:"locations,omitempty,comma"`
- Replies string `url:"replies,omitempty"`
- StallWarnings *bool `url:"stall_warnings,omitempty"`
- Track []string `url:"track,omitempty,comma"`
- With string `url:"with,omitempty"`
-}
-
-// User returns a stream of messages specific to the authenticated User.
-// https://dev.twitter.com/streaming/reference/get/user
-func (srv *StreamService) User(params *StreamUserParams) (*Stream, error) {
- req, err := srv.user.New().Get("user.json").QueryStruct(params).Request()
- if err != nil {
- return nil, err
- }
- return newStream(srv.client, req), nil
-}
-
-// StreamSiteParams are the parameters for StreamService.Site.
-type StreamSiteParams struct {
- FilterLevel string `url:"filter_level,omitempty"`
- Follow []string `url:"follow,omitempty,comma"`
- Language []string `url:"language,omitempty,comma"`
- Replies string `url:"replies,omitempty"`
- StallWarnings *bool `url:"stall_warnings,omitempty"`
- With string `url:"with,omitempty"`
-}
-
-// Site returns messages for a set of users.
-// Requires special permission to access.
-// https://dev.twitter.com/streaming/reference/get/site
-func (srv *StreamService) Site(params *StreamSiteParams) (*Stream, error) {
- req, err := srv.site.New().Get("site.json").QueryStruct(params).Request()
- if err != nil {
- return nil, err
- }
- return newStream(srv.client, req), nil
-}
-
-// StreamFirehoseParams are the parameters for StreamService.Firehose.
-type StreamFirehoseParams struct {
- Count int `url:"count,omitempty"`
- FilterLevel string `url:"filter_level,omitempty"`
- Language []string `url:"language,omitempty,comma"`
- StallWarnings *bool `url:"stall_warnings,omitempty"`
-}
-
-// Firehose returns all public messages and statuses.
-// Requires special permission to access.
-// https://dev.twitter.com/streaming/reference/get/statuses/firehose
-func (srv *StreamService) Firehose(params *StreamFirehoseParams) (*Stream, error) {
- req, err := srv.public.New().Get("firehose.json").QueryStruct(params).Request()
- if err != nil {
- return nil, err
- }
- return newStream(srv.client, req), nil
-}
-
-// Stream maintains a connection to the Twitter Streaming API, receives
-// messages from the streaming response, and sends them on the Messages
-// channel from a goroutine. The stream goroutine stops itself if an EOF is
-// reached or retry errors occur, also closing the Messages channel.
-//
-// The client must Stop() the stream when finished receiving, which will
-// wait until the stream is properly stopped.
-type Stream struct {
- client *http.Client
- Messages chan interface{}
- done chan struct{}
- group *sync.WaitGroup
- body io.Closer
-}
-
-// newStream creates a Stream and starts a goroutine to retry connecting and
-// receive from a stream response. The goroutine may stop due to retry errors
-// or be stopped by calling Stop() on the stream.
-func newStream(client *http.Client, req *http.Request) *Stream {
- s := &Stream{
- client: client,
- Messages: make(chan interface{}),
- done: make(chan struct{}),
- group: &sync.WaitGroup{},
- }
- s.group.Add(1)
- go s.retry(req, newExponentialBackOff(), newAggressiveExponentialBackOff())
- return s
-}
-
-// Stop signals retry and receiver to stop, closes the Messages channel, and
-// blocks until done.
-func (s *Stream) Stop() {
- close(s.done)
- // Scanner does not have a Stop() or take a done channel, so for low volume
- // streams Scan() blocks until the next keep-alive. Close the resp.Body to
- // escape and stop the stream in a timely fashion.
- if s.body != nil {
- s.body.Close()
- }
- // block until the retry goroutine stops
- s.group.Wait()
-}
-
-// retry retries making the given http.Request and receiving the response
-// according to the Twitter backoff policies. Callers should invoke in a
-// goroutine since backoffs sleep between retries.
-// https://dev.twitter.com/streaming/overview/connecting
-func (s *Stream) retry(req *http.Request, expBackOff backoff.BackOff, aggExpBackOff backoff.BackOff) {
- // close Messages channel and decrement the wait group counter
- defer close(s.Messages)
- defer s.group.Done()
-
- var wait time.Duration
- for !stopped(s.done) {
- resp, err := s.client.Do(req)
- if err != nil {
- // stop retrying for HTTP protocol errors
- s.Messages <- err
- return
- }
- // when err is nil, resp contains a non-nil Body which must be closed
- defer resp.Body.Close()
- s.body = resp.Body
- switch resp.StatusCode {
- case 200:
- // receive stream response Body, handles closing
- s.receive(resp.Body)
- expBackOff.Reset()
- aggExpBackOff.Reset()
- case 503:
- // exponential backoff
- wait = expBackOff.NextBackOff()
- case 420, 429:
- // aggressive exponential backoff
- wait = aggExpBackOff.NextBackOff()
- default:
- // stop retrying for other response codes
- resp.Body.Close()
- return
- }
- // close response before each retry
- resp.Body.Close()
- if wait == backoff.Stop {
- return
- }
- sleepOrDone(wait, s.done)
- }
-}
-
-// receive scans a stream response body, JSON decodes tokens to messages, and
-// sends messages to the Messages channel. Receiving continues until an EOF,
-// scan error, or the done channel is closed.
-func (s *Stream) receive(body io.Reader) {
- reader := newStreamResponseBodyReader(body)
- for !stopped(s.done) {
- data, err := reader.readNext()
- if err != nil {
- return
- }
- if len(data) == 0 {
- // empty keep-alive
- continue
- }
- select {
- // send messages, data, or errors
- case s.Messages <- getMessage(data):
- continue
- // allow client to Stop(), even if not receiving
- case <-s.done:
- return
- }
- }
-}
-
-// getMessage unmarshals the token and returns a message struct, if the type
-// can be determined. Otherwise, returns the token unmarshalled into a data
-// map[string]interface{} or the unmarshal error.
-func getMessage(token []byte) interface{} {
- var data map[string]interface{}
- // unmarshal JSON encoded token into a map for
- err := json.Unmarshal(token, &data)
- if err != nil {
- return err
- }
- return decodeMessage(token, data)
-}
-
-// decodeMessage determines the message type from known data keys, allocates
-// at most one message struct, and JSON decodes the token into the message.
-// Returns the message struct or the data map if the message type could not be
-// determined.
-func decodeMessage(token []byte, data map[string]interface{}) interface{} {
- if hasPath(data, "retweet_count") {
- tweet := new(Tweet)
- json.Unmarshal(token, tweet)
- return tweet
- } else if hasPath(data, "direct_message") {
- notice := new(directMessageNotice)
- json.Unmarshal(token, notice)
- return notice.DirectMessage
- } else if hasPath(data, "delete") {
- notice := new(statusDeletionNotice)
- json.Unmarshal(token, notice)
- return notice.Delete.StatusDeletion
- } else if hasPath(data, "scrub_geo") {
- notice := new(locationDeletionNotice)
- json.Unmarshal(token, notice)
- return notice.ScrubGeo
- } else if hasPath(data, "limit") {
- notice := new(streamLimitNotice)
- json.Unmarshal(token, notice)
- return notice.Limit
- } else if hasPath(data, "status_withheld") {
- notice := new(statusWithheldNotice)
- json.Unmarshal(token, notice)
- return notice.StatusWithheld
- } else if hasPath(data, "user_withheld") {
- notice := new(userWithheldNotice)
- json.Unmarshal(token, notice)
- return notice.UserWithheld
- } else if hasPath(data, "disconnect") {
- notice := new(streamDisconnectNotice)
- json.Unmarshal(token, notice)
- return notice.StreamDisconnect
- } else if hasPath(data, "warning") {
- notice := new(stallWarningNotice)
- json.Unmarshal(token, notice)
- return notice.StallWarning
- } else if hasPath(data, "friends") {
- friendsList := new(FriendsList)
- json.Unmarshal(token, friendsList)
- return friendsList
- } else if hasPath(data, "event") {
- event := new(Event)
- json.Unmarshal(token, event)
- return event
- }
- // message type unknown, return the data map[string]interface{}
- return data
-}
-
-// hasPath returns true if the map contains the given key, false otherwise.
-func hasPath(data map[string]interface{}, key string) bool {
- _, ok := data[key]
- return ok
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/streams_test.go b/vendor/github.com/dghubble/go-twitter/twitter/streams_test.go
deleted file mode 100644
index 633b3eeb2..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/streams_test.go
+++ /dev/null
@@ -1,393 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "net/http"
- "strings"
- "sync"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestStream_MessageJSONError(t *testing.T) {
- badJSON := []byte(`{`)
- msg := getMessage(badJSON)
- assert.EqualError(t, msg.(error), "unexpected end of JSON input")
-}
-
-func TestStream_GetMessageTweet(t *testing.T) {
- msgJSON := []byte(`{"id": 20, "text": "just setting up my twttr", "retweet_count": "68535"}`)
- msg := getMessage(msgJSON)
- assert.IsType(t, &Tweet{}, msg)
-}
-
-func TestStream_GetMessageDirectMessage(t *testing.T) {
- msgJSON := []byte(`{"direct_message": {"id": 666024290140217347}}`)
- msg := getMessage(msgJSON)
- assert.IsType(t, &DirectMessage{}, msg)
-}
-
-func TestStream_GetMessageDelete(t *testing.T) {
- msgJSON := []byte(`{"delete": { "id": 20}}`)
- msg := getMessage(msgJSON)
- assert.IsType(t, &StatusDeletion{}, msg)
-}
-
-func TestStream_GetMessageLocationDeletion(t *testing.T) {
- msgJSON := []byte(`{"scrub_geo": { "up_to_status_id": 20}}`)
- msg := getMessage(msgJSON)
- assert.IsType(t, &LocationDeletion{}, msg)
-}
-
-func TestStream_GetMessageStreamLimit(t *testing.T) {
- msgJSON := []byte(`{"limit": { "track": 10 }}`)
- msg := getMessage(msgJSON)
- assert.IsType(t, &StreamLimit{}, msg)
-}
-
-func TestStream_StatusWithheld(t *testing.T) {
- msgJSON := []byte(`{"status_withheld": { "id": 20, "user_id": 12, "withheld_in_countries":["USA", "China"] }}`)
- msg := getMessage(msgJSON)
- assert.IsType(t, &StatusWithheld{}, msg)
-}
-
-func TestStream_UserWithheld(t *testing.T) {
- msgJSON := []byte(`{"user_withheld": { "id": 12, "withheld_in_countries":["USA", "China"] }}`)
- msg := getMessage(msgJSON)
- assert.IsType(t, &UserWithheld{}, msg)
-}
-
-func TestStream_StreamDisconnect(t *testing.T) {
- msgJSON := []byte(`{"disconnect": { "code": "420", "stream_name": "streaming stuff", "reason": "too many connections" }}`)
- msg := getMessage(msgJSON)
- assert.IsType(t, &StreamDisconnect{}, msg)
-}
-
-func TestStream_StallWarning(t *testing.T) {
- msgJSON := []byte(`{"warning": { "code": "420", "percent_full": 90, "message": "a lot of messages" }}`)
- msg := getMessage(msgJSON)
- assert.IsType(t, &StallWarning{}, msg)
-}
-
-func TestStream_FriendsList(t *testing.T) {
- msgJSON := []byte(`{"friends": [666024290140217347, 666024290140217349, 666024290140217342]}`)
- msg := getMessage(msgJSON)
- assert.IsType(t, &FriendsList{}, msg)
-}
-
-func TestStream_Event(t *testing.T) {
- msgJSON := []byte(`{"event": "block", "target": {"name": "XKCD Comic", "favourites_count": 2}, "source": {"name": "XKCD Comic2", "favourites_count": 3}, "created_at": "Sat Sep 4 16:10:54 +0000 2010"}`)
- msg := getMessage(msgJSON)
- assert.IsType(t, &Event{}, msg)
-}
-
-func TestStream_Unknown(t *testing.T) {
- msgJSON := []byte(`{"unknown_data": {"new_twitter_type":"unexpected"}}`)
- msg := getMessage(msgJSON)
- assert.IsType(t, map[string]interface{}{}, msg)
-}
-
-func TestStream_Filter(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- reqCount := 0
- mux.HandleFunc("/1.1/statuses/filter.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "POST", r)
- assertQuery(t, map[string]string{"track": "gophercon,golang"}, r)
- switch reqCount {
- case 0:
- w.Header().Set("Content-Type", "application/json")
- w.Header().Set("Transfer-Encoding", "chunked")
- fmt.Fprintf(w,
- `{"text": "Gophercon talks!"}`+"\r\n"+
- `{"text": "Gophercon super talks!"}`+"\r\n",
- )
- default:
- // Only allow first request
- http.Error(w, "Stream API not available!", 130)
- }
- reqCount++
- })
-
- counts := &counter{}
- demux := newCounterDemux(counts)
- client := NewClient(httpClient)
- streamFilterParams := &StreamFilterParams{
- Track: []string{"gophercon", "golang"},
- }
- stream, err := client.Streams.Filter(streamFilterParams)
- // assert that the expected messages are received
- assert.NoError(t, err)
- defer stream.Stop()
- for message := range stream.Messages {
- demux.Handle(message)
- }
- expectedCounts := &counter{all: 2, other: 2}
- assert.Equal(t, expectedCounts, counts)
-}
-
-func TestStream_Sample(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- reqCount := 0
- mux.HandleFunc("/1.1/statuses/sample.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"stall_warnings": "true"}, r)
- switch reqCount {
- case 0:
- w.Header().Set("Content-Type", "application/json")
- w.Header().Set("Transfer-Encoding", "chunked")
- fmt.Fprintf(w,
- `{"text": "Gophercon talks!"}`+"\r\n"+
- `{"text": "Gophercon super talks!"}`+"\r\n",
- )
- default:
- // Only allow first request
- http.Error(w, "Stream API not available!", 130)
- }
- reqCount++
- })
-
- counts := &counter{}
- demux := newCounterDemux(counts)
- client := NewClient(httpClient)
- streamSampleParams := &StreamSampleParams{
- StallWarnings: Bool(true),
- }
- stream, err := client.Streams.Sample(streamSampleParams)
- // assert that the expected messages are received
- assert.NoError(t, err)
- defer stream.Stop()
- for message := range stream.Messages {
- demux.Handle(message)
- }
- expectedCounts := &counter{all: 2, other: 2}
- assert.Equal(t, expectedCounts, counts)
-}
-
-func TestStream_User(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- reqCount := 0
- mux.HandleFunc("/1.1/user.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"stall_warnings": "true", "with": "followings"}, r)
- switch reqCount {
- case 0:
- w.Header().Set("Content-Type", "application/json")
- w.Header().Set("Transfer-Encoding", "chunked")
- fmt.Fprintf(w, `{"friends": [666024290140217347, 666024290140217349, 666024290140217342]}`+"\r\n"+"\r\n")
- default:
- // Only allow first request
- http.Error(w, "Stream API not available!", 130)
- }
- reqCount++
- })
-
- counts := &counter{}
- demux := newCounterDemux(counts)
- client := NewClient(httpClient)
- streamUserParams := &StreamUserParams{
- StallWarnings: Bool(true),
- With: "followings",
- }
- stream, err := client.Streams.User(streamUserParams)
- // assert that the expected messages are received
- assert.NoError(t, err)
- defer stream.Stop()
- for message := range stream.Messages {
- demux.Handle(message)
- }
- expectedCounts := &counter{all: 1, friendsList: 1}
- assert.Equal(t, expectedCounts, counts)
-}
-
-func TestStream_User_TooManyFriends(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- reqCount := 0
- mux.HandleFunc("/1.1/user.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"stall_warnings": "true", "with": "followings"}, r)
- switch reqCount {
- case 0:
- w.Header().Set("Content-Type", "application/json")
- w.Header().Set("Transfer-Encoding", "chunked")
- // The first friend list message is more than bufio.MaxScanTokenSize (65536) bytes
- friendsList := "[" + strings.Repeat("1234567890, ", 7000) + "1234567890]"
- fmt.Fprintf(w, `{"friends": %s}`+"\r\n"+"\r\n", friendsList)
- default:
- // Only allow first request
- http.Error(w, "Stream API not available!", 130)
- }
- reqCount++
- })
-
- counts := &counter{}
- demux := newCounterDemux(counts)
- client := NewClient(httpClient)
- streamUserParams := &StreamUserParams{
- StallWarnings: Bool(true),
- With: "followings",
- }
- stream, err := client.Streams.User(streamUserParams)
- // assert that the expected messages are received
- assert.NoError(t, err)
- defer stream.Stop()
- for message := range stream.Messages {
- demux.Handle(message)
- }
- expectedCounts := &counter{all: 1, friendsList: 1}
- assert.Equal(t, expectedCounts, counts)
-}
-
-func TestStream_Site(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- reqCount := 0
- mux.HandleFunc("/1.1/site.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"follow": "666024290140217347,666024290140217349"}, r)
- switch reqCount {
- case 0:
- w.Header().Set("Content-Type", "application/json")
- w.Header().Set("Transfer-Encoding", "chunked")
- fmt.Fprintf(w,
- `{"text": "Gophercon talks!"}`+"\r\n"+
- `{"text": "Gophercon super talks!"}`+"\r\n",
- )
- default:
- // Only allow first request
- http.Error(w, "Stream API not available!", 130)
- }
- reqCount++
- })
-
- counts := &counter{}
- demux := newCounterDemux(counts)
- client := NewClient(httpClient)
- streamSiteParams := &StreamSiteParams{
- Follow: []string{"666024290140217347", "666024290140217349"},
- }
- stream, err := client.Streams.Site(streamSiteParams)
- // assert that the expected messages are received
- assert.NoError(t, err)
- defer stream.Stop()
- for message := range stream.Messages {
- demux.Handle(message)
- }
- expectedCounts := &counter{all: 2, other: 2}
- assert.Equal(t, expectedCounts, counts)
-}
-
-func TestStream_PublicFirehose(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- reqCount := 0
- mux.HandleFunc("/1.1/statuses/firehose.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"count": "100"}, r)
- switch reqCount {
- case 0:
- w.Header().Set("Content-Type", "application/json")
- w.Header().Set("Transfer-Encoding", "chunked")
- fmt.Fprintf(w,
- `{"text": "Gophercon talks!"}`+"\r\n"+
- `{"text": "Gophercon super talks!"}`+"\r\n",
- )
- default:
- // Only allow first request
- http.Error(w, "Stream API not available!", 130)
- }
- reqCount++
- })
-
- counts := &counter{}
- demux := newCounterDemux(counts)
- client := NewClient(httpClient)
- streamFirehoseParams := &StreamFirehoseParams{
- Count: 100,
- }
- stream, err := client.Streams.Firehose(streamFirehoseParams)
- // assert that the expected messages are received
- assert.NoError(t, err)
- defer stream.Stop()
- for message := range stream.Messages {
- demux.Handle(message)
- }
- expectedCounts := &counter{all: 2, other: 2}
- assert.Equal(t, expectedCounts, counts)
-}
-
-func TestStreamRetry_ExponentialBackoff(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- reqCount := 0
- mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
- switch reqCount {
- case 0:
- http.Error(w, "Service Unavailable", 503)
- default:
- // Only allow first request
- http.Error(w, "Stream API not available!", 130)
- }
- reqCount++
- })
- stream := &Stream{
- client: httpClient,
- Messages: make(chan interface{}),
- done: make(chan struct{}),
- group: &sync.WaitGroup{},
- }
- stream.group.Add(1)
- req, _ := http.NewRequest("GET", "http://example.com/", nil)
- expBackoff := &BackOffRecorder{}
- // receive messages and throw them away
- go NewSwitchDemux().HandleChan(stream.Messages)
- stream.retry(req, expBackoff, nil)
- defer stream.Stop()
- // assert exponential backoff in response to 503
- assert.Equal(t, 1, expBackoff.Count)
-}
-
-func TestStreamRetry_AggressiveBackoff(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- reqCount := 0
- mux.HandleFunc("/", func(w http.ResponseWriter, r *http.Request) {
- switch reqCount {
- case 0:
- http.Error(w, "Enhance Your Calm", 420)
- case 1:
- http.Error(w, "Too Many Requests", 429)
- default:
- // Only allow first request
- http.Error(w, "Stream API not available!", 130)
- }
- reqCount++
- })
- stream := &Stream{
- client: httpClient,
- Messages: make(chan interface{}),
- done: make(chan struct{}),
- group: &sync.WaitGroup{},
- }
- stream.group.Add(1)
- req, _ := http.NewRequest("GET", "http://example.com/", nil)
- aggExpBackoff := &BackOffRecorder{}
- // receive messages and throw them away
- go NewSwitchDemux().HandleChan(stream.Messages)
- stream.retry(req, nil, aggExpBackoff)
- defer stream.Stop()
- // assert aggressive exponential backoff in response to 420 and 429
- assert.Equal(t, 2, aggExpBackoff.Count)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/timelines.go b/vendor/github.com/dghubble/go-twitter/twitter/timelines.go
deleted file mode 100644
index 0fa4e1233..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/timelines.go
+++ /dev/null
@@ -1,109 +0,0 @@
-package twitter
-
-import (
- "net/http"
-
- "github.com/dghubble/sling"
-)
-
-// TimelineService provides methods for accessing Twitter status timeline
-// API endpoints.
-type TimelineService struct {
- sling *sling.Sling
-}
-
-// newTimelineService returns a new TimelineService.
-func newTimelineService(sling *sling.Sling) *TimelineService {
- return &TimelineService{
- sling: sling.Path("statuses/"),
- }
-}
-
-// UserTimelineParams are the parameters for TimelineService.UserTimeline.
-type UserTimelineParams struct {
- UserID int64 `url:"user_id,omitempty"`
- ScreenName string `url:"screen_name,omitempty"`
- Count int `url:"count,omitempty"`
- SinceID int64 `url:"since_id,omitempty"`
- MaxID int64 `url:"max_id,omitempty"`
- TrimUser *bool `url:"trim_user,omitempty"`
- ExcludeReplies *bool `url:"exclude_replies,omitempty"`
- IncludeRetweets *bool `url:"include_rts,omitempty"`
- TweetMode string `url:"tweet_mode,omitempty"`
-}
-
-// UserTimeline returns recent Tweets from the specified user.
-// https://dev.twitter.com/rest/reference/get/statuses/user_timeline
-func (s *TimelineService) UserTimeline(params *UserTimelineParams) ([]Tweet, *http.Response, error) {
- tweets := new([]Tweet)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("user_timeline.json").QueryStruct(params).Receive(tweets, apiError)
- return *tweets, resp, relevantError(err, *apiError)
-}
-
-// HomeTimelineParams are the parameters for TimelineService.HomeTimeline.
-type HomeTimelineParams struct {
- Count int `url:"count,omitempty"`
- SinceID int64 `url:"since_id,omitempty"`
- MaxID int64 `url:"max_id,omitempty"`
- TrimUser *bool `url:"trim_user,omitempty"`
- ExcludeReplies *bool `url:"exclude_replies,omitempty"`
- ContributorDetails *bool `url:"contributor_details,omitempty"`
- IncludeEntities *bool `url:"include_entities,omitempty"`
- TweetMode string `url:"tweet_mode,omitempty"`
-}
-
-// HomeTimeline returns recent Tweets and retweets from the user and those
-// users they follow.
-// Requires a user auth context.
-// https://dev.twitter.com/rest/reference/get/statuses/home_timeline
-func (s *TimelineService) HomeTimeline(params *HomeTimelineParams) ([]Tweet, *http.Response, error) {
- tweets := new([]Tweet)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("home_timeline.json").QueryStruct(params).Receive(tweets, apiError)
- return *tweets, resp, relevantError(err, *apiError)
-}
-
-// MentionTimelineParams are the parameters for TimelineService.MentionTimeline.
-type MentionTimelineParams struct {
- Count int `url:"count,omitempty"`
- SinceID int64 `url:"since_id,omitempty"`
- MaxID int64 `url:"max_id,omitempty"`
- TrimUser *bool `url:"trim_user,omitempty"`
- ContributorDetails *bool `url:"contributor_details,omitempty"`
- IncludeEntities *bool `url:"include_entities,omitempty"`
- TweetMode string `url:"tweet_mode,omitempty"`
-}
-
-// MentionTimeline returns recent Tweet mentions of the authenticated user.
-// Requires a user auth context.
-// https://dev.twitter.com/rest/reference/get/statuses/mentions_timeline
-func (s *TimelineService) MentionTimeline(params *MentionTimelineParams) ([]Tweet, *http.Response, error) {
- tweets := new([]Tweet)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("mentions_timeline.json").QueryStruct(params).Receive(tweets, apiError)
- return *tweets, resp, relevantError(err, *apiError)
-}
-
-// RetweetsOfMeTimelineParams are the parameters for
-// TimelineService.RetweetsOfMeTimeline.
-type RetweetsOfMeTimelineParams struct {
- Count int `url:"count,omitempty"`
- SinceID int64 `url:"since_id,omitempty"`
- MaxID int64 `url:"max_id,omitempty"`
- TrimUser *bool `url:"trim_user,omitempty"`
- IncludeEntities *bool `url:"include_entities,omitempty"`
- IncludeUserEntities *bool `url:"include_user_entities"`
- TweetMode string `url:"tweet_mode,omitempty"`
-}
-
-// RetweetsOfMeTimeline returns the most recent Tweets by the authenticated
-// user that have been retweeted by others.
-// Requires a user auth context.
-// https://dev.twitter.com/rest/reference/get/statuses/retweets_of_me
-func (s *TimelineService) RetweetsOfMeTimeline(params *RetweetsOfMeTimelineParams) ([]Tweet, *http.Response, error) {
- tweets := new([]Tweet)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("retweets_of_me.json").QueryStruct(params).Receive(tweets, apiError)
- return *tweets, resp, relevantError(err, *apiError)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/timelines_test.go b/vendor/github.com/dghubble/go-twitter/twitter/timelines_test.go
deleted file mode 100644
index 40550c974..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/timelines_test.go
+++ /dev/null
@@ -1,81 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "net/http"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestTimelineService_UserTimeline(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/user_timeline.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"user_id": "113419064", "trim_user": "true", "include_rts": "false"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[{"text": "Gophercon talks!"}, {"text": "Why gophers are so adorable"}]`)
- })
-
- client := NewClient(httpClient)
- tweets, _, err := client.Timelines.UserTimeline(&UserTimelineParams{UserID: 113419064, TrimUser: Bool(true), IncludeRetweets: Bool(false)})
- expected := []Tweet{Tweet{Text: "Gophercon talks!"}, Tweet{Text: "Why gophers are so adorable"}}
- assert.Nil(t, err)
- assert.Equal(t, expected, tweets)
-}
-
-func TestTimelineService_HomeTimeline(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/home_timeline.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"since_id": "589147592367431680", "exclude_replies": "false"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[{"text": "Live on #Periscope"}, {"text": "Clickbait journalism"}, {"text": "Useful announcement"}]`)
- })
-
- client := NewClient(httpClient)
- tweets, _, err := client.Timelines.HomeTimeline(&HomeTimelineParams{SinceID: 589147592367431680, ExcludeReplies: Bool(false)})
- expected := []Tweet{Tweet{Text: "Live on #Periscope"}, Tweet{Text: "Clickbait journalism"}, Tweet{Text: "Useful announcement"}}
- assert.Nil(t, err)
- assert.Equal(t, expected, tweets)
-}
-
-func TestTimelineService_MentionTimeline(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/mentions_timeline.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"count": "20", "include_entities": "false"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[{"text": "@dghubble can I get verified?"}, {"text": "@dghubble why are gophers so great?"}]`)
- })
-
- client := NewClient(httpClient)
- tweets, _, err := client.Timelines.MentionTimeline(&MentionTimelineParams{Count: 20, IncludeEntities: Bool(false)})
- expected := []Tweet{Tweet{Text: "@dghubble can I get verified?"}, Tweet{Text: "@dghubble why are gophers so great?"}}
- assert.Nil(t, err)
- assert.Equal(t, expected, tweets)
-}
-
-func TestTimelineService_RetweetsOfMeTimeline(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/statuses/retweets_of_me.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"trim_user": "false", "include_user_entities": "false"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[{"text": "RT Twitter UK edition"}, {"text": "RT Triply-replicated Gophers"}]`)
- })
-
- client := NewClient(httpClient)
- tweets, _, err := client.Timelines.RetweetsOfMeTimeline(&RetweetsOfMeTimelineParams{TrimUser: Bool(false), IncludeUserEntities: Bool(false)})
- expected := []Tweet{Tweet{Text: "RT Twitter UK edition"}, Tweet{Text: "RT Triply-replicated Gophers"}}
- assert.Nil(t, err)
- assert.Equal(t, expected, tweets)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/trends.go b/vendor/github.com/dghubble/go-twitter/twitter/trends.go
deleted file mode 100644
index b68a698ce..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/trends.go
+++ /dev/null
@@ -1,102 +0,0 @@
-package twitter
-
-import (
- "net/http"
-
- "github.com/dghubble/sling"
-)
-
-// TrendsService provides methods for accessing Twitter trends API endpoints.
-type TrendsService struct {
- sling *sling.Sling
-}
-
-// newTrendsService returns a new TrendsService.
-func newTrendsService(sling *sling.Sling) *TrendsService {
- return &TrendsService{
- sling: sling.Path("trends/"),
- }
-}
-
-// PlaceType represents a twitter trends PlaceType.
-type PlaceType struct {
- Code int `json:"code"`
- Name string `json:"name"`
-}
-
-// Location reporesents a twitter Location.
-type Location struct {
- Country string `json:"country"`
- CountryCode string `json:"countryCode"`
- Name string `json:"name"`
- ParentID int `json:"parentid"`
- PlaceType PlaceType `json:"placeType"`
- URL string `json:"url"`
- WOEID int64 `json:"woeid"`
-}
-
-// Available returns the locations that Twitter has trending topic information for.
-// https://dev.twitter.com/rest/reference/get/trends/available
-func (s *TrendsService) Available() ([]Location, *http.Response, error) {
- locations := new([]Location)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("available.json").Receive(locations, apiError)
- return *locations, resp, relevantError(err, *apiError)
-}
-
-// Trend represents a twitter trend.
-type Trend struct {
- Name string `json:"name"`
- URL string `json:"url"`
- PromotedContent string `json:"promoted_content"`
- Query string `json:"query"`
- TweetVolume int64 `json:"tweet_volume"`
-}
-
-// TrendsList represents a list of twitter trends.
-type TrendsList struct {
- Trends []Trend `json:"trends"`
- AsOf string `json:"as_of"`
- CreatedAt string `json:"created_at"`
- Locations []TrendsLocation `json:"locations"`
-}
-
-// TrendsLocation represents a twitter trend location.
-type TrendsLocation struct {
- Name string `json:"name"`
- WOEID int64 `json:"woeid"`
-}
-
-// TrendsPlaceParams are the parameters for Trends.Place.
-type TrendsPlaceParams struct {
- WOEID int64 `url:"id,omitempty"`
- Exclude string `url:"exclude,omitempty"`
-}
-
-// Place returns the top 50 trending topics for a specific WOEID.
-// https://dev.twitter.com/rest/reference/get/trends/place
-func (s *TrendsService) Place(woeid int64, params *TrendsPlaceParams) ([]TrendsList, *http.Response, error) {
- if params == nil {
- params = &TrendsPlaceParams{}
- }
- trendsList := new([]TrendsList)
- params.WOEID = woeid
- apiError := new(APIError)
- resp, err := s.sling.New().Get("place.json").QueryStruct(params).Receive(trendsList, apiError)
- return *trendsList, resp, relevantError(err, *apiError)
-}
-
-// ClosestParams are the parameters for Trends.Closest.
-type ClosestParams struct {
- Lat float64 `url:"lat"`
- Long float64 `url:"long"`
-}
-
-// Closest returns the locations that Twitter has trending topic information for, closest to a specified location.
-// https://dev.twitter.com/rest/reference/get/trends/closest
-func (s *TrendsService) Closest(params *ClosestParams) ([]Location, *http.Response, error) {
- locations := new([]Location)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("closest.json").QueryStruct(params).Receive(locations, apiError)
- return *locations, resp, relevantError(err, *apiError)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/trends_test.go b/vendor/github.com/dghubble/go-twitter/twitter/trends_test.go
deleted file mode 100644
index b8612ad90..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/trends_test.go
+++ /dev/null
@@ -1,87 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "net/http"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestTrendsService_Available(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/trends/available.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[{"country": "Sweden","countryCode": "SE","name": "Sweden","parentid": 1,"placeType": {"code": 12,"name": "Country"},"url": "http://where.yahooapis.com/v1/place/23424954","woeid": 23424954}]`)
- })
- expected := []Location{
- Location{
- Country: "Sweden",
- CountryCode: "SE",
- Name: "Sweden",
- ParentID: 1,
- PlaceType: PlaceType{Code: 12, Name: "Country"},
- URL: "http://where.yahooapis.com/v1/place/23424954",
- WOEID: 23424954,
- },
- }
-
- client := NewClient(httpClient)
- locations, _, err := client.Trends.Available()
- assert.Nil(t, err)
- assert.Equal(t, expected, locations)
-}
-
-func TestTrendsService_Place(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/trends/place.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"id": "123456"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[{"trends":[{"name":"#gotwitter"}], "as_of": "2017-02-08T16:18:18Z", "created_at": "2017-02-08T16:10:33Z","locations":[{"name": "Worldwide","woeid": 1}]}]`)
- })
- expected := []TrendsList{TrendsList{
- Trends: []Trend{Trend{Name: "#gotwitter"}},
- AsOf: "2017-02-08T16:18:18Z",
- CreatedAt: "2017-02-08T16:10:33Z",
- Locations: []TrendsLocation{TrendsLocation{Name: "Worldwide", WOEID: 1}},
- }}
-
- client := NewClient(httpClient)
- places, _, err := client.Trends.Place(123456, &TrendsPlaceParams{})
- assert.Nil(t, err)
- assert.Equal(t, expected, places)
-}
-
-func TestTrendsService_Closest(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/trends/closest.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"lat": "37.781157", "long": "-122.400612831116"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[{"country": "Sweden","countryCode": "SE","name": "Sweden","parentid": 1,"placeType": {"code": 12,"name": "Country"},"url": "http://where.yahooapis.com/v1/place/23424954","woeid": 23424954}]`)
- })
- expected := []Location{
- Location{
- Country: "Sweden",
- CountryCode: "SE",
- Name: "Sweden",
- ParentID: 1,
- PlaceType: PlaceType{Code: 12, Name: "Country"},
- URL: "http://where.yahooapis.com/v1/place/23424954",
- WOEID: 23424954,
- },
- }
-
- client := NewClient(httpClient)
- locations, _, err := client.Trends.Closest(&ClosestParams{Lat: 37.781157, Long: -122.400612831116})
- assert.Nil(t, err)
- assert.Equal(t, expected, locations)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/twitter.go b/vendor/github.com/dghubble/go-twitter/twitter/twitter.go
deleted file mode 100644
index 96fbf9fbc..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/twitter.go
+++ /dev/null
@@ -1,61 +0,0 @@
-package twitter
-
-import (
- "net/http"
-
- "github.com/dghubble/sling"
-)
-
-const twitterAPI = "https://api.twitter.com/1.1/"
-
-// Client is a Twitter client for making Twitter API requests.
-type Client struct {
- sling *sling.Sling
- // Twitter API Services
- Accounts *AccountService
- DirectMessages *DirectMessageService
- Favorites *FavoriteService
- Followers *FollowerService
- Friends *FriendService
- Friendships *FriendshipService
- Search *SearchService
- Statuses *StatusService
- Streams *StreamService
- Timelines *TimelineService
- Trends *TrendsService
- Users *UserService
-}
-
-// NewClient returns a new Client.
-func NewClient(httpClient *http.Client) *Client {
- base := sling.New().Client(httpClient).Base(twitterAPI)
- return &Client{
- sling: base,
- Accounts: newAccountService(base.New()),
- DirectMessages: newDirectMessageService(base.New()),
- Favorites: newFavoriteService(base.New()),
- Followers: newFollowerService(base.New()),
- Friends: newFriendService(base.New()),
- Friendships: newFriendshipService(base.New()),
- Search: newSearchService(base.New()),
- Statuses: newStatusService(base.New()),
- Streams: newStreamService(httpClient, base.New()),
- Timelines: newTimelineService(base.New()),
- Trends: newTrendsService(base.New()),
- Users: newUserService(base.New()),
- }
-}
-
-// Bool returns a new pointer to the given bool value.
-func Bool(v bool) *bool {
- ptr := new(bool)
- *ptr = v
- return ptr
-}
-
-// Float returns a new pointer to the given float64 value.
-func Float(v float64) *float64 {
- ptr := new(float64)
- *ptr = v
- return ptr
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/twitter_test.go b/vendor/github.com/dghubble/go-twitter/twitter/twitter_test.go
deleted file mode 100644
index 4b7ca2964..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/twitter_test.go
+++ /dev/null
@@ -1,93 +0,0 @@
-package twitter
-
-import (
- "net/http"
- "net/http/httptest"
- "net/url"
- "testing"
- "time"
-
- "github.com/stretchr/testify/assert"
-)
-
-var defaultTestTimeout = time.Second * 1
-
-// testServer returns an http Client, ServeMux, and Server. The client proxies
-// requests to the server and handlers can be registered on the mux to handle
-// requests. The caller must close the test server.
-func testServer() (*http.Client, *http.ServeMux, *httptest.Server) {
- mux := http.NewServeMux()
- server := httptest.NewServer(mux)
- transport := &RewriteTransport{&http.Transport{
- Proxy: func(req *http.Request) (*url.URL, error) {
- return url.Parse(server.URL)
- },
- }}
- client := &http.Client{Transport: transport}
- return client, mux, server
-}
-
-// RewriteTransport rewrites https requests to http to avoid TLS cert issues
-// during testing.
-type RewriteTransport struct {
- Transport http.RoundTripper
-}
-
-// RoundTrip rewrites the request scheme to http and calls through to the
-// composed RoundTripper or if it is nil, to the http.DefaultTransport.
-func (t *RewriteTransport) RoundTrip(req *http.Request) (*http.Response, error) {
- req.URL.Scheme = "http"
- if t.Transport == nil {
- return http.DefaultTransport.RoundTrip(req)
- }
- return t.Transport.RoundTrip(req)
-}
-
-func assertMethod(t *testing.T, expectedMethod string, req *http.Request) {
- assert.Equal(t, expectedMethod, req.Method)
-}
-
-// assertQuery tests that the Request has the expected url query key/val pairs
-func assertQuery(t *testing.T, expected map[string]string, req *http.Request) {
- queryValues := req.URL.Query()
- expectedValues := url.Values{}
- for key, value := range expected {
- expectedValues.Add(key, value)
- }
- assert.Equal(t, expectedValues, queryValues)
-}
-
-// assertPostForm tests that the Request has the expected key values pairs url
-// encoded in its Body
-func assertPostForm(t *testing.T, expected map[string]string, req *http.Request) {
- req.ParseForm() // parses request Body to put url.Values in r.Form/r.PostForm
- expectedValues := url.Values{}
- for key, value := range expected {
- expectedValues.Add(key, value)
- }
- assert.Equal(t, expectedValues, req.Form)
-}
-
-// assertDone asserts that the empty struct channel is closed before the given
-// timeout elapses.
-func assertDone(t *testing.T, ch <-chan struct{}, timeout time.Duration) {
- select {
- case <-ch:
- _, more := <-ch
- assert.False(t, more)
- case <-time.After(timeout):
- t.Errorf("expected channel to be closed within timeout %v", timeout)
- }
-}
-
-// assertClosed asserts that the channel is closed before the given timeout
-// elapses.
-func assertClosed(t *testing.T, ch <-chan interface{}, timeout time.Duration) {
- select {
- case <-ch:
- _, more := <-ch
- assert.False(t, more)
- case <-time.After(timeout):
- t.Errorf("expected channel to be closed within timeout %v", timeout)
- }
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/users.go b/vendor/github.com/dghubble/go-twitter/twitter/users.go
deleted file mode 100644
index 25be5c901..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/users.go
+++ /dev/null
@@ -1,122 +0,0 @@
-package twitter
-
-import (
- "net/http"
-
- "github.com/dghubble/sling"
-)
-
-// User represents a Twitter User.
-// https://dev.twitter.com/overview/api/users
-type User struct {
- ContributorsEnabled bool `json:"contributors_enabled"`
- CreatedAt string `json:"created_at"`
- DefaultProfile bool `json:"default_profile"`
- DefaultProfileImage bool `json:"default_profile_image"`
- Description string `json:"description"`
- Email string `json:"email"`
- Entities *UserEntities `json:"entities"`
- FavouritesCount int `json:"favourites_count"`
- FollowRequestSent bool `json:"follow_request_sent"`
- Following bool `json:"following"`
- FollowersCount int `json:"followers_count"`
- FriendsCount int `json:"friends_count"`
- GeoEnabled bool `json:"geo_enabled"`
- ID int64 `json:"id"`
- IDStr string `json:"id_str"`
- IsTranslator bool `json:"is_translator"`
- Lang string `json:"lang"`
- ListedCount int `json:"listed_count"`
- Location string `json:"location"`
- Name string `json:"name"`
- Notifications bool `json:"notifications"`
- ProfileBackgroundColor string `json:"profile_background_color"`
- ProfileBackgroundImageURL string `json:"profile_background_image_url"`
- ProfileBackgroundImageURLHttps string `json:"profile_background_image_url_https"`
- ProfileBackgroundTile bool `json:"profile_background_tile"`
- ProfileBannerURL string `json:"profile_banner_url"`
- ProfileImageURL string `json:"profile_image_url"`
- ProfileImageURLHttps string `json:"profile_image_url_https"`
- ProfileLinkColor string `json:"profile_link_color"`
- ProfileSidebarBorderColor string `json:"profile_sidebar_border_color"`
- ProfileSidebarFillColor string `json:"profile_sidebar_fill_color"`
- ProfileTextColor string `json:"profile_text_color"`
- ProfileUseBackgroundImage bool `json:"profile_use_background_image"`
- Protected bool `json:"protected"`
- ScreenName string `json:"screen_name"`
- ShowAllInlineMedia bool `json:"show_all_inline_media"`
- Status *Tweet `json:"status"`
- StatusesCount int `json:"statuses_count"`
- Timezone string `json:"time_zone"`
- URL string `json:"url"`
- UtcOffset int `json:"utc_offset"`
- Verified bool `json:"verified"`
- WithheldInCountries []string `json:"withheld_in_countries"`
- WithholdScope string `json:"withheld_scope"`
-}
-
-// UserService provides methods for accessing Twitter user API endpoints.
-type UserService struct {
- sling *sling.Sling
-}
-
-// newUserService returns a new UserService.
-func newUserService(sling *sling.Sling) *UserService {
- return &UserService{
- sling: sling.Path("users/"),
- }
-}
-
-// UserShowParams are the parameters for UserService.Show.
-type UserShowParams struct {
- UserID int64 `url:"user_id,omitempty"`
- ScreenName string `url:"screen_name,omitempty"`
- IncludeEntities *bool `url:"include_entities,omitempty"` // whether 'status' should include entities
-}
-
-// Show returns the requested User.
-// https://dev.twitter.com/rest/reference/get/users/show
-func (s *UserService) Show(params *UserShowParams) (*User, *http.Response, error) {
- user := new(User)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("show.json").QueryStruct(params).Receive(user, apiError)
- return user, resp, relevantError(err, *apiError)
-}
-
-// UserLookupParams are the parameters for UserService.Lookup.
-type UserLookupParams struct {
- UserID []int64 `url:"user_id,omitempty,comma"`
- ScreenName []string `url:"screen_name,omitempty,comma"`
- IncludeEntities *bool `url:"include_entities,omitempty"` // whether 'status' should include entities
-}
-
-// Lookup returns the requested Users as a slice.
-// https://dev.twitter.com/rest/reference/get/users/lookup
-func (s *UserService) Lookup(params *UserLookupParams) ([]User, *http.Response, error) {
- users := new([]User)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("lookup.json").QueryStruct(params).Receive(users, apiError)
- return *users, resp, relevantError(err, *apiError)
-}
-
-// UserSearchParams are the parameters for UserService.Search.
-type UserSearchParams struct {
- Query string `url:"q,omitempty"`
- Page int `url:"page,omitempty"` // 1-based page number
- Count int `url:"count,omitempty"`
- IncludeEntities *bool `url:"include_entities,omitempty"` // whether 'status' should include entities
-}
-
-// Search queries public user accounts.
-// Requires a user auth context.
-// https://dev.twitter.com/rest/reference/get/users/search
-func (s *UserService) Search(query string, params *UserSearchParams) ([]User, *http.Response, error) {
- if params == nil {
- params = &UserSearchParams{}
- }
- params.Query = query
- users := new([]User)
- apiError := new(APIError)
- resp, err := s.sling.New().Get("search.json").QueryStruct(params).Receive(users, apiError)
- return *users, resp, relevantError(err, *apiError)
-}
diff --git a/vendor/github.com/dghubble/go-twitter/twitter/users_test.go b/vendor/github.com/dghubble/go-twitter/twitter/users_test.go
deleted file mode 100644
index 54e6c5f2d..000000000
--- a/vendor/github.com/dghubble/go-twitter/twitter/users_test.go
+++ /dev/null
@@ -1,92 +0,0 @@
-package twitter
-
-import (
- "fmt"
- "net/http"
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestUserService_Show(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/users/show.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"screen_name": "xkcdComic"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `{"name": "XKCD Comic", "favourites_count": 2}`)
- })
-
- client := NewClient(httpClient)
- user, _, err := client.Users.Show(&UserShowParams{ScreenName: "xkcdComic"})
- expected := &User{Name: "XKCD Comic", FavouritesCount: 2}
- assert.Nil(t, err)
- assert.Equal(t, expected, user)
-}
-
-func TestUserService_LookupWithIds(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/users/lookup.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"user_id": "113419064,623265148"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[{"screen_name": "golang"}, {"screen_name": "dghubble"}]`)
- })
-
- client := NewClient(httpClient)
- users, _, err := client.Users.Lookup(&UserLookupParams{UserID: []int64{113419064, 623265148}})
- expected := []User{User{ScreenName: "golang"}, User{ScreenName: "dghubble"}}
- assert.Nil(t, err)
- assert.Equal(t, expected, users)
-}
-
-func TestUserService_LookupWithScreenNames(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/users/lookup.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"screen_name": "foo,bar"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[{"name": "Foo"}, {"name": "Bar"}]`)
- })
-
- client := NewClient(httpClient)
- users, _, err := client.Users.Lookup(&UserLookupParams{ScreenName: []string{"foo", "bar"}})
- expected := []User{User{Name: "Foo"}, User{Name: "Bar"}}
- assert.Nil(t, err)
- assert.Equal(t, expected, users)
-}
-
-func TestUserService_Search(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/users/search.json", func(w http.ResponseWriter, r *http.Request) {
- assertMethod(t, "GET", r)
- assertQuery(t, map[string]string{"count": "11", "q": "news"}, r)
- w.Header().Set("Content-Type", "application/json")
- fmt.Fprintf(w, `[{"name": "BBC"}, {"name": "BBC Breaking News"}]`)
- })
-
- client := NewClient(httpClient)
- users, _, err := client.Users.Search("news", &UserSearchParams{Query: "override me", Count: 11})
- expected := []User{User{Name: "BBC"}, User{Name: "BBC Breaking News"}}
- assert.Nil(t, err)
- assert.Equal(t, expected, users)
-}
-
-func TestUserService_SearchHandlesNilParams(t *testing.T) {
- httpClient, mux, server := testServer()
- defer server.Close()
-
- mux.HandleFunc("/1.1/users/search.json", func(w http.ResponseWriter, r *http.Request) {
- assertQuery(t, map[string]string{"q": "news"}, r)
- })
- client := NewClient(httpClient)
- client.Users.Search("news", nil)
-}
diff --git a/vendor/github.com/dghubble/oauth1/.travis.yml b/vendor/github.com/dghubble/oauth1/.travis.yml
deleted file mode 100644
index b93afce6d..000000000
--- a/vendor/github.com/dghubble/oauth1/.travis.yml
+++ /dev/null
@@ -1,10 +0,0 @@
-language: go
-go:
- - 1.7
- - 1.8
- - tip
-install:
- - go get github.com/golang/lint/golint
- - go get -v -t .
-script:
- - ./test
diff --git a/vendor/github.com/dghubble/oauth1/CHANGES.md b/vendor/github.com/dghubble/oauth1/CHANGES.md
deleted file mode 100644
index 975c61203..000000000
--- a/vendor/github.com/dghubble/oauth1/CHANGES.md
+++ /dev/null
@@ -1,30 +0,0 @@
-# OAuth1 Changelog
-
-## v0.4.0 (2016-04-20)
-
-* Add a Signer field to the Config to allow custom Signer implementations.
-* Use the HMACSigner by default. This provides the same signing behavior as in previous versions (HMAC-SHA1).
-* Add an RSASigner for "RSA-SHA1" OAuth1 Providers.
-* Add missing Authorization Header quotes around OAuth parameter values. Many providers allowed these quotes to be missing.
-* Change `Signer` to be a signer interface.
-* Remove the old Signer methods `SetAccessTokenAuthHeader`, `SetRequestAuthHeader`, and `SetRequestTokenAuthHeader`.
-
-## v0.3.0 (2015-09-13)
-
-* Added `NoContext` which may be used in most cases.
-* Allowed Transport Base http.RoundTripper to be set through a ctx.
-* Changed `NewClient` to require a context.Context.
-* Changed `Config.Client` to require a context.Context.
-
-## v.0.2.0 (2015-08-30)
-
-* Improved OAuth 1 spec compliance and test coverage.
-* Added `func StaticTokenSource(*Token) TokenSource`
-* Added `ParseAuthorizationCallback` function. Removed `Config.HandleAuthorizationCallback` method.
-* Changed `Config` method signatures to allow an interface to be defined for the OAuth1 authorization flow. Gives users of this package (and downstream packages) the freedom to use other implementations if they wish.
-* Removed `RequestToken` in favor of passing token and secret value strings.
-* Removed `ReuseTokenSource` struct, it was effectively a static source. Replaced by `StaticTokenSource`.
-
-## v0.1.0 (2015-04-26)
-
-* Initial OAuth1 support for obtaining authorization and making authorized requests.
\ No newline at end of file
diff --git a/vendor/github.com/dghubble/oauth1/LICENSE b/vendor/github.com/dghubble/oauth1/LICENSE
deleted file mode 100644
index 2718840d9..000000000
--- a/vendor/github.com/dghubble/oauth1/LICENSE
+++ /dev/null
@@ -1,21 +0,0 @@
-The MIT License (MIT)
-
-Copyright (c) 2015 Dalton Hubble
-
-Permission is hereby granted, free of charge, to any person obtaining a copy
-of this software and associated documentation files (the "Software"), to deal
-in the Software without restriction, including without limitation the rights
-to use, copy, modify, merge, publish, distribute, sublicense, and/or sell
-copies of the Software, and to permit persons to whom the Software is
-furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in
-all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR
-IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY,
-FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE
-AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER
-LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM,
-OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN
-THE SOFTWARE.
\ No newline at end of file
diff --git a/vendor/github.com/dghubble/oauth1/README.md b/vendor/github.com/dghubble/oauth1/README.md
deleted file mode 100644
index b7867ff05..000000000
--- a/vendor/github.com/dghubble/oauth1/README.md
+++ /dev/null
@@ -1,125 +0,0 @@
-
-# OAuth1 [](https://travis-ci.org/dghubble/oauth1) [](http://godoc.org/github.com/dghubble/oauth1)
-
-
-OAauth1 is a Go implementation of the [OAuth 1 spec](https://tools.ietf.org/html/rfc5849).
-
-It allows end-users to authorize a client (consumer) to access protected resources on his/her behalf and to make signed and authorized requests.
-
-Package `oauth1` takes design cues from [golang.org/x/oauth2](https://godoc.org/golang.org/x/oauth2), to provide an analogous API and an `http.Client` with a Transport which signs/authorizes requests.
-
-## Install
-
- go get github.com/dghubble/oauth1
-
-## Docs
-
-Read [GoDoc](https://godoc.org/github.com/dghubble/oauth1)
-
-## Usage
-
-Package `oauth1` implements the OAuth1 authorization flow and provides an `http.Client` which can sign and authorize OAuth1 requests.
-
-To implement "Login with X", use the [gologin](https://github.com/dghubble/gologin) packages which provide login handlers for OAuth1 and OAuth2 providers.
-
-To call the Twitter, Digits, or Tumblr OAuth1 APIs, use the higher level Go API clients.
-
-* [Twitter](https://github.com/dghubble/go-twitter)
-* [Digits](https://github.com/dghubble/go-digits)
-* [Tumblr](https://github.com/benfb/go-tumblr)
-
-### Authorization Flow
-
-Perform the OAuth 1 authorization flow to ask a user to grant an application access to his/her resources via an access token.
-
-```go
-import (
- "github.com/dghubble/oauth1"
- "github.com/dghubble/oauth1/twitter""
-)
-...
-
-config := oauth1.Config{
- ConsumerKey: "consumerKey",
- ConsumerSecret: "consumerSecret",
- CallbackURL: "http://mysite.com/oauth/twitter/callback",
- Endpoint: twitter.AuthorizeEndpoint,
-}
-```
-
-1. When a user performs an action (e.g. "Login with X" button calls "/login" route) get an OAuth1 request token (temporary credentials).
-
- ```go
- requestToken, requestSecret, err = config.RequestToken()
- // handle err
- ```
-
-2. Obtain authorization from the user by redirecting them to the OAuth1 provider's authorization URL to grant the application access.
-
- ```go
- authorizationURL, err := config.AuthorizationURL(requestToken)
- // handle err
- http.Redirect(w, req, authorizationURL.String(), http.StatusFound)
- ```
-
- Receive the callback from the OAuth1 provider in a handler.
-
- ```go
- requestToken, verifier, err := oauth1.ParseAuthorizationCallback(req)
- // handle err
- ```
-
-3. Acquire the access token (token credentials) which can later be used to make requests on behalf of the user.
-
- ```go
- accessToken, accessSecret, err := config.AccessToken(requestToken, requestSecret, verifier)
- // handle error
- token := oauth1.NewToken(accessToken, accessSecret)
- ```
-
-Check the [examples](examples) to see this authorization flow in action from the command line, with Twitter PIN-based login and Tumblr login.
-
-### Authorized Requests
-
-Use an access `Token` to make authorized requests on behalf of a user.
-
-```go
-import (
- "github.com/dghubble/oauth1"
-)
-
-func main() {
- config := oauth1.NewConfig("consumerKey", "consumerSecret")
- token := oauth1.NewToken("token", "tokenSecret")
-
- // httpClient will automatically authorize http.Request's
- httpClient := config.Client(oauth1.NoContext, token)
-
- // example Twitter API request
- path := "https://api.twitter.com/1.1/statuses/home_timeline.json?count=2"
- resp, _ := httpClient.Get(path)
- defer resp.Body.Close()
- body, _ := ioutil.ReadAll(resp.Body)
- fmt.Printf("Raw Response Body:\n%v\n", string(body))
-}
-```
-
-Check the [examples](examples) to see Twitter and Tumblr requests in action.
-
-### Concepts
-
-An `Endpoint` groups an OAuth provider's token and authorization URL endpoints.Endpoints for common providers are provided in subpackages.
-
-A `Config` stores a consumer application's consumer key and secret, the registered callback URL, and the `Endpoint` to which the consumer is registered. It provides OAuth1 authorization flow methods.
-
-An OAuth1 `Token` is an access token which can be used to make signed requests on behalf of a user. See [Authorized Requests](#Authorized Requests) for details.
-
-If you've used the [golang.org/x/oauth2](https://godoc.org/golang.org/x/oauth2) package for OAuth2 before, this organization should be familiar.
-
-## Contributing
-
-See the [Contributing Guide](https://gist.github.com/dghubble/be682c123727f70bcfe7).
-
-## License
-
-[MIT License](LICENSE)
diff --git a/vendor/github.com/dghubble/oauth1/auther.go b/vendor/github.com/dghubble/oauth1/auther.go
deleted file mode 100644
index 2de98d00c..000000000
--- a/vendor/github.com/dghubble/oauth1/auther.go
+++ /dev/null
@@ -1,265 +0,0 @@
-package oauth1
-
-import (
- "bytes"
- "crypto/rand"
- "encoding/base64"
- "fmt"
- "io/ioutil"
- "net/http"
- "net/url"
- "sort"
- "strconv"
- "strings"
- "time"
-)
-
-const (
- authorizationHeaderParam = "Authorization"
- authorizationPrefix = "OAuth " // trailing space is intentional
- oauthConsumerKeyParam = "oauth_consumer_key"
- oauthNonceParam = "oauth_nonce"
- oauthSignatureParam = "oauth_signature"
- oauthSignatureMethodParam = "oauth_signature_method"
- oauthTimestampParam = "oauth_timestamp"
- oauthTokenParam = "oauth_token"
- oauthVersionParam = "oauth_version"
- oauthCallbackParam = "oauth_callback"
- oauthVerifierParam = "oauth_verifier"
- defaultOauthVersion = "1.0"
- contentType = "Content-Type"
- formContentType = "application/x-www-form-urlencoded"
-)
-
-// clock provides a interface for current time providers. A Clock can be used
-// in place of calling time.Now() directly.
-type clock interface {
- Now() time.Time
-}
-
-// A noncer provides random nonce strings.
-type noncer interface {
- Nonce() string
-}
-
-// auther adds an "OAuth" Authorization header field to requests.
-type auther struct {
- config *Config
- clock clock
- noncer noncer
-}
-
-func newAuther(config *Config) *auther {
- return &auther{
- config: config,
- }
-}
-
-// setRequestTokenAuthHeader adds the OAuth1 header for the request token
-// request (temporary credential) according to RFC 5849 2.1.
-func (a *auther) setRequestTokenAuthHeader(req *http.Request) error {
- oauthParams := a.commonOAuthParams()
- oauthParams[oauthCallbackParam] = a.config.CallbackURL
- params, err := collectParameters(req, oauthParams)
- if err != nil {
- return err
- }
- signatureBase := signatureBase(req, params)
- signature, err := a.signer().Sign("", signatureBase)
- if err != nil {
- return err
- }
- oauthParams[oauthSignatureParam] = signature
- req.Header.Set(authorizationHeaderParam, authHeaderValue(oauthParams))
- return nil
-}
-
-// setAccessTokenAuthHeader sets the OAuth1 header for the access token request
-// (token credential) according to RFC 5849 2.3.
-func (a *auther) setAccessTokenAuthHeader(req *http.Request, requestToken, requestSecret, verifier string) error {
- oauthParams := a.commonOAuthParams()
- oauthParams[oauthTokenParam] = requestToken
- oauthParams[oauthVerifierParam] = verifier
- params, err := collectParameters(req, oauthParams)
- if err != nil {
- return err
- }
- signatureBase := signatureBase(req, params)
- signature, err := a.signer().Sign(requestSecret, signatureBase)
- if err != nil {
- return err
- }
- oauthParams[oauthSignatureParam] = signature
- req.Header.Set(authorizationHeaderParam, authHeaderValue(oauthParams))
- return nil
-}
-
-// setRequestAuthHeader sets the OAuth1 header for making authenticated
-// requests with an AccessToken (token credential) according to RFC 5849 3.1.
-func (a *auther) setRequestAuthHeader(req *http.Request, accessToken *Token) error {
- oauthParams := a.commonOAuthParams()
- oauthParams[oauthTokenParam] = accessToken.Token
- params, err := collectParameters(req, oauthParams)
- if err != nil {
- return err
- }
- signatureBase := signatureBase(req, params)
- signature, err := a.signer().Sign(accessToken.TokenSecret, signatureBase)
- if err != nil {
- return err
- }
- oauthParams[oauthSignatureParam] = signature
- req.Header.Set(authorizationHeaderParam, authHeaderValue(oauthParams))
- return nil
-}
-
-// commonOAuthParams returns a map of the common OAuth1 protocol parameters,
-// excluding the oauth_signature parameter.
-func (a *auther) commonOAuthParams() map[string]string {
- return map[string]string{
- oauthConsumerKeyParam: a.config.ConsumerKey,
- oauthSignatureMethodParam: a.signer().Name(),
- oauthTimestampParam: strconv.FormatInt(a.epoch(), 10),
- oauthNonceParam: a.nonce(),
- oauthVersionParam: defaultOauthVersion,
- }
-}
-
-// Returns a base64 encoded random 32 byte string.
-func (a *auther) nonce() string {
- if a.noncer != nil {
- return a.noncer.Nonce()
- }
- b := make([]byte, 32)
- rand.Read(b)
- return base64.StdEncoding.EncodeToString(b)
-}
-
-// Returns the Unix epoch seconds.
-func (a *auther) epoch() int64 {
- if a.clock != nil {
- return a.clock.Now().Unix()
- }
- return time.Now().Unix()
-}
-
-// Returns the Config's Signer or the default Signer.
-func (a *auther) signer() Signer {
- if a.config.Signer != nil {
- return a.config.Signer
- }
- return &HMACSigner{ConsumerSecret: a.config.ConsumerSecret}
-}
-
-// authHeaderValue formats OAuth parameters according to RFC 5849 3.5.1. OAuth
-// params are percent encoded, sorted by key (for testability), and joined by
-// "=" into pairs. Pairs are joined with a ", " comma separator into a header
-// string.
-// The given OAuth params should include the "oauth_signature" key.
-func authHeaderValue(oauthParams map[string]string) string {
- pairs := sortParameters(encodeParameters(oauthParams), `%s="%s"`)
- return authorizationPrefix + strings.Join(pairs, ", ")
-}
-
-// encodeParameters percent encodes parameter keys and values according to
-// RFC5849 3.6 and RFC3986 2.1 and returns a new map.
-func encodeParameters(params map[string]string) map[string]string {
- encoded := map[string]string{}
- for key, value := range params {
- encoded[PercentEncode(key)] = PercentEncode(value)
- }
- return encoded
-}
-
-// sortParameters sorts parameters by key and returns a slice of key/value
-// pairs formatted with the given format string (e.g. "%s=%s").
-func sortParameters(params map[string]string, format string) []string {
- // sort by key
- keys := make([]string, len(params))
- i := 0
- for key := range params {
- keys[i] = key
- i++
- }
- sort.Strings(keys)
- // parameter join
- pairs := make([]string, len(params))
- for i, key := range keys {
- pairs[i] = fmt.Sprintf(format, key, params[key])
- }
- return pairs
-}
-
-// collectParameters collects request parameters from the request query, OAuth
-// parameters (which should exclude oauth_signature), and the request body
-// provided the body is single part, form encoded, and the form content type
-// header is set. The returned map of collected parameter keys and values
-// follow RFC 5849 3.4.1.3, except duplicate parameters are not supported.
-func collectParameters(req *http.Request, oauthParams map[string]string) (map[string]string, error) {
- // add oauth, query, and body parameters into params
- params := map[string]string{}
- for key, value := range req.URL.Query() {
- // most backends do not accept duplicate query keys
- params[key] = value[0]
- }
- if req.Body != nil && req.Header.Get(contentType) == formContentType {
- // reads data to a []byte, draining req.Body
- b, err := ioutil.ReadAll(req.Body)
- if err != nil {
- return nil, err
- }
- values, err := url.ParseQuery(string(b))
- if err != nil {
- return nil, err
- }
- for key, value := range values {
- // not supporting params with duplicate keys
- params[key] = value[0]
- }
- // reinitialize Body with ReadCloser over the []byte
- req.Body = ioutil.NopCloser(bytes.NewReader(b))
- }
- for key, value := range oauthParams {
- params[key] = value
- }
- return params, nil
-}
-
-// signatureBase combines the uppercase request method, percent encoded base
-// string URI, and normalizes the request parameters int a parameter string.
-// Returns the OAuth1 signature base string according to RFC5849 3.4.1.
-func signatureBase(req *http.Request, params map[string]string) string {
- method := strings.ToUpper(req.Method)
- baseURL := baseURI(req)
- parameterString := normalizedParameterString(params)
- // signature base string constructed accoding to 3.4.1.1
- baseParts := []string{method, PercentEncode(baseURL), PercentEncode(parameterString)}
- return strings.Join(baseParts, "&")
-}
-
-// baseURI returns the base string URI of a request according to RFC 5849
-// 3.4.1.2. The scheme and host are lowercased, the port is dropped if it
-// is 80 or 443, and the path minus query parameters is included.
-func baseURI(req *http.Request) string {
- scheme := strings.ToLower(req.URL.Scheme)
- host := strings.ToLower(req.URL.Host)
- if hostPort := strings.Split(host, ":"); len(hostPort) == 2 && (hostPort[1] == "80" || hostPort[1] == "443") {
- host = hostPort[0]
- }
- // TODO: use req.URL.EscapedPath() once Go 1.5 is more generally adopted
- // For now, hacky workaround accomplishes the same internal escaping mode
- // escape(u.Path, encodePath) for proper compliance with the OAuth1 spec.
- path := req.URL.Path
- if path != "" {
- path = strings.Split(req.URL.RequestURI(), "?")[0]
- }
- return fmt.Sprintf("%v://%v%v", scheme, host, path)
-}
-
-// parameterString normalizes collected OAuth parameters (which should exclude
-// oauth_signature) into a parameter string as defined in RFC 5894 3.4.1.3.2.
-// The parameters are encoded, sorted by key, keys and values joined with "&",
-// and pairs joined with "=" (e.g. foo=bar&q=gopher).
-func normalizedParameterString(params map[string]string) string {
- return strings.Join(sortParameters(encodeParameters(params), "%s=%s"), "&")
-}
diff --git a/vendor/github.com/dghubble/oauth1/auther_test.go b/vendor/github.com/dghubble/oauth1/auther_test.go
deleted file mode 100644
index 4cd28a0a8..000000000
--- a/vendor/github.com/dghubble/oauth1/auther_test.go
+++ /dev/null
@@ -1,244 +0,0 @@
-package oauth1
-
-import (
- "net/http"
- "net/url"
- "strings"
- "testing"
- "time"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestCommonOAuthParams(t *testing.T) {
- config := &Config{ConsumerKey: "some_consumer_key"}
- auther := &auther{config, &fixedClock{time.Unix(50037133, 0)}, &fixedNoncer{"some_nonce"}}
- expectedParams := map[string]string{
- "oauth_consumer_key": "some_consumer_key",
- "oauth_signature_method": "HMAC-SHA1",
- "oauth_timestamp": "50037133",
- "oauth_nonce": "some_nonce",
- "oauth_version": "1.0",
- }
- assert.Equal(t, expectedParams, auther.commonOAuthParams())
-}
-
-func TestNonce(t *testing.T) {
- auther := &auther{}
- nonce := auther.nonce()
- // assert that 32 bytes (256 bites) become 44 bytes since a base64 byte
- // zeros the 2 high bits. 3 bytes convert to 4 base64 bytes, 40 base64 bytes
- // represent the first 30 of 32 bytes, = padding adds another 4 byte group.
- // base64 bytes = 4 * floor(bytes/3) + 4
- assert.Equal(t, 44, len([]byte(nonce)))
-}
-
-func TestEpoch(t *testing.T) {
- a := &auther{}
- // assert that a real time is used by default
- assert.InEpsilon(t, time.Now().Unix(), a.epoch(), 1)
- // assert that the fixed clock can be used for testing
- a = &auther{clock: &fixedClock{time.Unix(50037133, 0)}}
- assert.Equal(t, int64(50037133), a.epoch())
-}
-
-func TestSigner_Default(t *testing.T) {
- config := &Config{ConsumerSecret: "consumer_secret"}
- a := newAuther(config)
- // echo -n "hello world" | openssl dgst -sha1 -hmac "consumer_secret&token_secret" -binary | base64
- expectedSignature := "BE0uILOruKfSXd4UzYlLJDfOq08="
- // assert that the default signer produces the expected HMAC-SHA1 digest
- method := a.signer().Name()
- digest, err := a.signer().Sign("token_secret", "hello world")
- assert.Nil(t, err)
- assert.Equal(t, "HMAC-SHA1", method)
- assert.Equal(t, expectedSignature, digest)
-}
-
-type identitySigner struct{}
-
-func (s *identitySigner) Name() string {
- return "identity"
-}
-
-func (s *identitySigner) Sign(tokenSecret, message string) (string, error) {
- return message, nil
-}
-
-func TestSigner_Custom(t *testing.T) {
- config := &Config{
- ConsumerSecret: "consumer_secret",
- Signer: &identitySigner{},
- }
- a := newAuther(config)
- // assert that the custom signer is used
- method := a.signer().Name()
- digest, err := a.signer().Sign("secret", "hello world")
- assert.Nil(t, err)
- assert.Equal(t, "identity", method)
- assert.Equal(t, "hello world", digest)
-}
-
-func TestAuthHeaderValue(t *testing.T) {
- cases := []struct {
- params map[string]string
- authHeader string
- }{
- {map[string]string{}, "OAuth "},
- {map[string]string{"a": "b"}, `OAuth a="b"`},
- {map[string]string{"a": "b", "c": "d", "e": "f", "1": "2"}, `OAuth 1="2", a="b", c="d", e="f"`},
- {map[string]string{"/= +doencode": "/= +doencode"}, `OAuth %2F%3D%20%2Bdoencode="%2F%3D%20%2Bdoencode"`},
- {map[string]string{"-._~dontencode": "-._~dontencode"}, `OAuth -._~dontencode="-._~dontencode"`},
- }
- for _, c := range cases {
- assert.Equal(t, c.authHeader, authHeaderValue(c.params))
- }
-}
-
-func TestEncodeParameters(t *testing.T) {
- input := map[string]string{
- "a": "Dogs, Cats & Mice",
- "☃": "snowman",
- "ル": "ル",
- }
- expected := map[string]string{
- "a": "Dogs%2C%20Cats%20%26%20Mice",
- "%E2%98%83": "snowman",
- "%E3%83%AB": "%E3%83%AB",
- }
- assert.Equal(t, expected, encodeParameters(input))
-}
-
-func TestSortParameters(t *testing.T) {
- input := map[string]string{
- ".": "ape",
- "5.6": "bat",
- "rsa": "cat",
- "%20": "dog",
- "%E3%83%AB": "eel",
- "dup": "fox",
- //"dup": "fix", // duplicate keys not supported
- }
- expected := []string{
- "%20=dog",
- "%E3%83%AB=eel",
- ".=ape",
- "5.6=bat",
- "dup=fox",
- "rsa=cat",
- }
- assert.Equal(t, expected, sortParameters(input, "%s=%s"))
-}
-
-func TestCollectParameters(t *testing.T) {
- // example from RFC 5849 3.4.1.3.1
- oauthParams := map[string]string{
- "oauth_token": "kkk9d7dh3k39sjv7",
- "oauth_consumer_key": "9djdj82h48djs9d2",
- "oauth_signature_method": "HMAC-SHA1",
- "oauth_timestamp": "137131201",
- "oauth_nonce": "7d8f3e4a",
- }
- values := url.Values{}
- values.Add("c2", "")
- values.Add("plus", "2 q") // duplicate keys not supported, a3 -> plus
- req, err := http.NewRequest("POST", "/request?b5=%3D%253D&a3=a&c%40=&a2=r%20b", strings.NewReader(values.Encode()))
- assert.Nil(t, err)
- req.Header.Set(contentType, formContentType)
- params, err := collectParameters(req, oauthParams)
- // assert parameters were collected from oauthParams, the query, and form body
- expected := map[string]string{
- "b5": "=%3D",
- "a3": "a",
- "c@": "",
- "a2": "r b",
- "oauth_token": "kkk9d7dh3k39sjv7",
- "oauth_consumer_key": "9djdj82h48djs9d2",
- "oauth_signature_method": "HMAC-SHA1",
- "oauth_timestamp": "137131201",
- "oauth_nonce": "7d8f3e4a",
- "c2": "",
- "plus": "2 q",
- }
- assert.Nil(t, err)
- assert.Equal(t, expected, params)
- // RFC 5849 3.4.1.3.1 requires a {"a3"="2 q"} be form encoded to "a3=2+q" in
- // the application/x-www-form-urlencoded body. The parameter "2+q" should be
- // read as "2 q" and percent encoded to "2%20q".
- // In Go, data is form encoded by calling Encode on url.Values{} (URL
- // encoding) and decoded with url.ParseQuery to url.Values. So the encoding
- // of "2 q" to "2+q" and decoding back to "2 q" is handled and then params
- // are percent encoded.
- // http://golang.org/src/net/http/client.go#L496
- // http://golang.org/src/net/http/request.go#L837
-}
-
-func TestSignatureBase(t *testing.T) {
- reqA, err := http.NewRequest("get", "HTTPS://HELLO.IO?q=test", nil)
- assert.Nil(t, err)
- reqB, err := http.NewRequest("POST", "http://hello.io:8080", nil)
- assert.Nil(t, err)
- cases := []struct {
- req *http.Request
- params map[string]string
- signatureBase string
- }{
- {reqA, map[string]string{"a": "b", "c": "d"}, "GET&https%3A%2F%2Fhello.io&a%3Db%26c%3Dd"},
- {reqB, map[string]string{"a": "b"}, "POST&http%3A%2F%2Fhello.io%3A8080&a%3Db"},
- }
- // assert that method is uppercased, base uri rules applied, queries added, joined by &
- for _, c := range cases {
- base := signatureBase(c.req, c.params)
- assert.Equal(t, c.signatureBase, base)
- }
-}
-
-func TestBaseURI(t *testing.T) {
- reqA, err := http.NewRequest("GET", "HTTP://EXAMPLE.COM:80/r%20v/X?id=123", nil)
- assert.Nil(t, err)
- reqB, err := http.NewRequest("POST", "https://www.example.net:8080/?q=1", nil)
- assert.Nil(t, err)
- reqC, err := http.NewRequest("POST", "https://example.com:443", nil)
- cases := []struct {
- req *http.Request
- baseURI string
- }{
- {reqA, "http://example.com/r%20v/X"},
- {reqB, "https://www.example.net:8080/"},
- {reqC, "https://example.com"},
- }
- for _, c := range cases {
- baseURI := baseURI(c.req)
- assert.Equal(t, c.baseURI, baseURI)
- }
-}
-
-func TestNormalizedParameterString(t *testing.T) {
- simple := map[string]string{
- "a": "b & c",
- "☃": "snowman",
- }
- rfcExample := map[string]string{
- "b5": "=%3D",
- "a3": "a",
- "c@": "",
- "a2": "r b",
- "oauth_token": "kkk9d7dh3k39sjv7",
- "oauth_consumer_key": "9djdj82h48djs9d2",
- "oauth_signature_method": "HMAC-SHA1",
- "oauth_timestamp": "137131201",
- "oauth_nonce": "7d8f3e4a",
- "c2": "",
- "plus": "2 q",
- }
- cases := []struct {
- params map[string]string
- parameterStr string
- }{
- {simple, "%E2%98%83=snowman&a=b%20%26%20c"},
- {rfcExample, "a2=r%20b&a3=a&b5=%3D%253D&c%40=&c2=&oauth_consumer_key=9djdj82h48djs9d2&oauth_nonce=7d8f3e4a&oauth_signature_method=HMAC-SHA1&oauth_timestamp=137131201&oauth_token=kkk9d7dh3k39sjv7&plus=2%20q"},
- }
- for _, c := range cases {
- assert.Equal(t, c.parameterStr, normalizedParameterString(c.params))
- }
-}
diff --git a/vendor/github.com/dghubble/oauth1/config.go b/vendor/github.com/dghubble/oauth1/config.go
deleted file mode 100644
index df18e86bd..000000000
--- a/vendor/github.com/dghubble/oauth1/config.go
+++ /dev/null
@@ -1,172 +0,0 @@
-package oauth1
-
-import (
- "errors"
- "fmt"
- "io/ioutil"
- "net/http"
- "net/url"
-
- "golang.org/x/net/context"
-)
-
-const (
- oauthTokenSecretParam = "oauth_token_secret"
- oauthCallbackConfirmedParam = "oauth_callback_confirmed"
-)
-
-// Config represents an OAuth1 consumer's (client's) key and secret, the
-// callback URL, and the provider Endpoint to which the consumer corresponds.
-type Config struct {
- // Consumer Key (Client Identifier)
- ConsumerKey string
- // Consumer Secret (Client Shared-Secret)
- ConsumerSecret string
- // Callback URL
- CallbackURL string
- // Provider Endpoint specifying OAuth1 endpoint URLs
- Endpoint Endpoint
- // OAuth1 Signer (defaults to HMAC-SHA1)
- Signer Signer
-}
-
-// NewConfig returns a new Config with the given consumer key and secret.
-func NewConfig(consumerKey, consumerSecret string) *Config {
- return &Config{
- ConsumerKey: consumerKey,
- ConsumerSecret: consumerSecret,
- }
-}
-
-// Client returns an HTTP client which uses the provided ctx and access Token.
-func (c *Config) Client(ctx context.Context, t *Token) *http.Client {
- return NewClient(ctx, c, t)
-}
-
-// NewClient returns a new http Client which signs requests via OAuth1.
-func NewClient(ctx context.Context, config *Config, token *Token) *http.Client {
- transport := &Transport{
- Base: contextTransport(ctx),
- source: StaticTokenSource(token),
- auther: newAuther(config),
- }
- return &http.Client{Transport: transport}
-}
-
-// RequestToken obtains a Request token and secret (temporary credential) by
-// POSTing a request (with oauth_callback in the auth header) to the Endpoint
-// RequestTokenURL. The response body form is validated to ensure
-// oauth_callback_confirmed is true. Returns the request token and secret
-// (temporary credentials).
-// See RFC 5849 2.1 Temporary Credentials.
-func (c *Config) RequestToken() (requestToken, requestSecret string, err error) {
- req, err := http.NewRequest("POST", c.Endpoint.RequestTokenURL, nil)
- if err != nil {
- return "", "", err
- }
- err = newAuther(c).setRequestTokenAuthHeader(req)
- if err != nil {
- return "", "", err
- }
- resp, err := http.DefaultClient.Do(req)
- if err != nil {
- return "", "", err
- }
- // when err is nil, resp contains a non-nil resp.Body which must be closed
- defer resp.Body.Close()
- if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusCreated {
- return "", "", fmt.Errorf("oauth1: Server returned status %d", resp.StatusCode)
- }
- body, err := ioutil.ReadAll(resp.Body)
- if err != nil {
- return "", "", err
- }
- // ParseQuery to decode URL-encoded application/x-www-form-urlencoded body
- values, err := url.ParseQuery(string(body))
- if err != nil {
- return "", "", err
- }
- requestToken = values.Get(oauthTokenParam)
- requestSecret = values.Get(oauthTokenSecretParam)
- if requestToken == "" || requestSecret == "" {
- return "", "", errors.New("oauth1: Response missing oauth_token or oauth_token_secret")
- }
- if values.Get(oauthCallbackConfirmedParam) != "true" {
- return "", "", errors.New("oauth1: oauth_callback_confirmed was not true")
- }
- return requestToken, requestSecret, nil
-}
-
-// AuthorizationURL accepts a request token and returns the *url.URL to the
-// Endpoint's authorization page that asks the user (resource owner) for to
-// authorize the consumer to act on his/her/its behalf.
-// See RFC 5849 2.2 Resource Owner Authorization.
-func (c *Config) AuthorizationURL(requestToken string) (*url.URL, error) {
- authorizationURL, err := url.Parse(c.Endpoint.AuthorizeURL)
- if err != nil {
- return nil, err
- }
- values := authorizationURL.Query()
- values.Add(oauthTokenParam, requestToken)
- authorizationURL.RawQuery = values.Encode()
- return authorizationURL, nil
-}
-
-// ParseAuthorizationCallback parses an OAuth1 authorization callback request
-// from a provider server. The oauth_token and oauth_verifier parameters are
-// parsed to return the request token from earlier in the flow and the
-// verifier string.
-// See RFC 5849 2.2 Resource Owner Authorization.
-func ParseAuthorizationCallback(req *http.Request) (requestToken, verifier string, err error) {
- // parse the raw query from the URL into req.Form
- err = req.ParseForm()
- if err != nil {
- return "", "", err
- }
- requestToken = req.Form.Get(oauthTokenParam)
- verifier = req.Form.Get(oauthVerifierParam)
- if requestToken == "" || verifier == "" {
- return "", "", errors.New("oauth1: Request missing oauth_token or oauth_verifier")
- }
- return requestToken, verifier, nil
-}
-
-// AccessToken obtains an access token (token credential) by POSTing a
-// request (with oauth_token and oauth_verifier in the auth header) to the
-// Endpoint AccessTokenURL. Returns the access token and secret (token
-// credentials).
-// See RFC 5849 2.3 Token Credentials.
-func (c *Config) AccessToken(requestToken, requestSecret, verifier string) (accessToken, accessSecret string, err error) {
- req, err := http.NewRequest("POST", c.Endpoint.AccessTokenURL, nil)
- if err != nil {
- return "", "", err
- }
- err = newAuther(c).setAccessTokenAuthHeader(req, requestToken, requestSecret, verifier)
- if err != nil {
- return "", "", err
- }
- resp, err := http.DefaultClient.Do(req)
- if err != nil {
- return "", "", err
- }
- // when err is nil, resp contains a non-nil resp.Body which must be closed
- defer resp.Body.Close()
- if resp.StatusCode != http.StatusOK && resp.StatusCode != http.StatusCreated {
- return "", "", fmt.Errorf("oauth1: Server returned status %d", resp.StatusCode)
- }
- body, err := ioutil.ReadAll(resp.Body)
- if err != nil {
- return "", "", err
- }
- // ParseQuery to decode URL-encoded application/x-www-form-urlencoded body
- values, err := url.ParseQuery(string(body))
- if err != nil {
- return "", "", err
- }
- accessToken = values.Get(oauthTokenParam)
- accessSecret = values.Get(oauthTokenSecretParam)
- if accessToken == "" || accessSecret == "" {
- return "", "", errors.New("oauth1: Response missing oauth_token or oauth_token_secret")
- }
- return accessToken, accessSecret, nil
-}
diff --git a/vendor/github.com/dghubble/oauth1/config_test.go b/vendor/github.com/dghubble/oauth1/config_test.go
deleted file mode 100644
index fcb4525a0..000000000
--- a/vendor/github.com/dghubble/oauth1/config_test.go
+++ /dev/null
@@ -1,346 +0,0 @@
-package oauth1
-
-import (
- "net/http"
- "net/http/httptest"
- "net/url"
- "testing"
-
- "github.com/stretchr/testify/assert"
- "golang.org/x/net/context"
-)
-
-const expectedVerifier = "some_verifier"
-
-func TestNewConfig(t *testing.T) {
- expectedConsumerKey := "consumer_key"
- expectedConsumerSecret := "consumer_secret"
- config := NewConfig(expectedConsumerKey, expectedConsumerSecret)
- assert.Equal(t, expectedConsumerKey, config.ConsumerKey)
- assert.Equal(t, expectedConsumerSecret, config.ConsumerSecret)
-}
-
-func TestNewClient(t *testing.T) {
- expectedToken := "access_token"
- expectedConsumerKey := "consumer_key"
- config := NewConfig(expectedConsumerKey, "consumer_secret")
- token := NewToken(expectedToken, "access_secret")
- client := config.Client(NoContext, token)
-
- server := newMockServer(func(w http.ResponseWriter, req *http.Request) {
- assert.Equal(t, "GET", req.Method)
- params := parseOAuthParamsOrFail(t, req.Header.Get(authorizationHeaderParam))
- assert.Equal(t, expectedToken, params[oauthTokenParam])
- assert.Equal(t, expectedConsumerKey, params[oauthConsumerKeyParam])
- })
- defer server.Close()
- client.Get(server.URL)
-}
-
-func TestNewClient_DefaultTransport(t *testing.T) {
- client := NewClient(NoContext, NewConfig("t", "s"), NewToken("t", "s"))
- // assert that the client uses the DefaultTransport
- transport, ok := client.Transport.(*Transport)
- assert.True(t, ok)
- assert.Equal(t, http.DefaultTransport, transport.base())
-}
-
-func TestNewClient_ContextClientTransport(t *testing.T) {
- baseTransport := &http.Transport{}
- baseClient := &http.Client{Transport: baseTransport}
- ctx := context.WithValue(NoContext, HTTPClient, baseClient)
- client := NewClient(ctx, NewConfig("t", "s"), NewToken("t", "s"))
- // assert that the client uses the ctx client's Transport as its base RoundTripper
- transport, ok := client.Transport.(*Transport)
- assert.True(t, ok)
- assert.Equal(t, baseTransport, transport.base())
-}
-
-// newRequestTokenServer returns a new httptest.Server for an OAuth1 provider
-// request token endpoint.
-func newRequestTokenServer(t *testing.T, data url.Values) *httptest.Server {
- return newMockServer(func(w http.ResponseWriter, req *http.Request) {
- assert.Equal(t, "POST", req.Method)
- assert.NotEmpty(t, req.Header.Get("Authorization"))
- w.Header().Set(contentType, formContentType)
- w.Write([]byte(data.Encode()))
- })
-}
-
-// newAccessTokenServer returns a new httptest.Server for an OAuth1 provider
-// access token endpoint.
-func newAccessTokenServer(t *testing.T, data url.Values) *httptest.Server {
- return newMockServer(func(w http.ResponseWriter, req *http.Request) {
- assert.Equal(t, "POST", req.Method)
- assert.NotEmpty(t, req.Header.Get("Authorization"))
- params := parseOAuthParamsOrFail(t, req.Header.Get(authorizationHeaderParam))
- assert.Equal(t, expectedVerifier, params[oauthVerifierParam])
- w.Header().Set(contentType, formContentType)
- w.Write([]byte(data.Encode()))
- })
-}
-
-// newUnparseableBodyServer returns a new httptest.Server which writes
-// responses with bodies that error when parsed by url.ParseQuery.
-func newUnparseableBodyServer() *httptest.Server {
- return newMockServer(func(w http.ResponseWriter, req *http.Request) {
- w.Header().Set(contentType, formContentType)
- // url.ParseQuery will error, https://golang.org/src/net/url/url_test.go#L1107
- w.Write([]byte("%gh&%ij"))
- })
-}
-
-func TestConfigRequestToken(t *testing.T) {
- expectedToken := "reqest_token"
- expectedSecret := "request_secret"
- data := url.Values{}
- data.Add("oauth_token", expectedToken)
- data.Add("oauth_token_secret", expectedSecret)
- data.Add("oauth_callback_confirmed", "true")
- server := newRequestTokenServer(t, data)
- defer server.Close()
-
- config := &Config{
- Endpoint: Endpoint{
- RequestTokenURL: server.URL,
- },
- }
- requestToken, requestSecret, err := config.RequestToken()
- assert.Nil(t, err)
- assert.Equal(t, expectedToken, requestToken)
- assert.Equal(t, expectedSecret, requestSecret)
-}
-
-func TestConfigRequestToken_InvalidRequestTokenURL(t *testing.T) {
- config := &Config{
- Endpoint: Endpoint{
- RequestTokenURL: "http://wrong.com/oauth/request_token",
- },
- }
- requestToken, requestSecret, err := config.RequestToken()
- assert.NotNil(t, err)
- assert.Equal(t, "", requestToken)
- assert.Equal(t, "", requestSecret)
-}
-
-func TestConfigRequestToken_CallbackNotConfirmed(t *testing.T) {
- const expectedToken = "reqest_token"
- const expectedSecret = "request_secret"
- data := url.Values{}
- data.Add("oauth_token", expectedToken)
- data.Add("oauth_token_secret", expectedSecret)
- data.Add("oauth_callback_confirmed", "false")
- server := newRequestTokenServer(t, data)
- defer server.Close()
-
- config := &Config{
- Endpoint: Endpoint{
- RequestTokenURL: server.URL,
- },
- }
- requestToken, requestSecret, err := config.RequestToken()
- if assert.Error(t, err) {
- assert.Equal(t, "oauth1: oauth_callback_confirmed was not true", err.Error())
- }
- assert.Equal(t, "", requestToken)
- assert.Equal(t, "", requestSecret)
-}
-
-func TestConfigRequestToken_CannotParseBody(t *testing.T) {
- server := newUnparseableBodyServer()
- defer server.Close()
-
- config := &Config{
- Endpoint: Endpoint{
- RequestTokenURL: server.URL,
- },
- }
- requestToken, requestSecret, err := config.RequestToken()
- if assert.Error(t, err) {
- assert.Contains(t, err.Error(), "invalid URL escape")
- }
- assert.Equal(t, "", requestToken)
- assert.Equal(t, "", requestSecret)
-}
-
-func TestConfigRequestToken_MissingTokenOrSecret(t *testing.T) {
- data := url.Values{}
- data.Add("oauth_token", "any_token")
- data.Add("oauth_callback_confirmed", "true")
- server := newRequestTokenServer(t, data)
- defer server.Close()
-
- config := &Config{
- Endpoint: Endpoint{
- RequestTokenURL: server.URL,
- },
- }
- requestToken, requestSecret, err := config.RequestToken()
- if assert.Error(t, err) {
- assert.Equal(t, "oauth1: Response missing oauth_token or oauth_token_secret", err.Error())
- }
- assert.Equal(t, "", requestToken)
- assert.Equal(t, "", requestSecret)
-}
-
-func TestAuthorizationURL(t *testing.T) {
- expectedURL := "https://api.example.com/oauth/authorize?oauth_token=a%2Frequest_token"
- config := &Config{
- Endpoint: Endpoint{
- AuthorizeURL: "https://api.example.com/oauth/authorize",
- },
- }
- url, err := config.AuthorizationURL("a/request_token")
- assert.Nil(t, err)
- if assert.NotNil(t, url) {
- assert.Equal(t, expectedURL, url.String())
- }
-}
-
-func TestAuthorizationURL_CannotParseAuthorizeURL(t *testing.T) {
- config := &Config{
- Endpoint: Endpoint{
- AuthorizeURL: "%gh&%ij",
- },
- }
- url, err := config.AuthorizationURL("any_request_token")
- assert.Nil(t, url)
- if assert.Error(t, err) {
- assert.Contains(t, err.Error(), "parse")
- assert.Contains(t, err.Error(), "invalid URL")
- }
-}
-
-func TestConfigAccessToken(t *testing.T) {
- expectedToken := "access_token"
- expectedSecret := "access_secret"
- data := url.Values{}
- data.Add("oauth_token", expectedToken)
- data.Add("oauth_token_secret", expectedSecret)
- server := newAccessTokenServer(t, data)
- defer server.Close()
-
- config := &Config{
- Endpoint: Endpoint{
- AccessTokenURL: server.URL,
- },
- }
- accessToken, accessSecret, err := config.AccessToken("request_token", "request_secret", expectedVerifier)
- assert.Nil(t, err)
- assert.Equal(t, expectedToken, accessToken)
- assert.Equal(t, expectedSecret, accessSecret)
-}
-
-func TestConfigAccessToken_InvalidAccessTokenURL(t *testing.T) {
- config := &Config{
- Endpoint: Endpoint{
- AccessTokenURL: "http://wrong.com/oauth/access_token",
- },
- }
- accessToken, accessSecret, err := config.AccessToken("any_token", "any_secret", "any_verifier")
- assert.NotNil(t, err)
- assert.Equal(t, "", accessToken)
- assert.Equal(t, "", accessSecret)
-}
-
-func TestConfigAccessToken_CannotParseBody(t *testing.T) {
- server := newUnparseableBodyServer()
- defer server.Close()
-
- config := &Config{
- Endpoint: Endpoint{
- AccessTokenURL: server.URL,
- },
- }
- accessToken, accessSecret, err := config.AccessToken("any_token", "any_secret", "any_verifier")
- if assert.Error(t, err) {
- assert.Contains(t, err.Error(), "invalid URL escape")
- }
- assert.Equal(t, "", accessToken)
- assert.Equal(t, "", accessSecret)
-}
-
-func TestConfigAccessToken_MissingTokenOrSecret(t *testing.T) {
- data := url.Values{}
- data.Add("oauth_token", "any_token")
- server := newAccessTokenServer(t, data)
- defer server.Close()
-
- config := &Config{
- Endpoint: Endpoint{
- AccessTokenURL: server.URL,
- },
- }
- accessToken, accessSecret, err := config.AccessToken("request_token", "request_secret", expectedVerifier)
- if assert.Error(t, err) {
- assert.Equal(t, "oauth1: Response missing oauth_token or oauth_token_secret", err.Error())
- }
- assert.Equal(t, "", accessToken)
- assert.Equal(t, "", accessSecret)
-}
-
-func TestParseAuthorizationCallback_GET(t *testing.T) {
- expectedToken := "token"
- expectedVerifier := "verifier"
- server := newMockServer(func(w http.ResponseWriter, req *http.Request) {
- assert.Equal(t, "GET", req.Method)
- // logic under test
- requestToken, verifier, err := ParseAuthorizationCallback(req)
- assert.Nil(t, err)
- assert.Equal(t, expectedToken, requestToken)
- assert.Equal(t, expectedVerifier, verifier)
- })
- defer server.Close()
-
- // OAuth1 provider calls callback url
- url, err := url.Parse(server.URL)
- assert.Nil(t, err)
- query := url.Query()
- query.Add("oauth_token", expectedToken)
- query.Add("oauth_verifier", expectedVerifier)
- url.RawQuery = query.Encode()
- http.Get(url.String())
-}
-
-func TestParseAuthorizationCallback_POST(t *testing.T) {
- expectedToken := "token"
- expectedVerifier := "verifier"
- server := newMockServer(func(w http.ResponseWriter, req *http.Request) {
- assert.Equal(t, "POST", req.Method)
- // logic under test
- requestToken, verifier, err := ParseAuthorizationCallback(req)
- assert.Nil(t, err)
- assert.Equal(t, expectedToken, requestToken)
- assert.Equal(t, expectedVerifier, verifier)
- })
- defer server.Close()
-
- // OAuth1 provider calls callback url
- form := url.Values{}
- form.Add("oauth_token", expectedToken)
- form.Add("oauth_verifier", expectedVerifier)
- http.PostForm(server.URL, form)
-}
-
-func TestParseAuthorizationCallback_MissingTokenOrVerifier(t *testing.T) {
- server := newMockServer(func(w http.ResponseWriter, req *http.Request) {
- assert.Equal(t, "GET", req.Method)
- // logic under test
- requestToken, verifier, err := ParseAuthorizationCallback(req)
- if assert.Error(t, err) {
- assert.Equal(t, "oauth1: Request missing oauth_token or oauth_verifier", err.Error())
- }
- assert.Equal(t, "", requestToken)
- assert.Equal(t, "", verifier)
- })
- defer server.Close()
-
- // OAuth1 provider calls callback url
- url, err := url.Parse(server.URL)
- assert.Nil(t, err)
- query := url.Query()
- query.Add("oauth_token", "any_token")
- query.Add("oauth_verifier", "") // missing oauth_verifier
- url.RawQuery = query.Encode()
- http.Get(url.String())
-}
diff --git a/vendor/github.com/dghubble/oauth1/context.go b/vendor/github.com/dghubble/oauth1/context.go
deleted file mode 100644
index c4dbc26f3..000000000
--- a/vendor/github.com/dghubble/oauth1/context.go
+++ /dev/null
@@ -1,24 +0,0 @@
-package oauth1
-
-import (
- "net/http"
-
- "golang.org/x/net/context"
-)
-
-type contextKey struct{}
-
-// HTTPClient is the context key to associate an *http.Client value with
-// a context.
-var HTTPClient contextKey
-
-// NoContext is the default context to use in most cases.
-var NoContext = context.TODO()
-
-// contextTransport gets the Transport from the context client or nil.
-func contextTransport(ctx context.Context) http.RoundTripper {
- if client, ok := ctx.Value(HTTPClient).(*http.Client); ok {
- return client.Transport
- }
- return nil
-}
diff --git a/vendor/github.com/dghubble/oauth1/context_test.go b/vendor/github.com/dghubble/oauth1/context_test.go
deleted file mode 100644
index e81453b3b..000000000
--- a/vendor/github.com/dghubble/oauth1/context_test.go
+++ /dev/null
@@ -1,21 +0,0 @@
-package oauth1
-
-import (
- "net/http"
- "testing"
-
- "github.com/stretchr/testify/assert"
- "golang.org/x/net/context"
-)
-
-func TestContextTransport(t *testing.T) {
- client := &http.Client{
- Transport: http.DefaultTransport,
- }
- ctx := context.WithValue(NoContext, HTTPClient, client)
- assert.Equal(t, http.DefaultTransport, contextTransport(ctx))
-}
-
-func TestContextTransport_NoContextClient(t *testing.T) {
- assert.Nil(t, contextTransport(NoContext))
-}
diff --git a/vendor/github.com/dghubble/oauth1/doc.go b/vendor/github.com/dghubble/oauth1/doc.go
deleted file mode 100644
index ef303dbc5..000000000
--- a/vendor/github.com/dghubble/oauth1/doc.go
+++ /dev/null
@@ -1,97 +0,0 @@
-/*
-Package oauth1 is a Go implementation of the OAuth1 spec RFC 5849.
-
-It allows end-users to authorize a client (consumer) to access protected
-resources on their behalf (e.g. login) and allows clients to make signed and
-authorized requests on behalf of a user (e.g. API calls).
-
-It takes design cues from golang.org/x/oauth2, providing an http.Client which
-handles request signing and authorization.
-
-Usage
-
-Package oauth1 implements the OAuth1 authorization flow and provides an
-http.Client which can sign and authorize OAuth1 requests.
-
-To implement "Login with X", use the https://github.com/dghubble/gologin
-packages which provide login handlers for OAuth1 and OAuth2 providers.
-
-To call the Twitter, Digits, or Tumblr OAuth1 APIs, use the higher level Go API
-clients.
-
-* https://github.com/dghubble/go-twitter
-* https://github.com/dghubble/go-digits
-* https://github.com/benfb/go-tumblr
-
-Authorization Flow
-
-Perform the OAuth 1 authorization flow to ask a user to grant an application
-access to his/her resources via an access token.
-
- import (
- "github.com/dghubble/oauth1"
- "github.com/dghubble/oauth1/twitter""
- )
- ...
-
- config := oauth1.Config{
- ConsumerKey: "consumerKey",
- ConsumerSecret: "consumerSecret",
- CallbackURL: "http://mysite.com/oauth/twitter/callback",
- Endpoint: twitter.AuthorizeEndpoint,
- }
-
-1. When a user performs an action (e.g. "Login with X" button calls "/login"
-route) get an OAuth1 request token (temporary credentials).
-
- requestToken, requestSecret, err = config.RequestToken()
- // handle err
-
-2. Obtain authorization from the user by redirecting them to the OAuth1
-provider's authorization URL to grant the application access.
-
- authorizationURL, err := config.AuthorizationURL(requestToken)
- // handle err
- http.Redirect(w, req, authorizationURL.String(), htt.StatusFound)
-
-Receive the callback from the OAuth1 provider in a handler.
-
- requestToken, verifier, err := oauth1.ParseAuthorizationCallback(req)
- // handle err
-
-3. Acquire the access token (token credentials) which can later be used
-to make requests on behalf of the user.
-
- accessToken, accessSecret, err := config.AccessToken(requestToken, requestSecret, verifier)
- // handle error
- token := oauth1.NewToken(accessToken, accessSecret)
-
-Check the examples to see this authorization flow in action from the command
-line, with Twitter PIN-based login and Tumblr login.
-
-Authorized Requests
-
-Use an access Token to make authorized requests on behalf of a user.
-
- import (
- "github.com/dghubble/oauth1"
- )
-
- func main() {
- config := oauth1.NewConfig("consumerKey", "consumerSecret")
- token := oauth1.NewToken("token", "tokenSecret")
-
- // httpClient will automatically authorize http.Request's
- httpClient := config.Client(token)
-
- // example Twitter API request
- path := "https://api.twitter.com/1.1/statuses/home_timeline.json?count=2"
- resp, _ := httpClient.Get(path)
- defer resp.Body.Close()
- body, _ := ioutil.ReadAll(resp.Body)
- fmt.Printf("Raw Response Body:\n%v\n", string(body))
- }
-
-Check the examples to see Twitter and Tumblr requests in action.
-*/
-package oauth1
diff --git a/vendor/github.com/dghubble/oauth1/dropbox/dropbox.go b/vendor/github.com/dghubble/oauth1/dropbox/dropbox.go
deleted file mode 100644
index 7902cb91f..000000000
--- a/vendor/github.com/dghubble/oauth1/dropbox/dropbox.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Package dropbox provides constants for using OAuth1 to access Dropbox.
-package dropbox
-
-import (
- "github.com/dghubble/oauth1"
-)
-
-// Endpoint is Dropbox's OAuth 1 endpoint.
-var Endpoint = oauth1.Endpoint{
- RequestTokenURL: "https://api.dropbox.com/1/oauth/request_token",
- AuthorizeURL: "https://api.dropbox.com/1/oauth/authorize",
- AccessTokenURL: "https://api.dropbox.com/1/oauth/access_token",
-}
diff --git a/vendor/github.com/dghubble/oauth1/encode.go b/vendor/github.com/dghubble/oauth1/encode.go
deleted file mode 100644
index 9c078346e..000000000
--- a/vendor/github.com/dghubble/oauth1/encode.go
+++ /dev/null
@@ -1,36 +0,0 @@
-package oauth1
-
-import (
- "bytes"
- "fmt"
-)
-
-// PercentEncode percent encodes a string according to RFC 3986 2.1.
-func PercentEncode(input string) string {
- var buf bytes.Buffer
- for _, b := range []byte(input) {
- // if in unreserved set
- if shouldEscape(b) {
- buf.Write([]byte(fmt.Sprintf("%%%02X", b)))
- } else {
- // do not escape, write byte as-is
- buf.WriteByte(b)
- }
- }
- return buf.String()
-}
-
-// shouldEscape returns false if the byte is an unreserved character that
-// should not be escaped and true otherwise, according to RFC 3986 2.1.
-func shouldEscape(c byte) bool {
- // RFC3986 2.3 unreserved characters
- if 'A' <= c && c <= 'Z' || 'a' <= c && c <= 'z' || '0' <= c && c <= '9' {
- return false
- }
- switch c {
- case '-', '.', '_', '~':
- return false
- }
- // all other bytes must be escaped
- return true
-}
diff --git a/vendor/github.com/dghubble/oauth1/encode_test.go b/vendor/github.com/dghubble/oauth1/encode_test.go
deleted file mode 100644
index 6b310fc03..000000000
--- a/vendor/github.com/dghubble/oauth1/encode_test.go
+++ /dev/null
@@ -1,27 +0,0 @@
-package oauth1
-
-import (
- "testing"
-)
-
-func TestPercentEncode(t *testing.T) {
- cases := []struct {
- input string
- expected string
- }{
- {" ", "%20"},
- {"%", "%25"},
- {"&", "%26"},
- {"-._", "-._"},
- {" /=+", "%20%2F%3D%2B"},
- {"Ladies + Gentlemen", "Ladies%20%2B%20Gentlemen"},
- {"An encoded string!", "An%20encoded%20string%21"},
- {"Dogs, Cats & Mice", "Dogs%2C%20Cats%20%26%20Mice"},
- {"☃", "%E2%98%83"},
- }
- for _, c := range cases {
- if output := PercentEncode(c.input); output != c.expected {
- t.Errorf("expected %s, got %s", c.expected, output)
- }
- }
-}
diff --git a/vendor/github.com/dghubble/oauth1/endpoint.go b/vendor/github.com/dghubble/oauth1/endpoint.go
deleted file mode 100644
index cb3f66775..000000000
--- a/vendor/github.com/dghubble/oauth1/endpoint.go
+++ /dev/null
@@ -1,12 +0,0 @@
-package oauth1
-
-// Endpoint represents an OAuth1 provider's (server's) request token,
-// owner authorization, and access token request URLs.
-type Endpoint struct {
- // Request URL (Temporary Credential Request URI)
- RequestTokenURL string
- // Authorize URL (Resource Owner Authorization URI)
- AuthorizeURL string
- // Access Token URL (Token Request URI)
- AccessTokenURL string
-}
diff --git a/vendor/github.com/dghubble/oauth1/examples/README.md b/vendor/github.com/dghubble/oauth1/examples/README.md
deleted file mode 100644
index 47fb9c446..000000000
--- a/vendor/github.com/dghubble/oauth1/examples/README.md
+++ /dev/null
@@ -1,48 +0,0 @@
-
-# OAuth1 Examples
-
-## Twitter
-
-### Authorization Flow (PIN-based)
-
-An application can obtain a Twitter access `Token` for a user by requesting the user grant access via [3-legged](https://dev.twitter.com/oauth/3-legged) or [PIN-based](https://dev.twitter.com/oauth/pin-based) OAuth 1. Here is a command line example showing PIN-based authorization.
-
- export TWITTER_CONSUMER_KEY=xxx
- export TWITTER_CONSUMER_SECRET=xxx
- go run twitter-login.go
-
-The OAuth 1 flow can be used to implement Login with Twitter. Upon receiving an access token in a callback handler on your server, issue a user some form of unforgeable session identifier (i.e. cookie, token). Note that web backends should use a real `CallbackURL`, "oob" is for PIN-based agents such as the command line.
-
-### Authorized Requests
-
-Use the access `Token` to make requests on behalf of a Twitter user.
-
- export TWITTER_CONSUMER_KEY=xxx
- export TWITTER_CONSUMER_SECRET=xxx
- export TWITTER_ACCESS_TOKEN=xxx
- export TWITTER_ACCESS_SECRET=xxx
- go run twitter-request.go
-
-
-## Tumblr
-
-### Authorization Flow
-
-An application can obtain a Tumblr access `Token` to act on behalf of a user. Here is a command line example which requests permission.
-
- export TUMBLR_CONSUMER_KEY=xxx
- export TUMBLR_CONSUMER_SECRET=xxx
- go run tumblr-login.go
-
-### Authorized Requests
-
-Use the access `Token` to make requests on behalf of a Tumblr user.
-
- export TUMBLR_CONSUMER_KEY=xxx
- export TUMBLR_CONSUMER_SECRET=xxx
- export TUMBLR_ACCESS_TOKEN=xxx
- export TUMBLR_ACCESS_SECRET=xxx
- go run tumblr-request.go
-
-Note that only some Tumblr endpoints require OAuth1 signed requests, other endpoints require a special consumer key query parameter or no authorization.
-
diff --git a/vendor/github.com/dghubble/oauth1/examples/tumblr-login.go b/vendor/github.com/dghubble/oauth1/examples/tumblr-login.go
deleted file mode 100644
index 3b81f7716..000000000
--- a/vendor/github.com/dghubble/oauth1/examples/tumblr-login.go
+++ /dev/null
@@ -1,68 +0,0 @@
-package main
-
-import (
- "fmt"
- "log"
- "os"
-
- "github.com/dghubble/oauth1"
- "github.com/dghubble/oauth1/tumblr"
-)
-
-var config oauth1.Config
-
-// main performs the Tumblr OAuth1 user flow from the command line
-func main() {
- // read credentials from environment variables
- consumerKey := os.Getenv("TUMBLR_CONSUMER_KEY")
- consumerSecret := os.Getenv("TUMBLR_CONSUMER_SECRET")
- if consumerKey == "" || consumerSecret == "" {
- log.Fatal("Required environment variable missing.")
- }
-
- config = oauth1.Config{
- ConsumerKey: consumerKey,
- ConsumerSecret: consumerSecret,
- // Tumblr does not support oob, uses consumer registered callback
- CallbackURL: "",
- Endpoint: tumblr.Endpoint,
- }
-
- requestToken, requestSecret, err := login()
- if err != nil {
- log.Fatalf("Request Token Phase: %s", err.Error())
- }
- accessToken, err := receivePIN(requestToken, requestSecret)
- if err != nil {
- log.Fatalf("Access Token Phase: %s", err.Error())
- }
-
- fmt.Println("Consumer was granted an access token to act on behalf of a user.")
- fmt.Printf("token: %s\nsecret: %s\n", accessToken.Token, accessToken.TokenSecret)
-}
-
-func login() (requestToken, requestSecret string, err error) {
- requestToken, requestSecret, err = config.RequestToken()
- if err != nil {
- return "", "", err
- }
- authorizationURL, err := config.AuthorizationURL(requestToken)
- if err != nil {
- return "", "", err
- }
- fmt.Printf("Open this URL in your browser:\n%s\n", authorizationURL.String())
- return requestToken, requestSecret, err
-}
-
-func receivePIN(requestToken, requestSecret string) (*oauth1.Token, error) {
- fmt.Printf("Choose whether to grant the application access.\nPaste " +
- "the oauth_verifier parameter (excluding trailing #_=_) from the " +
- "address bar: ")
- var verifier string
- _, err := fmt.Scanf("%s", &verifier)
- accessToken, accessSecret, err := config.AccessToken(requestToken, requestSecret, verifier)
- if err != nil {
- return nil, err
- }
- return oauth1.NewToken(accessToken, accessSecret), err
-}
diff --git a/vendor/github.com/dghubble/oauth1/examples/tumblr-request.go b/vendor/github.com/dghubble/oauth1/examples/tumblr-request.go
deleted file mode 100644
index 588dd4134..000000000
--- a/vendor/github.com/dghubble/oauth1/examples/tumblr-request.go
+++ /dev/null
@@ -1,37 +0,0 @@
-package main
-
-import (
- "fmt"
- "io/ioutil"
- "os"
-
- "github.com/dghubble/oauth1"
-)
-
-// Tumblr access token (token credential) requests on behalf of a user
-func main() {
- // read credentials from environment variables
- consumerKey := os.Getenv("TUMBLR_CONSUMER_KEY")
- consumerSecret := os.Getenv("TUMBLR_CONSUMER_SECRET")
- accessToken := os.Getenv("TUMBLR_ACCESS_TOKEN")
- accessSecret := os.Getenv("TUMBLR_ACCESS_SECRET")
- if consumerKey == "" || consumerSecret == "" || accessToken == "" || accessSecret == "" {
- panic("Missing required environment variable")
- }
-
- config := oauth1.NewConfig(consumerKey, consumerSecret)
- token := oauth1.NewToken(accessToken, accessSecret)
-
- // httpClient will automatically authorize http.Request's
- httpClient := config.Client(oauth1.NoContext, token)
-
- // get information about the current authenticated user
- path := "https://api.tumblr.com/v2/user/info"
- resp, _ := httpClient.Get(path)
- defer resp.Body.Close()
- body, _ := ioutil.ReadAll(resp.Body)
- fmt.Printf("Raw Response Body:\n%v\n", string(body))
-
- // note: Tumblr requires OAuth signed requests for particular endpoints,
- // others just need a consumer key query parameter (its janky).
-}
diff --git a/vendor/github.com/dghubble/oauth1/examples/twitter-login.go b/vendor/github.com/dghubble/oauth1/examples/twitter-login.go
deleted file mode 100644
index 3ef4c3a1e..000000000
--- a/vendor/github.com/dghubble/oauth1/examples/twitter-login.go
+++ /dev/null
@@ -1,75 +0,0 @@
-package main
-
-import (
- "fmt"
- "log"
- "os"
-
- "github.com/dghubble/oauth1"
- twauth "github.com/dghubble/oauth1/twitter"
-)
-
-const outOfBand = "oob"
-
-var config oauth1.Config
-
-// main performs Twitter PIN-based 3-legged OAuth 1 from the command line
-func main() {
- // read credentials from environment variables
- consumerKey := os.Getenv("TWITTER_CONSUMER_KEY")
- consumerSecret := os.Getenv("TWITTER_CONSUMER_SECRET")
- if consumerKey == "" || consumerSecret == "" {
- log.Fatal("Required environment variable missing.")
- }
-
- config = oauth1.Config{
- ConsumerKey: consumerKey,
- ConsumerSecret: consumerSecret,
- CallbackURL: outOfBand,
- Endpoint: twauth.AuthorizeEndpoint,
- }
-
- requestToken, err := login()
- if err != nil {
- log.Fatalf("Request Token Phase: %s", err.Error())
- }
- accessToken, err := receivePIN(requestToken)
- if err != nil {
- log.Fatalf("Access Token Phase: %s", err.Error())
- }
-
- fmt.Println("Consumer was granted an access token to act on behalf of a user.")
- fmt.Printf("token: %s\nsecret: %s\n", accessToken.Token, accessToken.TokenSecret)
-}
-
-func login() (requestToken string, err error) {
- requestToken, _, err = config.RequestToken()
- if err != nil {
- return "", err
- }
- authorizationURL, err := config.AuthorizationURL(requestToken)
- if err != nil {
- return "", err
- }
- fmt.Printf("Open this URL in your browser:\n%s\n", authorizationURL.String())
- return requestToken, err
-}
-
-func receivePIN(requestToken string) (*oauth1.Token, error) {
- fmt.Printf("Paste your PIN here: ")
- var verifier string
- _, err := fmt.Scanf("%s", &verifier)
- if err != nil {
- return nil, err
- }
- // Twitter ignores the oauth_signature on the access token request. The user
- // to which the request (temporary) token corresponds is already known on the
- // server. The request for a request token earlier was validated signed by
- // the consumer. Consumer applications can avoid keeping request token state
- // between authorization granting and callback handling.
- accessToken, accessSecret, err := config.AccessToken(requestToken, "secret does not matter", verifier)
- if err != nil {
- return nil, err
- }
- return oauth1.NewToken(accessToken, accessSecret), err
-}
diff --git a/vendor/github.com/dghubble/oauth1/examples/twitter-request.go b/vendor/github.com/dghubble/oauth1/examples/twitter-request.go
deleted file mode 100644
index fba66b7cd..000000000
--- a/vendor/github.com/dghubble/oauth1/examples/twitter-request.go
+++ /dev/null
@@ -1,39 +0,0 @@
-package main
-
-import (
- "fmt"
- "io/ioutil"
- "os"
-
- "github.com/dghubble/go-twitter/twitter"
- "github.com/dghubble/oauth1"
-)
-
-// Twitter user-auth requests with an Access Token (token credential)
-func main() {
- // read credentials from environment variables
- consumerKey := os.Getenv("TWITTER_CONSUMER_KEY")
- consumerSecret := os.Getenv("TWITTER_CONSUMER_SECRET")
- accessToken := os.Getenv("TWITTER_ACCESS_TOKEN")
- accessSecret := os.Getenv("TWITTER_ACCESS_SECRET")
- if consumerKey == "" || consumerSecret == "" || accessToken == "" || accessSecret == "" {
- panic("Missing required environment variable")
- }
-
- config := oauth1.NewConfig(consumerKey, consumerSecret)
- token := oauth1.NewToken(accessToken, accessSecret)
-
- // httpClient will automatically authorize http.Request's
- httpClient := config.Client(oauth1.NoContext, token)
-
- path := "https://api.twitter.com/1.1/statuses/home_timeline.json?count=2"
- resp, _ := httpClient.Get(path)
- defer resp.Body.Close()
- body, _ := ioutil.ReadAll(resp.Body)
- fmt.Printf("Raw Response Body:\n%v\n", string(body))
-
- // Nicer: Pass OAuth1 client to go-twitter API
- api := twitter.NewClient(httpClient)
- tweets, _, _ := api.Timelines.HomeTimeline(nil)
- fmt.Printf("User's HOME TIMELINE:\n%+v\n", tweets)
-}
diff --git a/vendor/github.com/dghubble/oauth1/reference_test.go b/vendor/github.com/dghubble/oauth1/reference_test.go
deleted file mode 100644
index 3fbfc1288..000000000
--- a/vendor/github.com/dghubble/oauth1/reference_test.go
+++ /dev/null
@@ -1,202 +0,0 @@
-package oauth1
-
-import (
- "fmt"
- "net/http"
- "net/url"
- "strings"
- "testing"
- "time"
-
- "github.com/stretchr/testify/assert"
-)
-
-const (
- expectedVersion = "1.0"
- expectedSignatureMethod = "HMAC-SHA1"
-)
-
-func TestTwitterRequestTokenAuthHeader(t *testing.T) {
- // example from https://dev.twitter.com/web/sign-in/implementing
- var unixTimestamp int64 = 1318467427
- expectedConsumerKey := "cChZNFj6T5R0TigYB9yd1w"
- expectedCallback := "http%3A%2F%2Flocalhost%2Fsign-in-with-twitter%2F"
- expectedSignature := "F1Li3tvehgcraF8DMJ7OyxO4w9Y%3D"
- expectedTimestamp := "1318467427"
- expectedNonce := "ea9ec8429b68d6b77cd5600adbbb0456"
- config := &Config{
- ConsumerKey: expectedConsumerKey,
- ConsumerSecret: "L8qq9PZyRg6ieKGEKhZolGC0vJWLw8iEJ88DRdyOg",
- CallbackURL: "http://localhost/sign-in-with-twitter/",
- Endpoint: Endpoint{
- RequestTokenURL: "https://api.twitter.com/oauth/request_token",
- AuthorizeURL: "https://api.twitter.com/oauth/authorize",
- AccessTokenURL: "https://api.twitter.com/oauth/access_token",
- },
- }
-
- auther := &auther{config, &fixedClock{time.Unix(unixTimestamp, 0)}, &fixedNoncer{expectedNonce}}
- req, err := http.NewRequest("POST", config.Endpoint.RequestTokenURL, nil)
- assert.Nil(t, err)
- err = auther.setRequestTokenAuthHeader(req)
- // assert the request for a request token is signed and has an oauth_callback
- assert.Nil(t, err)
- params := parseOAuthParamsOrFail(t, req.Header.Get(authorizationHeaderParam))
- assert.Equal(t, expectedCallback, params[oauthCallbackParam])
- assert.Equal(t, expectedSignature, params[oauthSignatureParam])
- // additional OAuth parameters
- assert.Equal(t, expectedConsumerKey, params[oauthConsumerKeyParam])
- assert.Equal(t, expectedNonce, params[oauthNonceParam])
- assert.Equal(t, expectedTimestamp, params[oauthTimestampParam])
- assert.Equal(t, expectedVersion, params[oauthVersionParam])
- assert.Equal(t, expectedSignatureMethod, params[oauthSignatureMethodParam])
-}
-
-func TestTwitterAccessTokenAuthHeader(t *testing.T) {
- // example from https://dev.twitter.com/web/sign-in/implementing
- var unixTimestamp int64 = 1318467427
- expectedConsumerKey := "cChZNFj6T5R0TigYB9yd1w"
- expectedRequestToken := "NPcudxy0yU5T3tBzho7iCotZ3cnetKwcTIRlX0iwRl0"
- requestTokenSecret := "veNRnAWe6inFuo8o2u8SLLZLjolYDmDP7SzL0YfYI"
- expectedVerifier := "uw7NjWHT6OJ1MpJOXsHfNxoAhPKpgI8BlYDhxEjIBY"
- expectedSignature := "39cipBtIOHEEnybAR4sATQTpl2I%3D"
- expectedTimestamp := "1318467427"
- expectedNonce := "a9900fe68e2573b27a37f10fbad6a755"
- config := &Config{
- ConsumerKey: expectedConsumerKey,
- ConsumerSecret: "L8qq9PZyRg6ieKGEKhZolGC0vJWLw8iEJ88DRdyOg",
- Endpoint: Endpoint{
- RequestTokenURL: "https://api.twitter.com/oauth/request_token",
- AuthorizeURL: "https://api.twitter.com/oauth/authorize",
- AccessTokenURL: "https://api.twitter.com/oauth/access_token",
- },
- }
-
- auther := &auther{config, &fixedClock{time.Unix(unixTimestamp, 0)}, &fixedNoncer{expectedNonce}}
- req, err := http.NewRequest("POST", config.Endpoint.AccessTokenURL, nil)
- assert.Nil(t, err)
- err = auther.setAccessTokenAuthHeader(req, expectedRequestToken, requestTokenSecret, expectedVerifier)
- // assert the request for an access token is signed and has an oauth_token and verifier
- assert.Nil(t, err)
- params := parseOAuthParamsOrFail(t, req.Header.Get(authorizationHeaderParam))
- assert.Equal(t, expectedRequestToken, params[oauthTokenParam])
- assert.Equal(t, expectedVerifier, params[oauthVerifierParam])
- assert.Equal(t, expectedSignature, params[oauthSignatureParam])
- // additional OAuth parameters
- assert.Equal(t, expectedConsumerKey, params[oauthConsumerKeyParam])
- assert.Equal(t, expectedNonce, params[oauthNonceParam])
- assert.Equal(t, expectedTimestamp, params[oauthTimestampParam])
- assert.Equal(t, expectedVersion, params[oauthVersionParam])
- assert.Equal(t, expectedSignatureMethod, params[oauthSignatureMethodParam])
-}
-
-// example from https://dev.twitter.com/oauth/overview/authorizing-requests,
-// https://dev.twitter.com/oauth/overview/creating-signatures, and
-// https://dev.twitter.com/oauth/application-only
-var unixTimestampOfRequest int64 = 1318622958
-var expectedTwitterConsumerKey = "xvz1evFS4wEEPTGEFPHBog"
-var expectedTwitterOAuthToken = "370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb"
-var expectedNonce = "kYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg"
-var twitterConfig = &Config{
- ConsumerKey: expectedTwitterConsumerKey,
- ConsumerSecret: "kAcSOqF21Fu85e7zjz7ZN2U4ZRhfV3WpwPAoE3Z7kBw",
- Endpoint: Endpoint{
- RequestTokenURL: "https://api.twitter.com/oauth/request_token",
- AuthorizeURL: "https://api.twitter.com/oauth/authorize",
- AccessTokenURL: "https://api.twitter.com/oauth/access_token",
- },
-}
-
-func TestTwitterParameterString(t *testing.T) {
- auther := &auther{twitterConfig, &fixedClock{time.Unix(unixTimestampOfRequest, 0)}, &fixedNoncer{expectedNonce}}
- values := url.Values{}
- values.Add("status", "Hello Ladies + Gentlemen, a signed OAuth request!")
- // note: the reference example is old and uses api v1 in the URL
- req, err := http.NewRequest("post", "https://api.twitter.com/1/statuses/update.json?include_entities=true", strings.NewReader(values.Encode()))
- assert.Nil(t, err)
- req.Header.Set(contentType, formContentType)
- oauthParams := auther.commonOAuthParams()
- oauthParams[oauthTokenParam] = expectedTwitterOAuthToken
- params, err := collectParameters(req, oauthParams)
- // assert that the parameter string matches the reference
- expectedParameterString := "include_entities=true&oauth_consumer_key=xvz1evFS4wEEPTGEFPHBog&oauth_nonce=kYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg&oauth_signature_method=HMAC-SHA1&oauth_timestamp=1318622958&oauth_token=370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb&oauth_version=1.0&status=Hello%20Ladies%20%2B%20Gentlemen%2C%20a%20signed%20OAuth%20request%21"
- assert.Nil(t, err)
- assert.Equal(t, expectedParameterString, normalizedParameterString(params))
-}
-
-func TestTwitterSignatureBase(t *testing.T) {
- auther := &auther{twitterConfig, &fixedClock{time.Unix(unixTimestampOfRequest, 0)}, &fixedNoncer{expectedNonce}}
- values := url.Values{}
- values.Add("status", "Hello Ladies + Gentlemen, a signed OAuth request!")
- // note: the reference example is old and uses api v1 in the URL
- req, err := http.NewRequest("post", "https://api.twitter.com/1/statuses/update.json?include_entities=true", strings.NewReader(values.Encode()))
- assert.Nil(t, err)
- req.Header.Set(contentType, formContentType)
- oauthParams := auther.commonOAuthParams()
- oauthParams[oauthTokenParam] = expectedTwitterOAuthToken
- params, err := collectParameters(req, oauthParams)
- signatureBase := signatureBase(req, params)
- // assert that the signature base string matches the reference
- // checks that method is uppercased, url is encoded, parameter string is added, all joined by &
- expectedSignatureBase := "POST&https%3A%2F%2Fapi.twitter.com%2F1%2Fstatuses%2Fupdate.json&include_entities%3Dtrue%26oauth_consumer_key%3Dxvz1evFS4wEEPTGEFPHBog%26oauth_nonce%3DkYjzVBB8Y0ZFabxSWbWovY3uYSQ2pTgmZeNu2VS4cg%26oauth_signature_method%3DHMAC-SHA1%26oauth_timestamp%3D1318622958%26oauth_token%3D370773112-GmHxMAgYyLbNEtIKZeRNFsMKPR9EyMZeS9weJAEb%26oauth_version%3D1.0%26status%3DHello%2520Ladies%2520%252B%2520Gentlemen%252C%2520a%2520signed%2520OAuth%2520request%2521"
- assert.Nil(t, err)
- assert.Equal(t, expectedSignatureBase, signatureBase)
-}
-
-func TestTwitterRequestAuthHeader(t *testing.T) {
- oauthTokenSecret := "LswwdoUaIvS8ltyTt5jkRh4J50vUPVVHtR2YPi5kE"
- expectedSignature := PercentEncode("tnnArxj06cWHq44gCs1OSKk/jLY=")
- expectedTimestamp := "1318622958"
-
- auther := &auther{twitterConfig, &fixedClock{time.Unix(unixTimestampOfRequest, 0)}, &fixedNoncer{expectedNonce}}
- values := url.Values{}
- values.Add("status", "Hello Ladies + Gentlemen, a signed OAuth request!")
-
- accessToken := &Token{expectedTwitterOAuthToken, oauthTokenSecret}
- req, err := http.NewRequest("POST", "https://api.twitter.com/1/statuses/update.json?include_entities=true", strings.NewReader(values.Encode()))
- assert.Nil(t, err)
- req.Header.Set(contentType, formContentType)
- err = auther.setRequestAuthHeader(req, accessToken)
- // assert that request is signed and has an access token token
- assert.Nil(t, err)
- params := parseOAuthParamsOrFail(t, req.Header.Get(authorizationHeaderParam))
- assert.Equal(t, expectedTwitterOAuthToken, params[oauthTokenParam])
- assert.Equal(t, expectedSignature, params[oauthSignatureParam])
- // additional OAuth parameters
- assert.Equal(t, expectedTwitterConsumerKey, params[oauthConsumerKeyParam])
- assert.Equal(t, expectedNonce, params[oauthNonceParam])
- assert.Equal(t, expectedSignatureMethod, params[oauthSignatureMethodParam])
- assert.Equal(t, expectedTimestamp, params[oauthTimestampParam])
- assert.Equal(t, expectedVersion, params[oauthVersionParam])
-}
-
-func parseOAuthParamsOrFail(t *testing.T, authHeader string) map[string]string {
- if !strings.HasPrefix(authHeader, authorizationPrefix) {
- assert.Fail(t, fmt.Sprintf("Expected Authorization header to start with \"%s\", got \"%s\"", authorizationPrefix, authHeader[:len(authorizationPrefix)+1]))
- }
- params := map[string]string{}
- for _, pairStr := range strings.Split(authHeader[len(authorizationPrefix):], ", ") {
- pair := strings.Split(pairStr, "=")
- if len(pair) != 2 {
- assert.Fail(t, "Error parsing OAuth parameter %s", pairStr)
- }
- params[pair[0]] = strings.Replace(pair[1], "\"", "", -1)
- }
- return params
-}
-
-type fixedClock struct {
- now time.Time
-}
-
-func (c *fixedClock) Now() time.Time {
- return c.now
-}
-
-type fixedNoncer struct {
- nonce string
-}
-
-func (n *fixedNoncer) Nonce() string {
- return n.nonce
-}
diff --git a/vendor/github.com/dghubble/oauth1/signer.go b/vendor/github.com/dghubble/oauth1/signer.go
deleted file mode 100644
index 341c85929..000000000
--- a/vendor/github.com/dghubble/oauth1/signer.go
+++ /dev/null
@@ -1,62 +0,0 @@
-package oauth1
-
-import (
- "crypto"
- "crypto/hmac"
- "crypto/rand"
- "crypto/rsa"
- "crypto/sha1"
- "encoding/base64"
- "strings"
-)
-
-// A Signer signs messages to create signed OAuth1 Requests.
-type Signer interface {
- // Name returns the name of the signing method.
- Name() string
- // Sign signs the message using the given secret key.
- Sign(key string, message string) (string, error)
-}
-
-// HMACSigner signs messages with an HMAC SHA1 digest, using the concatenated
-// consumer secret and token secret as the key.
-type HMACSigner struct {
- ConsumerSecret string
-}
-
-// Name returns the HMAC-SHA1 method.
-func (s *HMACSigner) Name() string {
- return "HMAC-SHA1"
-}
-
-// Sign creates a concatenated consumer and token secret key and calculates
-// the HMAC digest of the message. Returns the base64 encoded digest bytes.
-func (s *HMACSigner) Sign(tokenSecret, message string) (string, error) {
- signingKey := strings.Join([]string{s.ConsumerSecret, tokenSecret}, "&")
- mac := hmac.New(sha1.New, []byte(signingKey))
- mac.Write([]byte(message))
- signatureBytes := mac.Sum(nil)
- return base64.StdEncoding.EncodeToString(signatureBytes), nil
-}
-
-// RSASigner RSA PKCS1-v1_5 signs SHA1 digests of messages using the given
-// RSA private key.
-type RSASigner struct {
- PrivateKey *rsa.PrivateKey
-}
-
-// Name returns the RSA-SHA1 method.
-func (s *RSASigner) Name() string {
- return "RSA-SHA1"
-}
-
-// Sign uses RSA PKCS1-v1_5 to sign a SHA1 digest of the given message. The
-// tokenSecret is not used with this signing scheme.
-func (s *RSASigner) Sign(tokenSecret, message string) (string, error) {
- digest := sha1.Sum([]byte(message))
- signature, err := rsa.SignPKCS1v15(rand.Reader, s.PrivateKey, crypto.SHA1, digest[:])
- if err != nil {
- return "", err
- }
- return base64.StdEncoding.EncodeToString(signature), nil
-}
diff --git a/vendor/github.com/dghubble/oauth1/test b/vendor/github.com/dghubble/oauth1/test
deleted file mode 100755
index b37bf4d6b..000000000
--- a/vendor/github.com/dghubble/oauth1/test
+++ /dev/null
@@ -1,23 +0,0 @@
-#!/usr/bin/env bash
-set -e
-
-PKGS=$(go list ./... | grep -v /examples)
-FORMATTABLE="$(find . -maxdepth 1 -type d)"
-LINTABLE=$(go list ./...)
-
-go test $PKGS -cover
-go vet $PKGS
-
-echo "Checking gofmt..."
-fmtRes=$(gofmt -l $FORMATTABLE)
-if [ -n "${fmtRes}" ]; then
- echo -e "gofmt checking failed:\n${fmtRes}"
- exit 2
-fi
-
-echo "Checking golint..."
-lintRes=$(echo $LINTABLE | xargs -n 1 golint)
-if [ -n "${lintRes}" ]; then
- echo -e "golint checking failed:\n${lintRes}"
- exit 2
-fi
diff --git a/vendor/github.com/dghubble/oauth1/token.go b/vendor/github.com/dghubble/oauth1/token.go
deleted file mode 100644
index d010d2fcc..000000000
--- a/vendor/github.com/dghubble/oauth1/token.go
+++ /dev/null
@@ -1,43 +0,0 @@
-package oauth1
-
-import (
- "errors"
-)
-
-// A TokenSource can return a Token.
-type TokenSource interface {
- Token() (*Token, error)
-}
-
-// Token is an AccessToken (token credential) which allows a consumer (client)
-// to access resources from an OAuth1 provider server.
-type Token struct {
- Token string
- TokenSecret string
-}
-
-// NewToken returns a new Token with the given token and token secret.
-func NewToken(token, tokenSecret string) *Token {
- return &Token{
- Token: token,
- TokenSecret: tokenSecret,
- }
-}
-
-// StaticTokenSource returns a TokenSource which always returns the same Token.
-// This is appropriate for tokens which do not have a time expiration.
-func StaticTokenSource(token *Token) TokenSource {
- return staticTokenSource{token}
-}
-
-// staticTokenSource is a TokenSource that always returns the same Token.
-type staticTokenSource struct {
- token *Token
-}
-
-func (s staticTokenSource) Token() (*Token, error) {
- if s.token == nil {
- return nil, errors.New("oauth1: Token is nil")
- }
- return s.token, nil
-}
diff --git a/vendor/github.com/dghubble/oauth1/token_test.go b/vendor/github.com/dghubble/oauth1/token_test.go
deleted file mode 100644
index 140dc4517..000000000
--- a/vendor/github.com/dghubble/oauth1/token_test.go
+++ /dev/null
@@ -1,31 +0,0 @@
-package oauth1
-
-import (
- "testing"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestNewToken(t *testing.T) {
- expectedToken := "token"
- expectedSecret := "secret"
- tk := NewToken(expectedToken, expectedSecret)
- assert.Equal(t, expectedToken, tk.Token)
- assert.Equal(t, expectedSecret, tk.TokenSecret)
-}
-
-func TestStaticTokenSource(t *testing.T) {
- ts := StaticTokenSource(NewToken("t", "s"))
- tk, err := ts.Token()
- assert.Nil(t, err)
- assert.Equal(t, "t", tk.Token)
-}
-
-func TestStaticTokenSourceEmpty(t *testing.T) {
- ts := StaticTokenSource(nil)
- tk, err := ts.Token()
- assert.Nil(t, tk)
- if assert.Error(t, err) {
- assert.Equal(t, "oauth1: Token is nil", err.Error())
- }
-}
diff --git a/vendor/github.com/dghubble/oauth1/transport.go b/vendor/github.com/dghubble/oauth1/transport.go
deleted file mode 100644
index c1af9937e..000000000
--- a/vendor/github.com/dghubble/oauth1/transport.go
+++ /dev/null
@@ -1,65 +0,0 @@
-package oauth1
-
-import (
- "fmt"
- "net/http"
-)
-
-// Transport is an http.RoundTripper which makes OAuth1 HTTP requests. It
-// wraps a base RoundTripper and adds an Authorization header using the
-// token from a TokenSource.
-//
-// Transport is a low-level component, most users should use Config to create
-// an http.Client instead.
-type Transport struct {
- // Base is the base RoundTripper used to make HTTP requests. If nil, then
- // http.DefaultTransport is used
- Base http.RoundTripper
- // source supplies the token to use when signing a request
- source TokenSource
- // auther adds OAuth1 Authorization headers to requests
- auther *auther
-}
-
-// RoundTrip authorizes the request with a signed OAuth1 Authorization header
-// using the auther and TokenSource.
-func (t *Transport) RoundTrip(req *http.Request) (*http.Response, error) {
- if t.source == nil {
- return nil, fmt.Errorf("oauth1: Transport's source is nil")
- }
- accessToken, err := t.source.Token()
- if err != nil {
- return nil, err
- }
- if t.auther == nil {
- return nil, fmt.Errorf("oauth1: Transport's auther is nil")
- }
- // RoundTripper should not modify the given request, clone it
- req2 := cloneRequest(req)
- err = t.auther.setRequestAuthHeader(req2, accessToken)
- if err != nil {
- return nil, err
- }
- return t.base().RoundTrip(req2)
-}
-
-func (t *Transport) base() http.RoundTripper {
- if t.Base != nil {
- return t.Base
- }
- return http.DefaultTransport
-}
-
-// cloneRequest returns a clone of the given *http.Request with a shallow
-// copy of struct fields and a deep copy of the Header map.
-func cloneRequest(req *http.Request) *http.Request {
- // shallow copy the struct
- r2 := new(http.Request)
- *r2 = *req
- // deep copy Header so setting a header on the clone does not affect original
- r2.Header = make(http.Header, len(req.Header))
- for k, s := range req.Header {
- r2.Header[k] = append([]string(nil), s...)
- }
- return r2
-}
diff --git a/vendor/github.com/dghubble/oauth1/transport_test.go b/vendor/github.com/dghubble/oauth1/transport_test.go
deleted file mode 100644
index 4a6fef5f7..000000000
--- a/vendor/github.com/dghubble/oauth1/transport_test.go
+++ /dev/null
@@ -1,117 +0,0 @@
-package oauth1
-
-import (
- "net/http"
- "net/http/httptest"
- "testing"
- "time"
-
- "github.com/stretchr/testify/assert"
-)
-
-func TestTransport(t *testing.T) {
- const (
- expectedToken = "access_token"
- expectedConsumerKey = "consumer_key"
- expectedNonce = "some_nonce"
- expectedSignatureMethod = "HMAC-SHA1"
- expectedTimestamp = "123456789"
- )
- server := newMockServer(func(w http.ResponseWriter, req *http.Request) {
- params := parseOAuthParamsOrFail(t, req.Header.Get("Authorization"))
- assert.Equal(t, expectedToken, params[oauthTokenParam])
- assert.Equal(t, expectedConsumerKey, params[oauthConsumerKeyParam])
- assert.Equal(t, expectedNonce, params[oauthNonceParam])
- assert.Equal(t, expectedSignatureMethod, params[oauthSignatureMethodParam])
- assert.Equal(t, expectedTimestamp, params[oauthTimestampParam])
- assert.Equal(t, defaultOauthVersion, params[oauthVersionParam])
- // oauth_signature will vary, httptest.Server uses a random port
- })
- defer server.Close()
-
- config := &Config{
- ConsumerKey: expectedConsumerKey,
- ConsumerSecret: "consumer_secret",
- }
- auther := &auther{
- config: config,
- clock: &fixedClock{time.Unix(123456789, 0)},
- noncer: &fixedNoncer{expectedNonce},
- }
- tr := &Transport{
- source: StaticTokenSource(NewToken(expectedToken, "some_secret")),
- auther: auther,
- }
- client := &http.Client{Transport: tr}
-
- req, err := http.NewRequest("GET", server.URL, nil)
- assert.Nil(t, err)
- _, err = client.Do(req)
- assert.Nil(t, err)
-}
-
-func TestTransport_defaultBaseTransport(t *testing.T) {
- tr := &Transport{
- Base: nil,
- }
- assert.Equal(t, http.DefaultTransport, tr.base())
-}
-
-func TestTransport_customBaseTransport(t *testing.T) {
- expected := &http.Transport{}
- tr := &Transport{
- Base: expected,
- }
- assert.Equal(t, expected, tr.base())
-}
-
-func TestTransport_nilSource(t *testing.T) {
- tr := &Transport{
- source: nil,
- auther: &auther{
- config: &Config{},
- clock: &fixedClock{time.Unix(123456789, 0)},
- noncer: &fixedNoncer{"any_nonce"},
- },
- }
- client := &http.Client{Transport: tr}
- resp, err := client.Get("http://example.com")
- assert.Nil(t, resp)
- if assert.Error(t, err) {
- assert.Equal(t, "Get http://example.com: oauth1: Transport's source is nil", err.Error())
- }
-}
-
-func TestTransport_emptySource(t *testing.T) {
- tr := &Transport{
- source: StaticTokenSource(nil),
- auther: &auther{
- config: &Config{},
- clock: &fixedClock{time.Unix(123456789, 0)},
- noncer: &fixedNoncer{"any_nonce"},
- },
- }
- client := &http.Client{Transport: tr}
- resp, err := client.Get("http://example.com")
- assert.Nil(t, resp)
- if assert.Error(t, err) {
- assert.Equal(t, "Get http://example.com: oauth1: Token is nil", err.Error())
- }
-}
-
-func TestTransport_nilAuther(t *testing.T) {
- tr := &Transport{
- source: StaticTokenSource(&Token{}),
- auther: nil,
- }
- client := &http.Client{Transport: tr}
- resp, err := client.Get("http://example.com")
- assert.Nil(t, resp)
- if assert.Error(t, err) {
- assert.Equal(t, "Get http://example.com: oauth1: Transport's auther is nil", err.Error())
- }
-}
-
-func newMockServer(handler func(w http.ResponseWriter, r *http.Request)) *httptest.Server {
- return httptest.NewServer(http.HandlerFunc(handler))
-}
diff --git a/vendor/github.com/dghubble/oauth1/tumblr/tumblr.go b/vendor/github.com/dghubble/oauth1/tumblr/tumblr.go
deleted file mode 100644
index 5c020ca75..000000000
--- a/vendor/github.com/dghubble/oauth1/tumblr/tumblr.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Package tumblr provides constants for using OAuth 1 to access Tumblr.
-package tumblr
-
-import (
- "github.com/dghubble/oauth1"
-)
-
-// Endpoint is Tumblr's OAuth 1a endpoint.
-var Endpoint = oauth1.Endpoint{
- RequestTokenURL: "http://www.tumblr.com/oauth/request_token",
- AuthorizeURL: "http://www.tumblr.com/oauth/authorize",
- AccessTokenURL: "http://www.tumblr.com/oauth/access_token",
-}
diff --git a/vendor/github.com/dghubble/oauth1/twitter/twitter.go b/vendor/github.com/dghubble/oauth1/twitter/twitter.go
deleted file mode 100644
index ffb0ea61f..000000000
--- a/vendor/github.com/dghubble/oauth1/twitter/twitter.go
+++ /dev/null
@@ -1,25 +0,0 @@
-// Package twitter provides constants for using OAuth1 to access Twitter.
-package twitter
-
-import (
- "github.com/dghubble/oauth1"
-)
-
-// AuthenticateEndpoint is Twitter's OAuth 1 endpoint which uses the
-// oauth/authenticate AuthorizeURL redirect. Logged in users who have granted
-// access are immediately authenticated and redirected to the callback URL.
-var AuthenticateEndpoint = oauth1.Endpoint{
- RequestTokenURL: "https://api.twitter.com/oauth/request_token",
- AuthorizeURL: "https://api.twitter.com/oauth/authenticate",
- AccessTokenURL: "https://api.twitter.com/oauth/access_token",
-}
-
-// AuthorizeEndpoint is Twitter's OAuth 1 endpoint which uses the
-// oauth/authorize AuthorizeURL redirect. Note that this requires users who
-// have granted access previously, to re-grant access at AuthorizeURL.
-// Prefer AuthenticateEndpoint over AuthorizeEndpoint if you are unsure.
-var AuthorizeEndpoint = oauth1.Endpoint{
- RequestTokenURL: "https://api.twitter.com/oauth/request_token",
- AuthorizeURL: "https://api.twitter.com/oauth/authorize",
- AccessTokenURL: "https://api.twitter.com/oauth/access_token",
-}
diff --git a/vendor/github.com/dghubble/oauth1/xing/xing.go b/vendor/github.com/dghubble/oauth1/xing/xing.go
deleted file mode 100644
index be47c5f0e..000000000
--- a/vendor/github.com/dghubble/oauth1/xing/xing.go
+++ /dev/null
@@ -1,13 +0,0 @@
-// Package xing provides constants for using OAuth1 to access Xing.
-package xing
-
-import (
- "github.com/dghubble/oauth1"
-)
-
-// Endpoint is Xing's OAuth 1 endpoint.
-var Endpoint = oauth1.Endpoint{
- RequestTokenURL: "https://api.xing.com/v1/request_token",
- AuthorizeURL: "https://api.xing.com/v1/authorize",
- AccessTokenURL: "https://api.xing.com/v1/access_token",
-}
diff --git a/vendor/github.com/dgrijalva/jwt-go/.gitignore b/vendor/github.com/dgrijalva/jwt-go/.gitignore
deleted file mode 100644
index 80bed650e..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/.gitignore
+++ /dev/null
@@ -1,4 +0,0 @@
-.DS_Store
-bin
-
-
diff --git a/vendor/github.com/dgrijalva/jwt-go/.travis.yml b/vendor/github.com/dgrijalva/jwt-go/.travis.yml
deleted file mode 100644
index 1027f56cd..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/.travis.yml
+++ /dev/null
@@ -1,13 +0,0 @@
-language: go
-
-script:
- - go vet ./...
- - go test -v ./...
-
-go:
- - 1.3
- - 1.4
- - 1.5
- - 1.6
- - 1.7
- - tip
diff --git a/vendor/github.com/dgrijalva/jwt-go/LICENSE b/vendor/github.com/dgrijalva/jwt-go/LICENSE
deleted file mode 100644
index df83a9c2f..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/LICENSE
+++ /dev/null
@@ -1,8 +0,0 @@
-Copyright (c) 2012 Dave Grijalva
-
-Permission is hereby granted, free of charge, to any person obtaining a copy of this software and associated documentation files (the "Software"), to deal in the Software without restriction, including without limitation the rights to use, copy, modify, merge, publish, distribute, sublicense, and/or sell copies of the Software, and to permit persons to whom the Software is furnished to do so, subject to the following conditions:
-
-The above copyright notice and this permission notice shall be included in all copies or substantial portions of the Software.
-
-THE SOFTWARE IS PROVIDED "AS IS", WITHOUT WARRANTY OF ANY KIND, EXPRESS OR IMPLIED, INCLUDING BUT NOT LIMITED TO THE WARRANTIES OF MERCHANTABILITY, FITNESS FOR A PARTICULAR PURPOSE AND NONINFRINGEMENT. IN NO EVENT SHALL THE AUTHORS OR COPYRIGHT HOLDERS BE LIABLE FOR ANY CLAIM, DAMAGES OR OTHER LIABILITY, WHETHER IN AN ACTION OF CONTRACT, TORT OR OTHERWISE, ARISING FROM, OUT OF OR IN CONNECTION WITH THE SOFTWARE OR THE USE OR OTHER DEALINGS IN THE SOFTWARE.
-
diff --git a/vendor/github.com/dgrijalva/jwt-go/MIGRATION_GUIDE.md b/vendor/github.com/dgrijalva/jwt-go/MIGRATION_GUIDE.md
deleted file mode 100644
index 7fc1f793c..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/MIGRATION_GUIDE.md
+++ /dev/null
@@ -1,97 +0,0 @@
-## Migration Guide from v2 -> v3
-
-Version 3 adds several new, frequently requested features. To do so, it introduces a few breaking changes. We've worked to keep these as minimal as possible. This guide explains the breaking changes and how you can quickly update your code.
-
-### `Token.Claims` is now an interface type
-
-The most requested feature from the 2.0 verison of this library was the ability to provide a custom type to the JSON parser for claims. This was implemented by introducing a new interface, `Claims`, to replace `map[string]interface{}`. We also included two concrete implementations of `Claims`: `MapClaims` and `StandardClaims`.
-
-`MapClaims` is an alias for `map[string]interface{}` with built in validation behavior. It is the default claims type when using `Parse`. The usage is unchanged except you must type cast the claims property.
-
-The old example for parsing a token looked like this..
-
-```go
- if token, err := jwt.Parse(tokenString, keyLookupFunc); err == nil {
- fmt.Printf("Token for user %v expires %v", token.Claims["user"], token.Claims["exp"])
- }
-```
-
-is now directly mapped to...
-
-```go
- if token, err := jwt.Parse(tokenString, keyLookupFunc); err == nil {
- claims := token.Claims.(jwt.MapClaims)
- fmt.Printf("Token for user %v expires %v", claims["user"], claims["exp"])
- }
-```
-
-`StandardClaims` is designed to be embedded in your custom type. You can supply a custom claims type with the new `ParseWithClaims` function. Here's an example of using a custom claims type.
-
-```go
- type MyCustomClaims struct {
- User string
- *StandardClaims
- }
-
- if token, err := jwt.ParseWithClaims(tokenString, &MyCustomClaims{}, keyLookupFunc); err == nil {
- claims := token.Claims.(*MyCustomClaims)
- fmt.Printf("Token for user %v expires %v", claims.User, claims.StandardClaims.ExpiresAt)
- }
-```
-
-### `ParseFromRequest` has been moved
-
-To keep this library focused on the tokens without becoming overburdened with complex request processing logic, `ParseFromRequest` and its new companion `ParseFromRequestWithClaims` have been moved to a subpackage, `request`. The method signatues have also been augmented to receive a new argument: `Extractor`.
-
-`Extractors` do the work of picking the token string out of a request. The interface is simple and composable.
-
-This simple parsing example:
-
-```go
- if token, err := jwt.ParseFromRequest(tokenString, req, keyLookupFunc); err == nil {
- fmt.Printf("Token for user %v expires %v", token.Claims["user"], token.Claims["exp"])
- }
-```
-
-is directly mapped to:
-
-```go
- if token, err := request.ParseFromRequest(req, request.OAuth2Extractor, keyLookupFunc); err == nil {
- claims := token.Claims.(jwt.MapClaims)
- fmt.Printf("Token for user %v expires %v", claims["user"], claims["exp"])
- }
-```
-
-There are several concrete `Extractor` types provided for your convenience:
-
-* `HeaderExtractor` will search a list of headers until one contains content.
-* `ArgumentExtractor` will search a list of keys in request query and form arguments until one contains content.
-* `MultiExtractor` will try a list of `Extractors` in order until one returns content.
-* `AuthorizationHeaderExtractor` will look in the `Authorization` header for a `Bearer` token.
-* `OAuth2Extractor` searches the places an OAuth2 token would be specified (per the spec): `Authorization` header and `access_token` argument
-* `PostExtractionFilter` wraps an `Extractor`, allowing you to process the content before it's parsed. A simple example is stripping the `Bearer ` text from a header
-
-
-### RSA signing methods no longer accept `[]byte` keys
-
-Due to a [critical vulnerability](https://auth0.com/blog/2015/03/31/critical-vulnerabilities-in-json-web-token-libraries/), we've decided the convenience of accepting `[]byte` instead of `rsa.PublicKey` or `rsa.PrivateKey` isn't worth the risk of misuse.
-
-To replace this behavior, we've added two helper methods: `ParseRSAPrivateKeyFromPEM(key []byte) (*rsa.PrivateKey, error)` and `ParseRSAPublicKeyFromPEM(key []byte) (*rsa.PublicKey, error)`. These are just simple helpers for unpacking PEM encoded PKCS1 and PKCS8 keys. If your keys are encoded any other way, all you need to do is convert them to the `crypto/rsa` package's types.
-
-```go
- func keyLookupFunc(*Token) (interface{}, error) {
- // Don't forget to validate the alg is what you expect:
- if _, ok := token.Method.(*jwt.SigningMethodRSA); !ok {
- return nil, fmt.Errorf("Unexpected signing method: %v", token.Header["alg"])
- }
-
- // Look up key
- key, err := lookupPublicKey(token.Header["kid"])
- if err != nil {
- return nil, err
- }
-
- // Unpack key from PEM encoded PKCS8
- return jwt.ParseRSAPublicKeyFromPEM(key)
- }
-```
diff --git a/vendor/github.com/dgrijalva/jwt-go/README.md b/vendor/github.com/dgrijalva/jwt-go/README.md
deleted file mode 100644
index 25aec486c..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/README.md
+++ /dev/null
@@ -1,85 +0,0 @@
-A [go](http://www.golang.org) (or 'golang' for search engine friendliness) implementation of [JSON Web Tokens](http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html)
-
-[](https://travis-ci.org/dgrijalva/jwt-go)
-
-**BREAKING CHANGES:*** Version 3.0.0 is here. It includes _a lot_ of changes including a few that break the API. We've tried to break as few things as possible, so there should just be a few type signature changes. A full list of breaking changes is available in `VERSION_HISTORY.md`. See `MIGRATION_GUIDE.md` for more information on updating your code.
-
-**NOTICE:** It's important that you [validate the `alg` presented is what you expect](https://auth0.com/blog/2015/03/31/critical-vulnerabilities-in-json-web-token-libraries/). This library attempts to make it easy to do the right thing by requiring key types match the expected alg, but you should take the extra step to verify it in your usage. See the examples provided.
-
-
-## What the heck is a JWT?
-
-JWT.io has [a great introduction](https://jwt.io/introduction) to JSON Web Tokens.
-
-In short, it's a signed JSON object that does something useful (for example, authentication). It's commonly used for `Bearer` tokens in Oauth 2. A token is made of three parts, separated by `.`'s. The first two parts are JSON objects, that have been [base64url](http://tools.ietf.org/html/rfc4648) encoded. The last part is the signature, encoded the same way.
-
-The first part is called the header. It contains the necessary information for verifying the last part, the signature. For example, which encryption method was used for signing and what key was used.
-
-The part in the middle is the interesting bit. It's called the Claims and contains the actual stuff you care about. Refer to [the RFC](http://self-issued.info/docs/draft-jones-json-web-token.html) for information about reserved keys and the proper way to add your own.
-
-## What's in the box?
-
-This library supports the parsing and verification as well as the generation and signing of JWTs. Current supported signing algorithms are HMAC SHA, RSA, RSA-PSS, and ECDSA, though hooks are present for adding your own.
-
-## Examples
-
-See [the project documentation](https://godoc.org/github.com/dgrijalva/jwt-go) for examples of usage:
-
-* [Simple example of parsing and validating a token](https://godoc.org/github.com/dgrijalva/jwt-go#example-Parse--Hmac)
-* [Simple example of building and signing a token](https://godoc.org/github.com/dgrijalva/jwt-go#example-New--Hmac)
-* [Directory of Examples](https://godoc.org/github.com/dgrijalva/jwt-go#pkg-examples)
-
-## Extensions
-
-This library publishes all the necessary components for adding your own signing methods. Simply implement the `SigningMethod` interface and register a factory method using `RegisterSigningMethod`.
-
-Here's an example of an extension that integrates with the Google App Engine signing tools: https://github.com/someone1/gcp-jwt-go
-
-## Compliance
-
-This library was last reviewed to comply with [RTF 7519](http://www.rfc-editor.org/info/rfc7519) dated May 2015 with a few notable differences:
-
-* In order to protect against accidental use of [Unsecured JWTs](http://self-issued.info/docs/draft-ietf-oauth-json-web-token.html#UnsecuredJWT), tokens using `alg=none` will only be accepted if the constant `jwt.UnsafeAllowNoneSignatureType` is provided as the key.
-
-## Project Status & Versioning
-
-This library is considered production ready. Feedback and feature requests are appreciated. The API should be considered stable. There should be very few backwards-incompatible changes outside of major version updates (and only with good reason).
-
-This project uses [Semantic Versioning 2.0.0](http://semver.org). Accepted pull requests will land on `master`. Periodically, versions will be tagged from `master`. You can find all the releases on [the project releases page](https://github.com/dgrijalva/jwt-go/releases).
-
-While we try to make it obvious when we make breaking changes, there isn't a great mechanism for pushing announcements out to users. You may want to use this alternative package include: `gopkg.in/dgrijalva/jwt-go.v2`. It will do the right thing WRT semantic versioning.
-
-## Usage Tips
-
-### Signing vs Encryption
-
-A token is simply a JSON object that is signed by its author. this tells you exactly two things about the data:
-
-* The author of the token was in the possession of the signing secret
-* The data has not been modified since it was signed
-
-It's important to know that JWT does not provide encryption, which means anyone who has access to the token can read its contents. If you need to protect (encrypt) the data, there is a companion spec, `JWE`, that provides this functionality. JWE is currently outside the scope of this library.
-
-### Choosing a Signing Method
-
-There are several signing methods available, and you should probably take the time to learn about the various options before choosing one. The principal design decision is most likely going to be symmetric vs asymmetric.
-
-Symmetric signing methods, such as HSA, use only a single secret. This is probably the simplest signing method to use since any `[]byte` can be used as a valid secret. They are also slightly computationally faster to use, though this rarely is enough to matter. Symmetric signing methods work the best when both producers and consumers of tokens are trusted, or even the same system. Since the same secret is used to both sign and validate tokens, you can't easily distribute the key for validation.
-
-Asymmetric signing methods, such as RSA, use different keys for signing and verifying tokens. This makes it possible to produce tokens with a private key, and allow any consumer to access the public key for verification.
-
-### JWT and OAuth
-
-It's worth mentioning that OAuth and JWT are not the same thing. A JWT token is simply a signed JSON object. It can be used anywhere such a thing is useful. There is some confusion, though, as JWT is the most common type of bearer token used in OAuth2 authentication.
-
-Without going too far down the rabbit hole, here's a description of the interaction of these technologies:
-
-* OAuth is a protocol for allowing an identity provider to be separate from the service a user is logging in to. For example, whenever you use Facebook to log into a different service (Yelp, Spotify, etc), you are using OAuth.
-* OAuth defines several options for passing around authentication data. One popular method is called a "bearer token". A bearer token is simply a string that _should_ only be held by an authenticated user. Thus, simply presenting this token proves your identity. You can probably derive from here why a JWT might make a good bearer token.
-* Because bearer tokens are used for authentication, it's important they're kept secret. This is why transactions that use bearer tokens typically happen over SSL.
-
-## More
-
-Documentation can be found [on godoc.org](http://godoc.org/github.com/dgrijalva/jwt-go).
-
-The command line utility included in this project (cmd/jwt) provides a straightforward example of token creation and parsing as well as a useful tool for debugging your own integration. You'll also find several implementation examples in the documentation.
diff --git a/vendor/github.com/dgrijalva/jwt-go/VERSION_HISTORY.md b/vendor/github.com/dgrijalva/jwt-go/VERSION_HISTORY.md
deleted file mode 100644
index b605b4509..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/VERSION_HISTORY.md
+++ /dev/null
@@ -1,105 +0,0 @@
-## `jwt-go` Version History
-
-#### 3.0.0
-
-* **Compatibility Breaking Changes**: See MIGRATION_GUIDE.md for tips on updating your code
- * Dropped support for `[]byte` keys when using RSA signing methods. This convenience feature could contribute to security vulnerabilities involving mismatched key types with signing methods.
- * `ParseFromRequest` has been moved to `request` subpackage and usage has changed
- * The `Claims` property on `Token` is now type `Claims` instead of `map[string]interface{}`. The default value is type `MapClaims`, which is an alias to `map[string]interface{}`. This makes it possible to use a custom type when decoding claims.
-* Other Additions and Changes
- * Added `Claims` interface type to allow users to decode the claims into a custom type
- * Added `ParseWithClaims`, which takes a third argument of type `Claims`. Use this function instead of `Parse` if you have a custom type you'd like to decode into.
- * Dramatically improved the functionality and flexibility of `ParseFromRequest`, which is now in the `request` subpackage
- * Added `ParseFromRequestWithClaims` which is the `FromRequest` equivalent of `ParseWithClaims`
- * Added new interface type `Extractor`, which is used for extracting JWT strings from http requests. Used with `ParseFromRequest` and `ParseFromRequestWithClaims`.
- * Added several new, more specific, validation errors to error type bitmask
- * Moved examples from README to executable example files
- * Signing method registry is now thread safe
- * Added new property to `ValidationError`, which contains the raw error returned by calls made by parse/verify (such as those returned by keyfunc or json parser)
-
-#### 2.7.0
-
-This will likely be the last backwards compatible release before 3.0.0, excluding essential bug fixes.
-
-* Added new option `-show` to the `jwt` command that will just output the decoded token without verifying
-* Error text for expired tokens includes how long it's been expired
-* Fixed incorrect error returned from `ParseRSAPublicKeyFromPEM`
-* Documentation updates
-
-#### 2.6.0
-
-* Exposed inner error within ValidationError
-* Fixed validation errors when using UseJSONNumber flag
-* Added several unit tests
-
-#### 2.5.0
-
-* Added support for signing method none. You shouldn't use this. The API tries to make this clear.
-* Updated/fixed some documentation
-* Added more helpful error message when trying to parse tokens that begin with `BEARER `
-
-#### 2.4.0
-
-* Added new type, Parser, to allow for configuration of various parsing parameters
- * You can now specify a list of valid signing methods. Anything outside this set will be rejected.
- * You can now opt to use the `json.Number` type instead of `float64` when parsing token JSON
-* Added support for [Travis CI](https://travis-ci.org/dgrijalva/jwt-go)
-* Fixed some bugs with ECDSA parsing
-
-#### 2.3.0
-
-* Added support for ECDSA signing methods
-* Added support for RSA PSS signing methods (requires go v1.4)
-
-#### 2.2.0
-
-* Gracefully handle a `nil` `Keyfunc` being passed to `Parse`. Result will now be the parsed token and an error, instead of a panic.
-
-#### 2.1.0
-
-Backwards compatible API change that was missed in 2.0.0.
-
-* The `SignedString` method on `Token` now takes `interface{}` instead of `[]byte`
-
-#### 2.0.0
-
-There were two major reasons for breaking backwards compatibility with this update. The first was a refactor required to expand the width of the RSA and HMAC-SHA signing implementations. There will likely be no required code changes to support this change.
-
-The second update, while unfortunately requiring a small change in integration, is required to open up this library to other signing methods. Not all keys used for all signing methods have a single standard on-disk representation. Requiring `[]byte` as the type for all keys proved too limiting. Additionally, this implementation allows for pre-parsed tokens to be reused, which might matter in an application that parses a high volume of tokens with a small set of keys. Backwards compatibilty has been maintained for passing `[]byte` to the RSA signing methods, but they will also accept `*rsa.PublicKey` and `*rsa.PrivateKey`.
-
-It is likely the only integration change required here will be to change `func(t *jwt.Token) ([]byte, error)` to `func(t *jwt.Token) (interface{}, error)` when calling `Parse`.
-
-* **Compatibility Breaking Changes**
- * `SigningMethodHS256` is now `*SigningMethodHMAC` instead of `type struct`
- * `SigningMethodRS256` is now `*SigningMethodRSA` instead of `type struct`
- * `KeyFunc` now returns `interface{}` instead of `[]byte`
- * `SigningMethod.Sign` now takes `interface{}` instead of `[]byte` for the key
- * `SigningMethod.Verify` now takes `interface{}` instead of `[]byte` for the key
-* Renamed type `SigningMethodHS256` to `SigningMethodHMAC`. Specific sizes are now just instances of this type.
- * Added public package global `SigningMethodHS256`
- * Added public package global `SigningMethodHS384`
- * Added public package global `SigningMethodHS512`
-* Renamed type `SigningMethodRS256` to `SigningMethodRSA`. Specific sizes are now just instances of this type.
- * Added public package global `SigningMethodRS256`
- * Added public package global `SigningMethodRS384`
- * Added public package global `SigningMethodRS512`
-* Moved sample private key for HMAC tests from an inline value to a file on disk. Value is unchanged.
-* Refactored the RSA implementation to be easier to read
-* Exposed helper methods `ParseRSAPrivateKeyFromPEM` and `ParseRSAPublicKeyFromPEM`
-
-#### 1.0.2
-
-* Fixed bug in parsing public keys from certificates
-* Added more tests around the parsing of keys for RS256
-* Code refactoring in RS256 implementation. No functional changes
-
-#### 1.0.1
-
-* Fixed panic if RS256 signing method was passed an invalid key
-
-#### 1.0.0
-
-* First versioned release
-* API stabilized
-* Supports creating, signing, parsing, and validating JWT tokens
-* Supports RS256 and HS256 signing methods
\ No newline at end of file
diff --git a/vendor/github.com/dgrijalva/jwt-go/claims.go b/vendor/github.com/dgrijalva/jwt-go/claims.go
deleted file mode 100644
index f0228f02e..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/claims.go
+++ /dev/null
@@ -1,134 +0,0 @@
-package jwt
-
-import (
- "crypto/subtle"
- "fmt"
- "time"
-)
-
-// For a type to be a Claims object, it must just have a Valid method that determines
-// if the token is invalid for any supported reason
-type Claims interface {
- Valid() error
-}
-
-// Structured version of Claims Section, as referenced at
-// https://tools.ietf.org/html/rfc7519#section-4.1
-// See examples for how to use this with your own claim types
-type StandardClaims struct {
- Audience string `json:"aud,omitempty"`
- ExpiresAt int64 `json:"exp,omitempty"`
- Id string `json:"jti,omitempty"`
- IssuedAt int64 `json:"iat,omitempty"`
- Issuer string `json:"iss,omitempty"`
- NotBefore int64 `json:"nbf,omitempty"`
- Subject string `json:"sub,omitempty"`
-}
-
-// Validates time based claims "exp, iat, nbf".
-// There is no accounting for clock skew.
-// As well, if any of the above claims are not in the token, it will still
-// be considered a valid claim.
-func (c StandardClaims) Valid() error {
- vErr := new(ValidationError)
- now := TimeFunc().Unix()
-
- // The claims below are optional, by default, so if they are set to the
- // default value in Go, let's not fail the verification for them.
- if c.VerifyExpiresAt(now, false) == false {
- delta := time.Unix(now, 0).Sub(time.Unix(c.ExpiresAt, 0))
- vErr.Inner = fmt.Errorf("token is expired by %v", delta)
- vErr.Errors |= ValidationErrorExpired
- }
-
- if c.VerifyIssuedAt(now, false) == false {
- vErr.Inner = fmt.Errorf("Token used before issued")
- vErr.Errors |= ValidationErrorIssuedAt
- }
-
- if c.VerifyNotBefore(now, false) == false {
- vErr.Inner = fmt.Errorf("token is not valid yet")
- vErr.Errors |= ValidationErrorNotValidYet
- }
-
- if vErr.valid() {
- return nil
- }
-
- return vErr
-}
-
-// Compares the aud claim against cmp.
-// If required is false, this method will return true if the value matches or is unset
-func (c *StandardClaims) VerifyAudience(cmp string, req bool) bool {
- return verifyAud(c.Audience, cmp, req)
-}
-
-// Compares the exp claim against cmp.
-// If required is false, this method will return true if the value matches or is unset
-func (c *StandardClaims) VerifyExpiresAt(cmp int64, req bool) bool {
- return verifyExp(c.ExpiresAt, cmp, req)
-}
-
-// Compares the iat claim against cmp.
-// If required is false, this method will return true if the value matches or is unset
-func (c *StandardClaims) VerifyIssuedAt(cmp int64, req bool) bool {
- return verifyIat(c.IssuedAt, cmp, req)
-}
-
-// Compares the iss claim against cmp.
-// If required is false, this method will return true if the value matches or is unset
-func (c *StandardClaims) VerifyIssuer(cmp string, req bool) bool {
- return verifyIss(c.Issuer, cmp, req)
-}
-
-// Compares the nbf claim against cmp.
-// If required is false, this method will return true if the value matches or is unset
-func (c *StandardClaims) VerifyNotBefore(cmp int64, req bool) bool {
- return verifyNbf(c.NotBefore, cmp, req)
-}
-
-// ----- helpers
-
-func verifyAud(aud string, cmp string, required bool) bool {
- if aud == "" {
- return !required
- }
- if subtle.ConstantTimeCompare([]byte(aud), []byte(cmp)) != 0 {
- return true
- } else {
- return false
- }
-}
-
-func verifyExp(exp int64, now int64, required bool) bool {
- if exp == 0 {
- return !required
- }
- return now <= exp
-}
-
-func verifyIat(iat int64, now int64, required bool) bool {
- if iat == 0 {
- return !required
- }
- return now >= iat
-}
-
-func verifyIss(iss string, cmp string, required bool) bool {
- if iss == "" {
- return !required
- }
- if subtle.ConstantTimeCompare([]byte(iss), []byte(cmp)) != 0 {
- return true
- } else {
- return false
- }
-}
-
-func verifyNbf(nbf int64, now int64, required bool) bool {
- if nbf == 0 {
- return !required
- }
- return now >= nbf
-}
diff --git a/vendor/github.com/dgrijalva/jwt-go/cmd/jwt/README.md b/vendor/github.com/dgrijalva/jwt-go/cmd/jwt/README.md
deleted file mode 100644
index c05150e33..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/cmd/jwt/README.md
+++ /dev/null
@@ -1,13 +0,0 @@
-`jwt` command-line tool
-=======================
-
-This is a simple tool to sign, verify and show JSON Web Tokens from
-the command line.
-
-The following will create and sign a token, then verify it and output the original claims:
-
- echo {\"foo\":\"bar\"} | ./jwt -key ../../test/sample_key -alg RS256 -sign - | ./jwt -key ../../test/sample_key.pub -alg RS256 -verify -
-
-To simply display a token, use:
-
- echo $JWT | ./jwt -show -
diff --git a/vendor/github.com/dgrijalva/jwt-go/cmd/jwt/app.go b/vendor/github.com/dgrijalva/jwt-go/cmd/jwt/app.go
deleted file mode 100644
index 727182a98..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/cmd/jwt/app.go
+++ /dev/null
@@ -1,282 +0,0 @@
-// A useful example app. You can use this to debug your tokens on the command line.
-// This is also a great place to look at how you might use this library.
-//
-// Example usage:
-// The following will create and sign a token, then verify it and output the original claims.
-// echo {\"foo\":\"bar\"} | bin/jwt -key test/sample_key -alg RS256 -sign - | bin/jwt -key test/sample_key.pub -verify -
-package main
-
-import (
- "encoding/json"
- "flag"
- "fmt"
- "io"
- "io/ioutil"
- "os"
- "regexp"
- "strings"
-
- jwt "github.com/dgrijalva/jwt-go"
-)
-
-var (
- // Options
- flagAlg = flag.String("alg", "", "signing algorithm identifier")
- flagKey = flag.String("key", "", "path to key file or '-' to read from stdin")
- flagCompact = flag.Bool("compact", false, "output compact JSON")
- flagDebug = flag.Bool("debug", false, "print out all kinds of debug data")
- flagClaims = make(ArgList)
- flagHead = make(ArgList)
-
- // Modes - exactly one of these is required
- flagSign = flag.String("sign", "", "path to claims object to sign, '-' to read from stdin, or '+' to use only -claim args")
- flagVerify = flag.String("verify", "", "path to JWT token to verify or '-' to read from stdin")
- flagShow = flag.String("show", "", "path to JWT file or '-' to read from stdin")
-)
-
-func main() {
- // Plug in Var flags
- flag.Var(flagClaims, "claim", "add additional claims. may be used more than once")
- flag.Var(flagHead, "header", "add additional header params. may be used more than once")
-
- // Usage message if you ask for -help or if you mess up inputs.
- flag.Usage = func() {
- fmt.Fprintf(os.Stderr, "Usage of %s:\n", os.Args[0])
- fmt.Fprintf(os.Stderr, " One of the following flags is required: sign, verify\n")
- flag.PrintDefaults()
- }
-
- // Parse command line options
- flag.Parse()
-
- // Do the thing. If something goes wrong, print error to stderr
- // and exit with a non-zero status code
- if err := start(); err != nil {
- fmt.Fprintf(os.Stderr, "Error: %v\n", err)
- os.Exit(1)
- }
-}
-
-// Figure out which thing to do and then do that
-func start() error {
- if *flagSign != "" {
- return signToken()
- } else if *flagVerify != "" {
- return verifyToken()
- } else if *flagShow != "" {
- return showToken()
- } else {
- flag.Usage()
- return fmt.Errorf("None of the required flags are present. What do you want me to do?")
- }
-}
-
-// Helper func: Read input from specified file or stdin
-func loadData(p string) ([]byte, error) {
- if p == "" {
- return nil, fmt.Errorf("No path specified")
- }
-
- var rdr io.Reader
- if p == "-" {
- rdr = os.Stdin
- } else if p == "+" {
- return []byte("{}"), nil
- } else {
- if f, err := os.Open(p); err == nil {
- rdr = f
- defer f.Close()
- } else {
- return nil, err
- }
- }
- return ioutil.ReadAll(rdr)
-}
-
-// Print a json object in accordance with the prophecy (or the command line options)
-func printJSON(j interface{}) error {
- var out []byte
- var err error
-
- if *flagCompact == false {
- out, err = json.MarshalIndent(j, "", " ")
- } else {
- out, err = json.Marshal(j)
- }
-
- if err == nil {
- fmt.Println(string(out))
- }
-
- return err
-}
-
-// Verify a token and output the claims. This is a great example
-// of how to verify and view a token.
-func verifyToken() error {
- // get the token
- tokData, err := loadData(*flagVerify)
- if err != nil {
- return fmt.Errorf("Couldn't read token: %v", err)
- }
-
- // trim possible whitespace from token
- tokData = regexp.MustCompile(`\s*$`).ReplaceAll(tokData, []byte{})
- if *flagDebug {
- fmt.Fprintf(os.Stderr, "Token len: %v bytes\n", len(tokData))
- }
-
- // Parse the token. Load the key from command line option
- token, err := jwt.Parse(string(tokData), func(t *jwt.Token) (interface{}, error) {
- data, err := loadData(*flagKey)
- if err != nil {
- return nil, err
- }
- if isEs() {
- return jwt.ParseECPublicKeyFromPEM(data)
- } else if isRs() {
- return jwt.ParseRSAPublicKeyFromPEM(data)
- }
- return data, nil
- })
-
- // Print some debug data
- if *flagDebug && token != nil {
- fmt.Fprintf(os.Stderr, "Header:\n%v\n", token.Header)
- fmt.Fprintf(os.Stderr, "Claims:\n%v\n", token.Claims)
- }
-
- // Print an error if we can't parse for some reason
- if err != nil {
- return fmt.Errorf("Couldn't parse token: %v", err)
- }
-
- // Is token invalid?
- if !token.Valid {
- return fmt.Errorf("Token is invalid")
- }
-
- // Print the token details
- if err := printJSON(token.Claims); err != nil {
- return fmt.Errorf("Failed to output claims: %v", err)
- }
-
- return nil
-}
-
-// Create, sign, and output a token. This is a great, simple example of
-// how to use this library to create and sign a token.
-func signToken() error {
- // get the token data from command line arguments
- tokData, err := loadData(*flagSign)
- if err != nil {
- return fmt.Errorf("Couldn't read token: %v", err)
- } else if *flagDebug {
- fmt.Fprintf(os.Stderr, "Token: %v bytes", len(tokData))
- }
-
- // parse the JSON of the claims
- var claims jwt.MapClaims
- if err := json.Unmarshal(tokData, &claims); err != nil {
- return fmt.Errorf("Couldn't parse claims JSON: %v", err)
- }
-
- // add command line claims
- if len(flagClaims) > 0 {
- for k, v := range flagClaims {
- claims[k] = v
- }
- }
-
- // get the key
- var key interface{}
- key, err = loadData(*flagKey)
- if err != nil {
- return fmt.Errorf("Couldn't read key: %v", err)
- }
-
- // get the signing alg
- alg := jwt.GetSigningMethod(*flagAlg)
- if alg == nil {
- return fmt.Errorf("Couldn't find signing method: %v", *flagAlg)
- }
-
- // create a new token
- token := jwt.NewWithClaims(alg, claims)
-
- // add command line headers
- if len(flagHead) > 0 {
- for k, v := range flagHead {
- token.Header[k] = v
- }
- }
-
- if isEs() {
- if k, ok := key.([]byte); !ok {
- return fmt.Errorf("Couldn't convert key data to key")
- } else {
- key, err = jwt.ParseECPrivateKeyFromPEM(k)
- if err != nil {
- return err
- }
- }
- } else if isRs() {
- if k, ok := key.([]byte); !ok {
- return fmt.Errorf("Couldn't convert key data to key")
- } else {
- key, err = jwt.ParseRSAPrivateKeyFromPEM(k)
- if err != nil {
- return err
- }
- }
- }
-
- if out, err := token.SignedString(key); err == nil {
- fmt.Println(out)
- } else {
- return fmt.Errorf("Error signing token: %v", err)
- }
-
- return nil
-}
-
-// showToken pretty-prints the token on the command line.
-func showToken() error {
- // get the token
- tokData, err := loadData(*flagShow)
- if err != nil {
- return fmt.Errorf("Couldn't read token: %v", err)
- }
-
- // trim possible whitespace from token
- tokData = regexp.MustCompile(`\s*$`).ReplaceAll(tokData, []byte{})
- if *flagDebug {
- fmt.Fprintf(os.Stderr, "Token len: %v bytes\n", len(tokData))
- }
-
- token, err := jwt.Parse(string(tokData), nil)
- if token == nil {
- return fmt.Errorf("malformed token: %v", err)
- }
-
- // Print the token details
- fmt.Println("Header:")
- if err := printJSON(token.Header); err != nil {
- return fmt.Errorf("Failed to output header: %v", err)
- }
-
- fmt.Println("Claims:")
- if err := printJSON(token.Claims); err != nil {
- return fmt.Errorf("Failed to output claims: %v", err)
- }
-
- return nil
-}
-
-func isEs() bool {
- return strings.HasPrefix(*flagAlg, "ES")
-}
-
-func isRs() bool {
- return strings.HasPrefix(*flagAlg, "RS")
-}
diff --git a/vendor/github.com/dgrijalva/jwt-go/cmd/jwt/args.go b/vendor/github.com/dgrijalva/jwt-go/cmd/jwt/args.go
deleted file mode 100644
index a5bba5b10..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/cmd/jwt/args.go
+++ /dev/null
@@ -1,23 +0,0 @@
-package main
-
-import (
- "encoding/json"
- "fmt"
- "strings"
-)
-
-type ArgList map[string]string
-
-func (l ArgList) String() string {
- data, _ := json.Marshal(l)
- return string(data)
-}
-
-func (l ArgList) Set(arg string) error {
- parts := strings.SplitN(arg, "=", 2)
- if len(parts) != 2 {
- return fmt.Errorf("Invalid argument '%v'. Must use format 'key=value'. %v", arg, parts)
- }
- l[parts[0]] = parts[1]
- return nil
-}
diff --git a/vendor/github.com/dgrijalva/jwt-go/doc.go b/vendor/github.com/dgrijalva/jwt-go/doc.go
deleted file mode 100644
index a86dc1a3b..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/doc.go
+++ /dev/null
@@ -1,4 +0,0 @@
-// Package jwt is a Go implementation of JSON Web Tokens: http://self-issued.info/docs/draft-jones-json-web-token.html
-//
-// See README.md for more info.
-package jwt
diff --git a/vendor/github.com/dgrijalva/jwt-go/ecdsa.go b/vendor/github.com/dgrijalva/jwt-go/ecdsa.go
deleted file mode 100644
index 2f59a2223..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/ecdsa.go
+++ /dev/null
@@ -1,147 +0,0 @@
-package jwt
-
-import (
- "crypto"
- "crypto/ecdsa"
- "crypto/rand"
- "errors"
- "math/big"
-)
-
-var (
- // Sadly this is missing from crypto/ecdsa compared to crypto/rsa
- ErrECDSAVerification = errors.New("crypto/ecdsa: verification error")
-)
-
-// Implements the ECDSA family of signing methods signing methods
-type SigningMethodECDSA struct {
- Name string
- Hash crypto.Hash
- KeySize int
- CurveBits int
-}
-
-// Specific instances for EC256 and company
-var (
- SigningMethodES256 *SigningMethodECDSA
- SigningMethodES384 *SigningMethodECDSA
- SigningMethodES512 *SigningMethodECDSA
-)
-
-func init() {
- // ES256
- SigningMethodES256 = &SigningMethodECDSA{"ES256", crypto.SHA256, 32, 256}
- RegisterSigningMethod(SigningMethodES256.Alg(), func() SigningMethod {
- return SigningMethodES256
- })
-
- // ES384
- SigningMethodES384 = &SigningMethodECDSA{"ES384", crypto.SHA384, 48, 384}
- RegisterSigningMethod(SigningMethodES384.Alg(), func() SigningMethod {
- return SigningMethodES384
- })
-
- // ES512
- SigningMethodES512 = &SigningMethodECDSA{"ES512", crypto.SHA512, 66, 521}
- RegisterSigningMethod(SigningMethodES512.Alg(), func() SigningMethod {
- return SigningMethodES512
- })
-}
-
-func (m *SigningMethodECDSA) Alg() string {
- return m.Name
-}
-
-// Implements the Verify method from SigningMethod
-// For this verify method, key must be an ecdsa.PublicKey struct
-func (m *SigningMethodECDSA) Verify(signingString, signature string, key interface{}) error {
- var err error
-
- // Decode the signature
- var sig []byte
- if sig, err = DecodeSegment(signature); err != nil {
- return err
- }
-
- // Get the key
- var ecdsaKey *ecdsa.PublicKey
- switch k := key.(type) {
- case *ecdsa.PublicKey:
- ecdsaKey = k
- default:
- return ErrInvalidKeyType
- }
-
- if len(sig) != 2*m.KeySize {
- return ErrECDSAVerification
- }
-
- r := big.NewInt(0).SetBytes(sig[:m.KeySize])
- s := big.NewInt(0).SetBytes(sig[m.KeySize:])
-
- // Create hasher
- if !m.Hash.Available() {
- return ErrHashUnavailable
- }
- hasher := m.Hash.New()
- hasher.Write([]byte(signingString))
-
- // Verify the signature
- if verifystatus := ecdsa.Verify(ecdsaKey, hasher.Sum(nil), r, s); verifystatus == true {
- return nil
- } else {
- return ErrECDSAVerification
- }
-}
-
-// Implements the Sign method from SigningMethod
-// For this signing method, key must be an ecdsa.PrivateKey struct
-func (m *SigningMethodECDSA) Sign(signingString string, key interface{}) (string, error) {
- // Get the key
- var ecdsaKey *ecdsa.PrivateKey
- switch k := key.(type) {
- case *ecdsa.PrivateKey:
- ecdsaKey = k
- default:
- return "", ErrInvalidKeyType
- }
-
- // Create the hasher
- if !m.Hash.Available() {
- return "", ErrHashUnavailable
- }
-
- hasher := m.Hash.New()
- hasher.Write([]byte(signingString))
-
- // Sign the string and return r, s
- if r, s, err := ecdsa.Sign(rand.Reader, ecdsaKey, hasher.Sum(nil)); err == nil {
- curveBits := ecdsaKey.Curve.Params().BitSize
-
- if m.CurveBits != curveBits {
- return "", ErrInvalidKey
- }
-
- keyBytes := curveBits / 8
- if curveBits%8 > 0 {
- keyBytes += 1
- }
-
- // We serialize the outpus (r and s) into big-endian byte arrays and pad
- // them with zeros on the left to make sure the sizes work out. Both arrays
- // must be keyBytes long, and the output must be 2*keyBytes long.
- rBytes := r.Bytes()
- rBytesPadded := make([]byte, keyBytes)
- copy(rBytesPadded[keyBytes-len(rBytes):], rBytes)
-
- sBytes := s.Bytes()
- sBytesPadded := make([]byte, keyBytes)
- copy(sBytesPadded[keyBytes-len(sBytes):], sBytes)
-
- out := append(rBytesPadded, sBytesPadded...)
-
- return EncodeSegment(out), nil
- } else {
- return "", err
- }
-}
diff --git a/vendor/github.com/dgrijalva/jwt-go/ecdsa_test.go b/vendor/github.com/dgrijalva/jwt-go/ecdsa_test.go
deleted file mode 100644
index 753047b1e..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/ecdsa_test.go
+++ /dev/null
@@ -1,100 +0,0 @@
-package jwt_test
-
-import (
- "crypto/ecdsa"
- "io/ioutil"
- "strings"
- "testing"
-
- "github.com/dgrijalva/jwt-go"
-)
-
-var ecdsaTestData = []struct {
- name string
- keys map[string]string
- tokenString string
- alg string
- claims map[string]interface{}
- valid bool
-}{
- {
- "Basic ES256",
- map[string]string{"private": "test/ec256-private.pem", "public": "test/ec256-public.pem"},
- "eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzI1NiJ9.eyJmb28iOiJiYXIifQ.feG39E-bn8HXAKhzDZq7yEAPWYDhZlwTn3sePJnU9VrGMmwdXAIEyoOnrjreYlVM_Z4N13eK9-TmMTWyfKJtHQ",
- "ES256",
- map[string]interface{}{"foo": "bar"},
- true,
- },
- {
- "Basic ES384",
- map[string]string{"private": "test/ec384-private.pem", "public": "test/ec384-public.pem"},
- "eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzM4NCJ9.eyJmb28iOiJiYXIifQ.ngAfKMbJUh0WWubSIYe5GMsA-aHNKwFbJk_wq3lq23aPp8H2anb1rRILIzVR0gUf4a8WzDtrzmiikuPWyCS6CN4-PwdgTk-5nehC7JXqlaBZU05p3toM3nWCwm_LXcld",
- "ES384",
- map[string]interface{}{"foo": "bar"},
- true,
- },
- {
- "Basic ES512",
- map[string]string{"private": "test/ec512-private.pem", "public": "test/ec512-public.pem"},
- "eyJ0eXAiOiJKV1QiLCJhbGciOiJFUzUxMiJ9.eyJmb28iOiJiYXIifQ.AAU0TvGQOcdg2OvrwY73NHKgfk26UDekh9Prz-L_iWuTBIBqOFCWwwLsRiHB1JOddfKAls5do1W0jR_F30JpVd-6AJeTjGKA4C1A1H6gIKwRY0o_tFDIydZCl_lMBMeG5VNFAjO86-WCSKwc3hqaGkq1MugPRq_qrF9AVbuEB4JPLyL5",
- "ES512",
- map[string]interface{}{"foo": "bar"},
- true,
- },
- {
- "basic ES256 invalid: foo => bar",
- map[string]string{"private": "test/ec256-private.pem", "public": "test/ec256-public.pem"},
- "eyJhbGciOiJFUzI1NiIsInR5cCI6IkpXVCJ9.eyJmb28iOiJiYXIifQ.MEQCIHoSJnmGlPaVQDqacx_2XlXEhhqtWceVopjomc2PJLtdAiAUTeGPoNYxZw0z8mgOnnIcjoxRuNDVZvybRZF3wR1l8W",
- "ES256",
- map[string]interface{}{"foo": "bar"},
- false,
- },
-}
-
-func TestECDSAVerify(t *testing.T) {
- for _, data := range ecdsaTestData {
- var err error
-
- key, _ := ioutil.ReadFile(data.keys["public"])
-
- var ecdsaKey *ecdsa.PublicKey
- if ecdsaKey, err = jwt.ParseECPublicKeyFromPEM(key); err != nil {
- t.Errorf("Unable to parse ECDSA public key: %v", err)
- }
-
- parts := strings.Split(data.tokenString, ".")
-
- method := jwt.GetSigningMethod(data.alg)
- err = method.Verify(strings.Join(parts[0:2], "."), parts[2], ecdsaKey)
- if data.valid && err != nil {
- t.Errorf("[%v] Error while verifying key: %v", data.name, err)
- }
- if !data.valid && err == nil {
- t.Errorf("[%v] Invalid key passed validation", data.name)
- }
- }
-}
-
-func TestECDSASign(t *testing.T) {
- for _, data := range ecdsaTestData {
- var err error
- key, _ := ioutil.ReadFile(data.keys["private"])
-
- var ecdsaKey *ecdsa.PrivateKey
- if ecdsaKey, err = jwt.ParseECPrivateKeyFromPEM(key); err != nil {
- t.Errorf("Unable to parse ECDSA private key: %v", err)
- }
-
- if data.valid {
- parts := strings.Split(data.tokenString, ".")
- method := jwt.GetSigningMethod(data.alg)
- sig, err := method.Sign(strings.Join(parts[0:2], "."), ecdsaKey)
- if err != nil {
- t.Errorf("[%v] Error signing token: %v", data.name, err)
- }
- if sig == parts[2] {
- t.Errorf("[%v] Identical signatures\nbefore:\n%v\nafter:\n%v", data.name, parts[2], sig)
- }
- }
- }
-}
diff --git a/vendor/github.com/dgrijalva/jwt-go/ecdsa_utils.go b/vendor/github.com/dgrijalva/jwt-go/ecdsa_utils.go
deleted file mode 100644
index d19624b72..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/ecdsa_utils.go
+++ /dev/null
@@ -1,67 +0,0 @@
-package jwt
-
-import (
- "crypto/ecdsa"
- "crypto/x509"
- "encoding/pem"
- "errors"
-)
-
-var (
- ErrNotECPublicKey = errors.New("Key is not a valid ECDSA public key")
- ErrNotECPrivateKey = errors.New("Key is not a valid ECDSA private key")
-)
-
-// Parse PEM encoded Elliptic Curve Private Key Structure
-func ParseECPrivateKeyFromPEM(key []byte) (*ecdsa.PrivateKey, error) {
- var err error
-
- // Parse PEM block
- var block *pem.Block
- if block, _ = pem.Decode(key); block == nil {
- return nil, ErrKeyMustBePEMEncoded
- }
-
- // Parse the key
- var parsedKey interface{}
- if parsedKey, err = x509.ParseECPrivateKey(block.Bytes); err != nil {
- return nil, err
- }
-
- var pkey *ecdsa.PrivateKey
- var ok bool
- if pkey, ok = parsedKey.(*ecdsa.PrivateKey); !ok {
- return nil, ErrNotECPrivateKey
- }
-
- return pkey, nil
-}
-
-// Parse PEM encoded PKCS1 or PKCS8 public key
-func ParseECPublicKeyFromPEM(key []byte) (*ecdsa.PublicKey, error) {
- var err error
-
- // Parse PEM block
- var block *pem.Block
- if block, _ = pem.Decode(key); block == nil {
- return nil, ErrKeyMustBePEMEncoded
- }
-
- // Parse the key
- var parsedKey interface{}
- if parsedKey, err = x509.ParsePKIXPublicKey(block.Bytes); err != nil {
- if cert, err := x509.ParseCertificate(block.Bytes); err == nil {
- parsedKey = cert.PublicKey
- } else {
- return nil, err
- }
- }
-
- var pkey *ecdsa.PublicKey
- var ok bool
- if pkey, ok = parsedKey.(*ecdsa.PublicKey); !ok {
- return nil, ErrNotECPublicKey
- }
-
- return pkey, nil
-}
diff --git a/vendor/github.com/dgrijalva/jwt-go/errors.go b/vendor/github.com/dgrijalva/jwt-go/errors.go
deleted file mode 100644
index 1c93024aa..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/errors.go
+++ /dev/null
@@ -1,59 +0,0 @@
-package jwt
-
-import (
- "errors"
-)
-
-// Error constants
-var (
- ErrInvalidKey = errors.New("key is invalid")
- ErrInvalidKeyType = errors.New("key is of invalid type")
- ErrHashUnavailable = errors.New("the requested hash function is unavailable")
-)
-
-// The errors that might occur when parsing and validating a token
-const (
- ValidationErrorMalformed uint32 = 1 << iota // Token is malformed
- ValidationErrorUnverifiable // Token could not be verified because of signing problems
- ValidationErrorSignatureInvalid // Signature validation failed
-
- // Standard Claim validation errors
- ValidationErrorAudience // AUD validation failed
- ValidationErrorExpired // EXP validation failed
- ValidationErrorIssuedAt // IAT validation failed
- ValidationErrorIssuer // ISS validation failed
- ValidationErrorNotValidYet // NBF validation failed
- ValidationErrorId // JTI validation failed
- ValidationErrorClaimsInvalid // Generic claims validation error
-)
-
-// Helper for constructing a ValidationError with a string error message
-func NewValidationError(errorText string, errorFlags uint32) *ValidationError {
- return &ValidationError{
- text: errorText,
- Errors: errorFlags,
- }
-}
-
-// The error from Parse if token is not valid
-type ValidationError struct {
- Inner error // stores the error returned by external dependencies, i.e.: KeyFunc
- Errors uint32 // bitfield. see ValidationError... constants
- text string // errors that do not have a valid error just have text
-}
-
-// Validation error is an error type
-func (e ValidationError) Error() string {
- if e.Inner != nil {
- return e.Inner.Error()
- } else if e.text != "" {
- return e.text
- } else {
- return "token is invalid"
- }
-}
-
-// No errors
-func (e *ValidationError) valid() bool {
- return e.Errors == 0
-}
diff --git a/vendor/github.com/dgrijalva/jwt-go/example_test.go b/vendor/github.com/dgrijalva/jwt-go/example_test.go
deleted file mode 100644
index ae8b788a0..000000000
--- a/vendor/github.com/dgrijalva/jwt-go/example_test.go
+++ /dev/null
@@ -1,114 +0,0 @@
-package jwt_test
-
-import (
- "fmt"
- "github.com/dgrijalva/jwt-go"
- "time"
-)
-
-// Example (atypical) using the StandardClaims type by itself to parse a token.
-// The StandardClaims type is designed to be embedded into your custom types
-// to provide standard validation features. You can use it alone, but there's
-// no way to retrieve other fields after parsing.
-// See the CustomClaimsType example for intended usage.
-func ExampleNewWithClaims_standardClaims() {
- mySigningKey := []byte("AllYourBase")
-
- // Create the Claims
- claims := &jwt.StandardClaims{
- ExpiresAt: 15000,
- Issuer: "test",
- }
-
- token := jwt.NewWithClaims(jwt.SigningMethodHS256, claims)
- ss, err := token.SignedString(mySigningKey)
- fmt.Printf("%v %v", ss, err)
- //Output: eyJhbGciOiJIUzI1NiIsInR5cCI6IkpXVCJ9.eyJleHAiOjE1MDAwLCJpc3MiOiJ0ZXN0In0.QsODzZu3lUZMVdhbO76u3Jv02iYCvEHcYVUI1kOWEU0 | Forums | -- A public forum for users to discuss questions and explore current design patterns and - best practices about Docker and related projects in the Docker Ecosystem. To participate, - just log in with your Docker Hub account on https://forums.docker.com. - | -
| Community Slack | -- The Docker Community has a dedicated Slack chat to discuss features and issues. You can sign-up with this link. - | -
| - You can follow Docker's Twitter feed - to get updates on our products. You can also tweet us questions or just - share blogs or stories. - | -|
| Stack Overflow | -- Stack Overflow has over 17000 Docker questions listed. We regularly - monitor Docker questions - and so do many other knowledgeable Docker users. - | -