Merge pull request #36 from janekolszak/devel

Changed Hydra's paths and updated to v0.8.5
janekolszak · Jun 2, 2017 · efef485 · efef485
2 parents dcbb690 + 0dc71a0
commit efef485
Show file tree

Hide file tree

Showing 5 changed files with 48 additions and 60 deletions.
diff --git a/README.md b/README.md
@@ -1,7 +1,7 @@
 # Identity Provider (IdP) for Hydra
 [![Build Status](https://travis-ci.org/janekolszak/idp.svg?branch=master)](https://travis-ci.org/janekolszak/idp) [![Code Climate](https://codeclimate.com/github/janekolszak/idp/badges/gpa.svg)](https://codeclimate.com/github/janekolszak/idp) [![GoDoc](https://godoc.org/github.com/janekolszak/idp?status.svg)](https://godoc.org/github.com/janekolszak/idp) [![Gitter](https://img.shields.io/gitter/room/nwjs/nw.js.svg?maxAge=2592000)](https://gitter.im/janekolszak/idp)
 
-This is a helper library for handling *challenge* requests from [Hydra](https://github.com/ory-am/hydra), it handles:
+This is a helper library for handling *challenge* requests from [Hydra](https://github.com/ory/hydra), it handles:
 - Storing challenge in a short lived cookie instead of query parameters
 - Passing user's consent to Hydra
 - Retriving keys from Hydra and using them for JWT verification

diff --git a/challenge.go b/challenge.go
@@ -1,11 +1,11 @@
-// Package for handling challenge requests from Hydra(https://github.com/ory-am/hydra).
+// Package for handling challenge requests from Hydra(https://github.com/ory/hydra).
 package idp
 
 import (
 	"encoding/gob"
 	jwt "github.com/dgrijalva/jwt-go"
 	// "github.com/gorilla/sessions"
-	hclient "github.com/ory-am/hydra/client"
+	hclient "github.com/ory/hydra/client"
 	"net/http"
 	"time"
 )

diff --git a/glide.lock b/glide.lock
diff --git a/glide.yaml b/glide.yaml
@@ -1,10 +1,11 @@
-package: .
+package: github.com/janekolszak/idp
 import:
 - package: github.com/dgrijalva/jwt-go
   version: ~3.0.0
 - package: github.com/gorilla/sessions
-- package: github.com/ory-am/hydra
-  version: ~0.7.11
+  version: ~1.1.0
+- package: github.com/ory/hydra
+  version: ~0.8.5
   subpackages:
   - client
   - jwk

diff --git a/idp.go b/idp.go
@@ -7,10 +7,10 @@ import (
 
 	jwt "github.com/dgrijalva/jwt-go"
 	"github.com/gorilla/sessions"
-	hclient "github.com/ory-am/hydra/client"
-	hjwk "github.com/ory-am/hydra/jwk"
-	hoauth2 "github.com/ory-am/hydra/oauth2"
-	hydra "github.com/ory-am/hydra/sdk"
+	hclient "github.com/ory/hydra/client"
+	hjwk "github.com/ory/hydra/jwk"
+	hoauth2 "github.com/ory/hydra/oauth2"
+	hydra "github.com/ory/hydra/sdk"
 	"github.com/patrickmn/go-cache"
 )