Skip to content

Commit

Permalink
Finished custom MSFT OAuth2 branch, Google wont maintain custom provi…
Browse files Browse the repository at this point in the history
…ders (see golang#112)
  • Loading branch information
Kr1sso committed Nov 25, 2015
1 parent 14d2dce commit 8f06451
Show file tree
Hide file tree
Showing 24 changed files with 45 additions and 45 deletions.
4 changes: 2 additions & 2 deletions README.md
Original file line number Diff line number Diff line change
Expand Up @@ -40,8 +40,8 @@ with the `oauth2` package.

import (
"golang.org/x/net/context"
"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
"github.com/Kr1sso/oauth2"
"github.com/Kr1sso/oauth2/google"
newappengine "google.golang.org/appengine"
newurlfetch "google.golang.org/appengine/urlfetch"

Expand Down
2 changes: 1 addition & 1 deletion bitbucket/bitbucket.go
Original file line number Diff line number Diff line change
Expand Up @@ -6,7 +6,7 @@
package bitbucket

import (
"golang.org/x/oauth2"
"github.com/Kr1sso/oauth2"
)

// Endpoint is Bitbucket's OAuth 2.0 endpoint.
Expand Down
2 changes: 1 addition & 1 deletion client_appengine.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"net/http"

"golang.org/x/net/context"
"golang.org/x/oauth2/internal"
"github.com/Kr1sso/oauth2/internal"
"google.golang.org/appengine/urlfetch"
)

Expand Down
6 changes: 3 additions & 3 deletions clientcredentials/clientcredentials.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,16 +11,16 @@
// server.
//
// See http://tools.ietf.org/html/draft-ietf-oauth-v2-31#section-4.4
package clientcredentials // import "golang.org/x/oauth2/clientcredentials"
package clientcredentials // import "github.com/Kr1sso/oauth2/clientcredentials"

import (
"net/http"
"net/url"
"strings"

"golang.org/x/net/context"
"golang.org/x/oauth2"
"golang.org/x/oauth2/internal"
"github.com/Kr1sso/oauth2"
"github.com/Kr1sso/oauth2/internal"
)

// tokenFromInternal maps an *internal.Token struct into
Expand Down
2 changes: 1 addition & 1 deletion clientcredentials/clientcredentials_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -10,7 +10,7 @@ import (
"net/http/httptest"
"testing"

"golang.org/x/oauth2"
"github.com/Kr1sso/oauth2"
)

func newConf(url string) *Config {
Expand Down
2 changes: 1 addition & 1 deletion example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -8,7 +8,7 @@ import (
"fmt"
"log"

"golang.org/x/oauth2"
"github.com/Kr1sso/oauth2"
)

func ExampleConfig() {
Expand Down
4 changes: 2 additions & 2 deletions facebook/facebook.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// license that can be found in the LICENSE file.

// Package facebook provides constants for using OAuth2 to access Facebook.
package facebook // import "golang.org/x/oauth2/facebook"
package facebook // import "github.com/Kr1sso/oauth2/facebook"

import (
"golang.org/x/oauth2"
"github.com/Kr1sso/oauth2"
)

// Endpoint is Facebook's OAuth 2.0 endpoint.
Expand Down
4 changes: 2 additions & 2 deletions github/github.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// license that can be found in the LICENSE file.

// Package github provides constants for using OAuth2 to access Github.
package github // import "golang.org/x/oauth2/github"
package github // import "github.com/Kr1sso/oauth2/github"

import (
"golang.org/x/oauth2"
"github.com/Kr1sso/oauth2"
)

// Endpoint is Github's OAuth 2.0 endpoint.
Expand Down
2 changes: 1 addition & 1 deletion google/appengine.go
Original file line number Diff line number Diff line change
Expand Up @@ -11,7 +11,7 @@ import (
"time"

"golang.org/x/net/context"
"golang.org/x/oauth2"
"github.com/Kr1sso/oauth2"
)

// Set at init time by appenginevm_hook.go. If true, we are on App Engine Managed VMs.
Expand Down
4 changes: 2 additions & 2 deletions google/default.go
Original file line number Diff line number Diff line change
Expand Up @@ -15,8 +15,8 @@ import (
"runtime"

"golang.org/x/net/context"
"golang.org/x/oauth2"
"golang.org/x/oauth2/jwt"
"github.com/Kr1sso/oauth2"
"github.com/Kr1sso/oauth2/jwt"
"google.golang.org/cloud/compute/metadata"
)

Expand Down
6 changes: 3 additions & 3 deletions google/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,9 +12,9 @@ import (
"log"
"net/http"

"golang.org/x/oauth2"
"golang.org/x/oauth2/google"
"golang.org/x/oauth2/jwt"
"github.com/Kr1sso/oauth2"
"github.com/Kr1sso/oauth2/google"
"github.com/Kr1sso/oauth2/jwt"
"google.golang.org/appengine"
"google.golang.org/appengine/urlfetch"
)
Expand Down
6 changes: 3 additions & 3 deletions google/google.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@
// https://developers.google.com/accounts/docs/OAuth2
// and
// https://developers.google.com/accounts/docs/application-default-credentials.
package google // import "golang.org/x/oauth2/google"
package google // import "github.com/Kr1sso/oauth2/google"

import (
"encoding/json"
Expand All @@ -21,8 +21,8 @@ import (
"strings"
"time"

"golang.org/x/oauth2"
"golang.org/x/oauth2/jwt"
"github.com/Kr1sso/oauth2"
"github.com/Kr1sso/oauth2/jwt"
"google.golang.org/cloud/compute/metadata"
)

Expand Down
6 changes: 3 additions & 3 deletions google/jwt.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,9 +9,9 @@ import (
"fmt"
"time"

"golang.org/x/oauth2"
"golang.org/x/oauth2/internal"
"golang.org/x/oauth2/jws"
"github.com/Kr1sso/oauth2"
"github.com/Kr1sso/oauth2/internal"
"github.com/Kr1sso/oauth2/jws"
)

// JWTAccessTokenSourceFromJSON uses a Google Developers service account JSON
Expand Down
4 changes: 2 additions & 2 deletions google/sdk.go
Original file line number Diff line number Diff line change
Expand Up @@ -17,8 +17,8 @@ import (
"time"

"golang.org/x/net/context"
"golang.org/x/oauth2"
"golang.org/x/oauth2/internal"
"github.com/Kr1sso/oauth2"
"github.com/Kr1sso/oauth2/internal"
)

type sdkCredentials struct {
Expand Down
2 changes: 1 addition & 1 deletion jws/jws.go
Original file line number Diff line number Diff line change
Expand Up @@ -4,7 +4,7 @@

// Package jws provides encoding and decoding utilities for
// signed JWS messages.
package jws // import "golang.org/x/oauth2/jws"
package jws // import "github.com/Kr1sso/oauth2/jws"

import (
"bytes"
Expand Down
4 changes: 2 additions & 2 deletions jwt/example_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,8 +5,8 @@
package jwt_test

import (
"golang.org/x/oauth2"
"golang.org/x/oauth2/jwt"
"github.com/Kr1sso/oauth2"
"github.com/Kr1sso/oauth2/jwt"
)

func ExampleJWTConfig() {
Expand Down
6 changes: 3 additions & 3 deletions jwt/jwt.go
Original file line number Diff line number Diff line change
Expand Up @@ -19,9 +19,9 @@ import (
"time"

"golang.org/x/net/context"
"golang.org/x/oauth2"
"golang.org/x/oauth2/internal"
"golang.org/x/oauth2/jws"
"github.com/Kr1sso/oauth2"
"github.com/Kr1sso/oauth2/internal"
"github.com/Kr1sso/oauth2/jws"
)

var (
Expand Down
2 changes: 1 addition & 1 deletion jwt/jwt_test.go
Original file line number Diff line number Diff line change
Expand Up @@ -9,7 +9,7 @@ import (
"net/http/httptest"
"testing"

"golang.org/x/oauth2"
"github.com/Kr1sso/oauth2"
)

var dummyPrivateKey = []byte(`-----BEGIN RSA PRIVATE KEY-----
Expand Down
4 changes: 2 additions & 2 deletions linkedin/linkedin.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// license that can be found in the LICENSE file.

// Package linkedin provides constants for using OAuth2 to access LinkedIn.
package linkedin // import "golang.org/x/oauth2/linkedin"
package linkedin // import "github.com/Kr1sso/oauth2/linkedin"

import (
"golang.org/x/oauth2"
"github.com/Kr1sso/oauth2"
)

// Endpoint is LinkedIn's OAuth 2.0 endpoint.
Expand Down
4 changes: 2 additions & 2 deletions oauth2.go
Original file line number Diff line number Diff line change
Expand Up @@ -5,7 +5,7 @@
// Package oauth2 provides support for making
// OAuth2 authorized and authenticated HTTP requests.
// It can additionally grant authorization with Bearer JWT.
package oauth2 // import "golang.org/x/oauth2"
package oauth2 // import "github.com/Kr1sso/oauth2"

import (
"bytes"
Expand All @@ -16,7 +16,7 @@ import (
"sync"

"golang.org/x/net/context"
"golang.org/x/oauth2/internal"
"github.com/Kr1sso/oauth2/internal"
)

// NoContext is the default context you should supply if not using
Expand Down
4 changes: 2 additions & 2 deletions odnoklassniki/odnoklassniki.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// license that can be found in the LICENSE file.

// Package odnoklassniki provides constants for using OAuth2 to access Odnoklassniki.
package odnoklassniki // import "golang.org/x/oauth2/odnoklassniki"
package odnoklassniki // import "github.com/Kr1sso/oauth2/odnoklassniki"

import (
"golang.org/x/oauth2"
"github.com/Kr1sso/oauth2"
)

// Endpoint is Odnoklassniki's OAuth 2.0 endpoint.
Expand Down
4 changes: 2 additions & 2 deletions paypal/paypal.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// license that can be found in the LICENSE file.

// Package paypal provides constants for using OAuth2 to access PayPal.
package paypal // import "golang.org/x/oauth2/paypal"
package paypal // import "github.com/Kr1sso/oauth2/paypal"

import (
"golang.org/x/oauth2"
"github.com/Kr1sso/oauth2"
)

// Endpoint is PayPal's OAuth 2.0 endpoint in live (production) environment.
Expand Down
2 changes: 1 addition & 1 deletion token.go
Original file line number Diff line number Diff line change
Expand Up @@ -12,7 +12,7 @@ import (
"time"

"golang.org/x/net/context"
"golang.org/x/oauth2/internal"
"github.com/Kr1sso/oauth2/internal"
)

// expiryDelta determines how earlier a token should be considered
Expand Down
4 changes: 2 additions & 2 deletions vk/vk.go
Original file line number Diff line number Diff line change
Expand Up @@ -3,10 +3,10 @@
// license that can be found in the LICENSE file.

// Package vk provides constants for using OAuth2 to access VK.com.
package vk // import "golang.org/x/oauth2/vk"
package vk // import "github.com/Kr1sso/oauth2/vk"

import (
"golang.org/x/oauth2"
"github.com/Kr1sso/oauth2"
)

// Endpoint is VK's OAuth 2.0 endpoint.
Expand Down

0 comments on commit 8f06451

Please sign in to comment.