From 3fe32cd207a87a257300737aca3e05d6a25e6cf0 Mon Sep 17 00:00:00 2001
From: aeneasr <aeneas@ory.sh>
Date: Tue, 20 Nov 2018 10:20:39 +0100
Subject: [PATCH 1/4] e2e: Improve e2e test pipeline

Signed-off-by: aeneasr <aeneas@ory.sh>
---
 .circleci/config.yml                     | 45 ++++++++----
 scripts/test-e2e-opaque.sh               | 93 ------------------------
 scripts/test-e2e-plugin.sh               |  2 +-
 scripts/{test-e2e-jwt.sh => test-e2e.sh} | 34 ++++++++-
 4 files changed, 63 insertions(+), 111 deletions(-)
 delete mode 100755 scripts/test-e2e-opaque.sh
 rename scripts/{test-e2e-jwt.sh => test-e2e.sh} (72%)
 mode change 100755 => 100644

diff --git a/.circleci/config.yml b/.circleci/config.yml
index b8b5cf5ed02..8a8b19ce37d 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -81,16 +81,29 @@ jobs:
           source $BASH_ENV
     - checkout
     - run: go mod verify
-    - run: go get -u github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/ory/go-acc
     - run: go install github.com/ory/hydra
-    - run: go install github.com/ory/hydra/test/mock-lcp
     - run: hydra migrate sql $DATABASE_URL_POSTGRES
     - run: hydra migrate sql $DATABASE_URL_MYSQL
-    - run: DATABASE_URL=$DATABASE_URL_POSTGRES ./scripts/test-e2e-opaque.sh
-    - run: DATABASE_URL=$DATABASE_URL_MYSQL ./scripts/test-e2e-opaque.sh
-    - run: DATABASE_URL=memory ./scripts/test-e2e-opaque.sh
-    - run: DATABASE_URL=memory ./scripts/test-e2e-opaque.sh
-    - run: ./scripts/test-e2e-plugin.sh
+    - run: DATABASE_URL=$DATABASE_URL_POSTGRES ./scripts/test-e2e.sh
+    - run: DATABASE_URL=$DATABASE_URL_MYSQL ./scripts/test-e2e.sh
+#    See https://github.com/ory/hydra/issues/1179
+#    - run: DATABASE_URL=memory ./scripts/test-e2e.sh
+
+    test-e2e-plugin:
+      docker:
+      - image: circleci/golang:1.11
+      working_directory: /go/src/github.com/ory/hydra
+      steps:
+      - run:
+          name: Enable go1.11 modules
+          command: |
+            echo 'export GO111MODULE=on' >> $BASH_ENV
+            source $BASH_ENV
+      - checkout
+      - run: go mod verify
+      - run: go install github.com/ory/hydra
+      - run: OAUTH2_ACCESS_TOKEN_STRATEGY=jwt ./scripts/test-e2e-plugin.sh
+      - run: ./scripts/test-e2e-plugin.sh
 
   test-e2e-jwt:
     docker:
@@ -115,16 +128,13 @@ jobs:
           source $BASH_ENV
     - checkout
     - run: go mod verify
-    - run: go get -u github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/ory/go-acc
     - run: go install github.com/ory/hydra
-    - run: go install github.com/ory/hydra/test/mock-lcp
     - run: hydra migrate sql $DATABASE_URL_POSTGRES
     - run: hydra migrate sql $DATABASE_URL_MYSQL
-    - run: DATABASE_URL=$DATABASE_URL_POSTGRES ./scripts/test-e2e-jwt.sh
-    - run: DATABASE_URL=$DATABASE_URL_MYSQL ./scripts/test-e2e-jwt.sh
-    - run: DATABASE_URL=memory ./scripts/test-e2e-opaque.sh
-    - run: DATABASE_URL=memory ./scripts/test-e2e-opaque.sh
-    - run: ./scripts/test-e2e-plugin.sh
+    - run: OAUTH2_ACCESS_TOKEN_STRATEGY=jwt DATABASE_URL=$DATABASE_URL_POSTGRES ./scripts/test-e2e.sh
+    - run: OAUTH2_ACCESS_TOKEN_STRATEGY=jwt DATABASE_URL=$DATABASE_URL_MYSQL ./scripts/test-e2e.sh
+#    See https://github.com/ory/hydra/issues/1179
+#    - run: OAUTH2_ACCESS_TOKEN_STRATEGY=jwt DATABASE_URL=memory ./scripts/test-e2e.sh
 
 # This test is really useless because there are always changes (usually timestamps in the generated code)
 #  generators:
@@ -285,6 +295,12 @@ workflows:
           filters:
             tags:
               only: /.*/
+      - test-e2e-plugin:
+          requires:
+            - test
+          filters:
+            tags:
+              only: /.*/
       - release-docs:
           filters:
             branches:
@@ -306,6 +322,7 @@ workflows:
 #            - generators
             - format
             - test-e2e-opaque
+            - test-e2e-plugin
             - test-e2e-jwt
           filters:
             tags:
diff --git a/scripts/test-e2e-opaque.sh b/scripts/test-e2e-opaque.sh
deleted file mode 100755
index 12170a0f44b..00000000000
--- a/scripts/test-e2e-opaque.sh
+++ /dev/null
@@ -1,93 +0,0 @@
-#!/usr/bin/env bash
-
-set -Eeuxo pipefail
-
-cd "$( dirname "${BASH_SOURCE[0]}" )/.."
-
-killall hydra || true
-killall mock-lcp || true
-killall mock-cb || true
-
-export HYDRA_URL=http://127.0.0.1:4444/
-export HYDRA_ADMIN_URL=http://127.0.0.1:4445/
-export OAUTH2_CLIENT_ID=foobar
-export OAUTH2_CLIENT_SECRET=bazbar
-export OAUTH2_ISSUER_URL=http://127.0.0.1:4444/
-export LOG_LEVEL=debug
-export REDIRECT_URL=http://127.0.0.1:5555/callback
-export OAUTH2_SCOPE=openid,offline
-
-go install .
-go install ./test/mock-client
-go install ./test/mock-lcp
-go install ./test/mock-cb
-
-OAUTH2_CONSENT_URL=http://127.0.0.1:3000/consent \
-    OAUTH2_LOGIN_URL=http://127.0.0.1:3000/login \
-    OAUTH2_ERROR_URL=http://127.0.0.1:3000/error \
-    OAUTH2_SHARE_ERROR_DEBUG=true \
-    hydra serve all --dangerous-force-http --disable-telemetry &
-
-PORT=3000 mock-lcp &
-
-PORT=5555 mock-cb &
-
-while ! echo exit | nc 127.0.0.1 4444; do sleep 1; done
-while ! echo exit | nc 127.0.0.1 4445; do sleep 1; done
-while ! echo exit | nc 127.0.0.1 5555; do sleep 1; done
-while ! echo exit | nc 127.0.0.1 3000; do sleep 1; done
-
-
-hydra clients create \
-    --endpoint http://127.0.0.1:4445 \
-    --id $OAUTH2_CLIENT_ID \
-    --secret $OAUTH2_CLIENT_SECRET \
-    --response-types token,code,id_token \
-    --grant-types refresh_token,authorization_code,client_credentials \
-    --scope openid,offline \
-    --callbacks http://127.0.0.1:5555/callback
-
-token=$(hydra token client)
-
-hydra token introspect "$token"
-
-## Authenticate but do not remember user
-cookie=$(OAUTH2_EXTRA="&mockLogin=accept&mockConsent=accept" \
-    mock-client)
-export AUTH_COOKIE=$cookie
-
-## Must fail because prompt=none but no session was remembered
-if OAUTH2_EXTRA="&mockLogin=accept&mockConsent=accept&prompt=none" \
-    mock-client; then
-    echo "should have failed"
-    exit 1
-fi
-
-# Authenticate and remember login (but not consent)
-cookie=$(OAUTH2_EXTRA="&mockLogin=accept&mockConsent=accept&rememberLogin=yes" \
-    mock-client)
-export AUTH_COOKIE=$cookie
-
-## Must fail because prompt=none but consent was not yet stored
-if OAUTH2_EXTRA="&mockLogin=accept&mockConsent=accept&prompt=none" \
-    mock-client; then
-    echo "should have failed"
-    exit 1
-fi
-
-# Remember consent
-cookie=$(OAUTH2_EXTRA="&mockLogin=accept&mockConsent=accept&rememberConsent=yes" \
-    mock-client)
-
-## Prompt none should work now because cookie was set
-OAUTH2_EXTRA="&mockLogin=accept&mockConsent=accept&prompt=none" \
-    mock-client
-
-hydra clients delete $OAUTH2_CLIENT_ID
-
-kill %1
-kill %2
-kill %3
-exit 0
-
-sleep 5
diff --git a/scripts/test-e2e-plugin.sh b/scripts/test-e2e-plugin.sh
index bc25f16c99e..8eb664cc398 100755
--- a/scripts/test-e2e-plugin.sh
+++ b/scripts/test-e2e-plugin.sh
@@ -8,7 +8,7 @@ killall hydra || true
 
 export HYDRA_URL=http://127.0.0.1:4444/
 export HYDRA_ADMIN_URL=http://127.0.0.1:4445/
-export OAUTH2_CLIENT_ID=foobar
+export OAUTH2_CLIENT_ID=foobar-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
 export OAUTH2_CLIENT_SECRET=bazbar
 export OAUTH2_ISSUER_URL=http://127.0.0.1:4444/
 export LOG_LEVEL=debug
diff --git a/scripts/test-e2e-jwt.sh b/scripts/test-e2e.sh
old mode 100755
new mode 100644
similarity index 72%
rename from scripts/test-e2e-jwt.sh
rename to scripts/test-e2e.sh
index 2b602dab454..fcb0a7612fe
--- a/scripts/test-e2e-jwt.sh
+++ b/scripts/test-e2e.sh
@@ -10,13 +10,12 @@ killall mock-cb || true
 
 export HYDRA_URL=http://127.0.0.1:4444/
 export HYDRA_ADMIN_URL=http://127.0.0.1:4445/
-export OAUTH2_CLIENT_ID=foobar
+export OAUTH2_CLIENT_ID=foobar-$(cat /dev/urandom | tr -dc 'a-zA-Z0-9' | fold -w 8 | head -n 1)
 export OAUTH2_CLIENT_SECRET=bazbar
 export OAUTH2_ISSUER_URL=http://127.0.0.1:4444/
 export LOG_LEVEL=debug
 export REDIRECT_URL=http://127.0.0.1:5555/callback
 export OAUTH2_SCOPE=openid,offline
-export OAUTH2_ACCESS_TOKEN_STRATEGY=jwt
 
 go install .
 go install ./test/mock-client
@@ -50,7 +49,12 @@ hydra clients create \
 
 token=$(hydra token client)
 
-hydra token introspect "$token"
+introspect=$(hydra token introspect "$token")
+
+if [[ "$(echo $introspect)" =~ "false" ]]; then
+    echo "Token introspection should return true"
+    exit 1
+fi
 
 ## Authenticate but do not remember user
 cookie=$(OAUTH2_EXTRA="&mockLogin=accept&mockConsent=accept" \
@@ -84,8 +88,32 @@ cookie=$(OAUTH2_EXTRA="&mockLogin=accept&mockConsent=accept&rememberConsent=yes"
 OAUTH2_EXTRA="&mockLogin=accept&mockConsent=accept&prompt=none" \
     mock-client
 
+if [[ "$(echo $introspect)" =~ "false" ]]; then
+    echo "Token introspection should return true"
+    exit 1
+fi
+
 hydra clients delete $OAUTH2_CLIENT_ID
 
+if [[ "$(hydra token introspect $token)" =~ "true" ]]; then
+    echo "Token introspection should return false"
+    exit 1
+fi
+
+hydra clients create \
+    --endpoint http://127.0.0.1:4445 \
+    --id $OAUTH2_CLIENT_ID \
+    --secret $OAUTH2_CLIENT_SECRET \
+    --response-types token,code,id_token \
+    --grant-types refresh_token,authorization_code,client_credentials \
+    --scope openid,offline \
+    --callbacks http://127.0.0.1:5555/callback
+
+if [[ "$(hydra token introspect $token)" =~ "true" ]]; then
+    echo "Token introspection should return false"
+    exit 1
+fi
+
 kill %1
 kill %2
 kill %3

From 41e6e17bd22788d2d575075e2b84cbe62cb7953f Mon Sep 17 00:00:00 2001
From: aeneasr <aeneas@ory.sh>
Date: Tue, 20 Nov 2018 11:26:54 +0100
Subject: [PATCH 2/4] u

---
 .circleci/config.yml | 30 +++++++++++++++---------------
 scripts/test-e2e.sh  |  0
 2 files changed, 15 insertions(+), 15 deletions(-)
 mode change 100644 => 100755 scripts/test-e2e.sh

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 8a8b19ce37d..03526bee309 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -89,21 +89,21 @@ jobs:
 #    See https://github.com/ory/hydra/issues/1179
 #    - run: DATABASE_URL=memory ./scripts/test-e2e.sh
 
-    test-e2e-plugin:
-      docker:
-      - image: circleci/golang:1.11
-      working_directory: /go/src/github.com/ory/hydra
-      steps:
-      - run:
-          name: Enable go1.11 modules
-          command: |
-            echo 'export GO111MODULE=on' >> $BASH_ENV
-            source $BASH_ENV
-      - checkout
-      - run: go mod verify
-      - run: go install github.com/ory/hydra
-      - run: OAUTH2_ACCESS_TOKEN_STRATEGY=jwt ./scripts/test-e2e-plugin.sh
-      - run: ./scripts/test-e2e-plugin.sh
+  test-e2e-plugin:
+    docker:
+    - image: circleci/golang:1.11
+    working_directory: /go/src/github.com/ory/hydra
+    steps:
+    - run:
+        name: Enable go1.11 modules
+        command: |
+          echo 'export GO111MODULE=on' >> $BASH_ENV
+          source $BASH_ENV
+    - checkout
+    - run: go mod verify
+    - run: go install github.com/ory/hydra
+    - run: OAUTH2_ACCESS_TOKEN_STRATEGY=jwt ./scripts/test-e2e-plugin.sh
+    - run: ./scripts/test-e2e-plugin.sh
 
   test-e2e-jwt:
     docker:
diff --git a/scripts/test-e2e.sh b/scripts/test-e2e.sh
old mode 100644
new mode 100755

From f3b3117055ac014d44fa7e0a34350d177c6378a3 Mon Sep 17 00:00:00 2001
From: aeneasr <aeneas@ory.sh>
Date: Tue, 20 Nov 2018 12:12:25 +0100
Subject: [PATCH 3/4] u

---
 .circleci/config.yml            |  9 +++--
 client/sql_migration_files.go   | 58 ++++++++++++++++-----------------
 consent/sql_migration_files.go  | 44 ++++++++++++-------------
 jwk/sql_migration_files.go      | 20 ++++++------
 oauth2/oauth2_auth_code_test.go | 36 +++++++++++---------
 oauth2/sql_migration_files.go   | 52 ++++++++++++++---------------
 6 files changed, 112 insertions(+), 107 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 03526bee309..1b39fd2c7f1 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -34,7 +34,7 @@ jobs:
         environment:
         - TEST_DATABASE_POSTGRESQL=postgres://test:test@localhost:5432/hydra?sslmode=disable
         - TEST_DATABASE_MYSQL=root:test@(localhost:3306)/mysql?parseTime=true
-      - image: postgres:9.5
+      - image: postgres:9.6
         environment:
         - POSTGRES_USER=test
         - POSTGRES_PASSWORD=test
@@ -52,10 +52,9 @@ jobs:
       - checkout
       - run: go mod verify
       - run: go get -u github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/ory/go-acc
-      - run: go install github.com/ory/hydra
-      - run: go install github.com/ory/hydra/test/mock-lcp
-      - run: go-acc -o coverage.txt ./... -- -failfast -v -timeout=20m
-      - run: go test -race -short $(go list ./... | grep -v cmd)
+      - run: go-acc -o coverage.txt ./... -- -failfast -timeout=20m
+#      Running race conditions requires parallel tests, otherwise it's worthless (which is the case)
+#      - run: go test -race -short $(go list ./... | grep -v cmd)
       - run: test -z "$CIRCLE_PR_NUMBER" && goveralls -service=circle-ci -coverprofile=coverage.txt -repotoken=$COVERALLS_REPO_TOKEN || echo "forks are not allowed to push to coveralls"
 
   test-e2e-opaque:
diff --git a/client/sql_migration_files.go b/client/sql_migration_files.go
index f9a2885a776..b6072d34764 100644
--- a/client/sql_migration_files.go
+++ b/client/sql_migration_files.go
@@ -109,7 +109,7 @@ func migrationsSqlSharedGitattributes() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/.gitattributes", size: 12, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/.gitattributes", size: 12, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -129,7 +129,7 @@ func migrationsSqlSharedGitkeep() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/.gitkeep", size: 0, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/.gitkeep", size: 0, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -149,7 +149,7 @@ func migrationsSqlShared1Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/1.sql", size: 559, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/1.sql", size: 559, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -169,7 +169,7 @@ func migrationsSqlShared10Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/10.sql", size: 124, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/10.sql", size: 124, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -189,7 +189,7 @@ func migrationsSqlShared2Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/2.sql", size: 178, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/2.sql", size: 178, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -209,7 +209,7 @@ func migrationsSqlShared3Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/3.sql", size: 890, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/3.sql", size: 890, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -229,7 +229,7 @@ func migrationsSqlShared5Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/5.sql", size: 300, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/5.sql", size: 300, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -249,7 +249,7 @@ func migrationsSqlShared6Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/6.sql", size: 159, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/6.sql", size: 159, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -269,7 +269,7 @@ func migrationsSqlShared7Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/7.sql", size: 148, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/7.sql", size: 148, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -289,7 +289,7 @@ func migrationsSqlMysql11Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/11.sql", size: 173, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/11.sql", size: 173, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -309,7 +309,7 @@ func migrationsSqlMysql4Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/4.sql", size: 559, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/4.sql", size: 559, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -329,7 +329,7 @@ func migrationsSqlMysql8Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/8.sql", size: 209, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/8.sql", size: 209, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -349,7 +349,7 @@ func migrationsSqlMysql9Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/9.sql", size: 362, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/9.sql", size: 362, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -369,7 +369,7 @@ func migrationsSqlPostgres11Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/11.sql", size: 193, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/11.sql", size: 193, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -389,7 +389,7 @@ func migrationsSqlPostgres4Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/4.sql", size: 640, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/4.sql", size: 640, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -409,7 +409,7 @@ func migrationsSqlPostgres8Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/8.sql", size: 233, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/8.sql", size: 233, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -429,7 +429,7 @@ func migrationsSqlPostgres9Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/9.sql", size: 428, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/9.sql", size: 428, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -449,7 +449,7 @@ func migrationsSqlTestsGitkeep() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/.gitkeep", size: 0, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/.gitkeep", size: 0, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -469,7 +469,7 @@ func migrationsSqlTests10_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/10_test.sql", size: 787, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/10_test.sql", size: 787, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -489,7 +489,7 @@ func migrationsSqlTests11_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/11_test.sql", size: 809, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/11_test.sql", size: 809, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -509,7 +509,7 @@ func migrationsSqlTests1_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/1_test.sql", size: 437, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/1_test.sql", size: 437, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -529,7 +529,7 @@ func migrationsSqlTests2_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/2_test.sql", size: 466, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/2_test.sql", size: 466, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -549,7 +549,7 @@ func migrationsSqlTests3_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/3_test.sql", size: 715, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/3_test.sql", size: 715, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -569,7 +569,7 @@ func migrationsSqlTests4_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/4_test.sql", size: 715, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/4_test.sql", size: 715, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -589,7 +589,7 @@ func migrationsSqlTests5_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/5_test.sql", size: 692, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/5_test.sql", size: 692, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -609,7 +609,7 @@ func migrationsSqlTests6_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/6_test.sql", size: 716, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/6_test.sql", size: 716, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -629,7 +629,7 @@ func migrationsSqlTests7_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/7_test.sql", size: 772, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/7_test.sql", size: 772, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -649,7 +649,7 @@ func migrationsSqlTests8_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/8_test.sql", size: 772, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/8_test.sql", size: 772, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -669,7 +669,7 @@ func migrationsSqlTests9_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/9_test.sql", size: 772, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/9_test.sql", size: 772, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
diff --git a/consent/sql_migration_files.go b/consent/sql_migration_files.go
index 5c264ec5e63..63a7c8c0a3b 100644
--- a/consent/sql_migration_files.go
+++ b/consent/sql_migration_files.go
@@ -102,7 +102,7 @@ func migrationsSqlSharedGitkeep() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/.gitkeep", size: 0, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/.gitkeep", size: 0, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -122,7 +122,7 @@ func migrationsSqlShared1Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/1.sql", size: 2263, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/1.sql", size: 2263, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -142,7 +142,7 @@ func migrationsSqlShared2Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/2.sql", size: 714, mode: os.FileMode(438), modTime: time.Unix(1542622082, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/2.sql", size: 714, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -162,7 +162,7 @@ func migrationsSqlShared3Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/3.sql", size: 535, mode: os.FileMode(438), modTime: time.Unix(1542540402, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/3.sql", size: 535, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -182,7 +182,7 @@ func migrationsSqlMysqlGitkeep() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/.gitkeep", size: 0, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/.gitkeep", size: 0, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -202,7 +202,7 @@ func migrationsSqlMysql4Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/4.sql", size: 1002, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/4.sql", size: 1002, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -222,7 +222,7 @@ func migrationsSqlMysql5Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/5.sql", size: 1462, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/5.sql", size: 1462, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -242,7 +242,7 @@ func migrationsSqlMysql6Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/6.sql", size: 266, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/6.sql", size: 266, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -262,7 +262,7 @@ func migrationsSqlMysql7Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/7.sql", size: 6246, mode: os.FileMode(438), modTime: time.Unix(1542626922, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/7.sql", size: 6246, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -282,7 +282,7 @@ func migrationsSqlPostgresGitkeep() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/.gitkeep", size: 0, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/.gitkeep", size: 0, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -302,7 +302,7 @@ func migrationsSqlPostgres4Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/4.sql", size: 558, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/4.sql", size: 558, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -322,7 +322,7 @@ func migrationsSqlPostgres5Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/5.sql", size: 1199, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/5.sql", size: 1199, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -342,7 +342,7 @@ func migrationsSqlPostgres6Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/6.sql", size: 162, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/6.sql", size: 162, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -362,7 +362,7 @@ func migrationsSqlPostgres7Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/7.sql", size: 6324, mode: os.FileMode(438), modTime: time.Unix(1542626922, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/7.sql", size: 6324, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -382,7 +382,7 @@ func migrationsSqlTestsGitkeep() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/.gitkeep", size: 0, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/.gitkeep", size: 0, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -402,7 +402,7 @@ func migrationsSqlTests1_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/1_test.sql", size: 2061, mode: os.FileMode(438), modTime: time.Unix(1542622082, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/1_test.sql", size: 2061, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -422,7 +422,7 @@ func migrationsSqlTests2_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/2_test.sql", size: 2295, mode: os.FileMode(438), modTime: time.Unix(1542622082, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/2_test.sql", size: 2295, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -442,7 +442,7 @@ func migrationsSqlTests3_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/3_test.sql", size: 2407, mode: os.FileMode(438), modTime: time.Unix(1542622082, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/3_test.sql", size: 2407, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -462,7 +462,7 @@ func migrationsSqlTests4_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/4_test.sql", size: 2501, mode: os.FileMode(438), modTime: time.Unix(1542622082, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/4_test.sql", size: 2501, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -482,7 +482,7 @@ func migrationsSqlTests5_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/5_test.sql", size: 2501, mode: os.FileMode(438), modTime: time.Unix(1542622082, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/5_test.sql", size: 2501, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -502,7 +502,7 @@ func migrationsSqlTests6_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/6_test.sql", size: 5639, mode: os.FileMode(438), modTime: time.Unix(1542622082, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/6_test.sql", size: 5639, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -522,7 +522,7 @@ func migrationsSqlTests7_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/7_test.sql", size: 2515, mode: os.FileMode(438), modTime: time.Unix(1542622082, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/7_test.sql", size: 2515, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
diff --git a/jwk/sql_migration_files.go b/jwk/sql_migration_files.go
index 7c22cffc58a..6fec659119e 100644
--- a/jwk/sql_migration_files.go
+++ b/jwk/sql_migration_files.go
@@ -90,7 +90,7 @@ func migrationsSqlShared1Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/1.sql", size: 239, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/1.sql", size: 239, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -110,7 +110,7 @@ func migrationsSqlShared2Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/2.sql", size: 150, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/2.sql", size: 150, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -130,7 +130,7 @@ func migrationsSqlShared3Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/3.sql", size: 90, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/3.sql", size: 90, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -150,7 +150,7 @@ func migrationsSqlMysql4Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/4.sql", size: 350, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/4.sql", size: 350, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -170,7 +170,7 @@ func migrationsSqlPostgres4Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/4.sql", size: 407, mode: os.FileMode(438), modTime: time.Unix(1542622082, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/4.sql", size: 407, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -190,7 +190,7 @@ func migrationsSqlTestsGitkeep() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/.gitkeep", size: 0, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/.gitkeep", size: 0, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -210,7 +210,7 @@ func migrationsSqlTests1_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/1_test.sql", size: 126, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/1_test.sql", size: 126, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -230,7 +230,7 @@ func migrationsSqlTests2_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/2_test.sql", size: 145, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/2_test.sql", size: 145, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -250,7 +250,7 @@ func migrationsSqlTests3_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/3_test.sql", size: 145, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/3_test.sql", size: 145, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -270,7 +270,7 @@ func migrationsSqlTests4_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/4_test.sql", size: 145, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/4_test.sql", size: 145, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
diff --git a/oauth2/oauth2_auth_code_test.go b/oauth2/oauth2_auth_code_test.go
index 665ab64a919..158cb4865ba 100644
--- a/oauth2/oauth2_auth_code_test.go
+++ b/oauth2/oauth2_auth_code_test.go
@@ -181,8 +181,8 @@ func TestAuthCodeWithDefaultStrategy(t *testing.T) {
 					require.NoError(t, jm.AddKeySet(context.TODO(), OpenIDConnectKeyName, keys))
 					jwtStrategy, err := jwk.NewRS256JWTStrategy(jm, OpenIDConnectKeyName)
 
-					fc.RefreshTokenLifespan = time.Second * 5
-					fc.AccessTokenLifespan = time.Second * 15
+					fc.RefreshTokenLifespan = time.Second * 2
+					fc.AccessTokenLifespan = time.Second * 8
 					handler := &Handler{
 						OAuth2: compose.Compose(
 							fc, fs.f, strat.s, hasher,
@@ -652,7 +652,7 @@ func TestAuthCodeWithDefaultStrategy(t *testing.T) {
 							setup: func() {
 								// In order to check if authenticatedAt/requestedAt works, we'll sleep first in order to ensure that authenticatedAt is in the past
 								// if handled correctly.
-								time.Sleep(time.Second * 2)
+								time.Sleep(time.Second + time.Millisecond)
 							},
 							authURL: oauthConfig.AuthCodeURL("some-hardcoded-state") + "&prompt=none&max_age=60",
 							cj:      persistentCJ,
@@ -886,7 +886,7 @@ func TestAuthCodeWithDefaultStrategy(t *testing.T) {
 						},
 						{
 							d:       "should not cause issues if max_age is very low and consent takes a long time",
-							authURL: oauthConfig.AuthCodeURL("some-hardcoded-state") + "&max_age=3",
+							authURL: oauthConfig.AuthCodeURL("some-hardcoded-state") + "&max_age=1",
 							//cj:      persistentCJ,
 							lph: func(t *testing.T) func(w http.ResponseWriter, r *http.Request) {
 								return func(w http.ResponseWriter, r *http.Request) {
@@ -894,7 +894,7 @@ func TestAuthCodeWithDefaultStrategy(t *testing.T) {
 									require.NoError(t, err)
 									require.EqualValues(t, http.StatusOK, res.StatusCode)
 
-									time.Sleep(time.Second * 5)
+									time.Sleep(time.Second * 2)
 
 									v, res, err := apiClient.AcceptLoginRequest(r.URL.Query().Get("login_challenge"), swagger.AcceptLoginRequest{Subject: "user-a"})
 									require.NoError(t, err)
@@ -909,8 +909,6 @@ func TestAuthCodeWithDefaultStrategy(t *testing.T) {
 									require.NoError(t, err)
 									require.EqualValues(t, http.StatusOK, res.StatusCode)
 
-									time.Sleep(time.Second * 5)
-
 									v, res, err := apiClient.AcceptConsentRequest(r.URL.Query().Get("consent_challenge"), swagger.AcceptConsentRequest{
 										GrantScope: []string{"hydra", "openid"},
 										Session: swagger.ConsentRequestSession{
@@ -1127,6 +1125,7 @@ func TestAuthCodeWithMockStrategy(t *testing.T) {
 				shouldPassConsentStrategy bool
 				expectOAuthAuthError      bool
 				expectOAuthTokenError     bool
+				checkExpiry     bool
 				authTime                  time.Time
 				requestTime               time.Time
 				assertAccessToken         func(*testing.T, string)
@@ -1135,6 +1134,7 @@ func TestAuthCodeWithMockStrategy(t *testing.T) {
 					d:                         "should pass request if strategy passes",
 					authURL:                   oauthConfig.AuthCodeURL("some-foo-state"),
 					shouldPassConsentStrategy: true,
+					checkExpiry: true,
 					cb: func(t *testing.T) httprouter.Handle {
 						return func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 							code = r.URL.Query().Get("code")
@@ -1333,9 +1333,9 @@ func TestAuthCodeWithMockStrategy(t *testing.T) {
 					})
 					t.Logf("Got token: %s", token.AccessToken)
 
-					time.Sleep(time.Millisecond * 1200) // Makes sure exp/iat/nbf time is different later on
+					// time.Sleep(time.Millisecond * 1200) // Makes sure exp/iat/nbf time is different later on
 
-					res, err := testRefresh(t, token, ts.URL)
+					res, err := testRefresh(t, token, ts.URL, tc.checkExpiry)
 					require.NoError(t, err)
 					assert.Equal(t, http.StatusOK, res.StatusCode)
 
@@ -1368,9 +1368,11 @@ func TestAuthCodeWithMockStrategy(t *testing.T) {
 						refreshedPayload := map[string]interface{}{}
 						require.NoError(t, json.Unmarshal(body, &refreshedPayload))
 
-						assert.NotEqual(t, refreshedPayload["exp"], origPayload["exp"])
-						assert.NotEqual(t, refreshedPayload["iat"], origPayload["iat"])
-						assert.NotEqual(t, refreshedPayload["nbf"], origPayload["nbf"])
+						if tc.checkExpiry {
+							assert.NotEqual(t, refreshedPayload["exp"], origPayload["exp"])
+							assert.NotEqual(t, refreshedPayload["iat"], origPayload["iat"])
+							assert.NotEqual(t, refreshedPayload["nbf"], origPayload["nbf"])
+						}
 						assert.NotEqual(t, refreshedPayload["jti"], origPayload["jti"])
 						assert.Equal(t, refreshedPayload["client_id"], origPayload["client_id"])
 					})
@@ -1387,13 +1389,13 @@ func TestAuthCodeWithMockStrategy(t *testing.T) {
 					})
 
 					t.Run("refreshing old token should no longer work", func(t *testing.T) {
-						res, err := testRefresh(t, token, ts.URL)
+						res, err := testRefresh(t, token, ts.URL, false)
 						require.NoError(t, err)
 						assert.Equal(t, http.StatusBadRequest, res.StatusCode)
 					})
 
 					t.Run("refreshing new refresh token should work", func(t *testing.T) {
-						res, err := testRefresh(t, &refreshedToken, ts.URL)
+						res, err := testRefresh(t, &refreshedToken, ts.URL, false)
 						require.NoError(t, err)
 						assert.Equal(t, http.StatusOK, res.StatusCode)
 					})
@@ -1411,7 +1413,11 @@ func TestAuthCodeWithMockStrategy(t *testing.T) {
 	}
 }
 
-func testRefresh(t *testing.T, token *oauth2.Token, u string) (*http.Response, error) {
+func testRefresh(t *testing.T, token *oauth2.Token, u string, sleep bool) (*http.Response, error) {
+	if sleep {
+		time.Sleep(time.Millisecond * 1001)
+	}
+
 	oauthClientConfig := &clientcredentials.Config{
 		ClientID:     "app-client",
 		ClientSecret: "secret",
diff --git a/oauth2/sql_migration_files.go b/oauth2/sql_migration_files.go
index 163edfb38eb..97618dac31b 100644
--- a/oauth2/sql_migration_files.go
+++ b/oauth2/sql_migration_files.go
@@ -105,7 +105,7 @@ func migrationsSqlShared1Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/1.sql", size: 1542, mode: os.FileMode(438), modTime: time.Unix(1542622082, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/1.sql", size: 1542, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -125,7 +125,7 @@ func migrationsSqlShared2Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/2.sql", size: 552, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/2.sql", size: 552, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -145,7 +145,7 @@ func migrationsSqlShared3Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/3.sql", size: 445, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/3.sql", size: 445, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -165,7 +165,7 @@ func migrationsSqlShared4Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/4.sql", size: 638, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/4.sql", size: 638, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -185,7 +185,7 @@ func migrationsSqlShared8Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/shared/8.sql", size: 649, mode: os.FileMode(438), modTime: time.Unix(1542659858, 0)}
+	info := bindataFileInfo{name: "migrations/sql/shared/8.sql", size: 649, mode: os.FileMode(420), modTime: time.Unix(1542710303, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -205,7 +205,7 @@ func migrationsSqlMysqlGitkeep() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/.gitkeep", size: 0, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/.gitkeep", size: 0, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -225,7 +225,7 @@ func migrationsSqlMysql5Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/5.sql", size: 361, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/5.sql", size: 361, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -245,7 +245,7 @@ func migrationsSqlMysql6Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/6.sql", size: 194, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/6.sql", size: 194, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -265,12 +265,12 @@ func migrationsSqlMysql7Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/7.sql", size: 2531, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/7.sql", size: 2531, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
 
-var _migrationsSqlMysql9Sql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x58\xd1\x72\xe2\x36\x14\x7d\xcf\x57\xdc\x37\xc2\xb4\xd0\xdd\x4c\xf2\xc4\xb4\x33\x14\x8b\x5d\xa6\xac\xe9\x80\x33\x9b\x7d\x62\x54\xfb\x82\x35\x31\x12\x95\x04\x24\xfd\xfa\x8e\x04\x04\x03\xc6\x96\xb1\x9b\xe6\x15\xeb\x1e\x1f\x7c\xce\x91\x74\x6f\xab\x05\x3f\x2d\xd8\x5c\x52\x8d\xf0\xb8\xbc\xb9\x69\xb5\xa0\xcf\xa4\xd2\xb0\x41\xe0\x88\x11\x68\x01\x11\x26\xa8\x11\x68\x92\x80\x14\x1b\x05\x3a\xa6\x1a\x96\x82\x71\x6d\x9e\x52\xe0\x82\xb7\xf0\x85\x29\xcd\xf8\x1c\x04\x5d\xe9\xf8\x0e\xc2\x84\x21\xd7\xed\x1b\x8f\x0c\x49\x40\xa0\x3f\x1e\x7d\x83\xf8\x35\x92\x74\xba\x5d\x30\xa5\x61\x88\x4a\xc1\xf7\xaf\x64\x4c\xc0\x1f\x05\x40\x9e\x06\x93\x60\x02\xb7\x13\x32\x24\xbd\x00\x3e\xa7\x6b\xb6\x68\xbb\xc5\x19\x30\xed\xed\x82\x29\x8b\xe0\xd7\xa3\x92\x36\x8b\x9a\x9d\xcb\x24\x24\xce\x24\xaa\xb8\x32\x8b\x1d\xce\xb5\x34\x42\x11\x61\x65\x0e\x06\xe4\x5a\x02\x82\x45\x61\x65\x02\x06\xe4\x5a\x02\xcb\xe7\xb0\xfa\x17\x30\x20\x05\x04\xac\xc1\x25\xfe\xbd\x42\x65\xd7\x30\x05\x14\xee\x3f\xc1\x9a\xca\x30\xa6\x12\x18\x07\x1d\x23\x48\x9c\xa1\x44\x1e\x1a\xff\xd3\xbf\x12\x84\x4d\xcc\xc2\xd8\xac\xde\xc4\xaf\x26\x1a\x54\x9a\x45\x8a\xfd\xc3\xf8\xdc\x40\x7e\x6e\xc3\x77\x84\xc5\x4a\x69\x90\xb8\x10\x6b\x4c\xbd\x44\x41\x22\xf8\x1c\xa5\xc9\x0d\x37\x2f\x33\x6f\x52\x6d\x08\x62\xa6\x40\xc5\x62\x95\x44\xc0\x71\x8d\x12\x62\xba\x5c\x22\x07\xaa\x60\x83\x8d\x35\xee\x7e\x65\x4a\xad\x0c\x91\x18\x17\x47\x48\x3a\x66\xca\x31\x5f\x43\xe2\x7f\x09\xbe\xde\x1e\x38\x35\xe1\x37\xb8\xff\xe4\x9c\x8c\xf2\xf5\x29\x4b\x97\x2f\x4e\xd9\xb1\x7c\x71\xca\x4a\x17\x8b\x8d\x64\x77\x6d\xf0\xf1\xc5\x6c\x74\x0d\x89\x40\x43\xbd\xa2\x49\xf2\x7a\x50\xb5\x3b\x0c\xc8\x18\x82\xee\xef\xc3\xcc\x2d\x07\xbe\x8d\xbc\x41\xff\x47\xda\x4c\x3b\x13\xdd\xde\x7f\x6a\x5a\x17\xfb\x8f\xc3\x21\x78\xa4\xdf\x7d\x1c\x06\xd0\x68\x74\x2e\x43\xee\xbf\x76\x9d\x98\x56\x81\x3a\x01\xad\x2a\x75\x02\x5a\xa5\xae\x00\x34\xea\x0d\x38\x2c\x25\x2e\xa9\xa4\x9a\x09\x0e\x33\x21\x21\x94\x48\xed\x11\x64\x12\x7c\xd8\x06\x18\x8f\xf0\x05\x28\x8f\xcc\x22\x64\x73\x0e\xcf\xf8\xfa\xb3\x09\xb1\x8d\xab\x42\x0d\xcc\x1e\x64\xfb\xf7\xde\x3d\x3c\x34\x0f\x81\xa7\x89\x12\xe6\x85\x06\x34\x41\x3e\xd7\x31\x88\xd9\xe9\xce\x52\x2e\x86\x6f\xdc\x8c\x1d\xef\x1e\x1e\xca\xc6\xb0\x44\xfd\x79\x0c\x4b\x14\x9f\xc7\xb0\x44\xf1\x79\x0c\xcf\x8b\x1d\x23\x76\xd0\xf2\x48\xa2\x4a\x11\xab\x05\x33\x1d\xb1\x5a\x00\xd3\x11\xab\x05\x30\x1d\xb1\x32\x80\xc6\xf1\xbe\xd8\x00\xd3\x0d\x05\x9a\x2d\xd0\x04\xc4\x06\x0c\x6d\x12\xb6\xa1\xb2\xa9\xdb\xa3\xde\xf4\xc6\xa4\x1b\x10\x18\xf8\x1e\x79\xca\x92\x73\xfa\xb6\x74\xca\xa2\x17\x18\xf9\x99\x9a\xa7\x6c\xd2\xc9\x81\xdc\xc9\x59\x80\xb9\x17\xdd\x11\xd4\xe8\x59\x80\x68\x25\x77\x84\x33\x6a\x16\xc0\x59\xc1\x1d\xe1\x8c\x96\x05\x70\x56\xee\x23\x38\x7b\xa1\x3f\xec\x7b\x0a\x94\xa6\x52\x43\x8c\x12\xed\x33\x7b\x09\xd9\x0a\x6b\xae\x42\xa9\x2d\x72\x7b\xcd\x0f\xa9\x0a\x69\x84\xbb\x1e\xa0\xa1\x80\xcd\x4e\xf7\x57\xb5\xbb\xf2\x44\xed\xc2\x40\x77\x3d\x0f\x7a\x23\x7f\x12\x8c\xbb\x03\x3f\x28\x30\xc9\xec\x19\xfa\xa3\x31\x19\x7c\xf1\xe1\x0f\xf2\x23\xfd\xb7\x60\x4c\xfa\x64\x4c\xfc\x1e\x99\x1c\xed\xc4\xb7\xe6\xd9\xc8\x87\xdd\xa6\xd4\xeb\x4e\x7a\x5d\x8f\x38\x6c\x0a\x79\xbc\xce\x9d\xf6\x0e\xc4\xac\xcd\xf2\x58\x9d\x58\xf5\x1d\x28\x59\xab\xe6\x51\x3a\xb1\xfb\x3b\x50\xb2\x76\xcf\xa3\x74\x12\x99\xfa\x28\x55\x8a\x8e\xe0\xca\x74\x30\x54\x29\x11\x32\xaa\x31\x82\x0d\xd3\xb1\xbd\xcf\xd7\x9e\xa6\x98\x26\xe6\xd6\x82\x99\x7f\x3f\xf5\x30\xe3\x0b\xbc\x39\xcd\xd2\x9d\xee\x6f\x68\x31\xe5\x51\x82\xd1\xa1\xfa\x3f\x8c\xdc\x87\x63\xef\x98\xcb\x0f\xc7\xdb\x31\xbc\x1f\x8e\xb7\x63\xc2\xff\x2f\xde\x37\xe9\xf1\x99\x27\x36\xdc\xfe\xe2\x49\xb1\x54\x27\xa7\x64\x6a\x77\x28\xcc\xb5\x37\x1e\xfd\x79\xf4\x1f\x8a\xce\x49\x87\xb8\xe5\x63\x66\x9d\x71\x45\x29\xc8\x47\x3c\x3b\x9f\x8a\xcc\x99\x0f\x77\x76\xb6\x14\x79\x26\x1f\xee\xec\x5c\xe8\x9c\x0a\xb7\x97\xfd\x97\x54\x63\x5a\xbf\x86\xc7\xbe\xad\x4f\x46\x67\x5c\x67\x25\x9d\x11\x9d\xc5\x74\x46\x74\xd6\xf3\x14\xf1\x58\xd2\xac\x96\xc5\xa2\x56\x6b\x58\x3a\x17\x41\x4a\xb5\x28\x97\x61\x1c\x9b\x92\xcb\x00\x8e\x6d\xc8\x65\x00\xc7\xc6\xa3\x73\x3a\x5c\xdd\x50\x65\xc7\x2b\xa9\xd9\x8a\x9d\xe9\x98\x66\xf3\xd6\x5c\x79\xc4\x4a\x43\x84\x33\xba\x4a\x74\x13\x5a\x90\xa0\xe9\x36\x25\xae\x51\x6a\x7b\x85\xaa\x30\x83\xab\x3e\x21\xa8\x07\xb4\x60\x0a\x57\x71\x46\x50\x0f\x62\xc1\x1c\x2e\x67\x4a\x50\x7a\x80\x13\x90\xa7\xe0\x0d\xeb\x9a\x69\x8d\x2b\x40\xf6\x68\xc6\xb5\x3a\x7b\x0e\xe3\x5a\x9d\x3d\x74\x39\xae\xfe\x37\x00\x00\xff\xff\x3a\x9c\x0d\xd6\x78\x1b\x00\x00")
+var _migrationsSqlMysql9Sql = []byte("\x1f\x8b\x08\x00\x00\x00\x00\x00\x00\xff\xcc\x58\xd1\x72\xe2\x36\x14\x7d\xcf\x57\xdc\x37\xc2\xb4\xd0\xdd\x4c\xf2\xc4\xb4\x33\x14\x8b\x5d\xa6\xac\xe9\x80\x33\x9b\x7d\x62\x54\xfb\x82\x35\x31\x12\x95\x04\x24\xfd\xfa\x8e\x04\x04\x03\xc6\x96\xb1\x9b\xe6\x15\xeb\x1e\x1f\x7c\xce\x91\x74\x6f\xab\x05\x3f\x2d\xd8\x5c\x52\x8d\xf0\xb8\xbc\xb9\x69\xb5\xa0\xcf\xa4\xd2\xb0\x41\xe0\x88\x11\x68\x01\x11\x26\xa8\x11\x68\x92\x80\x14\x1b\x05\x3a\xa6\x1a\x96\x82\x71\x6d\x9e\x52\xe0\x82\xb7\xf0\x85\x29\xcd\xf8\x1c\x04\x5d\xe9\xf8\x0e\xc2\x84\x21\xd7\xed\x1b\x8f\x0c\x49\x40\xa0\x3f\x1e\x7d\x83\xf8\x35\x92\x74\xba\x5d\x30\xa5\x61\x88\x4a\xc1\xf7\xaf\x64\x4c\xc0\x1f\x05\x40\x9e\x06\x93\x60\x02\xb7\x13\x32\x24\xbd\x00\x3e\xa7\x6b\xb6\x68\xbb\xc5\x19\x30\xed\xed\x82\x29\x8b\xe0\xd7\xa3\x92\x36\x8b\x9a\x9d\xcb\x24\x24\xce\x24\xaa\xb8\x32\x8b\x1d\xce\xb5\x34\x42\x11\x61\x65\x0e\x06\xe4\x5a\x02\x82\x45\x61\x65\x02\x06\xe4\x5a\x02\xcb\xe7\xb0\xfa\x17\x30\x20\x05\x04\x8c\xbf\x25\xfe\xbd\x42\x65\x97\x30\x05\x14\xee\x3f\xc1\x9a\xca\x30\xa6\x12\x18\x07\x1d\x23\x48\x9c\xa1\x44\x1e\x1a\xfb\xd3\xbf\x12\x84\x4d\xcc\xc2\xd8\xac\xde\xc4\xaf\x26\x19\x54\x9a\x45\x8a\xfd\xc3\xf8\xdc\x40\x7e\x6e\xc3\x77\x84\xc5\x4a\x69\x90\xb8\x10\x6b\x4c\xbd\x44\x41\x22\xf8\x1c\xa5\x89\x0d\x37\x2f\x33\x6f\x52\x6d\x08\x62\xa6\x40\xc5\x62\x95\x44\xc0\x71\x8d\x12\x62\xba\x5c\x22\x07\xaa\x60\x83\x8d\x35\xee\x7e\x65\x4a\xad\x0c\x91\x18\x17\x47\x48\x3a\x66\xca\x31\x5e\x43\xe2\x7f\x09\xbe\xde\x1e\x38\x35\xe1\x37\xb8\xff\xe4\x1c\x8c\xf2\xf5\x29\x47\x97\x2f\x4e\xb9\xb1\x7c\x71\xca\x49\x17\x8b\x8d\x64\x77\x6d\xf0\xf1\xc5\xec\x73\x0d\x89\x40\x43\xbd\xa2\x49\xf2\x7a\x50\xb5\x3b\x0c\xc8\x18\x82\xee\xef\xc3\xcc\x1d\x07\xbe\x8d\xbc\x41\xff\x47\xda\x4c\x3b\x13\xdd\xde\x7f\x6a\x5a\x13\xfb\x8f\xc3\x21\x78\xa4\xdf\x7d\x1c\x06\xd0\x68\x74\x2e\x43\xee\xbf\x76\x9d\x98\x56\x81\x3a\x01\xad\x2a\x75\x02\x5a\xa5\xae\x00\x34\xea\x0d\x38\x2c\x25\x2e\xa9\xa4\x9a\x09\x0e\x33\x21\x21\x94\x48\xed\x09\x64\x12\x7c\xd8\x05\x18\x8f\xf0\x05\x28\x8f\xcc\x22\x64\x73\x0e\xcf\xf8\xfa\xb3\x09\xb1\x8d\xab\x42\x0d\xcc\x9e\x63\xfb\xf7\xde\x3d\x3c\x34\x0f\x81\xa7\x89\x12\xe6\x85\x06\x34\x41\x3e\xd7\x31\x88\xd9\xe9\xc6\x52\x2e\x86\x6f\xdc\x8c\x1d\xef\x1e\x1e\xca\xc6\xb0\x44\xfd\x79\x0c\x4b\x14\x9f\xc7\xb0\x44\xf1\x79\x0c\xcf\x8b\x1d\x23\x76\xd0\xf2\x48\xa2\x4a\x11\xab\x05\x33\x1d\xb1\x5a\x00\xd3\x11\xab\x05\x30\x1d\xb1\x32\x80\xc6\xf1\xbe\xd8\x00\xd3\x0d\x05\x9a\x2d\xd0\x04\xc4\x06\x0c\x6d\x12\xb6\xa1\xb2\xa9\xdb\xa3\xde\xf4\xc6\xa4\x1b\x10\x18\xf8\x1e\x79\xca\x92\x73\xfa\xb6\x74\xca\xa2\x17\x18\xf9\x99\x9a\xa7\x6c\xd2\xc9\x81\xdc\xc9\x59\x80\xb9\x17\xdd\x11\xd4\xe8\x59\x80\x68\x25\x77\x84\x33\x6a\x16\xc0\x59\xc1\x1d\xe1\x8c\x96\x05\x70\x56\xee\x23\x38\x7b\x9f\x3f\xec\x7b\x0a\x94\xa6\x52\x43\x8c\x12\xed\x33\x7b\x09\xd9\x0a\x6b\xae\x42\xa9\x2d\x72\x7b\xcb\x0f\xa9\x0a\x69\x84\xbb\x16\xa0\xa1\x80\xcd\x4e\xf7\x57\xb5\xbb\xf2\x44\xed\xc2\x40\x77\x3d\x0f\x7a\x23\x7f\x12\x8c\xbb\x03\x3f\x28\x30\xc9\xec\x19\xfa\xa3\x31\x19\x7c\xf1\xe1\x0f\xf2\x23\xfd\xb7\x60\x4c\xfa\x64\x4c\xfc\x1e\x99\x1c\xed\xc4\xb7\xe6\xd9\xc8\x87\xdd\xa6\xd4\xeb\x4e\x7a\x5d\x8f\x38\x6c\x0a\x79\xbc\xce\x9d\xf6\x0e\xc4\xac\xcd\xf2\x58\x9d\x58\xf5\x1d\x28\x59\xab\xe6\x51\x3a\xb1\xfb\x3b\x50\xb2\x76\xcf\xa3\x74\x12\x99\xfa\x28\x55\x8a\x8e\xe0\xca\x34\x30\x54\x29\x11\x32\xaa\x31\x82\x0d\xd3\xb1\xbd\xcf\xd7\x9e\xa6\x98\x26\xe6\xd6\x82\x99\x7f\x3f\xf5\x30\xe3\x0b\xbc\x39\xcd\xd2\x9d\xee\x6f\x68\x31\xe5\x51\x82\xd1\xa1\xfa\x3f\x8c\xdc\x87\x63\xef\x98\xcb\x0f\xc7\xdb\x31\xbc\x1f\x8e\xb7\x63\xc2\xff\x2f\xde\x37\xe9\xe9\x99\x27\x36\xdc\xfe\xe2\x49\xb1\x54\x27\xa7\x64\x6a\x77\x28\xcc\xb5\x37\x1e\xfd\x79\xf4\x1f\x8a\xce\x49\x87\xb8\xe5\x63\x66\x9d\x71\x45\x29\xc8\x47\x3c\x3b\x9f\x8a\xcc\x99\x0f\x77\x76\xb6\x14\x79\x26\x1f\xee\xec\x5c\xe8\x9c\x0a\xb7\x97\xfd\x97\x54\x63\x5a\xbf\x86\xc7\xbe\xad\x4f\x46\x67\x5c\x67\x25\x9d\x11\x9d\xc5\x74\x46\x74\xd6\xf3\x14\xf1\x58\xd2\xac\x96\xc5\xa2\x56\x6b\x58\x3a\x17\x41\x4a\xb5\x28\x97\x61\x1c\x9b\x92\xcb\x00\x8e\x6d\xc8\x65\x00\xc7\xc6\xe3\x6c\xb8\xba\xa1\xca\x8e\x57\x52\xb3\x15\x3b\xd3\x31\xcd\xe6\xad\xb9\xf2\x88\x95\x86\x08\x67\x74\x95\xe8\x26\xb4\x20\x41\xd3\x6d\x4a\x5c\xa3\xd4\xf6\x0a\x55\x61\x06\x57\x7d\x42\x50\x0f\x68\xc1\x14\xae\xe2\x8c\xa0\x1e\xc4\x82\x39\x5c\xce\x94\xa0\xf4\x00\x27\x20\x4f\xc1\x1b\xd6\x35\xd3\x1a\x57\x80\xec\xd1\x8c\x6b\x75\xf6\x1c\xc6\xb5\x3a\x7b\xe8\x72\x5c\xfd\x6f\x00\x00\x00\xff\xff\xf1\x23\xf1\xe9\x77\x1b\x00\x00")
 
 func migrationsSqlMysql9SqlBytes() ([]byte, error) {
 	return bindataRead(
@@ -285,7 +285,7 @@ func migrationsSqlMysql9Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/mysql/9.sql", size: 7032, mode: os.FileMode(438), modTime: time.Unix(1542659858, 0)}
+	info := bindataFileInfo{name: "migrations/sql/mysql/9.sql", size: 7031, mode: os.FileMode(420), modTime: time.Unix(1542710303, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -305,7 +305,7 @@ func migrationsSqlPostgresGitkeep() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/.gitkeep", size: 0, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/.gitkeep", size: 0, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -325,7 +325,7 @@ func migrationsSqlPostgres5Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/5.sql", size: 314, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/5.sql", size: 314, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -345,7 +345,7 @@ func migrationsSqlPostgres6Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/6.sql", size: 171, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/6.sql", size: 171, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -365,7 +365,7 @@ func migrationsSqlPostgres7Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/7.sql", size: 1411, mode: os.FileMode(438), modTime: time.Unix(1542626922, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/7.sql", size: 1411, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -385,7 +385,7 @@ func migrationsSqlPostgres9Sql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/postgres/9.sql", size: 6926, mode: os.FileMode(438), modTime: time.Unix(1542659858, 0)}
+	info := bindataFileInfo{name: "migrations/sql/postgres/9.sql", size: 6926, mode: os.FileMode(420), modTime: time.Unix(1542710303, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -405,7 +405,7 @@ func migrationsSqlTestsGitkeep() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/.gitkeep", size: 0, mode: os.FileMode(438), modTime: time.Unix(1542278753, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/.gitkeep", size: 0, mode: os.FileMode(420), modTime: time.Unix(1542646176, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -425,7 +425,7 @@ func migrationsSqlTests1_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/1_test.sql", size: 913, mode: os.FileMode(438), modTime: time.Unix(1542660091, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/1_test.sql", size: 913, mode: os.FileMode(420), modTime: time.Unix(1542710303, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -445,7 +445,7 @@ func migrationsSqlTests2_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/2_test.sql", size: 1001, mode: os.FileMode(438), modTime: time.Unix(1542660091, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/2_test.sql", size: 1001, mode: os.FileMode(420), modTime: time.Unix(1542710303, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -465,7 +465,7 @@ func migrationsSqlTests3_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/3_test.sql", size: 1243, mode: os.FileMode(438), modTime: time.Unix(1542660091, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/3_test.sql", size: 1243, mode: os.FileMode(420), modTime: time.Unix(1542710303, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -485,7 +485,7 @@ func migrationsSqlTests4_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/4_test.sql", size: 1313, mode: os.FileMode(438), modTime: time.Unix(1542660091, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/4_test.sql", size: 1313, mode: os.FileMode(420), modTime: time.Unix(1542710303, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -505,7 +505,7 @@ func migrationsSqlTests5_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/5_test.sql", size: 1313, mode: os.FileMode(438), modTime: time.Unix(1542660091, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/5_test.sql", size: 1313, mode: os.FileMode(420), modTime: time.Unix(1542710303, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -525,7 +525,7 @@ func migrationsSqlTests6_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/6_test.sql", size: 1313, mode: os.FileMode(438), modTime: time.Unix(1542660091, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/6_test.sql", size: 1313, mode: os.FileMode(420), modTime: time.Unix(1542710303, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -545,7 +545,7 @@ func migrationsSqlTests7_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/7_test.sql", size: 1683, mode: os.FileMode(438), modTime: time.Unix(1542660091, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/7_test.sql", size: 1683, mode: os.FileMode(420), modTime: time.Unix(1542710303, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -565,7 +565,7 @@ func migrationsSqlTests8_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/8_test.sql", size: 1783, mode: os.FileMode(438), modTime: time.Unix(1542660091, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/8_test.sql", size: 1783, mode: os.FileMode(420), modTime: time.Unix(1542710303, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }
@@ -585,7 +585,7 @@ func migrationsSqlTests9_testSql() (*asset, error) {
 		return nil, err
 	}
 
-	info := bindataFileInfo{name: "migrations/sql/tests/9_test.sql", size: 3952, mode: os.FileMode(438), modTime: time.Unix(1542660269, 0)}
+	info := bindataFileInfo{name: "migrations/sql/tests/9_test.sql", size: 3952, mode: os.FileMode(420), modTime: time.Unix(1542710303, 0)}
 	a := &asset{bytes: bytes, info: info}
 	return a, nil
 }

From 5ce366074256254a9a9f3f201e3f058b8260dce0 Mon Sep 17 00:00:00 2001
From: aeneasr <aeneas@ory.sh>
Date: Tue, 20 Nov 2018 16:24:04 +0100
Subject: [PATCH 4/4] u

---
 .circleci/config.yml                     | 2 +-
 consent/manager_test.go                  | 6 ++----
 consent/x_manager_sql_migrations_test.go | 3 +--
 oauth2/fosite_store_helpers_test.go      | 6 ++----
 oauth2/fosite_store_test.go              | 3 +--
 oauth2/oauth2_auth_code_test.go          | 7 +++----
 oauth2/x_fosite_migrations_test.go       | 3 +--
 7 files changed, 11 insertions(+), 19 deletions(-)

diff --git a/.circleci/config.yml b/.circleci/config.yml
index 1b39fd2c7f1..b8610eff9e4 100644
--- a/.circleci/config.yml
+++ b/.circleci/config.yml
@@ -50,7 +50,7 @@ jobs:
             echo 'export GO111MODULE=on' >> $BASH_ENV
             source $BASH_ENV
       - checkout
-      - run: go mod verify
+      - run: go mod download
       - run: go get -u github.com/mattn/goveralls golang.org/x/tools/cmd/cover github.com/ory/go-acc
       - run: go-acc -o coverage.txt ./... -- -failfast -timeout=20m
 #      Running race conditions requires parallel tests, otherwise it's worthless (which is the case)
diff --git a/consent/manager_test.go b/consent/manager_test.go
index a8c42a8859e..aa065105f50 100644
--- a/consent/manager_test.go
+++ b/consent/manager_test.go
@@ -26,17 +26,15 @@ import (
 	"testing"
 	"time"
 
-	"github.com/stretchr/testify/require"
-
-	"github.com/ory/hydra/pkg"
-
 	_ "github.com/go-sql-driver/mysql"
 	_ "github.com/lib/pq"
+	"github.com/stretchr/testify/require"
 
 	"github.com/ory/fosite"
 	"github.com/ory/hydra/client"
 	. "github.com/ory/hydra/consent"
 	"github.com/ory/hydra/oauth2"
+	"github.com/ory/hydra/pkg"
 	"github.com/ory/x/sqlcon/dockertest"
 )
 
diff --git a/consent/x_manager_sql_migrations_test.go b/consent/x_manager_sql_migrations_test.go
index 66037e760bd..31a73e993ec 100644
--- a/consent/x_manager_sql_migrations_test.go
+++ b/consent/x_manager_sql_migrations_test.go
@@ -5,13 +5,12 @@ import (
 	"fmt"
 	"testing"
 
-	"github.com/ory/fosite"
-
 	"github.com/jmoiron/sqlx"
 	migrate "github.com/rubenv/sql-migrate"
 	"github.com/sirupsen/logrus"
 	"github.com/stretchr/testify/require"
 
+	"github.com/ory/fosite"
 	"github.com/ory/hydra/client"
 	"github.com/ory/hydra/consent"
 	"github.com/ory/x/dbal"
diff --git a/oauth2/fosite_store_helpers_test.go b/oauth2/fosite_store_helpers_test.go
index aa09cd40428..5dbf4016263 100644
--- a/oauth2/fosite_store_helpers_test.go
+++ b/oauth2/fosite_store_helpers_test.go
@@ -26,18 +26,16 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ory/fosite/handler/openid"
-
-	"github.com/ory/hydra/consent"
-
 	"github.com/pborman/uuid"
 	"github.com/pkg/errors"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 
 	"github.com/ory/fosite"
+	"github.com/ory/fosite/handler/openid"
 	"github.com/ory/herodot"
 	"github.com/ory/hydra/client"
+	"github.com/ory/hydra/consent"
 	. "github.com/ory/hydra/oauth2"
 	"github.com/ory/x/sqlcon"
 )
diff --git a/oauth2/fosite_store_test.go b/oauth2/fosite_store_test.go
index eb4553ae418..ff70532330e 100644
--- a/oauth2/fosite_store_test.go
+++ b/oauth2/fosite_store_test.go
@@ -27,8 +27,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ory/hydra/consent"
-
 	_ "github.com/go-sql-driver/mysql"
 	"github.com/jmoiron/sqlx"
 	_ "github.com/lib/pq"
@@ -37,6 +35,7 @@ import (
 
 	"github.com/ory/fosite"
 	"github.com/ory/hydra/client"
+	"github.com/ory/hydra/consent"
 	. "github.com/ory/hydra/oauth2"
 	"github.com/ory/hydra/pkg"
 	"github.com/ory/x/sqlcon/dockertest"
diff --git a/oauth2/oauth2_auth_code_test.go b/oauth2/oauth2_auth_code_test.go
index 158cb4865ba..addf876e607 100644
--- a/oauth2/oauth2_auth_code_test.go
+++ b/oauth2/oauth2_auth_code_test.go
@@ -35,8 +35,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ory/hydra/client"
-
 	djwt "github.com/dgrijalva/jwt-go"
 	"github.com/gorilla/sessions"
 	"github.com/julienschmidt/httprouter"
@@ -53,6 +51,7 @@ import (
 	"github.com/ory/fosite/handler/openid"
 	"github.com/ory/fosite/token/jwt"
 	"github.com/ory/herodot"
+	"github.com/ory/hydra/client"
 	hc "github.com/ory/hydra/client"
 	"github.com/ory/hydra/consent"
 	"github.com/ory/hydra/jwk"
@@ -1125,7 +1124,7 @@ func TestAuthCodeWithMockStrategy(t *testing.T) {
 				shouldPassConsentStrategy bool
 				expectOAuthAuthError      bool
 				expectOAuthTokenError     bool
-				checkExpiry     bool
+				checkExpiry               bool
 				authTime                  time.Time
 				requestTime               time.Time
 				assertAccessToken         func(*testing.T, string)
@@ -1134,7 +1133,7 @@ func TestAuthCodeWithMockStrategy(t *testing.T) {
 					d:                         "should pass request if strategy passes",
 					authURL:                   oauthConfig.AuthCodeURL("some-foo-state"),
 					shouldPassConsentStrategy: true,
-					checkExpiry: true,
+					checkExpiry:               true,
 					cb: func(t *testing.T) httprouter.Handle {
 						return func(w http.ResponseWriter, r *http.Request, _ httprouter.Params) {
 							code = r.URL.Query().Get("code")
diff --git a/oauth2/x_fosite_migrations_test.go b/oauth2/x_fosite_migrations_test.go
index e45fd8552b3..c3d36c52096 100644
--- a/oauth2/x_fosite_migrations_test.go
+++ b/oauth2/x_fosite_migrations_test.go
@@ -6,8 +6,6 @@ import (
 	"testing"
 	"time"
 
-	"github.com/ory/hydra/consent"
-
 	"github.com/jmoiron/sqlx"
 	migrate "github.com/rubenv/sql-migrate"
 	"github.com/sirupsen/logrus"
@@ -15,6 +13,7 @@ import (
 
 	"github.com/ory/fosite"
 	"github.com/ory/hydra/client"
+	"github.com/ory/hydra/consent"
 	"github.com/ory/hydra/oauth2"
 	"github.com/ory/x/dbal"
 	"github.com/ory/x/dbal/migratest"