Merge remote-tracking branch 'origin/master' into fix-fosite-refresh-…

…scope-narrowing
ory · Jan 29, 2023 · 322f0a8 · 322f0a8
2 parents 8381101 + 5585539
commit 322f0a8
Show file tree

Hide file tree

Showing 156 changed files with 543 additions and 760 deletions.
diff --git a/.github/workflows/ci.yaml b/.github/workflows/ci.yaml
@@ -86,6 +86,8 @@ jobs:
       - run: go list -json > go.list
       - name: Run nancy
         uses: sonatype-nexus-community/[email protected]
+        with:
+          nancyVersion: v1.0.42
       - name: Run golangci-lint
         uses: golangci/golangci-lint-action@v2
         env:

diff --git a/.goreleaser.yml b/.goreleaser.yml
@@ -5,9 +5,9 @@ includes:
 variables:
   brew_name: hydra
   brew_description: "The Ory OAuth2 and OpenID Connect Platform (Ory Hydra)"
-  buildinfo_hash: "github.com/ory/hydra/driver/config.Commit"
-  buildinfo_tag: "github.com/ory/hydra/driver/config.Version"
-  buildinfo_date: "github.com/ory/hydra/driver/config.Date"
+  buildinfo_hash: "github.com/ory/hydra/v2/driver/config.Commit"
+  buildinfo_tag: "github.com/ory/hydra/v2/driver/config.Version"
+  buildinfo_date: "github.com/ory/hydra/v2/driver/config.Date"
   dockerfile: ".docker/Dockerfile-alpine"
 
 project_name: hydra
diff --git a/CHANGELOG.md b/CHANGELOG.md
@@ -4,102 +4,103 @@
 <!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
 **Table of Contents**
 
-- [0.0.0 (2022-12-23)](#000-2022-12-23)
-- [2.0.3 (2022-12-08)](#203-2022-12-08)
+- [0.0.0 (2023-01-28)](#000-2023-01-28)
     - [Bug Fixes](#bug-fixes)
+- [2.0.3 (2022-12-08)](#203-2022-12-08)
+    - [Bug Fixes](#bug-fixes-1)
     - [Code Generation](#code-generation)
     - [Features](#features)
 - [2.0.2 (2022-11-10)](#202-2022-11-10)
-    - [Bug Fixes](#bug-fixes-1)
+    - [Bug Fixes](#bug-fixes-2)
     - [Code Generation](#code-generation-1)
     - [Documentation](#documentation)
     - [Features](#features-1)
     - [Tests](#tests)
 - [2.0.1 (2022-10-27)](#201-2022-10-27)
-    - [Bug Fixes](#bug-fixes-2)
+    - [Bug Fixes](#bug-fixes-3)
     - [Code Generation](#code-generation-2)
     - [Documentation](#documentation-1)
 - [2.0.0 (2022-10-27)](#200-2022-10-27)
   - [Breaking Changes](#breaking-changes)
-    - [Bug Fixes](#bug-fixes-3)
+    - [Bug Fixes](#bug-fixes-4)
     - [Code Generation](#code-generation-3)
     - [Code Refactoring](#code-refactoring)
     - [Documentation](#documentation-2)
     - [Features](#features-2)
     - [Tests](#tests-1)
     - [Unclassified](#unclassified)
 - [1.11.10 (2022-08-25)](#11110-2022-08-25)
-    - [Bug Fixes](#bug-fixes-4)
+    - [Bug Fixes](#bug-fixes-5)
     - [Code Generation](#code-generation-4)
 - [1.11.9 (2022-08-01)](#1119-2022-08-01)
-    - [Bug Fixes](#bug-fixes-5)
+    - [Bug Fixes](#bug-fixes-6)
     - [Code Generation](#code-generation-5)
     - [Documentation](#documentation-3)
     - [Features](#features-3)
 - [1.11.8 (2022-05-04)](#1118-2022-05-04)
-    - [Bug Fixes](#bug-fixes-6)
+    - [Bug Fixes](#bug-fixes-7)
     - [Code Generation](#code-generation-6)
     - [Documentation](#documentation-4)
     - [Features](#features-4)
     - [Tests](#tests-2)
 - [1.11.7 (2022-02-23)](#1117-2022-02-23)
     - [Code Generation](#code-generation-7)
 - [1.11.6 (2022-02-23)](#1116-2022-02-23)
-    - [Bug Fixes](#bug-fixes-7)
+    - [Bug Fixes](#bug-fixes-8)
     - [Code Generation](#code-generation-8)
 - [1.11.5 (2022-02-21)](#1115-2022-02-21)
-    - [Bug Fixes](#bug-fixes-8)
+    - [Bug Fixes](#bug-fixes-9)
     - [Code Generation](#code-generation-9)
 - [1.11.4 (2022-02-16)](#1114-2022-02-16)
-    - [Bug Fixes](#bug-fixes-9)
+    - [Bug Fixes](#bug-fixes-10)
     - [Code Generation](#code-generation-10)
 - [1.11.3 (2022-02-15)](#1113-2022-02-15)
-    - [Bug Fixes](#bug-fixes-10)
+    - [Bug Fixes](#bug-fixes-11)
     - [Code Generation](#code-generation-11)
 - [1.11.2 (2022-02-11)](#1112-2022-02-11)
     - [Code Generation](#code-generation-12)
 - [1.11.1 (2022-02-11)](#1111-2022-02-11)
-    - [Bug Fixes](#bug-fixes-11)
+    - [Bug Fixes](#bug-fixes-12)
     - [Code Generation](#code-generation-13)
     - [Code Refactoring](#code-refactoring-1)
     - [Documentation](#documentation-5)
 - [1.11.0 (2022-01-21)](#1110-2022-01-21)
   - [Breaking Changes](#breaking-changes-1)
-    - [Bug Fixes](#bug-fixes-12)
+    - [Bug Fixes](#bug-fixes-13)
     - [Code Generation](#code-generation-14)
     - [Documentation](#documentation-6)
     - [Features](#features-5)
 - [1.10.7 (2021-10-27)](#1107-2021-10-27)
   - [Breaking Changes](#breaking-changes-2)
-    - [Bug Fixes](#bug-fixes-13)
+    - [Bug Fixes](#bug-fixes-14)
     - [Code Generation](#code-generation-15)
     - [Code Refactoring](#code-refactoring-2)
     - [Documentation](#documentation-7)
     - [Features](#features-6)
 - [1.10.6 (2021-08-28)](#1106-2021-08-28)
-    - [Bug Fixes](#bug-fixes-14)
+    - [Bug Fixes](#bug-fixes-15)
     - [Code Generation](#code-generation-16)
     - [Documentation](#documentation-8)
 - [1.10.5 (2021-08-13)](#1105-2021-08-13)
-    - [Bug Fixes](#bug-fixes-15)
+    - [Bug Fixes](#bug-fixes-16)
     - [Code Generation](#code-generation-17)
     - [Documentation](#documentation-9)
     - [Features](#features-7)
 - [1.10.3 (2021-07-14)](#1103-2021-07-14)
-    - [Bug Fixes](#bug-fixes-16)
+    - [Bug Fixes](#bug-fixes-17)
     - [Code Generation](#code-generation-18)
     - [Code Refactoring](#code-refactoring-3)
     - [Documentation](#documentation-10)
     - [Features](#features-8)
 - [1.10.2 (2021-05-04)](#1102-2021-05-04)
   - [Breaking Changes](#breaking-changes-3)
-    - [Bug Fixes](#bug-fixes-17)
+    - [Bug Fixes](#bug-fixes-18)
     - [Code Generation](#code-generation-19)
     - [Code Refactoring](#code-refactoring-4)
     - [Documentation](#documentation-11)
     - [Features](#features-9)
 - [1.10.1 (2021-03-25)](#1101-2021-03-25)
-    - [Bug Fixes](#bug-fixes-18)
+    - [Bug Fixes](#bug-fixes-19)
     - [Code Generation](#code-generation-20)
     - [Documentation](#documentation-12)
     - [Features](#features-10)
@@ -116,26 +117,26 @@
 - [1.9.0-rc.0 (2021-01-12)](#190-rc0-2021-01-12)
     - [Code Generation](#code-generation-24)
 - [1.9.0-alpha.4.pre.0 (2021-01-12)](#190-alpha4pre0-2021-01-12)
-    - [Bug Fixes](#bug-fixes-19)
+    - [Bug Fixes](#bug-fixes-20)
     - [Code Generation](#code-generation-25)
     - [Documentation](#documentation-14)
 - [1.9.0-alpha.3 (2020-12-08)](#190-alpha3-2020-12-08)
   - [Breaking Changes](#breaking-changes-4)
-    - [Bug Fixes](#bug-fixes-20)
+    - [Bug Fixes](#bug-fixes-21)
     - [Code Generation](#code-generation-26)
     - [Code Refactoring](#code-refactoring-5)
     - [Documentation](#documentation-15)
     - [Features](#features-12)
     - [Tests](#tests-4)
     - [Unclassified](#unclassified-2)
 - [1.9.0-alpha.2 (2020-10-29)](#190-alpha2-2020-10-29)
-    - [Bug Fixes](#bug-fixes-21)
+    - [Bug Fixes](#bug-fixes-22)
     - [Code Generation](#code-generation-27)
     - [Documentation](#documentation-16)
     - [Features](#features-13)
     - [Tests](#tests-5)
 - [1.9.0-alpha.1 (2020-10-20)](#190-alpha1-2020-10-20)
-    - [Bug Fixes](#bug-fixes-22)
+    - [Bug Fixes](#bug-fixes-23)
     - [Code Generation](#code-generation-28)
     - [Code Refactoring](#code-refactoring-6)
     - [Documentation](#documentation-17)
@@ -144,62 +145,62 @@
 - [1.8.5 (2020-10-03)](#185-2020-10-03)
     - [Code Generation](#code-generation-29)
 - [1.8.0-pre.1 (2020-10-03)](#180-pre1-2020-10-03)
-    - [Bug Fixes](#bug-fixes-23)
+    - [Bug Fixes](#bug-fixes-24)
     - [Code Generation](#code-generation-30)
     - [Features](#features-15)
 - [1.8.0-pre.0 (2020-10-02)](#180-pre0-2020-10-02)
   - [Breaking Changes](#breaking-changes-5)
-    - [Bug Fixes](#bug-fixes-24)
+    - [Bug Fixes](#bug-fixes-25)
     - [Code Generation](#code-generation-31)
     - [Documentation](#documentation-18)
     - [Features](#features-16)
 - [1.7.4 (2020-08-31)](#174-2020-08-31)
-    - [Bug Fixes](#bug-fixes-25)
+    - [Bug Fixes](#bug-fixes-26)
     - [Code Generation](#code-generation-32)
 - [1.7.3 (2020-08-31)](#173-2020-08-31)
     - [Code Generation](#code-generation-33)
 - [1.7.1 (2020-08-31)](#171-2020-08-31)
   - [Breaking Changes](#breaking-changes-6)
-    - [Bug Fixes](#bug-fixes-26)
+    - [Bug Fixes](#bug-fixes-27)
     - [Code Generation](#code-generation-34)
     - [Code Refactoring](#code-refactoring-7)
     - [Documentation](#documentation-19)
     - [Features](#features-17)
     - [Unclassified](#unclassified-3)
 - [1.7.0 (2020-08-14)](#170-2020-08-14)
   - [Breaking Changes](#breaking-changes-7)
-    - [Bug Fixes](#bug-fixes-27)
+    - [Bug Fixes](#bug-fixes-28)
     - [Code Generation](#code-generation-35)
     - [Code Refactoring](#code-refactoring-8)
     - [Documentation](#documentation-20)
     - [Features](#features-18)
     - [Unclassified](#unclassified-4)
 - [1.6.0 (2020-07-20)](#160-2020-07-20)
-    - [Bug Fixes](#bug-fixes-28)
+    - [Bug Fixes](#bug-fixes-29)
     - [Code Generation](#code-generation-36)
     - [Documentation](#documentation-21)
     - [Unclassified](#unclassified-5)
 - [1.5.2 (2020-06-23)](#152-2020-06-23)
-    - [Bug Fixes](#bug-fixes-29)
+    - [Bug Fixes](#bug-fixes-30)
     - [Code Generation](#code-generation-37)
     - [Features](#features-19)
 - [1.5.1 (2020-06-16)](#151-2020-06-16)
     - [Code Generation](#code-generation-38)
 - [1.5.0 (2020-06-16)](#150-2020-06-16)
-    - [Bug Fixes](#bug-fixes-30)
+    - [Bug Fixes](#bug-fixes-31)
     - [Chores](#chores)
     - [Documentation](#documentation-22)
     - [Features](#features-20)
     - [Unclassified](#unclassified-6)
 - [1.5.0-beta.5 (2020-05-28)](#150-beta5-2020-05-28)
-    - [Bug Fixes](#bug-fixes-31)
+    - [Bug Fixes](#bug-fixes-32)
     - [Chores](#chores-1)
     - [Documentation](#documentation-23)
     - [Features](#features-21)
 - [1.5.0-beta.3 (2020-05-23)](#150-beta3-2020-05-23)
     - [Chores](#chores-2)
 - [1.5.0-beta.2 (2020-05-23)](#150-beta2-2020-05-23)
-    - [Bug Fixes](#bug-fixes-32)
+    - [Bug Fixes](#bug-fixes-33)
     - [Chores](#chores-3)
     - [Code Refactoring](#code-refactoring-9)
     - [Documentation](#documentation-24)
@@ -208,38 +209,38 @@
     - [Chores](#chores-4)
     - [Code Refactoring](#code-refactoring-10)
 - [1.4.10 (2020-04-30)](#1410-2020-04-30)
-    - [Bug Fixes](#bug-fixes-33)
+    - [Bug Fixes](#bug-fixes-34)
     - [Chores](#chores-5)
     - [Documentation](#documentation-25)
     - [Unclassified](#unclassified-7)
 - [1.4.9 (2020-04-25)](#149-2020-04-25)
-    - [Bug Fixes](#bug-fixes-34)
+    - [Bug Fixes](#bug-fixes-35)
     - [Chores](#chores-6)
 - [1.4.8 (2020-04-24)](#148-2020-04-24)
-    - [Bug Fixes](#bug-fixes-35)
+    - [Bug Fixes](#bug-fixes-36)
     - [Chores](#chores-7)
     - [Documentation](#documentation-26)
     - [Features](#features-22)
 - [1.4.7 (2020-04-24)](#147-2020-04-24)
-    - [Bug Fixes](#bug-fixes-36)
+    - [Bug Fixes](#bug-fixes-37)
     - [Chores](#chores-8)
     - [Documentation](#documentation-27)
 - [1.4.6 (2020-04-17)](#146-2020-04-17)
-    - [Bug Fixes](#bug-fixes-37)
+    - [Bug Fixes](#bug-fixes-38)
     - [Documentation](#documentation-28)
 - [1.4.5 (2020-04-16)](#145-2020-04-16)
-    - [Bug Fixes](#bug-fixes-38)
+    - [Bug Fixes](#bug-fixes-39)
     - [Documentation](#documentation-29)
 - [1.4.3 (2020-04-16)](#143-2020-04-16)
-    - [Bug Fixes](#bug-fixes-39)
+    - [Bug Fixes](#bug-fixes-40)
     - [Code Refactoring](#code-refactoring-11)
     - [Documentation](#documentation-30)
     - [Features](#features-23)
 - [1.4.2 (2020-04-03)](#142-2020-04-03)
     - [Chores](#chores-9)
     - [Documentation](#documentation-31)
 - [1.4.1 (2020-04-02)](#141-2020-04-02)
-    - [Bug Fixes](#bug-fixes-40)
+    - [Bug Fixes](#bug-fixes-41)
 - [1.4.0 (2020-04-02)](#140-2020-04-02)
   - [GHSA-3p3g-vpw6-4w66](#ghsa-3p3g-vpw6-4w66)
     - [Impact](#impact)
@@ -256,19 +257,19 @@
     - [Workarounds](#workarounds-1)
     - [References](#references-1)
     - [Upstream](#upstream-1)
-    - [Bug Fixes](#bug-fixes-41)
+    - [Bug Fixes](#bug-fixes-42)
     - [Code Refactoring](#code-refactoring-12)
     - [Documentation](#documentation-32)
     - [Features](#features-24)
     - [Unclassified](#unclassified-8)
 - [1.3.2 (2020-02-17)](#132-2020-02-17)
-    - [Bug Fixes](#bug-fixes-42)
+    - [Bug Fixes](#bug-fixes-43)
     - [Chores](#chores-10)
     - [Documentation](#documentation-33)
 - [1.3.1 (2020-02-16)](#131-2020-02-16)
     - [Continuous Integration](#continuous-integration)
 - [1.3.0 (2020-02-14)](#130-2020-02-14)
-    - [Bug Fixes](#bug-fixes-43)
+    - [Bug Fixes](#bug-fixes-44)
     - [Documentation](#documentation-34)
     - [Features](#features-25)
     - [Unclassified](#unclassified-9)
@@ -663,8 +664,14 @@
 
 <!-- END doctoc generated TOC please keep comment here to allow auto update -->
 
-# [0.0.0](https://github.com/ory/hydra/compare/v2.0.3...v0.0.0) (2022-12-23)
+# [0.0.0](https://github.com/ory/hydra/compare/v2.0.3...v0.0.0) (2023-01-28)
+
+
+### Bug Fixes
 
+* Append /v2 to module path ([f56e5fa](https://github.com/ory/hydra/commit/f56e5fad74632c1f0c5f3768a0de8465f351a533))
+* Clean up unused code ([488f930](https://github.com/ory/hydra/commit/488f930e4f2c39386b1c1ff68dd60d1aaf968cb9))
+* Pin nancy ([0156556](https://github.com/ory/hydra/commit/0156556bb35278fcbc416b02504bc04511c468a7))
 
 
 # [2.0.3](https://github.com/ory/hydra/compare/v2.0.2...v2.0.3) (2022-12-08)

diff --git a/Makefile b/Makefile
@@ -44,7 +44,7 @@ docs/cli: .bin/clidoc
 	curl https://raw.githubusercontent.com/ory/ci/master/licenses/install | sh
 
 .bin/ory: Makefile
-	curl https://raw.githubusercontent.com/ory/meta/master/install.sh | bash -s -- -b .bin ory v0.1.48
+	curl https://raw.githubusercontent.com/ory/meta/master/install.sh | bash -s -- -b .bin ory v0.2.2
 	touch .bin/ory
 
 .PHONY: lint
@@ -116,12 +116,12 @@ mocks: .bin/mockgen
 .PHONY: sdk
 sdk: .bin/swagger .bin/ory node_modules
 	swagger generate spec -m -o spec/swagger.json \
-		-c github.com/ory/hydra/client \
-		-c github.com/ory/hydra/consent \
-		-c github.com/ory/hydra/health \
-		-c github.com/ory/hydra/jwk \
-		-c github.com/ory/hydra/oauth2 \
-		-c github.com/ory/hydra/x \
+		-c github.com/ory/hydra/v2/client \
+		-c github.com/ory/hydra/v2/consent \
+		-c github.com/ory/hydra/v2/health \
+		-c github.com/ory/hydra/v2/jwk \
+		-c github.com/ory/hydra/v2/oauth2 \
+		-c github.com/ory/hydra/v2/x \
 		-c github.com/ory/x/healthx \
 		-c github.com/ory/x/openapix \
 		-c github.com/ory/x/pagination \
@@ -147,6 +147,7 @@ sdk: .bin/swagger .bin/ory node_modules
 		--git-user-id ory \
 		--git-repo-id hydra-client-go \
 		--git-host github.com
+	(cd internal/httpclient && go mod edit -module github.com/ory/hydra-client-go/v2)
 
 	make format
 
@@ -177,7 +178,7 @@ install-stable:
 	git checkout $$HYDRA_LATEST
 	GO111MODULE=on go install \
 		-tags sqlite,json1 \
-		-ldflags "-X github.com/ory/hydra/driver/config.Version=$$HYDRA_LATEST -X github.com/ory/hydra/driver/config.Date=`TZ=UTC date -u '+%Y-%m-%dT%H:%M:%SZ'` -X github.com/ory/hydra/driver/config.Commit=`git rev-parse HEAD`" \
+		-ldflags "-X github.com/ory/hydra/v2/driver/config.Version=$$HYDRA_LATEST -X github.com/ory/hydra/v2/driver/config.Date=`TZ=UTC date -u '+%Y-%m-%dT%H:%M:%SZ'` -X github.com/ory/hydra/v2/driver/config.Commit=`git rev-parse HEAD`" \
 		.
 	git checkout master
 

diff --git a/client/client.go b/client/client.go
@@ -15,7 +15,7 @@ import (
 	jose "gopkg.in/square/go-jose.v2" // Naming the dependency jose is important for go-swagger to work, see https://github.com/go-swagger/go-swagger/issues/1587
 
 	"github.com/ory/fosite"
-	"github.com/ory/hydra/x"
+	"github.com/ory/hydra/v2/x"
 	"github.com/ory/x/sqlxx"
 )
 

diff --git a/client/handler.go b/client/handler.go
@@ -28,7 +28,7 @@ import (
 	"github.com/ory/x/errorsx"
 
 	"github.com/ory/herodot"
-	"github.com/ory/hydra/x"
+	"github.com/ory/hydra/v2/x"
 
 	"github.com/julienschmidt/httprouter"
 	"github.com/pkg/errors"