From be13dcc6e1c5a859d4f4ffe5d8f9a2f001186c60 Mon Sep 17 00:00:00 2001
From: aeneasr <aeneas.rekkas@serlo.org>
Date: Thu, 6 Oct 2016 13:35:22 +0200
Subject: [PATCH] oauth2: refresh token does not migrate session object to new
 token - closes #283

---
 cmd/cli/handler_policy.go | 20 ++++++++++----------
 docs/demo.md              |  5 +----
 glide.lock                |  6 +++---
 glide.yaml                |  2 +-
 4 files changed, 15 insertions(+), 18 deletions(-)

diff --git a/cmd/cli/handler_policy.go b/cmd/cli/handler_policy.go
index a8e1cfba717..86ec7f9fd1e 100644
--- a/cmd/cli/handler_policy.go
+++ b/cmd/cli/handler_policy.go
@@ -161,7 +161,7 @@ func (h *PolicyHandler) AddActionToPolicy(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	policy, err := h.M.Get(args[0])
+	p, err := h.M.Get(args[0])
 	pkg.Must(err, "Could not get policy: %s", err)
 
 	err = h.M.Delete(args[0])
@@ -171,16 +171,16 @@ func (h *PolicyHandler) AddActionToPolicy(cmd *cobra.Command, args []string) {
 		pkg.Must(err, "Could not prepare policy for update: %s", err)
 	}
 
-	p := policy.(*ladon.DefaultPolicy)
-	p.Actions = append(p.Actions, args[1:]...)
+	encp := p.(*ladon.DefaultPolicy)
+	encp.Actions = append(encp.Actions, args[1:]...)
 
-	err = h.M.Create(policy)
+	err = h.M.Create(p)
 	if h.M.Dry {
 		fmt.Printf("%s\n", err)
 		return
 	}
 	pkg.Must(err, "Could not update policy: %s", err)
-	fmt.Printf("Added actions to policy %s", p.ID)
+	fmt.Printf("Added actions to policy %s", encp.ID)
 }
 
 func (h *PolicyHandler) RemoveActionFromPolicy(cmd *cobra.Command, args []string) {
@@ -197,16 +197,16 @@ func (h *PolicyHandler) GetPolicy(cmd *cobra.Command, args []string) {
 		return
 	}
 
-	policy, err := h.M.Get(args[0])
+	p, err := h.M.Get(args[0])
 	if h.M.Dry {
 		fmt.Printf("%s\n", err)
 		return
 	}
-	pkg.Must(err, "Could not delete policy: %s", err)
-
-	out, err := json.MarshalIndent(policy, "", "\t")
 	pkg.Must(err, "Could not retrieve policy: %s", err)
 
+	out, err := json.MarshalIndent(p, "", "\t")
+	pkg.Must(err, "Could not convert policy to JSON: %s", err)
+
 	fmt.Printf("%s\n", out)
 }
 
@@ -229,4 +229,4 @@ func (h *PolicyHandler) DeletePolicy(cmd *cobra.Command, args []string) {
 		pkg.Must(err, "Could not delete policy: %s", err)
 		fmt.Printf("Connection %s deleted.\n", arg)
 	}
-}
+}
\ No newline at end of file
diff --git a/docs/demo.md b/docs/demo.md
index 2cc4e7cf88d..451122a6dfe 100644
--- a/docs/demo.md
+++ b/docs/demo.md
@@ -13,10 +13,7 @@ We will use a dummy password as the system secret: `SYSTEM_SECRET=passwordtutori
 ```
 $ go get github.com/ory-am/hydra
 $ cd $GOPATH/src/github.com/ory-am/hydra
-$ docker-compose build
-Building hydra
-[...]
-$ SYSTEM_SECRET=passwordtutorial DOCKER_IP=localhost docker-compose up
+$ SYSTEM_SECRET=passwordtutorial DOCKER_IP=localhost docker-compose up --build
 Starting hydra_rethinkdb_1
 [...]
 mhydra   | mtime="2016-05-17T18:09:28Z" level=warning msg="Generated system secret: MnjFP5eLIr60h?hLI1h-!<4(TlWjAHX7"
diff --git a/glide.lock b/glide.lock
index 614d03509f0..4c6ffd1ada5 100644
--- a/glide.lock
+++ b/glide.lock
@@ -1,5 +1,5 @@
-hash: f1931945f77f6461c6134be605c3def735f6c1e7fbabe54993f731591fa02d98
-updated: 2016-10-03T11:23:49.9431729+02:00
+hash: 83ebe5a2aa0e2e818b556ef9dad206d0685000271c269876310d45d0e2bf6e30
+updated: 2016-10-06T13:24:49.885386519+02:00
 imports:
 - name: github.com/asaskevich/govalidator
   version: 7664702784775e51966f0885f5cd27435916517b
@@ -60,7 +60,7 @@ imports:
   - pkg
   - rand/sequence
 - name: github.com/ory-am/fosite
-  version: e61a25f3e3d3f067141c3f6464ab4213f4e14d45
+  version: bef61973fdee1a18aedba4e42a1d8977c3f8cc1c
   subpackages:
   - compose
   - fosite-example/pkg
diff --git a/glide.yaml b/glide.yaml
index 81f64024c3f..247aae84e26 100644
--- a/glide.yaml
+++ b/glide.yaml
@@ -18,7 +18,7 @@ import:
 - package: github.com/dgrijalva/jwt-go
   version: ~3.0.0
 - package: github.com/ory-am/fosite
-  version: ~0.3.2
+  version: ~0.3.5
   subpackages:
   - compose
   - fosite-example/pkg