all: move to new org

.travis.yml

@@ -1,6 +1,6 @@
 language: go
 
-go_import_path: github.com/ory-am/fosite
+go_import_path: github.com/ory/fosite
 
 go:
   - 1.7

HISTORY.md

@@ -6,6 +6,7 @@ bumps (`0.1.0` -> `0.2.0`).
 Breaking changes
 
 * Replaced `"golang.org/x/net/context"` with `"context"`.
+* Move the repo from `github.com/ory-am/fosite` to `github.com/ory/fosite`
 
 ## 0.6.0
 

README.md

@@ -2,7 +2,7 @@
 
 [![Build Status](https://travis-ci.org/ory/fosite.svg?branch=master)](https://travis-ci.org/ory/fosite?branch=master)
 [![Coverage Status](https://coveralls.io/repos/ory/fosite/badge.svg?branch=master&service=github&foo)](https://coveralls.io/github/ory/fosite?branch=master)
-[![Go Report Card](https://goreportcard.com/badge/ory-am/fosite)](https://goreportcard.com/report/ory-am/fosite)
+[![Go Report Card](https://goreportcard.com/badge/ory/fosite)](https://goreportcard.com/report/ory/fosite)
 
 [![Join the chat at https://gitter.im/ory-am/fosite](https://badges.gitter.im/ory-am/fosite.svg)](https://gitter.im/ory-am/fosite)
 
@@ -70,15 +70,15 @@ You can run this minimalistic example by doing
 
 ```
 go get github.com/Masterminds/glide
-go get github.com/ory-am/fosite-example
-cd $GOPATH/src/github.com/ory-am/fosite-example
+go get github.com/ory/fosite-example
+cd $GOPATH/src/github.com/ory/fosite-example
 glide install
-go install github.com/ory-am/fosite-example
+go install github.com/ory/fosite-example
 fosite-example
 ```
 
 There should be a server listening on [localhost:3846](https://localhost:3846/). You can check out the example's
-source code [here](https://github.com/ory-am/fosite-example/).
+source code [here](https://github.com/ory/fosite-example/).
 
 ## A word on quality
 
@@ -125,7 +125,7 @@ Additionally, we added these safeguards:
 
 Sections below [Section 5](https://tools.ietf.org/html/rfc6819#section-5)
 that are not covered in the list above should be reviewed by you. If you think that a specific section should be something
-that is covered in Fosite, feel free to create an [issue](https://github.com/ory-am/fosite/issues). Please be
+that is covered in Fosite, feel free to create an [issue](https://github.com/ory/fosite/issues). Please be
 aware that OpenID Connect requires specific knowledge of the identity provider, which is why Fosite only implements core
 requirements and most things must be implemented by you (for example prompt, max_age, ui_locales, id_token_hint, user authentication, session management, ...).
 
@@ -145,15 +145,15 @@ OAuth2 stack, that's no problem. Or custom assertions, what ever you like and as
 GOPATH environment variable.
 
 ```
-go get -d github.com/ory-am/fosite
+go get -d github.com/ory/fosite
 ```
 
 We recommend to use [Glide](https://github.com/Masterminds/glide) or [Godep](https://github.com/tools/godep) to
 mitigate compatibility breaks that come with new api versions.
 
 ## Documentation
 
-There is an API documentation available at [godoc.org/ory-am/fosite](https://godoc.org/github.com/ory-am/fosite).
+There is an API documentation available at [godoc.org/ory/fosite](https://godoc.org/github.com/ory/fosite).
 
 ### Scopes
 
@@ -176,14 +176,14 @@ Instantiating fosite by hand can be painful. Therefore we created a few convenie
 It is strongly encouraged to use these well tested composers.
 
 In this very basic example, we will instantiate fosite with all OpenID Connect and OAuth2 handlers enabled. Please refer
-to the [example app](https://github.com/ory-am/fosite-example/) for more details.
+to the [example app](https://github.com/ory/fosite-example/) for more details.
 
 This little code snippet sets up a full-blown OAuth2 and OpenID Connect example.
 
 ```go
-import "github.com/ory-am/fosite"
-import "github.com/ory-am/fosite/compose"
-import "github.com/ory-am/fosite/storage"
+import "github.com/ory/fosite"
+import "github.com/ory/fosite/compose"
+import "github.com/ory/fosite/storage"
 
 // This is the exemplary storage that contains:
 // * an OAuth2 Client with id "my-client" and secret "foobar" capable of all oauth2 and open id connect grant and response types.
@@ -310,7 +310,7 @@ func someResourceProviderHandlerFunc(rw http.ResponseWriter, req *http.Request)
 
 Fosite provides integration tests as well as a http server example:
 
-* Fosite ships with an example app that runs in your browser: [Example app](https://github.com/ory-am/fosite-example/).
+* Fosite ships with an example app that runs in your browser: [Example app](https://github.com/ory/fosite-example/).
 * If you want to check out how to enable specific handlers, check out the [integration tests](integration/).
 
 If you have working examples yourself, please share them with us!
@@ -347,8 +347,8 @@ Please note that when using the OAuth2StatelessJWTIntrospectionFactory access to
 You need git and golang installed on your system.
 
 ```
-go get -d github.com/ory-am/fosite
-cd $GOPATH/src/github.com/ory-am/fosite
+go get -d github.com/ory/fosite
+cd $GOPATH/src/github.com/ory/fosite
 git status
 git remote add myfork <url-to-your-fork>
 go test ./...
@@ -366,23 +366,23 @@ Run `./generate-mocks.sh` in fosite's root directory or run the contents of [gen
 This place is reserved for the fearless bug hunters, reviewers and contributors (alphabetical order).
 
 * [agtorre](https://github.com/agtorre):
-  [contributions](https://github.com/ory-am/fosite/issues?q=author%3Aagtorre),
-  [participations](https://github.com/ory-am/fosite/issues?q=commenter%3Aagtorre).
+  [contributions](https://github.com/ory/fosite/issues?q=author%3Aagtorre),
+  [participations](https://github.com/ory/fosite/issues?q=commenter%3Aagtorre).
 * [danielchatfield](https://github.com/danielchatfield):
-  [contributions](https://github.com/ory-am/fosite/issues?q=author%3Adanielchatfield),
-  [participations](https://github.com/ory-am/fosite/issues?q=commenter%3Adanielchatfield).
+  [contributions](https://github.com/ory/fosite/issues?q=author%3Adanielchatfield),
+  [participations](https://github.com/ory/fosite/issues?q=commenter%3Adanielchatfield).
 * [leetal](https://github.com/leetal):
-  [contributions](https://github.com/ory-am/fosite/issues?q=author%3Aleetal),
-  [participations](https://github.com/ory-am/fosite/issues?q=commenter%3Aleetal).
+  [contributions](https://github.com/ory/fosite/issues?q=author%3Aleetal),
+  [participations](https://github.com/ory/fosite/issues?q=commenter%3Aleetal).
 * [jrossiter](https://github.com/jrossiter):
-  [contributions](https://github.com/ory-am/fosite/issues?q=author%3Ajrossiter),
-  [participations](https://github.com/ory-am/fosite/issues?q=commenter%3Ajrossiter).
+  [contributions](https://github.com/ory/fosite/issues?q=author%3Ajrossiter),
+  [participations](https://github.com/ory/fosite/issues?q=commenter%3Ajrossiter).
 * [jrossiter](https://github.com/jrossiter):
-  [contributions](https://github.com/ory-am/fosite/issues?q=author%3Ajrossiter),
-  [participations](https://github.com/ory-am/fosite/issues?q=commenter%3Ajrossiter).
+  [contributions](https://github.com/ory/fosite/issues?q=author%3Ajrossiter),
+  [participations](https://github.com/ory/fosite/issues?q=commenter%3Ajrossiter).
 * [danilobuerger](https://github.com/danilobuerger):
-  [contributions](https://github.com/ory-am/fosite/issues?q=author%3Adanilobuerger),
-  [participations](https://github.com/ory-am/fosite/issues?q=commenter%3Adanilobuerger).
+  [contributions](https://github.com/ory/fosite/issues?q=author%3Adanilobuerger),
+  [participations](https://github.com/ory/fosite/issues?q=commenter%3Adanilobuerger).
 
 Find out more about the [author](https://aeneas.io/) of Fosite and Hydra, and the
 [Ory Company](https://ory.am/).

access_error_test.go

@@ -7,8 +7,8 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	. "github.com/ory-am/fosite"
-	. "github.com/ory-am/fosite/internal"
+	. "github.com/ory/fosite"
+	. "github.com/ory/fosite/internal"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

access_request_handler_test.go

@@ -9,8 +9,8 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/ory-am/common/pkg"
-	. "github.com/ory-am/fosite"
-	"github.com/ory-am/fosite/internal"
+	. "github.com/ory/fosite"
+	"github.com/ory/fosite/internal"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 )

access_response_test.go

@@ -3,7 +3,7 @@ package fosite_test
 import (
 	"testing"
 
-	. "github.com/ory-am/fosite"
+	. "github.com/ory/fosite"
 	"github.com/stretchr/testify/assert"
 )
 

access_response_writer_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	. "github.com/ory-am/fosite"
-	"github.com/ory-am/fosite/internal"
+	. "github.com/ory/fosite"
+	"github.com/ory/fosite/internal"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"context"

access_write_test.go

@@ -6,8 +6,8 @@ import (
 	"net/http"
 
 	"github.com/golang/mock/gomock"
-	. "github.com/ory-am/fosite"
-	. "github.com/ory-am/fosite/internal"
+	. "github.com/ory/fosite"
+	. "github.com/ory/fosite/internal"
 	"github.com/stretchr/testify/assert"
 )
 

authorize_error_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	. "github.com/ory-am/fosite"
-	. "github.com/ory-am/fosite/internal"
+	. "github.com/ory/fosite"
+	. "github.com/ory/fosite/internal"
 	"github.com/stretchr/testify/assert"
 )
 

authorize_request_handler_test.go

@@ -7,8 +7,8 @@ import (
 
 	"github.com/golang/mock/gomock"
 	"github.com/ory-am/common/pkg"
-	. "github.com/ory-am/fosite"
-	. "github.com/ory-am/fosite/internal"
+	. "github.com/ory/fosite"
+	. "github.com/ory/fosite/internal"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"context"

authorize_response_writer_test.go

@@ -5,8 +5,8 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	. "github.com/ory-am/fosite"
-	. "github.com/ory-am/fosite/internal"
+	. "github.com/ory/fosite"
+	. "github.com/ory/fosite/internal"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"context"

authorize_write_test.go

@@ -6,8 +6,8 @@ import (
 	"testing"
 
 	"github.com/golang/mock/gomock"
-	. "github.com/ory-am/fosite"
-	. "github.com/ory-am/fosite/internal"
+	. "github.com/ory/fosite"
+	. "github.com/ory/fosite/internal"
 	"github.com/stretchr/testify/assert"
 )
 

compose/compose.go

@@ -3,14 +3,14 @@ package compose
 import (
 	"crypto/rsa"
 
-	"github.com/ory-am/fosite"
+	"github.com/ory/fosite"
 )
 
 type Factory func(config *Config, storage interface{}, strategy interface{}) interface{}
 
 // Compose takes a config, a storage, a strategy and handlers to instantiate an OAuth2Provider:
 //
-//  import "github.com/ory-am/fosite/compose"
+//  import "github.com/ory/fosite/compose"
 //
 //  // var storage = new(MyFositeStorage)
 //  var config = Config {

compose/compose_oauth2.go

@@ -1,8 +1,8 @@
 package compose
 
 import (
-	"github.com/ory-am/fosite"
-	"github.com/ory-am/fosite/handler/oauth2"
+	"github.com/ory/fosite"
+	"github.com/ory/fosite/handler/oauth2"
 )
 
 // OAuth2AuthorizeExplicitFactory creates an OAuth2 authorize code grant ("authorize explicit flow") handler and registers

compose/compose_openid.go

@@ -1,9 +1,9 @@
 package compose
 
 import (
-	"github.com/ory-am/fosite"
-	"github.com/ory-am/fosite/handler/oauth2"
-	"github.com/ory-am/fosite/handler/openid"
+	"github.com/ory/fosite"
+	"github.com/ory/fosite/handler/oauth2"
+	"github.com/ory/fosite/handler/openid"
 )
 
 // OpenIDConnectExplicitFactory creates an OpenID Connect explicit ("authorize code flow") grant handler. You must add this handler

compose/compose_strategy.go

@@ -3,10 +3,10 @@ package compose
 import (
 	"crypto/rsa"
 
-	"github.com/ory-am/fosite/handler/oauth2"
-	"github.com/ory-am/fosite/handler/openid"
-	"github.com/ory-am/fosite/token/hmac"
-	"github.com/ory-am/fosite/token/jwt"
+	"github.com/ory/fosite/handler/oauth2"
+	"github.com/ory/fosite/handler/openid"
+	"github.com/ory/fosite/token/hmac"
+	"github.com/ory/fosite/token/jwt"
 )
 
 type CommonStrategy struct {

fosite_test.go

@@ -3,8 +3,8 @@ package fosite_test
 import (
 	"testing"
 
-	. "github.com/ory-am/fosite"
-	"github.com/ory-am/fosite/handler/oauth2"
+	. "github.com/ory/fosite"
+	"github.com/ory/fosite/handler/oauth2"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )

generate-mocks.sh

@@ -1,30 +1,30 @@
 #!/bin/bash
 
-mockgen -package internal -destination internal/hash.go github.com/ory-am/fosite Hasher
-mockgen -package internal -destination internal/storage.go github.com/ory-am/fosite Storage
-mockgen -package internal -destination internal/oauth2_storage.go github.com/ory-am/fosite/handler/oauth2 CoreStorage
-mockgen -package internal -destination internal/oauth2_strategy.go github.com/ory-am/fosite/handler/oauth2 CoreStrategy
-mockgen -package internal -destination internal/authorize_code_storage.go github.com/ory-am/fosite/handler/oauth2 AuthorizeCodeStorage
-mockgen -package internal -destination internal/access_token_storage.go github.com/ory-am/fosite/handler/oauth2 AccessTokenStorage
-mockgen -package internal -destination internal/refresh_token_strategy.go github.com/ory-am/fosite/handler/oauth2 RefreshTokenStorage
-mockgen -package internal -destination internal/oauth2_client_storage.go github.com/ory-am/fosite/handler/oauth2 ClientCredentialsGrantStorage
-mockgen -package internal -destination internal/oauth2_explicit_storage.go github.com/ory-am/fosite/handler/oauth2 AuthorizeCodeGrantStorage
-mockgen -package internal -destination internal/oauth2_implicit_storage.go github.com/ory-am/fosite/handler/oauth2 ImplicitGrantStorage
-mockgen -package internal -destination internal/oauth2_owner_storage.go github.com/ory-am/fosite/handler/oauth2 ResourceOwnerPasswordCredentialsGrantStorage
-mockgen -package internal -destination internal/oauth2_refresh_storage.go github.com/ory-am/fosite/handler/oauth2 RefreshTokenGrantStorage
-mockgen -package internal -destination internal/oauth2_revoke_storage.go github.com/ory-am/fosite/handler/oauth2 TokenRevocationStorage
-mockgen -package internal -destination internal/openid_id_token_storage.go github.com/ory-am/fosite/handler/openid OpenIDConnectRequestStorage
-mockgen -package internal -destination internal/access_token_strategy.go github.com/ory-am/fosite/handler/oauth2 AccessTokenStrategy
-mockgen -package internal -destination internal/refresh_token_strategy.go github.com/ory-am/fosite/handler/oauth2 RefreshTokenStrategy
-mockgen -package internal -destination internal/authorize_code_strategy.go github.com/ory-am/fosite/handler/oauth2 AuthorizeCodeStrategy
-mockgen -package internal -destination internal/id_token_strategy.go github.com/ory-am/fosite/handler/openid OpenIDConnectTokenStrategy
-mockgen -package internal -destination internal/authorize_handler.go github.com/ory-am/fosite AuthorizeEndpointHandler
-mockgen -package internal -destination internal/revoke_handler.go github.com/ory-am/fosite RevocationHandler
-mockgen -package internal -destination internal/token_handler.go github.com/ory-am/fosite TokenEndpointHandler
-mockgen -package internal -destination internal/introspector.go github.com/ory-am/fosite TokenIntrospector
-mockgen -package internal -destination internal/client.go github.com/ory-am/fosite Client
-mockgen -package internal -destination internal/request.go github.com/ory-am/fosite Requester
-mockgen -package internal -destination internal/access_request.go github.com/ory-am/fosite AccessRequester
-mockgen -package internal -destination internal/access_response.go github.com/ory-am/fosite AccessResponder
-mockgen -package internal -destination internal/authorize_request.go github.com/ory-am/fosite AuthorizeRequester
-mockgen -package internal -destination internal/authorize_response.go github.com/ory-am/fosite AuthorizeResponder
+mockgen -package internal -destination internal/hash.go github.com/ory/fosite Hasher
+mockgen -package internal -destination internal/storage.go github.com/ory/fosite Storage
+mockgen -package internal -destination internal/oauth2_storage.go github.com/ory/fosite/handler/oauth2 CoreStorage
+mockgen -package internal -destination internal/oauth2_strategy.go github.com/ory/fosite/handler/oauth2 CoreStrategy
+mockgen -package internal -destination internal/authorize_code_storage.go github.com/ory/fosite/handler/oauth2 AuthorizeCodeStorage
+mockgen -package internal -destination internal/access_token_storage.go github.com/ory/fosite/handler/oauth2 AccessTokenStorage
+mockgen -package internal -destination internal/refresh_token_strategy.go github.com/ory/fosite/handler/oauth2 RefreshTokenStorage
+mockgen -package internal -destination internal/oauth2_client_storage.go github.com/ory/fosite/handler/oauth2 ClientCredentialsGrantStorage
+mockgen -package internal -destination internal/oauth2_explicit_storage.go github.com/ory/fosite/handler/oauth2 AuthorizeCodeGrantStorage
+mockgen -package internal -destination internal/oauth2_implicit_storage.go github.com/ory/fosite/handler/oauth2 ImplicitGrantStorage
+mockgen -package internal -destination internal/oauth2_owner_storage.go github.com/ory/fosite/handler/oauth2 ResourceOwnerPasswordCredentialsGrantStorage
+mockgen -package internal -destination internal/oauth2_refresh_storage.go github.com/ory/fosite/handler/oauth2 RefreshTokenGrantStorage
+mockgen -package internal -destination internal/oauth2_revoke_storage.go github.com/ory/fosite/handler/oauth2 TokenRevocationStorage
+mockgen -package internal -destination internal/openid_id_token_storage.go github.com/ory/fosite/handler/openid OpenIDConnectRequestStorage
+mockgen -package internal -destination internal/access_token_strategy.go github.com/ory/fosite/handler/oauth2 AccessTokenStrategy
+mockgen -package internal -destination internal/refresh_token_strategy.go github.com/ory/fosite/handler/oauth2 RefreshTokenStrategy
+mockgen -package internal -destination internal/authorize_code_strategy.go github.com/ory/fosite/handler/oauth2 AuthorizeCodeStrategy
+mockgen -package internal -destination internal/id_token_strategy.go github.com/ory/fosite/handler/openid OpenIDConnectTokenStrategy
+mockgen -package internal -destination internal/authorize_handler.go github.com/ory/fosite AuthorizeEndpointHandler
+mockgen -package internal -destination internal/revoke_handler.go github.com/ory/fosite RevocationHandler
+mockgen -package internal -destination internal/token_handler.go github.com/ory/fosite TokenEndpointHandler
+mockgen -package internal -destination internal/introspector.go github.com/ory/fosite TokenIntrospector
+mockgen -package internal -destination internal/client.go github.com/ory/fosite Client
+mockgen -package internal -destination internal/request.go github.com/ory/fosite Requester
+mockgen -package internal -destination internal/access_request.go github.com/ory/fosite AccessRequester
+mockgen -package internal -destination internal/access_response.go github.com/ory/fosite AccessResponder
+mockgen -package internal -destination internal/authorize_request.go github.com/ory/fosite AuthorizeRequester
+mockgen -package internal -destination internal/authorize_response.go github.com/ory/fosite AuthorizeResponder

glide.yaml

@@ -1,4 +1,4 @@
-package: github.com/ory-am/fosite
+package: github.com/ory/fosite
 import:
 - package: github.com/asaskevich/govalidator
   version: ~5.0.0

handler/oauth2/flow_authorize_code_auth.go

@@ -7,7 +7,7 @@ import (
 
 	"fmt"
 
-	"github.com/ory-am/fosite"
+	"github.com/ory/fosite"
 	"github.com/pkg/errors"
 	"context"
 )

handler/oauth2/flow_authorize_code_auth_test.go

@@ -8,8 +8,8 @@ import (
 	"strings"
 
 	"github.com/golang/mock/gomock"
-	"github.com/ory-am/fosite"
-	"github.com/ory-am/fosite/internal"
+	"github.com/ory/fosite"
+	"github.com/ory/fosite/internal"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 )