fix(deps): update go-jose to new updated repo due to migration (#630)

* updates go-jose to new updated repo due to migration

- updated from /square/go-jose to /go-jose/go-jose
- updates to v2.6.3
- addresses CVE-2016-9123 and CVE-2016-9121
- fixes tests that were adjusting for a 1s delay

* revert 299>300 in op_test.go

.forgejo.bak/workflows/issue.yml

@@ -1,43 +0,0 @@
-name: Add new issues to product management project
-
-on:
-  issues:
-    types:
-      - opened
-  pull_request_target:
-    types:
-      - opened
-
-jobs:
-  add-to-project:
-    name: Add issue and community pr to project
-    runs-on: ubuntu-latest
-    steps:
-      - name: add issue
-        uses: actions/add-to-project@v1.0.2
-        if: ${{ github.event_name == 'issues' }}
-        with:
-          # You can target a repository in a different organization
-          # to the issue
-          project-url: https://github.com/orgs/zitadel/projects/2
-          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
-      - uses: tspascoal/get-user-teams-membership@v3
-        id: checkUserMember
-        if: github.actor != 'dependabot[bot]'
-        with:
-         username: ${{ github.actor }}
-         GITHUB_TOKEN: ${{ secrets.ADD_TO_PROJECT_PAT }}
-      - name: add pr
-        uses: actions/add-to-project@v1.0.2
-        if: ${{ github.event_name == 'pull_request_target' && github.actor != 'dependabot[bot]' && !contains(steps.checkUserMember.outputs.teams, 'engineers')}}
-        with:
-          # You can target a repository in a different organization
-          # to the issue
-          project-url: https://github.com/orgs/zitadel/projects/2
-          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}
-      - uses: actions-ecosystem/action-add-labels@v1.1.3
-        if: ${{ github.event_name == 'pull_request_target' && github.actor != 'dependabot[bot]' && !contains(steps.checkUserMember.outputs.teams, 'staff')}}
-        with:
-          github_token: ${{ secrets.ADD_TO_PROJECT_PAT }}
-          labels: |
-            os-contribution

.github/ISSUE_TEMPLATE/bug_report.yaml

@@ -2,7 +2,6 @@ name: Bug Report
 description: "Create a bug report to help us improve ZITADEL. Click [here](https://github.com/zitadel/zitadel/blob/main/CONTRIBUTING.md#product-management) to see how we process your issue."
 title: "[Bug]: "
 labels: ["bug"]
-type: Bug
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/docs.yaml

@@ -1,7 +1,6 @@
 name: 📄 Documentation
 description: Create an issue for missing or wrong documentation.
 labels: ["docs"]
-type: task
 body:
   - type: markdown
     attributes:

.github/ISSUE_TEMPLATE/improvement.yaml

@@ -1,12 +1,11 @@
 name: 🛠️ Improvement
 description: "Create an new issue for an improvment in ZITADEL"
-labels: ["enhancement"]
-type: enhancement
+labels: ["improvement"]
 body:
   - type: markdown
     attributes:
       value: |
-        Thanks for taking the time to fill out this proposal / feature reqeust
+        Thanks for taking the time to fill out this improvement request
   - type: checkboxes
     id: preflight
     attributes:

.github/ISSUE_TEMPLATE/proposal.yaml

@@ -0,0 +1,44 @@
+name: 💡 Proposal / Feature request
+description: "Create an issue for a feature request/proposal."
+labels: ["enhancement"]
+body:
+  - type: markdown
+    attributes:
+      value: |
+        Thanks for taking the time to fill out this proposal / feature reqeust
+  - type: checkboxes
+    id: preflight
+    attributes:
+      label: Preflight Checklist
+      options:
+      - label:
+          I could not find a solution in the existing issues, docs, nor discussions
+        required: true
+      - label:
+          I have joined the [ZITADEL chat](https://zitadel.com/chat)
+  - type: textarea
+    id: problem
+    attributes:
+      label: Describe your problem
+      description: Please describe your problem this proposal / feature is supposed to solve.
+      placeholder: Describe the problem you have.
+    validations:
+      required: true
+  - type: textarea
+    id: solution
+    attributes:
+      label: Describe your ideal solution
+      description: Which solution do you propose?
+      placeholder: As a [type of user], I want [some goal] so that [some reason].
+    validations:
+      required: true
+  - type: input
+    id: version
+    attributes:
+      label: Version
+      description: Which version of the OIDC Library are you using.
+  - type: textarea
+    id: additional
+    attributes:
+      label: Additional Context
+      description: Please add any other infos that could be useful.

.github/dependabot.yml

@@ -9,16 +9,6 @@ updates:
   commit-message:
     prefix: chore
     include: scope
-- package-ecosystem: gomod
-  target-branch: "2.12.x"
-  directory: "/"
-  schedule:
-    interval: daily
-    time: '04:00'
-  open-pull-requests-limit: 10
-  commit-message:
-    prefix: chore
-    include: scope
 - package-ecosystem: "github-actions"
   directory: "/"
   schedule:

.github/workflows/codeql-analysis.yml

@@ -29,7 +29,7 @@ jobs:
 
     # Initializes the CodeQL tools for scanning.
     - name: Initialize CodeQL
-      uses: github/codeql-action/init@v3
+      uses: github/codeql-action/init@v2
       # Override language selection by uncommenting this and choosing your languages
       with:
         languages: go
@@ -37,7 +37,7 @@ jobs:
     # Autobuild attempts to build any compiled languages  (C/C++, C#, or Java).
     # If this step fails, then you should remove it and run the build manually (see below)
     - name: Autobuild
-      uses: github/codeql-action/autobuild@v3
+      uses: github/codeql-action/autobuild@v2
 
     # ℹ️ Command-line programs to run using the OS shell.
     # 📚 https://git.io/JvXDl
@@ -51,4 +51,4 @@ jobs:
     #   make release
 
     - name: Perform CodeQL Analysis
-      uses: github/codeql-action/analyze@v3
+      uses: github/codeql-action/analyze@v2

.github/workflows/issue.yml

@@ -0,0 +1,18 @@
+name: Add new issues to product management project
+
+on:
+  issues:
+    types:
+      - opened
+
+jobs:
+  add-to-project:
+    name: Add issue to project
+    runs-on: ubuntu-latest
+    steps:
+      - uses: actions/add-to-project@v0.5.0
+        with:
+          # You can target a repository in a different organization
+          # to the issue
+          project-url: https://github.com/orgs/zitadel/projects/2
+          github-token: ${{ secrets.ADD_TO_PROJECT_PAT }}

.github/workflows/release.yml

@@ -2,7 +2,7 @@ name: Release
 on:
   push:
     branches:
-      - "2.11.x"
+      - "2.12.x"
       - main
       - next
     tags-ignore:
@@ -14,25 +14,25 @@ on:
 
 jobs:
   test:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     strategy:
       fail-fast: false
       matrix:
-        go: ['1.23', '1.24']
+        go: ['1.19', '1.20', '1.21']
     name: Go ${{ matrix.go }} test
     steps:
       - uses: actions/checkout@v4
       - name: Setup go
-        uses: actions/setup-go@v5
+        uses: actions/setup-go@v4
         with:
           go-version: ${{ matrix.go }}
       - run: go test -race -v -coverprofile=profile.cov -coverpkg=./pkg/... ./pkg/...
-      - uses: codecov/codecov-action@v5.4.3
+      - uses: codecov/codecov-action@v3.1.4
         with:
           file: ./profile.cov
           name: codecov-go
   release:
-    runs-on: ubuntu-24.04
+    runs-on: ubuntu-20.04
     needs: [test]
     if: ${{ github.event_name == 'workflow_dispatch' || github.ref == 'refs/heads/main' || github.ref == 'refs/heads/next' }}
     env:

.releaserc.js

@@ -1,6 +1,6 @@
 module.exports = {
     branches: [
-        {name: "2.11.x"},
+        {name: "2.12.x"},
         {name: "main"},
         {name: "next", prerelease: true},
     ],

README.md

@@ -2,10 +2,10 @@
 
 [![semantic-release](https://img.shields.io/badge/%20%20%F0%9F%93%A6%F0%9F%9A%80-semantic--release-e10079.svg)](https://github.com/semantic-release/semantic-release)
 [![Release](https://github.com/zitadel/oidc/workflows/Release/badge.svg)](https://github.com/zitadel/oidc/actions)
-[![Go Reference](https://pkg.go.dev/badge/github.com/zitadel/oidc/v3.svg)](https://pkg.go.dev/github.com/zitadel/oidc/v3)
+[![GoDoc](https://godoc.org/github.com/zitadel/oidc?status.png)](https://pkg.go.dev/github.com/zitadel/oidc)
 [![license](https://badgen.net/github/license/zitadel/oidc/)](https://github.com/zitadel/oidc/blob/master/LICENSE)
 [![release](https://badgen.net/github/release/zitadel/oidc/stable)](https://github.com/zitadel/oidc/releases)
-[![Go Report Card](https://goreportcard.com/badge/github.com/zitadel/oidc/v3)](https://goreportcard.com/report/github.com/zitadel/oidc/v3)
+[![Go Report Card](https://goreportcard.com/badge/github.com/zitadel/oidc)](https://goreportcard.com/report/github.com/zitadel/oidc)
 [![codecov](https://codecov.io/gh/zitadel/oidc/branch/main/graph/badge.svg)](https://codecov.io/gh/zitadel/oidc)
 
 [![openid_certified](https://cloud.githubusercontent.com/assets/1454075/7611268/4d19de32-f97b-11e4-895b-31b2455a7ca6.png)](https://openid.net/certification/)
@@ -21,10 +21,9 @@ Whenever possible we tried to reuse / extend existing packages like `OAuth2 for
 ## Basic Overview
 
 The most important packages of the library:
-
 <pre>
 /pkg
-    /client            clients using the OP for retrieving, exchanging and verifying tokens
+    /client            clients using the OP for retrieving, exchanging and verifying tokens       
         /rp            definition and implementation of an OIDC Relying Party (client)
         /rs            definition and implementation of an OAuth Resource Server (API)
     /op                definition and implementation of an OIDC OpenID Provider (server)
@@ -38,10 +37,6 @@ The most important packages of the library:
     /server            examples of an OpenID Provider implementations (including dynamic) with some very basic login UI
 </pre>
 
-### Semver
-
-This package uses [semver](https://semver.org/) for [releases](https://github.com/zitadel/oidc/releases). Major releases ship breaking changes. Starting with the `v2` to `v3` increment we provide an [upgrade guide](UPGRADING.md) to ease migration to a newer version.
-
 ## How To Use It
 
 Check the `/example` folder where example code for different scenarios is located.
@@ -49,90 +44,54 @@ Check the `/example` folder where example code for different scenarios is locate
 ```bash
 # start oidc op server
 # oidc discovery http://localhost:9998/.well-known/openid-configuration
-go run github.com/zitadel/oidc/v3/example/server
+go run github.com/zitadel/oidc/v2/example/server
 # start oidc web client (in a new terminal)
-CLIENT_ID=web CLIENT_SECRET=secret ISSUER=http://localhost:9998/ SCOPES="openid profile" PORT=9999 go run github.com/zitadel/oidc/v3/example/client/app
+CLIENT_ID=web CLIENT_SECRET=secret ISSUER=http://localhost:9998/ SCOPES="openid profile" PORT=9999 go run github.com/zitadel/oidc/v2/example/client/app
 ```
 
 - open http://localhost:9999/login in your browser
-- you will be redirected to op server and the login UI
+- you will be redirected to op server and the login UI 
 - login with user `test-user@localhost` and password `verysecure`
 - the OP will redirect you to the client app, which displays the user info
 
 for the dynamic issuer, just start it with:
-
 ```bash
-go run github.com/zitadel/oidc/v3/example/server/dynamic
-```
-
+go run github.com/zitadel/oidc/v2/example/server/dynamic
+``` 
 the oidc web client above will still work, but if you add `oidc.local` (pointing to 127.0.0.1) in your hosts file you can also start it with:
-
 ```bash
-CLIENT_ID=web CLIENT_SECRET=secret ISSUER=http://oidc.local:9998/ SCOPES="openid profile" PORT=9999 go run github.com/zitadel/oidc/v3/example/client/app
+CLIENT_ID=web CLIENT_SECRET=secret ISSUER=http://oidc.local:9998/ SCOPES="openid profile" PORT=9999 go run github.com/zitadel/oidc/v2/example/client/app
 ```
 
 > Note: Usernames are suffixed with the hostname (`test-user@localhost` or `test-user@oidc.local`)
 
-### Server configuration
-
-Example server allows extra configuration using environment variables and could be used for end to
-end testing of your services.
-
-| Name         | Format                           | Description                           |
-| ------------ | -------------------------------- | ------------------------------------- |
-| PORT         | Number between 1 and 65535       | OIDC listen port                      |
-| REDIRECT_URI | Comma-separated URIs             | List of allowed redirect URIs         |
-| USERS_FILE   | Path to json in local filesystem | Users with their data and credentials |
-
-Here is json equivalent for one of the default users
-
-```json
-{
-  "id2": {
-    "ID": "id2",
-    "Username": "test-user2",
-    "Password": "verysecure",
-    "FirstName": "Test",
-    "LastName": "User2",
-    "Email": "test-user2@zitadel.ch",
-    "EmailVerified": true,
-    "Phone": "",
-    "PhoneVerified": false,
-    "PreferredLanguage": "DE",
-    "IsAdmin": false
-  }
-}
-```
-
 ## Features
 
-|                      | Relying party | OpenID Provider | Specification                                |
-| -------------------- | ------------- | --------------- | -------------------------------------------- |
-| Code Flow            | yes           | yes             | OpenID Connect Core 1.0, [Section 3.1][1]    |
-| Implicit Flow        | no[^1]        | yes             | OpenID Connect Core 1.0, [Section 3.2][2]    |
-| Hybrid Flow          | no            | not yet         | OpenID Connect Core 1.0, [Section 3.3][3]    |
-| Client Credentials   | yes           | yes             | OpenID Connect Core 1.0, [Section 9][4]      |
-| Refresh Token        | yes           | yes             | OpenID Connect Core 1.0, [Section 12][5]     |
-| Discovery            | yes           | yes             | OpenID Connect [Discovery][6] 1.0            |
-| JWT Profile          | yes           | yes             | [RFC 7523][7]                                |
-| PKCE                 | yes           | yes             | [RFC 7636][8]                                |
-| Token Exchange       | yes           | yes             | [RFC 8693][9]                                |
-| Device Authorization | yes           | yes             | [RFC 8628][10]                               |
-| mTLS                 | not yet       | not yet         | [RFC 8705][11]                               |
-| Back-Channel Logout  | not yet       | yes             | OpenID Connect [Back-Channel Logout][12] 1.0 |
+|                      | Relying party | OpenID Provider | Specification                             |
+| -------------------- | ------------- | --------------- | ----------------------------------------- |
+| Code Flow            | yes           | yes             | OpenID Connect Core 1.0, [Section 3.1][1] |
+| Implicit Flow        | no[^1]        | yes             | OpenID Connect Core 1.0, [Section 3.2][2] |
+| Hybrid Flow          | no            | not yet         | OpenID Connect Core 1.0, [Section 3.3][3] |
+| Client Credentials   | not yet       | yes             | OpenID Connect Core 1.0, [Section 9][4]   |
+| Refresh Token        | yes           | yes             | OpenID Connect Core 1.0, [Section 12][5]  |
+| Discovery            | yes           | yes             | OpenID Connect [Discovery][6] 1.0         |
+| JWT Profile          | yes           | yes             | [RFC 7523][7]                             |
+| PKCE                 | yes           | yes             | [RFC 7636][8]                             |
+| Token Exchange       | yes           | yes             | [RFC 8693][9]                             |
+| Device Authorization | yes           | yes             | [RFC 8628][10]                            |
+| mTLS                 | not yet       | not yet         | [RFC 8705][11]                            |
 
-[1]: https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth "3.1. Authentication using the Authorization Code Flow"
-[2]: https://openid.net/specs/openid-connect-core-1_0.html#ImplicitFlowAuth "3.2. Authentication using the Implicit Flow"
-[3]: https://openid.net/specs/openid-connect-core-1_0.html#HybridFlowAuth "3.3. Authentication using the Hybrid Flow"
-[4]: https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication "9. Client Authentication"
-[5]: https://openid.net/specs/openid-connect-core-1_0.html#RefreshTokens "12. Using Refresh Tokens"
-[6]: https://openid.net/specs/openid-connect-discovery-1_0.html "OpenID Connect Discovery 1.0 incorporating errata set 1"
-[7]: https://www.rfc-editor.org/rfc/rfc7523.html "JSON Web Token (JWT) Profile for OAuth 2.0 Client Authentication and Authorization Grants"
-[8]: https://www.rfc-editor.org/rfc/rfc7636.html "Proof Key for Code Exchange by OAuth Public Clients"
-[9]: https://www.rfc-editor.org/rfc/rfc8693.html "OAuth 2.0 Token Exchange"
-[10]: https://www.rfc-editor.org/rfc/rfc8628.html "OAuth 2.0 Device Authorization Grant"
-[11]: https://www.rfc-editor.org/rfc/rfc8705.html "OAuth 2.0 Mutual-TLS Client Authentication and Certificate-Bound Access Tokens"
-[12]: https://openid.net/specs/openid-connect-backchannel-1_0.html "OpenID Connect Back-Channel Logout 1.0 incorporating errata set 1"
+[1]: <https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowAuth> "3.1. Authentication using the Authorization Code Flow"
+[2]: <https://openid.net/specs/openid-connect-core-1_0.html#ImplicitFlowAuth> "3.2. Authentication using the Implicit Flow"
+[3]: <https://openid.net/specs/openid-connect-core-1_0.html#HybridFlowAuth> "3.3. Authentication using the Hybrid Flow"
+[4]: <https://openid.net/specs/openid-connect-core-1_0.html#ClientAuthentication> "9. Client Authentication"
+[5]: <https://openid.net/specs/openid-connect-core-1_0.html#RefreshTokens> "12. Using Refresh Tokens"
+[6]: <https://openid.net/specs/openid-connect-discovery-1_0.html> "OpenID Connect Discovery 1.0 incorporating errata set 1"
+[7]: <https://www.rfc-editor.org/rfc/rfc7523.html> "JSON Web Token (JWT) Profile for OAuth 2.0 Client Authentication and Authorization Grants"
+[8]: <https://www.rfc-editor.org/rfc/rfc7636.html> "Proof Key for Code Exchange by OAuth Public Clients"
+[9]: <https://www.rfc-editor.org/rfc/rfc8693.html> "OAuth 2.0 Token Exchange"
+[10]: <https://www.rfc-editor.org/rfc/rfc8628.html> "OAuth 2.0 Device Authorization Grant"
+[11]: <https://www.rfc-editor.org/rfc/rfc8705.html> "OAuth 2.0 Mutual-TLS Client Authentication and Certificate-Bound Access Tokens"
 
 ## Contributors
 
@@ -151,14 +110,15 @@ For your convenience you can find the relevant guides linked below.
 
 ## Supported Go Versions
 
-For security reasons, we only support and recommend the use of one of the latest two Go versions (:white_check_mark:).
+For security reasons, we only support and recommend the use of one of the latest two Go versions (:white_check_mark:).  
 Versions that also build are marked with :warning:.
 
 | Version | Supported          |
 | ------- | ------------------ |
-| <1.23   | :x:                |
-| 1.23    | :white_check_mark: |
-| 1.24    | :white_check_mark: |
+| <1.19   | :x:                |
+| 1.19    | :warning:          |
+| 1.20    | :white_check_mark: |
+| 1.21    | :white_check_mark: |
 
 ## Why another library
 
@@ -189,4 +149,5 @@ Unless required by applicable law or agreed to in writing, software distributed
 AS IS" BASIS, WITHOUT WARRANTIES OR CONDITIONS OF ANY KIND, either express or implied. See the License for the specific
 language governing permissions and limitations under the License.
 
+
 [^1]: https://github.com/zitadel/oidc/issues/135#issuecomment-950563892

SECURITY.md

@@ -1,6 +1,6 @@
 # Security Policy
 
-Please refer to the security policy [on zitadel/zitadel](https://github.com/zitadel/zitadel/blob/main/SECURITY.md) which is applicable for all open source repositories of our organization.
+At ZITADEL we are extremely grateful for security aware people that disclose vulnerabilities to us and the open source community. All reports will be investigated by our team.
 
 ## Supported Versions
 
@@ -9,12 +9,42 @@ We currently support the following version of the OIDC framework:
 | Version  | Supported          | Branch      | Details                              |
 | -------- | ------------------ | ----------- | ------------------------------------ |
 | 0.x.x    | :x:                |             | not maintained                       |
-| <2.11    | :x:                |             | not maintained                       |
-| 2.11.x   | :lock: :warning:   | [2.11.x][1] | security only, [community effort][2] |
+| <2.12    | :x:                |             | not maintained                       |
+| 2.12.x   | :lock: :warning:   | [2.12.x][1] | security only, [community effort][2] |
 | 3.x.x    | :heavy_check_mark: | [main][3]   | supported                            |
-| 4.0.0-xx | :white_check_mark: | [next][4]   | [development branch]                 |
+| 4.0.0-xx | :white_check_mark: | [next][4]   | [development branch]                |
 
-[1]: https://github.com/zitadel/oidc/tree/2.11.x
+[1]: https://github.com/zitadel/oidc/tree/2.12.x
 [2]: https://github.com/zitadel/oidc/discussions/458
 [3]: https://github.com/zitadel/oidc/tree/main
 [4]: https://github.com/zitadel/oidc/tree/next
+
+## Reporting a vulnerability
+
+To file a incident, please disclose by email to security@zitadel.com with the security details.
+
+At the moment GPG encryption is no yet supported, however you may sign your message at will.
+
+### When should I report a vulnerability
+
+* You think you discovered a ...
+  * ... potential security vulnerability in the SDK
+  * ... vulnerability in another project that this SDK bases on
+* For projects with their own vulnerability reporting and disclosure process, please report it directly there
+
+### When should I NOT report a vulnerability
+
+* You need help applying security related updates
+* Your issue is not security related
+
+## Security Vulnerability Response
+
+TBD
+
+## Public Disclosure
+
+All accepted and mitigated vulnerabilities will be published on the [Github Security Page](https://github.com/zitadel/oidc/security/advisories)
+
+### Timing
+
+We think it is crucial to publish advisories `ASAP` as mitigations are ready. But due to the unknown nature of the disclosures the time frame can range from 7 to 90 days.

UPGRADING.md

@@ -1,370 +0,0 @@
-# Upgrading
-
-All commands are executed from the root of the project that imports oidc packages.
-`sed` commands are created with **GNU sed** in mind and might need alternate syntax
-on non-GNU systems, such as MacOS.
-Alternatively, GNU sed can be installed on such systems. (`coreutils` package?).
-
-## V2 to V3
-
-**TL;DR** at the [bottom](#full-script) of this chapter is a full `sed` script
-containing all automatic steps at once.
-
-
-As first steps we will:
-1. Download the latest v3 module;
-2. Replace imports in all Go files;
-3. Tidy the module file;
-
-```bash
-go get -u github.com/zitadel/oidc/v3
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/github\.com\/zitadel\/oidc\/v2/github.com\/zitadel\/oidc\/v3/g'
-go mod tidy
-```
-
-### global
-
-#### go-jose package
-
-`gopkg.in/square/go-jose.v2` import has been changed to `github.com/go-jose/go-jose/v3`.
-That means that the imported types are also changed and imports need to be adapted.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/gopkg.in\/square\/go-jose\.v2/github.com\/go-jose\/go-jose\/v3/g'
-go mod tidy
-```
-
-### op
-
-```go
-import "github.com/zitadel/oidc/v3/pkg/op"
-```
-
-#### Logger
-
-This version of OIDC adds logging to the framework. For this we use the new Go standard library `log/slog`. (Until v3.12.0 we used `x/exp/slog`).
-Mostly OIDC will use error level logs where it's returning an error through a HTTP handler. OIDC errors that are user facing don't carry much context, also for security reasons. With logging we are now able to print the error context, so that developers can more easily find the source of their issues. Previously we just discarded such context.
-
-Most users of the OP package with the storage interface will not experience breaking changes. However if you use `RequestError()` directly in your code, you now need to give it a `Logger` as final argument.
-
-The `OpenIDProvider` and sub-interfaces like `Authorizer` and `Exchanger` got a `Logger()` method to return the configured logger. This logger is in turn used by `AuthRequestError()`. You configure the logger with the `WithLogger()` for the `Provider`. By default the `slog.Default()` is used.
-
-We also provide a new optional interface: [`LogAuthRequest`](https://pkg.go.dev/github.com/zitadel/oidc/v3/pkg/op#LogAuthRequest). If an `AuthRequest` implements this interface, it is completely passed into the logger after an error. Its `LogValue()` will be used by `slog` to print desired fields. This allows omitting sensitive fields you wish not no print. If the interface is not implemented, no `AuthRequest` details will ever be printed.
-
-#### Server interface
-
-We've added a new [`Server`](https://pkg.go.dev/github.com/zitadel/oidc/v3/pkg/op#Server) interface. This interface is experimental and subject to change. See [issue 440](https://github.com/zitadel/oidc/issues/440) for the motivation and discussion around this new interface.
-Usage of the new interface is not required, but may be used for advanced scenarios when working with the `Storage` interface isn't the optimal solution for your app (like we experienced in [Zitadel](https://github.com/zitadel/zitadel)).
-
-#### AuthRequestError
-
-`AuthRequestError` now takes the complete `Authorizer` as final argument, instead of only the encoder.
-This is to facilitate the use of the `Logger` as described above.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/\bAuthRequestError(w, r, authReq, err, authorizer.Encoder())/AuthRequestError(w, r, authReq, err, authorizer)/g'
-```
-
-Note: the sed regex might not find all uses if the local variables of the passed arguments use different names.
-
-#### AccessTokenVerifier
-
-`AccessTokenVerifier` interface has become a struct type. `NewAccessTokenVerifier` now returns a pointer to `AccessTokenVerifier`.
-Variable and struct fields declarations need to be changed from `op.AccessTokenVerifier` to `*op.AccessTokenVerifier`.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/\bop\.AccessTokenVerifier\b/*op.AccessTokenVerifier/g'
-```
-
-#### JWTProfileVerifier
-
-`JWTProfileVerifier` interface has become a struct type. `NewJWTProfileVerifier` now returns a pointer to `JWTProfileVerifier`.
-Variable and struct fields declarations need to be changed from `op.JWTProfileVerifier` to `*op.JWTProfileVerifier`.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/\bop\.JWTProfileVerifier\b/*op.JWTProfileVerifier/g'
-```
-
-#### IDTokenHintVerifier
-
-`IDTokenHintVerifier` interface has become a struct type. `NewIDTokenHintVerifier` now returns a pointer to `IDTokenHintVerifier`.
-Variable and struct fields declarations need to be changed from `op.IDTokenHintVerifier` to `*op.IDTokenHintVerifier`.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/\bop\.IDTokenHintVerifier\b/*op.IDTokenHintVerifier/g'
-```
-
-#### ParseRequestObject
-
-`ParseRequestObject` no longer returns `*oidc.AuthRequest` as it already operates on the pointer for the passed `authReq` argument. As such the argument and the return value were the same pointer. Callers can just use the original `*oidc.AuthRequest` now.
-
-#### Endpoint Configuration
-
-`Endpoint`s returned from `Configuration` interface methods are now pointers. Usually, `op.Provider` is the main implementation of the `Configuration` interface. However, if a custom implementation is used, you should be able to update it using the following:
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/AuthorizationEndpoint() Endpoint/AuthorizationEndpoint() *Endpoint/g' \
-    -e 's/TokenEndpoint() Endpoint/TokenEndpoint() *Endpoint/g' \
-    -e 's/IntrospectionEndpoint() Endpoint/IntrospectionEndpoint() *Endpoint/g' \
-    -e 's/UserinfoEndpoint() Endpoint/UserinfoEndpoint() *Endpoint/g' \
-    -e 's/RevocationEndpoint() Endpoint/RevocationEndpoint() *Endpoint/g' \
-    -e 's/EndSessionEndpoint() Endpoint/EndSessionEndpoint() *Endpoint/g' \
-    -e 's/KeysEndpoint() Endpoint/KeysEndpoint() *Endpoint/g' \
-    -e 's/DeviceAuthorizationEndpoint() Endpoint/DeviceAuthorizationEndpoint() *Endpoint/g'
-```
-
-#### CreateDiscoveryConfig
-
-`CreateDiscoveryConfig` now takes a context as first argument. The following adds `context.TODO()` to the function:
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/op\.CreateDiscoveryConfig(/op.CreateDiscoveryConfig(context.TODO(), /g'
-```
-
-It now takes the issuer out of the context using the [`IssuerFromContext`](https://pkg.go.dev/github.com/zitadel/oidc/v3/pkg/op#IssuerFromContext) functionality,
-instead of the `config.IssuerFromRequest()` method.
-
-#### CreateRouter
-
-`CreateRouter` now returns a `chi.Router` instead of `*mux.Router`.
-Usually this function is called when the Provider is constructed and not by package consumers.
-However if your project does call this function directly, manual update of the code is required.
-
-#### DeviceAuthorizationStorage
-
-`DeviceAuthorizationStorage` dropped the following methods:
-
-- `GetDeviceAuthorizationByUserCode`
-- `CompleteDeviceAuthorization`
-- `DenyDeviceAuthorization`
-
-These methods proved not to be required from a library point of view.
-Implementations of a device authorization flow may take care of these calls in a way they see fit.
-
-#### AuthorizeCodeChallenge
-
-The `AuthorizeCodeChallenge` function now only takes the `CodeVerifier` argument, instead of the complete `*oidc.AccessTokenRequest`.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/op\.AuthorizeCodeChallenge(tokenReq/op.AuthorizeCodeChallenge(tokenReq.CodeVerifier/g'
-```
-
-### client
-
-```go
-import "github.com/zitadel/oidc/v3/pkg/client"
-```
-
-#### Context
-
-All client calls now take a context as first argument. The following adds `context.TODO()` to all the affected functions:
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/client\.Discover(/client.Discover(context.TODO(), /g' \
-    -e 's/client\.CallTokenEndpoint(/client.CallTokenEndpoint(context.TODO(), /g' \
-    -e 's/client\.CallEndSessionEndpoint(/client.CallEndSessionEndpoint(context.TODO(), /g' \
-    -e 's/client\.CallRevokeEndpoint(/client.CallRevokeEndpoint(context.TODO(), /g' \
-    -e 's/client\.CallTokenExchangeEndpoint(/client.CallTokenExchangeEndpoint(context.TODO(), /g' \
-    -e 's/client\.CallDeviceAuthorizationEndpoint(/client.CallDeviceAuthorizationEndpoint(context.TODO(), /g' \
-    -e 's/client\.JWTProfileExchange(/client.JWTProfileExchange(context.TODO(), /g'
-```
-
-#### keyFile type
-
-The `keyFile` struct type is now exported a `KeyFile` and returned by the `ConfigFromKeyFile` and `ConfigFromKeyFileData`. No changes are needed on the caller's side.
-
-### client/profile
-
-The package now defines a new interface `TokenSource` which compliments the `oauth2.TokenSource` with a `TokenCtx` method, so that a context can be explicitly added on each call. Users can migrate to the new method when they whish.
-
-`NewJWTProfileTokenSource` now takes a context as first argument, so do the related `NewJWTProfileTokenSourceFromKeyFile` and `NewJWTProfileTokenSourceFromKeyFileData`. The context is used for the Discovery request.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/profile\.NewJWTProfileTokenSource(/profile.NewJWTProfileTokenSource(context.TODO(), /g' \
-    -e 's/profile\.NewJWTProfileTokenSourceFromKeyFileData(/profile.NewJWTProfileTokenSourceFromKeyFileData(context.TODO(), /g' \
-    -e 's/profile\.NewJWTProfileTokenSourceFromKeyFile(/profile.NewJWTProfileTokenSourceFromKeyFile(context.TODO(), /g'
-```
-
-
-### client/rp
-
-```go
-import "github.com/zitadel/oidc/v3/pkg/client/rs"
-```
-
-#### Discover
-
-The `Discover` function has been removed. Use `client.Discover` instead.
-
-#### Context
-
-Most `rp` functions now require a context as first argument. The following adds `context.TODO()` to the function that have no additional changes. Functions with more complex changes are documented below.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/rp\.NewRelyingPartyOIDC(/rp.NewRelyingPartyOIDC(context.TODO(), /g' \
-    -e 's/rp\.EndSession(/rp.EndSession(context.TODO(), /g' \
-    -e 's/rp\.RevokeToken(/rp.RevokeToken(context.TODO(), /g' \
-    -e 's/rp\.DeviceAuthorization(/rp.DeviceAuthorization(context.TODO(), /g'
-```
-
-Remember to replace `context.TODO()` with a context that is applicable for your app, where possible.
-
-#### RefreshAccessToken
-
-1. Renamed to `RefreshTokens`;
-2. A context must be passed;
-3. An `*oidc.Tokens` object is now returned, which included an ID Token if it was returned by the server;
-4. The function is now generic and requires a type argument for the `IDTokenClaims` implementation inside the returned `oidc.Tokens` object;
-
-For most use cases `*oidc.IDTokenClaims` can be used as type argument. A custom implementation of `oidc.IDClaims` can be used if type-safe access to custom claims is required.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/rp\.RefreshAccessToken(/rp.RefreshTokens[*oidc.IDTokenClaims](context.TODO(), /g'
-```
-
-Users that called `tokens.Extra("id_token").(string)` and a subsequent `VerifyTokens` to get the claims, no longer need to do this. The ID token is verified (when present) by `RefreshTokens` already.
-
-
-#### Userinfo
-
-1. A context must be passed as first argument;
-2. The function is now generic and requires a type argument for the returned user info object;
-
-For most use cases `*oidc.UserInfo` can be used a type argument. A [custom implementation](https://pkg.go.dev/github.com/zitadel/oidc/v3/pkg/client/rp#example-Userinfo-Custom) of `rp.SubjectGetter` can be used if type-safe access to custom claims is required.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/rp\.Userinfo(/rp.Userinfo[*oidc.UserInfo](context.TODO(), /g'
-```
-
-#### UserinfoCallback
-
-`UserinfoCallback` has an additional type argument fot the `UserInfo` object. Typically the type argument can be inferred by the compiler, by the function that is passed. The actual code update cannot be done by a simple `sed` script and depends on how the caller implemented the function.
-
-
-#### IDTokenVerifier
-
-`IDTokenVerifier` interface has become a struct type. `NewIDTokenVerifier` now returns a pointer to `IDTokenVerifier`.
-Variable and struct fields declarations need to be changed from `rp.IDTokenVerifier` to `*rp.AccessTokenVerifier`.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/\brp\.IDTokenVerifier\b/*rp.IDTokenVerifier/g'
-```
-
-### client/rs
-
-```go
-import "github.com/zitadel/oidc/v3/pkg/client/rs"
-```
-
-#### NewResourceServer
-
-The `NewResourceServerClientCredentials` and `NewResourceServerJWTProfile` constructor functions now take a context as first argument.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/rs\.NewResourceServerClientCredentials(/rs.NewResourceServerClientCredentials(context.TODO(), /g' \
-    -e 's/rs\.NewResourceServerJWTProfile(/rs.NewResourceServerJWTProfile(context.TODO(), /g'
-```
-
-#### Introspect
-
-`Introspect` is now generic and requires a type argument for the returned introspection response. For most use cases `*oidc.IntrospectionResponse` can be used as type argument. Any other response type if type-safe access to [custom claims](https://pkg.go.dev/github.com/zitadel/oidc/v3/pkg/client/rs#example-Introspect-Custom) is required.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/rs\.Introspect(/rs.Introspect[*oidc.IntrospectionResponse](/g'
-```
-
-### client/tokenexchange
-
-The `TokenExchanger` constructor functions `NewTokenExchanger` and `NewTokenExchangerClientCredentials` now take a context as first argument.
-As well as the `ExchangeToken` function.
-
-```bash
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/tokenexchange\.NewTokenExchanger(/tokenexchange.NewTokenExchanger(context.TODO(), /g' \
-    -e 's/tokenexchange\.NewTokenExchangerClientCredentials(/tokenexchange.NewTokenExchangerClientCredentials(context.TODO(), /g' \
-    -e 's/tokenexchange\.ExchangeToken(/tokenexchange.ExchangeToken(context.TODO(), /g'
-```
-
-### oidc
-
-#### SpaceDelimitedArray
-
-The `SpaceDelimitedArray` type's `Encode()` function has been renamed to `String()` so it implements the `fmt.Stringer` interface. If the `Encode` method was called by a package consumer, it should be changed manually.
-
-#### Verifier
-
-The `Verifier` interface as been changed into a struct type. The struct type is aliased in the `op` and `rp` packages for the specific token use cases. See the relevant section above.
-
-### Full script
-
-For the courageous this is the full `sed` script which combines all the steps described above.
-It should migrate most of the code in a repository to a more-or-less compilable state,
-using defaults such as `context.TODO()` where possible.
-
-Warnings:
-- Again, this is written for **GNU sed** not the posix variant.
-- Assumes imports that use the package names, not aliases.
-- Do this on a project with version control (eg Git), that allows you to rollback if things went wrong.
-- The script has been tested on the [ZITADEL](https://github.com/zitadel/zitadel) project, but we do not use all affected symbols. Parts of the script are mere guesswork.
-
-```bash
-go get -u github.com/zitadel/oidc/v3
-find . -type f -name '*.go' | xargs sed -i \
-    -e 's/github\.com\/zitadel\/oidc\/v2/github.com\/zitadel\/oidc\/v3/g' \
-    -e 's/gopkg.in\/square\/go-jose\.v2/github.com\/go-jose\/go-jose\/v3/g' \
-    -e 's/\bAuthRequestError(w, r, authReq, err, authorizer.Encoder())/AuthRequestError(w, r, authReq, err, authorizer)/g' \
-    -e 's/\bop\.AccessTokenVerifier\b/*op.AccessTokenVerifier/g' \
-    -e 's/\bop\.JWTProfileVerifier\b/*op.JWTProfileVerifier/g' \
-    -e 's/\bop\.IDTokenHintVerifier\b/*op.IDTokenHintVerifier/g' \
-    -e 's/AuthorizationEndpoint() Endpoint/AuthorizationEndpoint() *Endpoint/g' \
-    -e 's/TokenEndpoint() Endpoint/TokenEndpoint() *Endpoint/g' \
-    -e 's/IntrospectionEndpoint() Endpoint/IntrospectionEndpoint() *Endpoint/g' \
-    -e 's/UserinfoEndpoint() Endpoint/UserinfoEndpoint() *Endpoint/g' \
-    -e 's/RevocationEndpoint() Endpoint/RevocationEndpoint() *Endpoint/g' \
-    -e 's/EndSessionEndpoint() Endpoint/EndSessionEndpoint() *Endpoint/g' \
-    -e 's/KeysEndpoint() Endpoint/KeysEndpoint() *Endpoint/g' \
-    -e 's/DeviceAuthorizationEndpoint() Endpoint/DeviceAuthorizationEndpoint() *Endpoint/g' \
-    -e 's/op\.CreateDiscoveryConfig(/op.CreateDiscoveryConfig(context.TODO(), /g' \
-    -e 's/op\.AuthorizeCodeChallenge(tokenReq/op.AuthorizeCodeChallenge(tokenReq.CodeVerifier/g' \
-    -e 's/client\.Discover(/client.Discover(context.TODO(), /g' \
-    -e 's/client\.CallTokenEndpoint(/client.CallTokenEndpoint(context.TODO(), /g' \
-    -e 's/client\.CallEndSessionEndpoint(/client.CallEndSessionEndpoint(context.TODO(), /g' \
-    -e 's/client\.CallRevokeEndpoint(/client.CallRevokeEndpoint(context.TODO(), /g' \
-    -e 's/client\.CallTokenExchangeEndpoint(/client.CallTokenExchangeEndpoint(context.TODO(), /g' \
-    -e 's/client\.CallDeviceAuthorizationEndpoint(/client.CallDeviceAuthorizationEndpoint(context.TODO(), /g' \
-    -e 's/client\.JWTProfileExchange(/client.JWTProfileExchange(context.TODO(), /g' \
-    -e 's/profile\.NewJWTProfileTokenSource(/profile.NewJWTProfileTokenSource(context.TODO(), /g' \
-    -e 's/profile\.NewJWTProfileTokenSourceFromKeyFileData(/profile.NewJWTProfileTokenSourceFromKeyFileData(context.TODO(), /g' \
-    -e 's/profile\.NewJWTProfileTokenSourceFromKeyFile(/profile.NewJWTProfileTokenSourceFromKeyFile(context.TODO(), /g' \
-    -e 's/rp\.NewRelyingPartyOIDC(/rp.NewRelyingPartyOIDC(context.TODO(), /g' \
-    -e 's/rp\.EndSession(/rp.EndSession(context.TODO(), /g' \
-    -e 's/rp\.RevokeToken(/rp.RevokeToken(context.TODO(), /g' \
-    -e 's/rp\.DeviceAuthorization(/rp.DeviceAuthorization(context.TODO(), /g' \
-    -e 's/rp\.RefreshAccessToken(/rp.RefreshTokens[*oidc.IDTokenClaims](context.TODO(), /g' \
-    -e 's/rp\.Userinfo(/rp.Userinfo[*oidc.UserInfo](context.TODO(), /g' \
-    -e 's/\brp\.IDTokenVerifier\b/*rp.IDTokenVerifier/g' \
-    -e 's/rs\.NewResourceServerClientCredentials(/rs.NewResourceServerClientCredentials(context.TODO(), /g' \
-    -e 's/rs\.NewResourceServerJWTProfile(/rs.NewResourceServerJWTProfile(context.TODO(), /g' \
-    -e 's/rs\.Introspect(/rs.Introspect[*oidc.IntrospectionResponse](/g' \
-    -e 's/tokenexchange\.NewTokenExchanger(/tokenexchange.NewTokenExchanger(context.TODO(), /g' \
-    -e 's/tokenexchange\.NewTokenExchangerClientCredentials(/tokenexchange.NewTokenExchangerClientCredentials(context.TODO(), /g' \
-    -e 's/tokenexchange\.ExchangeToken(/tokenexchange.ExchangeToken(context.TODO(), /g'
-go mod tidy
-```

example/client/api/api.go

@@ -1,7 +1,6 @@
 package main
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
 	"log"
@@ -10,11 +9,11 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-chi/chi/v5"
+	"github.com/gorilla/mux"
 	"github.com/sirupsen/logrus"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client/rs"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/client/rs"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 const (
@@ -28,12 +27,12 @@ func main() {
 	port := os.Getenv("PORT")
 	issuer := os.Getenv("ISSUER")
 
-	provider, err := rs.NewResourceServerFromKeyFile(context.TODO(), issuer, keyPath)
+	provider, err := rs.NewResourceServerFromKeyFile(issuer, keyPath)
 	if err != nil {
 		logrus.Fatalf("error creating provider %s", err.Error())
 	}
 
-	router := chi.NewRouter()
+	router := mux.NewRouter()
 
 	// public url accessible without any authorization
 	// will print `OK` and current timestamp
@@ -48,7 +47,7 @@ func main() {
 		if !ok {
 			return
 		}
-		resp, err := rs.Introspect[*oidc.IntrospectionResponse](r.Context(), provider, token)
+		resp, err := rs.Introspect(r.Context(), provider, token)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusForbidden)
 			return
@@ -69,14 +68,14 @@ func main() {
 		if !ok {
 			return
 		}
-		resp, err := rs.Introspect[*oidc.IntrospectionResponse](r.Context(), provider, token)
+		resp, err := rs.Introspect(r.Context(), provider, token)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusForbidden)
 			return
 		}
-		requestedClaim := chi.URLParam(r, "claim")
-		requestedValue := chi.URLParam(r, "value")
-
+		params := mux.Vars(r)
+		requestedClaim := params["claim"]
+		requestedValue := params["value"]
 		value, ok := resp.Claims[requestedClaim].(string)
 		if !ok || value == "" || value != requestedValue {
 			http.Error(w, "claim does not match", http.StatusForbidden)

example/client/app/app.go

@@ -1,23 +1,19 @@
 package main
 
 import (
-	"context"
 	"encoding/json"
 	"fmt"
-	"log/slog"
 	"net/http"
 	"os"
 	"strings"
-	"sync/atomic"
 	"time"
 
 	"github.com/google/uuid"
 	"github.com/sirupsen/logrus"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client/rp"
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"github.com/zitadel/logging"
+	"github.com/zitadel/oidc/v2/pkg/client/rp"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 var (
@@ -32,31 +28,13 @@ func main() {
 	issuer := os.Getenv("ISSUER")
 	port := os.Getenv("PORT")
 	scopes := strings.Split(os.Getenv("SCOPES"), " ")
-	responseMode := os.Getenv("RESPONSE_MODE")
 
 	redirectURI := fmt.Sprintf("http://localhost:%v%v", port, callbackPath)
 	cookieHandler := httphelper.NewCookieHandler(key, key, httphelper.WithUnsecure())
 
-	logger := slog.New(
-		slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{
-			AddSource: true,
-			Level:     slog.LevelDebug,
-		}),
-	)
-	client := &http.Client{
-		Timeout: time.Minute,
-	}
-	// enable outgoing request logging
-	logging.EnableHTTPClient(client,
-		logging.WithClientGroup("client"),
-	)
-
 	options := []rp.Option{
 		rp.WithCookieHandler(cookieHandler),
 		rp.WithVerifierOpts(rp.WithIssuedAtOffset(5 * time.Second)),
-		rp.WithHTTPClient(client),
-		rp.WithLogger(logger),
-		rp.WithSigningAlgsFromDiscovery(),
 	}
 	if clientSecret == "" {
 		options = append(options, rp.WithPKCE(cookieHandler))
@@ -65,10 +43,7 @@ func main() {
 		options = append(options, rp.WithJWTProfile(rp.SignerFromKeyPath(keyPath)))
 	}
 
-	// One can add a logger to the context,
-	// pre-defining log attributes as required.
-	ctx := logging.ToContext(context.TODO(), logger)
-	provider, err := rp.NewRelyingPartyOIDC(ctx, issuer, clientID, clientSecret, redirectURI, scopes, options...)
+	provider, err := rp.NewRelyingPartyOIDC(issuer, clientID, clientSecret, redirectURI, scopes, options...)
 	if err != nil {
 		logrus.Fatalf("error creating provider %s", err.Error())
 	}
@@ -79,37 +54,20 @@ func main() {
 		return uuid.New().String()
 	}
 
-	urlOptions := []rp.URLParamOpt{
-		rp.WithPromptURLParam("Welcome back!"),
-	}
-
-	if responseMode != "" {
-		urlOptions = append(urlOptions, rp.WithResponseModeURLParam(oidc.ResponseMode(responseMode)))
-	}
-
 	// register the AuthURLHandler at your preferred path.
 	// the AuthURLHandler creates the auth request and redirects the user to the auth server.
 	// including state handling with secure cookie and the possibility to use PKCE.
 	// Prompts can optionally be set to inform the server of
 	// any messages that need to be prompted back to the user.
-	http.Handle("/login", rp.AuthURLHandler(
-		state,
-		provider,
-		urlOptions...,
-	))
+	http.Handle("/login", rp.AuthURLHandler(state, provider, rp.WithPromptURLParam("Welcome back!")))
 
 	// for demonstration purposes the returned userinfo response is written as JSON object onto response
 	marshalUserinfo := func(w http.ResponseWriter, r *http.Request, tokens *oidc.Tokens[*oidc.IDTokenClaims], state string, rp rp.RelyingParty, info *oidc.UserInfo) {
-		fmt.Println("access token", tokens.AccessToken)
-		fmt.Println("refresh token", tokens.RefreshToken)
-		fmt.Println("id token", tokens.IDToken)
-
 		data, err := json.Marshal(info)
 		if err != nil {
 			http.Error(w, err.Error(), http.StatusInternalServerError)
 			return
 		}
-		w.Header().Set("content-type", "application/json")
 		w.Write(data)
 	}
 
@@ -160,22 +118,8 @@ func main() {
 	//
 	// http.Handle(callbackPath, rp.CodeExchangeHandler(marshalToken, provider))
 
-	// simple counter for request IDs
-	var counter atomic.Int64
-	// enable incomming request logging
-	mw := logging.Middleware(
-		logging.WithLogger(logger),
-		logging.WithGroup("server"),
-		logging.WithIDFunc(func() slog.Attr {
-			return slog.Int64("id", counter.Add(1))
-		}),
-	)
-
 	lis := fmt.Sprintf("127.0.0.1:%s", port)
-	logger.Info("server listening, press ctrl+c to stop", "addr", lis)
-	err = http.ListenAndServe(lis, mw(http.DefaultServeMux))
-	if err != http.ErrServerClosed {
-		logger.Error("server terminated", "error", err)
-		os.Exit(1)
-	}
+	logrus.Infof("listening on http://%s/", lis)
+	logrus.Info("press ctrl+c to stop")
+	logrus.Fatal(http.ListenAndServe(lis, nil))
 }

example/client/device/device.go

@@ -1,37 +1,3 @@
-// Command device is an example Oauth2 Device Authorization Grant app.
-// It creates a new Device Authorization request on the Issuer and then polls for tokens.
-// The user is then prompted to visit a URL and enter the user code.
-// Or, the complete URL can be used instead to omit manual entry.
-// In practice then can be a "magic link" in the form or a QR.
-//
-// The following environment variables are used for configuration:
-//
-//	ISSUER: URL to the OP, required.
-//	CLIENT_ID: ID of the application, required.
-//	CLIENT_SECRET: Secret to authenticate the app using basic auth. Only required if the OP expects this type of authentication.
-//	KEY_PATH: Path to a private key file, used to for JWT authentication of the App. Only required if the OP expects this type of authentication.
-//	SCOPES: Scopes of the Authentication Request. Optional.
-//
-// Basic usage:
-//
-//	cd example/client/device
-//	export ISSUER="http://localhost:9000" CLIENT_ID="246048465824634593@demo"
-//
-// Get an Access Token:
-//
-//	SCOPES="email profile" go run .
-//
-// Get an Access Token and ID Token:
-//
-//	SCOPES="email profile openid" go run .
-//
-// Get an Access Token and Refresh Token
-//
-//	SCOPES="email profile offline_access" go run .
-//
-// Get Access, Refresh and ID Tokens:
-//
-//	SCOPES="email profile offline_access openid" go run .
 package main
 
 import (
@@ -45,8 +11,8 @@ import (
 
 	"github.com/sirupsen/logrus"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client/rp"
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/client/rp"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
 )
 
 var (
@@ -73,13 +39,13 @@ func main() {
 		options = append(options, rp.WithJWTProfile(rp.SignerFromKeyPath(keyPath)))
 	}
 
-	provider, err := rp.NewRelyingPartyOIDC(ctx, issuer, clientID, clientSecret, "", scopes, options...)
+	provider, err := rp.NewRelyingPartyOIDC(issuer, clientID, clientSecret, "", scopes, options...)
 	if err != nil {
 		logrus.Fatalf("error creating provider %s", err.Error())
 	}
 
 	logrus.Info("starting device authorization flow")
-	resp, err := rp.DeviceAuthorization(ctx, scopes, provider, nil)
+	resp, err := rp.DeviceAuthorization(scopes, provider)
 	if err != nil {
 		logrus.Fatal(err)
 	}
@@ -91,5 +57,5 @@ func main() {
 	if err != nil {
 		logrus.Fatal(err)
 	}
-	logrus.Infof("successfully obtained token: %#v", token)
+	logrus.Infof("successfully obtained token: %v", token)
 }

example/client/github/github.go

@@ -10,10 +10,10 @@ import (
 	"golang.org/x/oauth2"
 	githubOAuth "golang.org/x/oauth2/github"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client/rp"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client/rp/cli"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/client/rp"
+	"github.com/zitadel/oidc/v2/pkg/client/rp/cli"
+	"github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 var (

example/client/service/service.go

@@ -13,7 +13,7 @@ import (
 	"github.com/sirupsen/logrus"
 	"golang.org/x/oauth2"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client/profile"
+	"github.com/zitadel/oidc/v2/pkg/client/profile"
 )
 
 var client = http.DefaultClient
@@ -25,7 +25,7 @@ func main() {
 	scopes := strings.Split(os.Getenv("SCOPES"), " ")
 
 	if keyPath != "" {
-		ts, err := profile.NewJWTProfileTokenSourceFromKeyFile(context.TODO(), issuer, keyPath, scopes)
+		ts, err := profile.NewJWTProfileTokenSourceFromKeyFile(issuer, keyPath, scopes)
 		if err != nil {
 			logrus.Fatalf("error creating token source %s", err.Error())
 		}
@@ -76,7 +76,7 @@ func main() {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return
 			}
-			ts, err := profile.NewJWTProfileTokenSourceFromKeyFileData(context.TODO(), issuer, key, scopes)
+			ts, err := profile.NewJWTProfileTokenSourceFromKeyFileData(issuer, key, scopes)
 			if err != nil {
 				http.Error(w, err.Error(), http.StatusInternalServerError)
 				return

example/server/config/config.go

@@ -1,40 +0,0 @@
-package config
-
-import (
-	"os"
-	"strings"
-)
-
-const (
-	// default port for the http server to run
-	DefaultIssuerPort = "9998"
-)
-
-type Config struct {
-	Port        string
-	RedirectURI []string
-	UsersFile   string
-}
-
-// FromEnvVars loads configuration parameters from environment variables.
-// If there is no such variable defined, then use default values.
-func FromEnvVars(defaults *Config) *Config {
-	if defaults == nil {
-		defaults = &Config{}
-	}
-	cfg := &Config{
-		Port:        defaults.Port,
-		RedirectURI: defaults.RedirectURI,
-		UsersFile:   defaults.UsersFile,
-	}
-	if value, ok := os.LookupEnv("PORT"); ok {
-		cfg.Port = value
-	}
-	if value, ok := os.LookupEnv("USERS_FILE"); ok {
-		cfg.UsersFile = value
-	}
-	if value, ok := os.LookupEnv("REDIRECT_URI"); ok {
-		cfg.RedirectURI = strings.Split(value, ",")
-	}
-	return cfg
-}

example/server/config/config_test.go

@@ -1,77 +0,0 @@
-package config
-
-import (
-	"fmt"
-	"os"
-	"testing"
-)
-
-func TestFromEnvVars(t *testing.T) {
-
-	for _, tc := range []struct {
-		name     string
-		env      map[string]string
-		defaults *Config
-		want     *Config
-	}{
-		{
-			name: "no vars, no default values",
-			env:  map[string]string{},
-			want: &Config{},
-		},
-		{
-			name: "no vars, only defaults",
-			env:  map[string]string{},
-			defaults: &Config{
-				Port:        "6666",
-				UsersFile:   "/default/user/path",
-				RedirectURI: []string{"re", "direct", "uris"},
-			},
-			want: &Config{
-				Port:        "6666",
-				UsersFile:   "/default/user/path",
-				RedirectURI: []string{"re", "direct", "uris"},
-			},
-		},
-		{
-			name: "overriding default values",
-			env: map[string]string{
-				"PORT":         "1234",
-				"USERS_FILE":   "/path/to/users",
-				"REDIRECT_URI": "http://redirect/redirect",
-			},
-			defaults: &Config{
-				Port:        "6666",
-				UsersFile:   "/default/user/path",
-				RedirectURI: []string{"re", "direct", "uris"},
-			},
-			want: &Config{
-				Port:        "1234",
-				UsersFile:   "/path/to/users",
-				RedirectURI: []string{"http://redirect/redirect"},
-			},
-		},
-		{
-			name: "multiple redirect uris",
-			env: map[string]string{
-				"REDIRECT_URI": "http://host_1,http://host_2,http://host_3",
-			},
-			want: &Config{
-				RedirectURI: []string{
-					"http://host_1", "http://host_2", "http://host_3",
-				},
-			},
-		},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			os.Clearenv()
-			for k, v := range tc.env {
-				os.Setenv(k, v)
-			}
-			cfg := FromEnvVars(tc.defaults)
-			if fmt.Sprint(cfg) != fmt.Sprint(tc.want) {
-				t.Errorf("Expected FromEnvVars()=%q, but got %q", tc.want, cfg)
-			}
-		})
-	}
-}

example/server/dynamic/login.go

@@ -6,9 +6,9 @@ import (
 	"html/template"
 	"net/http"
 
-	"github.com/go-chi/chi/v5"
+	"github.com/gorilla/mux"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
+	"github.com/zitadel/oidc/v2/pkg/op"
 )
 
 const (
@@ -43,7 +43,7 @@ var (
 
 type login struct {
 	authenticate authenticate
-	router       chi.Router
+	router       *mux.Router
 	callback     func(context.Context, string) string
 }
 
@@ -57,9 +57,9 @@ func NewLogin(authenticate authenticate, callback func(context.Context, string)
 }
 
 func (l *login) createRouter(issuerInterceptor *op.IssuerInterceptor) {
-	l.router = chi.NewRouter()
-	l.router.Get("/username", l.loginHandler)
-	l.router.With(issuerInterceptor.Handler).Post("/username", l.checkLoginHandler)
+	l.router = mux.NewRouter()
+	l.router.Path("/username").Methods("GET").HandlerFunc(l.loginHandler)
+	l.router.Path("/username").Methods("POST").HandlerFunc(issuerInterceptor.HandlerFunc(l.checkLoginHandler))
 }
 
 type authenticate interface {

example/server/dynamic/op.go

@@ -7,11 +7,11 @@ import (
 	"log"
 	"net/http"
 
-	"github.com/go-chi/chi/v5"
+	"github.com/gorilla/mux"
 	"golang.org/x/text/language"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/example/server/storage"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
+	"github.com/zitadel/oidc/v2/example/server/storage"
+	"github.com/zitadel/oidc/v2/pkg/op"
 )
 
 const (
@@ -47,7 +47,7 @@ func main() {
 	//be sure to create a proper crypto random key and manage it securely!
 	key := sha256.Sum256([]byte("test"))
 
-	router := chi.NewRouter()
+	router := mux.NewRouter()
 
 	//for simplicity, we provide a very small default page for users who have signed out
 	router.HandleFunc(pathLoggedOut, func(w http.ResponseWriter, req *http.Request) {
@@ -76,7 +76,7 @@ func main() {
 
 	//regardless of how many pages / steps there are in the process, the UI must be registered in the router,
 	//so we will direct all calls to /login to the login UI
-	router.Mount("/login/", http.StripPrefix("/login", l.router))
+	router.PathPrefix("/login/").Handler(http.StripPrefix("/login", l.router))
 
 	//we register the http handler of the OP on the root, so that the discovery endpoint (/.well-known/openid-configuration)
 	//is served on the correct path
@@ -84,7 +84,7 @@ func main() {
 	//if your issuer ends with a path (e.g. http://localhost:9998/custom/path/),
 	//then you would have to set the path prefix (/custom/path/):
 	//router.PathPrefix("/custom/path/").Handler(http.StripPrefix("/custom/path", provider.HttpHandler()))
-	router.Mount("/", provider)
+	router.PathPrefix("/").Handler(provider.HttpHandler())
 
 	server := &http.Server{
 		Addr:    ":" + port,

example/server/exampleop/device.go

@@ -1,34 +1,21 @@
 package exampleop
 
 import (
-	"context"
 	"errors"
 	"fmt"
 	"io"
 	"net/http"
 	"net/url"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
-	"github.com/go-chi/chi/v5"
+	"github.com/gorilla/mux"
 	"github.com/gorilla/securecookie"
 	"github.com/sirupsen/logrus"
+	"github.com/zitadel/oidc/v2/pkg/op"
 )
 
 type deviceAuthenticate interface {
 	CheckUsernamePasswordSimple(username, password string) error
 	op.DeviceAuthorizationStorage
-
-	// GetDeviceAuthorizationByUserCode resturns the current state of the device authorization flow,
-	// identified by the user code.
-	GetDeviceAuthorizationByUserCode(ctx context.Context, userCode string) (*op.DeviceAuthorizationState, error)
-
-	// CompleteDeviceAuthorization marks a device authorization entry as Completed,
-	// identified by userCode. The Subject is added to the state, so that
-	// GetDeviceAuthorizatonState can use it to create a new Access Token.
-	CompleteDeviceAuthorization(ctx context.Context, userCode, subject string) error
-
-	// DenyDeviceAuthorization marks a device authorization entry as Denied.
-	DenyDeviceAuthorization(ctx context.Context, userCode string) error
 }
 
 type deviceLogin struct {
@@ -36,14 +23,14 @@ type deviceLogin struct {
 	cookie  *securecookie.SecureCookie
 }
 
-func registerDeviceAuth(storage deviceAuthenticate, router chi.Router) {
+func registerDeviceAuth(storage deviceAuthenticate, router *mux.Router) {
 	l := &deviceLogin{
 		storage: storage,
 		cookie:  securecookie.New(securecookie.GenerateRandomKey(32), nil),
 	}
 
-	router.HandleFunc("/", l.userCodeHandler)
-	router.Post("/login", l.loginHandler)
+	router.HandleFunc("", l.userCodeHandler)
+	router.Path("/login").Methods(http.MethodPost).HandlerFunc(l.loginHandler)
 	router.HandleFunc("/confirm", l.confirmHandler)
 }
 

example/server/exampleop/login.go

@@ -5,13 +5,13 @@ import (
 	"fmt"
 	"net/http"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
-	"github.com/go-chi/chi/v5"
+	"github.com/gorilla/mux"
+	"github.com/zitadel/oidc/v2/pkg/op"
 )
 
 type login struct {
 	authenticate authenticate
-	router       chi.Router
+	router       *mux.Router
 	callback     func(context.Context, string) string
 }
 
@@ -25,9 +25,9 @@ func NewLogin(authenticate authenticate, callback func(context.Context, string)
 }
 
 func (l *login) createRouter(issuerInterceptor *op.IssuerInterceptor) {
-	l.router = chi.NewRouter()
-	l.router.Get("/username", l.loginHandler)
-	l.router.Post("/username", issuerInterceptor.HandlerFunc(l.checkLoginHandler))
+	l.router = mux.NewRouter()
+	l.router.Path("/username").Methods("GET").HandlerFunc(l.loginHandler)
+	l.router.Path("/username").Methods("POST").HandlerFunc(issuerInterceptor.HandlerFunc(l.checkLoginHandler))
 }
 
 type authenticate interface {

example/server/exampleop/op.go

@@ -3,55 +3,54 @@ package exampleop
 import (
 	"crypto/sha256"
 	"log"
-	"log/slog"
 	"net/http"
-	"sync/atomic"
 	"time"
 
-	"github.com/go-chi/chi/v5"
-	"github.com/zitadel/logging"
+	"github.com/gorilla/mux"
 	"golang.org/x/text/language"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
+	"github.com/zitadel/oidc/v2/example/server/storage"
+	"github.com/zitadel/oidc/v2/pkg/op"
 )
 
 const (
 	pathLoggedOut = "/logged-out"
 )
 
+func init() {
+	storage.RegisterClients(
+		storage.NativeClient("native"),
+		storage.WebClient("web", "secret"),
+		storage.WebClient("api", "secret"),
+	)
+}
+
 type Storage interface {
 	op.Storage
 	authenticate
 	deviceAuthenticate
 }
 
-// simple counter for request IDs
-var counter atomic.Int64
-
 // SetupServer creates an OIDC server with Issuer=http://localhost:<port>
 //
 // Use one of the pre-made clients in storage/clients.go or register a new one.
-func SetupServer(issuer string, storage Storage, logger *slog.Logger, wrapServer bool, extraOptions ...op.Option) chi.Router {
+func SetupServer(issuer string, storage Storage, extraOptions ...op.Option) *mux.Router {
 	// the OpenID Provider requires a 32-byte key for (token) encryption
 	// be sure to create a proper crypto random key and manage it securely!
 	key := sha256.Sum256([]byte("test"))
 
-	router := chi.NewRouter()
-	router.Use(logging.Middleware(
-		logging.WithLogger(logger),
-		logging.WithIDFunc(func() slog.Attr {
-			return slog.Int64("id", counter.Add(1))
-		}),
-	))
+	router := mux.NewRouter()
 
 	// for simplicity, we provide a very small default page for users who have signed out
 	router.HandleFunc(pathLoggedOut, func(w http.ResponseWriter, req *http.Request) {
-		w.Write([]byte("signed out successfully"))
-		// no need to check/log error, this will be handled by the middleware.
+		_, err := w.Write([]byte("signed out successfully"))
+		if err != nil {
+			log.Printf("error serving logged out page: %v", err)
+		}
 	})
 
 	// creation of the OpenIDProvider with the just created in-memory Storage
-	provider, err := newOP(storage, issuer, key, logger, extraOptions...)
+	provider, err := newOP(storage, issuer, key, extraOptions...)
 	if err != nil {
 		log.Fatal(err)
 	}
@@ -63,23 +62,17 @@ func SetupServer(issuer string, storage Storage, logger *slog.Logger, wrapServer
 
 	// regardless of how many pages / steps there are in the process, the UI must be registered in the router,
 	// so we will direct all calls to /login to the login UI
-	router.Mount("/login/", http.StripPrefix("/login", l.router))
+	router.PathPrefix("/login/").Handler(http.StripPrefix("/login", l.router))
 
-	router.Route("/device", func(r chi.Router) {
-		registerDeviceAuth(storage, r)
-	})
-
-	handler := http.Handler(provider)
-	if wrapServer {
-		handler = op.RegisterLegacyServer(op.NewLegacyServer(provider, *op.DefaultEndpoints), op.AuthorizeCallbackHandler(provider))
-	}
+	router.PathPrefix("/device").Subrouter()
+	registerDeviceAuth(storage, router.PathPrefix("/device").Subrouter())
 
 	// we register the http handler of the OP on the root, so that the discovery endpoint (/.well-known/openid-configuration)
 	// is served on the correct path
 	//
 	// if your issuer ends with a path (e.g. http://localhost:9998/custom/path/),
 	// then you would have to set the path prefix (/custom/path/)
-	router.Mount("/", handler)
+	router.PathPrefix("/").Handler(provider.HttpHandler())
 
 	return router
 }
@@ -87,7 +80,7 @@ func SetupServer(issuer string, storage Storage, logger *slog.Logger, wrapServer
 // newOP will create an OpenID Provider for localhost on a specified port with a given encryption key
 // and a predefined default logout uri
 // it will enable all options (see descriptions)
-func newOP(storage op.Storage, issuer string, key [32]byte, logger *slog.Logger, extraOptions ...op.Option) (op.OpenIDProvider, error) {
+func newOP(storage op.Storage, issuer string, key [32]byte, extraOptions ...op.Option) (op.OpenIDProvider, error) {
 	config := &op.Config{
 		CryptoKey: key,
 
@@ -121,12 +114,10 @@ func newOP(storage op.Storage, issuer string, key [32]byte, logger *slog.Logger,
 	}
 	handler, err := op.NewOpenIDProvider(issuer, config, storage,
 		append([]op.Option{
-			//we must explicitly allow the use of the http issuer
+			// we must explicitly allow the use of the http issuer
 			op.WithAllowInsecure(),
 			// as an example on how to customize an endpoint this will change the authorization_endpoint from /authorize to /auth
 			op.WithCustomAuthEndpoint(op.NewEndpoint("auth")),
-			// Pass our logger to the OP
-			op.WithLogger(logger.WithGroup("op")),
 		}, extraOptions...)...,
 	)
 	if err != nil {

example/server/main.go

@@ -2,58 +2,34 @@ package main
 
 import (
 	"fmt"
-	"log/slog"
+	"log"
 	"net/http"
-	"os"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/example/server/config"
-	"git.christmann.info/LARA/zitadel-oidc/v3/example/server/exampleop"
-	"git.christmann.info/LARA/zitadel-oidc/v3/example/server/storage"
+	"github.com/zitadel/oidc/v2/example/server/exampleop"
+	"github.com/zitadel/oidc/v2/example/server/storage"
 )
 
-func getUserStore(cfg *config.Config) (storage.UserStore, error) {
-	if cfg.UsersFile == "" {
-		return storage.NewUserStore(fmt.Sprintf("http://localhost:%s/", cfg.Port)), nil
-	}
-	return storage.StoreFromFile(cfg.UsersFile)
-}
-
 func main() {
-	cfg := config.FromEnvVars(&config.Config{Port: "9998"})
-	logger := slog.New(
-		slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{
-			AddSource: true,
-			Level:     slog.LevelDebug,
-		}),
-	)
-
+	//we will run on :9998
+	port := "9998"
 	//which gives us the issuer: http://localhost:9998/
-	issuer := fmt.Sprintf("http://localhost:%s/", cfg.Port)
-
-	storage.RegisterClients(
-		storage.NativeClient("native", cfg.RedirectURI...),
-		storage.WebClient("web", "secret", cfg.RedirectURI...),
-		storage.WebClient("api", "secret", cfg.RedirectURI...),
-	)
+	issuer := fmt.Sprintf("http://localhost:%s/", port)
 
 	// the OpenIDProvider interface needs a Storage interface handling various checks and state manipulations
 	// this might be the layer for accessing your database
 	// in this example it will be handled in-memory
-	store, err := getUserStore(cfg)
-	if err != nil {
-		logger.Error("cannot create UserStore", "error", err)
-		os.Exit(1)
-	}
-	storage := storage.NewStorage(store)
-	router := exampleop.SetupServer(issuer, storage, logger, false)
+	storage := storage.NewStorage(storage.NewUserStore(issuer))
+
+	router := exampleop.SetupServer(issuer, storage)
 
 	server := &http.Server{
-		Addr:    ":" + cfg.Port,
+		Addr:    ":" + port,
 		Handler: router,
 	}
-	logger.Info("server listening, press ctrl+c to stop", "addr", issuer)
-	if server.ListenAndServe() != http.ErrServerClosed {
-		logger.Error("server terminated", "error", err)
-		os.Exit(1)
+	log.Printf("server listening on http://localhost:%s/", port)
+	log.Println("press ctrl+c to stop")
+	err := server.ListenAndServe()
+	if err != nil {
+		log.Fatal(err)
 	}
 }

example/server/storage/client.go

@@ -3,8 +3,8 @@ package storage
 import (
 	"time"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/op"
 )
 
 var (
@@ -184,10 +184,10 @@ func WebClient(id, secret string, redirectURIs ...string) *Client {
 		applicationType:                op.ApplicationTypeWeb,
 		authMethod:                     oidc.AuthMethodBasic,
 		loginURL:                       defaultLoginURL,
-		responseTypes:                  []oidc.ResponseType{oidc.ResponseTypeCode, oidc.ResponseTypeIDTokenOnly, oidc.ResponseTypeIDToken},
-		grantTypes:                     []oidc.GrantType{oidc.GrantTypeCode, oidc.GrantTypeRefreshToken, oidc.GrantTypeTokenExchange},
+		responseTypes:                  []oidc.ResponseType{oidc.ResponseTypeCode},
+		grantTypes:                     []oidc.GrantType{oidc.GrantTypeCode, oidc.GrantTypeRefreshToken},
 		accessTokenType:                op.AccessTokenTypeBearer,
-		devMode:                        true,
+		devMode:                        false,
 		idTokenUserinfoClaimsAssertion: false,
 		clockSkew:                      0,
 	}

example/server/storage/oidc.go

@@ -1,13 +1,12 @@
 package storage
 
 import (
-	"log/slog"
 	"time"
 
 	"golang.org/x/text/language"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/op"
 )
 
 const (
@@ -35,7 +34,6 @@ type AuthRequest struct {
 	UserID        string
 	Scopes        []string
 	ResponseType  oidc.ResponseType
-	ResponseMode  oidc.ResponseMode
 	Nonce         string
 	CodeChallenge *OIDCCodeChallenge
 
@@ -43,19 +41,6 @@ type AuthRequest struct {
 	authTime time.Time
 }
 
-// LogValue allows you to define which fields will be logged.
-// Implements the [slog.LogValuer]
-func (a *AuthRequest) LogValue() slog.Value {
-	return slog.GroupValue(
-		slog.String("id", a.ID),
-		slog.Time("creation_date", a.CreationDate),
-		slog.Any("scopes", a.Scopes),
-		slog.String("response_type", string(a.ResponseType)),
-		slog.String("app_id", a.ApplicationID),
-		slog.String("callback_uri", a.CallbackURI),
-	)
-}
-
 func (a *AuthRequest) GetID() string {
 	return a.ID
 }
@@ -101,7 +86,7 @@ func (a *AuthRequest) GetResponseType() oidc.ResponseType {
 }
 
 func (a *AuthRequest) GetResponseMode() oidc.ResponseMode {
-	return a.ResponseMode
+	return "" // we won't handle response mode in this example
 }
 
 func (a *AuthRequest) GetScopes() []string {
@@ -121,7 +106,7 @@ func (a *AuthRequest) Done() bool {
 }
 
 func PromptToInternal(oidcPrompt oidc.SpaceDelimitedArray) []string {
-	prompts := make([]string, 0, len(oidcPrompt))
+	prompts := make([]string, len(oidcPrompt))
 	for _, oidcPrompt := range oidcPrompt {
 		switch oidcPrompt {
 		case oidc.PromptNone,
@@ -155,7 +140,6 @@ func authRequestToInternal(authReq *oidc.AuthRequest, userID string) *AuthReques
 		UserID:        userID,
 		Scopes:        authReq.Scopes,
 		ResponseType:  authReq.ResponseType,
-		ResponseMode:  authReq.ResponseMode,
 		Nonce:         authReq.Nonce,
 		CodeChallenge: &OIDCCodeChallenge{
 			Challenge: authReq.CodeChallenge,
@@ -164,15 +148,6 @@ func authRequestToInternal(authReq *oidc.AuthRequest, userID string) *AuthReques
 	}
 }
 
-type AuthRequestWithSessionState struct {
-	*AuthRequest
-	SessionState string
-}
-
-func (a *AuthRequestWithSessionState) GetSessionState() string {
-	return a.SessionState
-}
-
 type OIDCCodeChallenge struct {
 	Challenge string
 	Method    string

example/server/storage/storage.go

@@ -11,11 +11,11 @@ import (
 	"sync"
 	"time"
 
-	jose "github.com/go-jose/go-jose/v4"
 	"github.com/google/uuid"
+	"gopkg.in/go-jose/go-jose.v2"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/op"
 )
 
 // serviceKey1 is a public key which will be used for the JWT Profile Authorization Grant
@@ -90,10 +90,6 @@ func (s *publicKey) Key() any {
 }
 
 func NewStorage(userStore UserStore) *Storage {
-	return NewStorageWithClients(userStore, clients)
-}
-
-func NewStorageWithClients(userStore UserStore, clients map[string]*Client) *Storage {
 	key, _ := rsa.GenerateKey(rand.Reader, 2048)
 	return &Storage{
 		authRequests:  make(map[string]*AuthRequest),
@@ -151,9 +147,6 @@ func (s *Storage) CheckUsernamePassword(username, password, id string) error {
 		// in this example we'll simply check the username / password and set a boolean to true
 		// therefore we will also just check this boolean if the request / login has been finished
 		request.done = true
-
-		request.authTime = time.Now()
-
 		return nil
 	}
 	return fmt.Errorf("username or password wrong")
@@ -298,19 +291,15 @@ func (s *Storage) CreateAccessAndRefreshTokens(ctx context.Context, request op.T
 
 	// if we get here, the currentRefreshToken was not empty, so the call is a refresh token request
 	// we therefore will have to check the currentRefreshToken and renew the refresh token
-
-	newRefreshToken = uuid.NewString()
-
-	accessToken, err := s.accessToken(applicationID, newRefreshToken, request.GetSubject(), request.GetAudience(), request.GetScopes())
+	refreshToken, refreshTokenID, err := s.renewRefreshToken(currentRefreshToken)
 	if err != nil {
 		return "", "", time.Time{}, err
 	}
-
-	if err := s.renewRefreshToken(currentRefreshToken, newRefreshToken, accessToken.ID); err != nil {
+	accessToken, err := s.accessToken(applicationID, refreshTokenID, request.GetSubject(), request.GetAudience(), request.GetScopes())
+	if err != nil {
 		return "", "", time.Time{}, err
 	}
-
-	return accessToken.ID, newRefreshToken, accessToken.Expiration, nil
+	return accessToken.ID, refreshToken, accessToken.Expiration, nil
 }
 
 func (s *Storage) exchangeRefreshToken(ctx context.Context, request op.TokenExchangeRequest) (accessTokenID string, newRefreshToken string, expiration time.Time, err error) {
@@ -392,9 +381,14 @@ func (s *Storage) RevokeToken(ctx context.Context, tokenIDOrToken string, userID
 	if refreshToken.ApplicationID != clientID {
 		return oidc.ErrInvalidClient().WithDescription("token was not issued for this client")
 	}
-	delete(s.refreshTokens, refreshToken.ID)
 	// if it is a refresh token, you will have to remove the access token as well
-	delete(s.tokens, refreshToken.AccessToken)
+	delete(s.refreshTokens, refreshToken.ID)
+	for _, accessToken := range s.tokens {
+		if accessToken.RefreshTokenID == refreshToken.ID {
+			delete(s.tokens, accessToken.ID)
+			return nil
+		}
+	}
 	return nil
 }
 
@@ -490,9 +484,6 @@ func (s *Storage) SetUserinfoFromToken(ctx context.Context, userinfo *oidc.UserI
 	//		return err
 	//	}
 	//}
-	if token.Expiration.Before(time.Now()) {
-		return fmt.Errorf("token is expired")
-	}
 	return s.setUserinfo(ctx, userinfo, token.Subject, token.ApplicationID, token.Scopes)
 }
 
@@ -599,41 +590,33 @@ func (s *Storage) createRefreshToken(accessToken *Token, amr []string, authTime
 		Audience:      accessToken.Audience,
 		Expiration:    time.Now().Add(5 * time.Hour),
 		Scopes:        accessToken.Scopes,
-		AccessToken:   accessToken.ID,
 	}
 	s.refreshTokens[token.ID] = token
 	return token.Token, nil
 }
 
 // renewRefreshToken checks the provided refresh_token and creates a new one based on the current
-//
-// [Refresh Token Rotation] is implemented.
-//
-// [Refresh Token Rotation]: https://www.rfc-editor.org/rfc/rfc6819#section-5.2.2.3
-func (s *Storage) renewRefreshToken(currentRefreshToken, newRefreshToken, newAccessToken string) error {
+func (s *Storage) renewRefreshToken(currentRefreshToken string) (string, string, error) {
 	s.lock.Lock()
 	defer s.lock.Unlock()
 	refreshToken, ok := s.refreshTokens[currentRefreshToken]
 	if !ok {
-		return fmt.Errorf("invalid refresh token")
+		return "", "", fmt.Errorf("invalid refresh token")
 	}
-	// deletes the refresh token
+	// deletes the refresh token and all access tokens which were issued based on this refresh token
 	delete(s.refreshTokens, currentRefreshToken)
-
-	// delete the access token which was issued based on this refresh token
-	delete(s.tokens, refreshToken.AccessToken)
-
-	if refreshToken.Expiration.Before(time.Now()) {
-		return fmt.Errorf("expired refresh token")
+	for _, token := range s.tokens {
+		if token.RefreshTokenID == currentRefreshToken {
+			delete(s.tokens, token.ID)
+			break
+		}
 	}
-
 	// creates a new refresh token based on the current one
-	refreshToken.Token = newRefreshToken
-	refreshToken.ID = newRefreshToken
-	refreshToken.Expiration = time.Now().Add(5 * time.Hour)
-	refreshToken.AccessToken = newAccessToken
-	s.refreshTokens[newRefreshToken] = refreshToken
-	return nil
+	token := uuid.NewString()
+	refreshToken.Token = token
+	refreshToken.ID = token
+	s.refreshTokens[token] = refreshToken
+	return token, refreshToken.ID, nil
 }
 
 // accessToken will store an access_token in-memory based on the provided information

example/server/storage/storage_dynamic.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"time"
 
-	jose "github.com/go-jose/go-jose/v4"
+	"gopkg.in/go-jose/go-jose.v2"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/op"
 )
 
 type multiStorage struct {

example/server/storage/token.go

@@ -22,5 +22,4 @@ type RefreshToken struct {
 	ApplicationID string
 	Expiration    time.Time
 	Scopes        []string
-	AccessToken   string // Token.ID
 }

example/server/storage/user.go

@@ -2,8 +2,6 @@ package storage
 
 import (
 	"crypto/rsa"
-	"encoding/json"
-	"os"
 	"strings"
 
 	"golang.org/x/text/language"
@@ -37,18 +35,6 @@ type userStore struct {
 	users map[string]*User
 }
 
-func StoreFromFile(path string) (UserStore, error) {
-	users := map[string]*User{}
-	data, err := os.ReadFile(path)
-	if err != nil {
-		return nil, err
-	}
-	if err := json.Unmarshal(data, &users); err != nil {
-		return nil, err
-	}
-	return userStore{users}, nil
-}
-
 func NewUserStore(issuer string) UserStore {
 	hostname := strings.Split(strings.Split(issuer, "://")[1], ":")[0]
 	return userStore{

example/server/storage/user_test.go

@@ -1,70 +0,0 @@
-package storage
-
-import (
-	"os"
-	"path"
-	"reflect"
-	"testing"
-
-	"golang.org/x/text/language"
-)
-
-func TestStoreFromFile(t *testing.T) {
-	for _, tc := range []struct {
-		name       string
-		pathToFile string
-		content    string
-		want       UserStore
-		wantErr    bool
-	}{
-		{
-			name:       "normal user file",
-			pathToFile: "userfile.json",
-			content: `{
-				"id1": {
-					"ID":                "id1",
-					"EmailVerified":     true,
-					"PreferredLanguage": "DE"
-				}
-			}`,
-			want: userStore{map[string]*User{
-				"id1": {
-					ID:                "id1",
-					EmailVerified:     true,
-					PreferredLanguage: language.German,
-				},
-			}},
-		},
-		{
-			name:       "malformed file",
-			pathToFile: "whatever",
-			content:    "not a json just a text",
-			wantErr:    true,
-		},
-		{
-			name:       "not existing file",
-			pathToFile: "what/ever/file",
-			wantErr:    true,
-		},
-	} {
-		t.Run(tc.name, func(t *testing.T) {
-			actualPath := path.Join(t.TempDir(), tc.pathToFile)
-
-			if tc.content != "" && tc.pathToFile != "" {
-				if err := os.WriteFile(actualPath, []byte(tc.content), 0666); err != nil {
-					t.Fatalf("cannot create file with test content: %q", tc.content)
-				}
-			}
-			result, err := StoreFromFile(actualPath)
-			if err != nil && !tc.wantErr {
-				t.Errorf("StoreFromFile(%q) returned unexpected error %q", tc.pathToFile, err)
-			} else if err == nil && tc.wantErr {
-				t.Errorf("StoreFromFile(%q) did not return an expected error", tc.pathToFile)
-			}
-			if !tc.wantErr && !reflect.DeepEqual(tc.want, result.(userStore)) {
-				t.Errorf("expected StoreFromFile(%q) = %v, but got %v",
-					tc.pathToFile, tc.want, result)
-			}
-		})
-	}
-}

go.mod

@@ -1,40 +1,36 @@
-module git.christmann.info/LARA/zitadel-oidc/v3
+module github.com/zitadel/oidc/v2
 
-go 1.23.7
-
-toolchain go1.24.1
+go 1.19
 
 require (
-	github.com/bmatcuk/doublestar/v4 v4.8.1
-	github.com/go-chi/chi/v5 v5.2.1
-	github.com/go-jose/go-jose/v4 v4.0.5
 	github.com/golang/mock v1.6.0
 	github.com/google/go-github/v31 v31.0.0
 	github.com/google/uuid v1.6.0
+	github.com/gorilla/mux v1.8.1
+	github.com/gorilla/schema v1.3.0
 	github.com/gorilla/securecookie v1.1.2
-	github.com/jeremija/gosubmit v0.2.8
+	github.com/jeremija/gosubmit v0.2.7
 	github.com/muhlemmer/gu v0.3.1
 	github.com/muhlemmer/httpforwarded v0.1.0
-	github.com/rs/cors v1.11.1
+	github.com/rs/cors v1.11.0
 	github.com/sirupsen/logrus v1.9.3
-	github.com/stretchr/testify v1.10.0
-	github.com/zitadel/logging v0.6.2
-	github.com/zitadel/schema v1.3.1
-	go.opentelemetry.io/otel v1.29.0
-	golang.org/x/oauth2 v0.30.0
-	golang.org/x/text v0.26.0
+	github.com/stretchr/testify v1.9.0
+	go.opentelemetry.io/otel v1.24.0
+	go.opentelemetry.io/otel/trace v1.24.0
+	golang.org/x/oauth2 v0.20.0
+	golang.org/x/text v0.15.0
+	gopkg.in/go-jose/go-jose.v2 v2.6.3
 )
 
 require (
 	github.com/davecgh/go-spew v1.1.1 // indirect
-	github.com/go-logr/logr v1.4.2 // indirect
+	github.com/go-logr/logr v1.4.1 // indirect
 	github.com/go-logr/stdr v1.2.2 // indirect
 	github.com/google/go-querystring v1.1.0 // indirect
 	github.com/pmezard/go-difflib v1.0.0 // indirect
-	go.opentelemetry.io/otel/metric v1.29.0 // indirect
-	go.opentelemetry.io/otel/trace v1.29.0 // indirect
-	golang.org/x/crypto v0.36.0 // indirect
-	golang.org/x/net v0.38.0 // indirect
-	golang.org/x/sys v0.31.0 // indirect
+	go.opentelemetry.io/otel/metric v1.24.0 // indirect
+	golang.org/x/crypto v0.21.0 // indirect
+	golang.org/x/net v0.22.0 // indirect
+	golang.org/x/sys v0.18.0 // indirect
 	gopkg.in/yaml.v3 v3.0.1 // indirect
 )

go.sum

@@ -1,15 +1,9 @@
-github.com/bmatcuk/doublestar/v4 v4.8.1 h1:54Bopc5c2cAvhLRAzqOGCYHYyhcDHsFF4wWIR5wKP38=
-github.com/bmatcuk/doublestar/v4 v4.8.1/go.mod h1:xBQ8jztBU6kakFMg+8WGxn0c6z1fTSPVIjEY1Wr7jzc=
 github.com/davecgh/go-spew v1.1.0/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
 github.com/davecgh/go-spew v1.1.1 h1:vj9j/u1bqnvCEfJOwUhtlOARqs3+rkHYY13jYWTU97c=
 github.com/davecgh/go-spew v1.1.1/go.mod h1:J7Y8YcW2NihsgmVo/mv3lAwl/skON4iLHjSsI+c5H38=
-github.com/go-chi/chi/v5 v5.2.1 h1:KOIHODQj58PmL80G2Eak4WdvUzjSJSm0vG72crDCqb8=
-github.com/go-chi/chi/v5 v5.2.1/go.mod h1:L2yAIGWB3H+phAw1NxKwWM+7eUH/lU8pOMm5hHcoops=
-github.com/go-jose/go-jose/v4 v4.0.5 h1:M6T8+mKZl/+fNNuFHvGIzDz7BTLQPIounk/b9dw3AaE=
-github.com/go-jose/go-jose/v4 v4.0.5/go.mod h1:s3P1lRrkT8igV8D9OjyL4WRyHvjB6a4JSllnOrmmBOA=
 github.com/go-logr/logr v1.2.2/go.mod h1:jdQByPbusPIv2/zmleS9BjJVeZ6kBagPoEUsqbVz/1A=
-github.com/go-logr/logr v1.4.2 h1:6pFjapn8bFcIbiKo3XT4j/BhANplGihG6tvd+8rYgrY=
-github.com/go-logr/logr v1.4.2/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
+github.com/go-logr/logr v1.4.1 h1:pKouT5E8xu9zeFC39JXRDukb6JFQPXM5p5I91188VAQ=
+github.com/go-logr/logr v1.4.1/go.mod h1:9T104GzyrTigFIr8wt5mBrctHMim0Nb2HLGrmQ40KvY=
 github.com/go-logr/stdr v1.2.2 h1:hSWxHoqTgW2S2qGc0LTAI563KZ5YKYRhT3MFKZMbjag=
 github.com/go-logr/stdr v1.2.2/go.mod h1:mMo/vtBO5dYbehREoey6XUKy/eSumjCCveDpRre4VKE=
 github.com/golang/mock v1.6.0 h1:ErTB+efbowRARo13NNdxyJji2egdxLGQhRaY+DUumQc=
@@ -17,64 +11,60 @@ github.com/golang/mock v1.6.0/go.mod h1:p6yTPP+5HYm5mzsMV8JkE6ZKdX+/wYM6Hr+Licev
 github.com/golang/protobuf v1.3.2/go.mod h1:6lQm79b+lXiMfvg/cZm0SGofjICqVBUtrP5yJMmIC1U=
 github.com/google/go-cmp v0.5.2/go.mod h1:v8dTdLbMG2kIc/vJvl+f65V22dbkXbowE6jgT/gNBxE=
 github.com/google/go-cmp v0.6.0 h1:ofyhxvXcZhMsU5ulbFiLKl/XBFqE1GSq7atu8tAmTRI=
-github.com/google/go-cmp v0.6.0/go.mod h1:17dUlkBOakJ0+DkrSSNjCkIjxS6bF9zb3elmeNGIjoY=
 github.com/google/go-github/v31 v31.0.0 h1:JJUxlP9lFK+ziXKimTCprajMApV1ecWD4NB6CCb0plo=
 github.com/google/go-github/v31 v31.0.0/go.mod h1:NQPZol8/1sMoWYGN2yaALIBytu17gAWfhbweiEed3pM=
 github.com/google/go-querystring v1.0.0/go.mod h1:odCYkC5MyYFN7vkCjXpyrEuKhc/BUO6wN/zVPAxq5ck=
 github.com/google/go-querystring v1.1.0 h1:AnCroh3fv4ZBgVIf1Iwtovgjaw/GiKJo8M8yD/fhyJ8=
 github.com/google/go-querystring v1.1.0/go.mod h1:Kcdr2DB4koayq7X8pmAG4sNG59So17icRSOU623lUBU=
 github.com/google/gofuzz v1.2.0 h1:xRy4A+RhZaiKjJ1bPfwQ8sedCA+YS2YcCHW6ec7JMi0=
-github.com/google/gofuzz v1.2.0/go.mod h1:dBl0BpW6vV/+mYPU4Po3pmUjxk6FQPldtuIdl/M65Eg=
 github.com/google/uuid v1.6.0 h1:NIvaJDMOsjHA8n1jAhLSgzrAzy1Hgr+hNrb57e+94F0=
 github.com/google/uuid v1.6.0/go.mod h1:TIyPZe4MgqvfeYDBFedMoGGpEw/LqOeaOT+nhxU+yHo=
+github.com/gorilla/mux v1.8.1 h1:TuBL49tXwgrFYWhqrNgrUNEY92u81SPhu7sTdzQEiWY=
+github.com/gorilla/mux v1.8.1/go.mod h1:AKf9I4AEqPTmMytcMc0KkNouC66V3BtZ4qD5fmWSiMQ=
+github.com/gorilla/schema v1.3.0 h1:rbciOzXAx3IB8stEFnfTwO3sYa6EWlQk79XdyustPDA=
+github.com/gorilla/schema v1.3.0/go.mod h1:Dg5SSm5PV60mhF2NFaTV1xuYYj8tV8NOPRo4FggUMnM=
 github.com/gorilla/securecookie v1.1.2 h1:YCIWL56dvtr73r6715mJs5ZvhtnY73hBvEF8kXD8ePA=
 github.com/gorilla/securecookie v1.1.2/go.mod h1:NfCASbcHqRSY+3a8tlWJwsQap2VX5pwzwo4h3eOamfo=
-github.com/jeremija/gosubmit v0.2.8 h1:mmSITBz9JxVtu8eqbN+zmmwX7Ij2RidQxhcwRVI4wqA=
-github.com/jeremija/gosubmit v0.2.8/go.mod h1:Ui+HS073lCFREXBbdfrJzMB57OI/bdxTiLtrDHHhFPI=
+github.com/jeremija/gosubmit v0.2.7 h1:At0OhGCFGPXyjPYAsCchoBUhE099pcBXmsb4iZqROIc=
+github.com/jeremija/gosubmit v0.2.7/go.mod h1:Ui+HS073lCFREXBbdfrJzMB57OI/bdxTiLtrDHHhFPI=
 github.com/kr/pretty v0.2.1 h1:Fmg33tUaq4/8ym9TJN1x7sLJnHVwhP33CNkpYV/7rwI=
-github.com/kr/pretty v0.2.1/go.mod h1:ipq/a2n7PKx3OHsz4KJII5eveXtPO4qwEXGdVfWzfnI=
 github.com/kr/text v0.1.0 h1:45sCR5RtlFHMR4UwH9sdQ5TC8v0qDQCHnXt+kaKSTVE=
-github.com/kr/text v0.1.0/go.mod h1:4Jbv+DJW3UT/LiOwJeYQe1efqtUx/iVham/4vfdArNI=
 github.com/muhlemmer/gu v0.3.1 h1:7EAqmFrW7n3hETvuAdmFmn4hS8W+z3LgKtrnow+YzNM=
 github.com/muhlemmer/gu v0.3.1/go.mod h1:YHtHR+gxM+bKEIIs7Hmi9sPT3ZDUvTN/i88wQpZkrdM=
 github.com/muhlemmer/httpforwarded v0.1.0 h1:x4DLrzXdliq8mprgUMR0olDvHGkou5BJsK/vWUetyzY=
 github.com/muhlemmer/httpforwarded v0.1.0/go.mod h1:yo9czKedo2pdZhoXe+yDkGVbU0TJ0q9oQ90BVoDEtw0=
 github.com/pmezard/go-difflib v1.0.0 h1:4DBwDE0NGyQoBHbLQYPwSUPoCMWR5BEzIk/f1lZbAQM=
 github.com/pmezard/go-difflib v1.0.0/go.mod h1:iKH77koFhYxTK1pcRnkKkqfTogsbg7gZNVY4sRDYZ/4=
-github.com/rs/cors v1.11.1 h1:eU3gRzXLRK57F5rKMGMZURNdIG4EoAmX8k94r9wXWHA=
-github.com/rs/cors v1.11.1/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
+github.com/rs/cors v1.11.0 h1:0B9GE/r9Bc2UxRMMtymBkHTenPkHDv0CW4Y98GBY+po=
+github.com/rs/cors v1.11.0/go.mod h1:XyqrcTp5zjWr1wsJ8PIRZssZ8b/WMcMf71DJnit4EMU=
 github.com/sirupsen/logrus v1.9.3 h1:dueUQJ1C2q9oE3F7wvmSGAaVtTmUizReu6fjN8uqzbQ=
 github.com/sirupsen/logrus v1.9.3/go.mod h1:naHLuLoDiP4jHNo9R0sCBMtWGeIprob74mVsIT4qYEQ=
 github.com/stretchr/objx v0.1.0/go.mod h1:HFkY916IF+rwdDfMAkV7OtwuqBVzrE8GR6GFx+wExME=
 github.com/stretchr/testify v1.7.0/go.mod h1:6Fq8oRcR53rry900zMqJjRRixrwX3KX962/h/Wwjteg=
-github.com/stretchr/testify v1.10.0 h1:Xv5erBjTwe/5IxqUQTdXv5kgmIvbHo3QQyRwhJsOfJA=
-github.com/stretchr/testify v1.10.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
+github.com/stretchr/testify v1.9.0 h1:HtqpIVDClZ4nwg75+f6Lvsy/wHu+3BoSGCbBAcpTsTg=
+github.com/stretchr/testify v1.9.0/go.mod h1:r2ic/lqez/lEtzL7wO/rwa5dbSLXVDPFyf8C91i36aY=
 github.com/yuin/goldmark v1.3.5/go.mod h1:mwnBkeHKe2W/ZEtQ+71ViKU8L12m81fl3OWwC1Zlc8k=
-github.com/zitadel/logging v0.6.2 h1:MW2kDDR0ieQynPZ0KIZPrh9ote2WkxfBif5QoARDQcU=
-github.com/zitadel/logging v0.6.2/go.mod h1:z6VWLWUkJpnNVDSLzrPSQSQyttysKZ6bCRongw0ROK4=
-github.com/zitadel/schema v1.3.1 h1:QT3kwiRIRXXLVAs6gCK/u044WmUVh6IlbLXUsn6yRQU=
-github.com/zitadel/schema v1.3.1/go.mod h1:071u7D2LQacy1HAN+YnMd/mx1qVE2isb0Mjeqg46xnU=
-go.opentelemetry.io/otel v1.29.0 h1:PdomN/Al4q/lN6iBJEN3AwPvUiHPMlt93c8bqTG5Llw=
-go.opentelemetry.io/otel v1.29.0/go.mod h1:N/WtXPs1CNCUEx+Agz5uouwCba+i+bJGFicT8SR4NP8=
-go.opentelemetry.io/otel/metric v1.29.0 h1:vPf/HFWTNkPu1aYeIsc98l4ktOQaL6LeSoeV2g+8YLc=
-go.opentelemetry.io/otel/metric v1.29.0/go.mod h1:auu/QWieFVWx+DmQOUMgj0F8LHWdgalxXqvp7BII/W8=
-go.opentelemetry.io/otel/trace v1.29.0 h1:J/8ZNK4XgR7a21DZUAsbF8pZ5Jcw1VhACmnYt39JTi4=
-go.opentelemetry.io/otel/trace v1.29.0/go.mod h1:eHl3w0sp3paPkYstJOmAimxhiFXPg+MMTlEh3nsQgWQ=
+go.opentelemetry.io/otel v1.24.0 h1:0LAOdjNmQeSTzGBzduGe/rU4tZhMwL5rWgtp9Ku5Jfo=
+go.opentelemetry.io/otel v1.24.0/go.mod h1:W7b9Ozg4nkF5tWI5zsXkaKKDjdVjpD4oAt9Qi/MArHo=
+go.opentelemetry.io/otel/metric v1.24.0 h1:6EhoGWWK28x1fbpA4tYTOWBkPefTDQnb8WSGXlc88kI=
+go.opentelemetry.io/otel/metric v1.24.0/go.mod h1:VYhLe1rFfxuTXLgj4CBiyz+9WYBA8pNGJgDcSFRKBco=
+go.opentelemetry.io/otel/trace v1.24.0 h1:CsKnnL4dUAr/0llH9FKuc698G04IrpWV0MQA/Y1YELI=
+go.opentelemetry.io/otel/trace v1.24.0/go.mod h1:HPc3Xr/cOApsBI154IU0OI0HJexz+aw5uPdbs3UCjNU=
 golang.org/x/crypto v0.0.0-20190308221718-c2843e01d9a2/go.mod h1:djNgcEr1/C05ACkg1iLfiJU5Ep61QUkGW8qpdssI0+w=
 golang.org/x/crypto v0.0.0-20191011191535-87dc89f01550/go.mod h1:yigFU9vqHzYiE8UmvKecakEJjdnWj3jj499lnFckfCI=
-golang.org/x/crypto v0.36.0 h1:AnAEvhDddvBdpY+uR+MyHmuZzzNqXSe/GvuDeob5L34=
-golang.org/x/crypto v0.36.0/go.mod h1:Y4J0ReaxCR1IMaabaSMugxJES1EpwhBHhv2bDHklZvc=
+golang.org/x/crypto v0.21.0 h1:X31++rzVUdKhX5sWmSOFZxx8UW/ldWx55cbf08iNAMA=
+golang.org/x/crypto v0.21.0/go.mod h1:0BP7YvVV9gBbVKyeTG0Gyn+gZm94bibOW5BjDEYAOMs=
 golang.org/x/mod v0.4.2/go.mod h1:s0Qsj1ACt9ePp/hMypM3fl4fZqREWJwdYDEqhRiZZUA=
 golang.org/x/net v0.0.0-20190311183353-d8887717615a/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190404232315-eb5bcb51f2a3/go.mod h1:t9HGtf8HONx5eT2rtn7q6eTqICYqUVnKs3thJo3Qplg=
 golang.org/x/net v0.0.0-20190620200207-3b0461eec859/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20200202094626-16171245cfb2/go.mod h1:z5CRVTTTmAJ677TzLLGU+0bjPO0LkuOLi4/5GtJWs/s=
 golang.org/x/net v0.0.0-20210405180319-a5a99cb37ef4/go.mod h1:p54w0d4576C0XHj96bSt6lcn1PtDYWL6XObtHCRCNQM=
-golang.org/x/net v0.38.0 h1:vRMAPTMaeGqVhG5QyLJHqNDwecKTomGeqbnfZyKlBI8=
-golang.org/x/net v0.38.0/go.mod h1:ivrbrMbzFq5J41QOQh0siUuly180yBYtLp+CKbEaFx8=
+golang.org/x/net v0.22.0 h1:9sGLhx7iRIHEiX0oAJ3MRZMUCElJgy7Br1nO+AMN3Tc=
+golang.org/x/net v0.22.0/go.mod h1:JKghWKKOSdJwpW2GEx0Ja7fmaKnMsbu+MWVZTokSYmg=
 golang.org/x/oauth2 v0.0.0-20180821212333-d2e6202438be/go.mod h1:N/0e6XlmueqKjAGxoOufVs8QHGRruUQn6yWY3a++T0U=
-golang.org/x/oauth2 v0.30.0 h1:dnDm7JmhM45NNpd8FDDeLhK6FwqbOf4MLCM9zb1BOHI=
-golang.org/x/oauth2 v0.30.0/go.mod h1:B++QgG3ZKulg6sRPGD/mqlHQs5rB3Ml9erfeDY7xKlU=
+golang.org/x/oauth2 v0.20.0 h1:4mQdhULixXKP1rwYBW0vAijoXnkTG0BLCDRzfe1idMo=
+golang.org/x/oauth2 v0.20.0/go.mod h1:XYTD2NtWslqkgxebSiOHnXEap4TF09sJSc7H1sXbhtI=
 golang.org/x/sync v0.0.0-20190423024810-112230192c58/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sync v0.0.0-20210220032951-036812b2e83c/go.mod h1:RxMgew5VJxzue5/jJTE5uejpjVlOe/izrB70Jof72aM=
 golang.org/x/sys v0.0.0-20190215142949-d0b11bdaac8a/go.mod h1:STP8DvDyc/dI5b8T5hshtkjS+E42TnysNCUPdjciGhY=
@@ -83,13 +73,13 @@ golang.org/x/sys v0.0.0-20201119102817-f84b799fce68/go.mod h1:h1NjWce9XRLGQEsW7w
 golang.org/x/sys v0.0.0-20210330210617-4fbd30eecc44/go.mod h1:h1NjWce9XRLGQEsW7wpKNCjG9DtNlClVuFLEZdDNbEs=
 golang.org/x/sys v0.0.0-20210510120138-977fb7262007/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
 golang.org/x/sys v0.0.0-20220715151400-c0bba94af5f8/go.mod h1:oPkhp1MJrh7nUepCBck5+mAzfO9JrbApNNgaTdGDITg=
-golang.org/x/sys v0.31.0 h1:ioabZlmFYtWhL+TRYpcnNlLwhyxaM9kWTDEmfnprqik=
-golang.org/x/sys v0.31.0/go.mod h1:BJP2sWEmIv4KK5OTEluFJCKSidICx8ciO85XgH3Ak8k=
+golang.org/x/sys v0.18.0 h1:DBdB3niSjOA/O0blCZBqDefyWNYveAYMNF1Wum0DYQ4=
+golang.org/x/sys v0.18.0/go.mod h1:/VUhepiaJMQUp4+oa/7Zr1D23ma6VTLIYjOOTFZPUcA=
 golang.org/x/term v0.0.0-20201126162022-7de9c90e9dd1/go.mod h1:bj7SfCRtBDWHUb9snDiAeCFNEtKQo2Wmx5Cou7ajbmo=
 golang.org/x/text v0.3.0/go.mod h1:NqM8EUOU14njkJ3fqMW+pc6Ldnwhi/IjpwHt7yyuwOQ=
 golang.org/x/text v0.3.3/go.mod h1:5Zoc/QRtKVWzQhOtBMvqHzDpF6irO9z98xDceosuGiQ=
-golang.org/x/text v0.26.0 h1:P42AVeLghgTYr4+xUnTRKDMqpar+PtX7KWuNQL21L8M=
-golang.org/x/text v0.26.0/go.mod h1:QK15LZJUUQVJxhz7wXgxSy/CJaTFjd0G+YLonydOVQA=
+golang.org/x/text v0.15.0 h1:h1V/4gjBv8v9cjcR6+AR5+/cIYK5N/WAgiv4xlsEtAk=
+golang.org/x/text v0.15.0/go.mod h1:18ZOQIKpY8NJVqYksKHtTdi31H5itFRjB5/qKTNYzSU=
 golang.org/x/tools v0.0.0-20180917221912-90fa682c2a6e/go.mod h1:n7NCudcB/nEzxVGmLbDWY5pfWTLqBcC2KZ6jyYvM4mQ=
 golang.org/x/tools v0.0.0-20191119224855-298f0cb1881e/go.mod h1:b+2E5dAYhXwXZwtnZ6UAqBI28+e2cm9otk0dWdXHAEo=
 golang.org/x/tools v0.1.1/go.mod h1:o0xws9oXOQQZyjljx8fwUC0k7L1pTE6eaCbjGeHmOkk=
@@ -100,9 +90,8 @@ golang.org/x/xerrors v0.0.0-20200804184101-5ec99f83aff1/go.mod h1:I/5z698sn9Ka8T
 google.golang.org/appengine v1.1.0/go.mod h1:EbEs0AVv82hx2wNQdGPgUI5lhzA/G0D9YwlJXL52JkM=
 gopkg.in/check.v1 v0.0.0-20161208181325-20d25e280405/go.mod h1:Co6ibVJAznAaIkqp8huTwlJQCZ016jof/cbN4VW5Yz0=
 gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c h1:Hei/4ADfdWqJk1ZMxUNpqntNwaWcugrBjAiHlqqRiVk=
-gopkg.in/check.v1 v1.0.0-20201130134442-10cb98267c6c/go.mod h1:JHkPIbrfpd72SG/EVd6muEfDQjcINNoR0C8j2r3qZ4Q=
-gopkg.in/yaml.v2 v2.4.0 h1:D8xgwECY7CYvx+Y2n4sBz93Jn9JRvxdiyyo8CTfuKaY=
-gopkg.in/yaml.v2 v2.4.0/go.mod h1:RDklbk79AGWmwhnvt/jBztapEOGDOx6ZbXqjP6csGnQ=
+gopkg.in/go-jose/go-jose.v2 v2.6.3 h1:nt80fvSDlhKWQgSWyHyy5CfmlQr+asih51R8PTWNKKs=
+gopkg.in/go-jose/go-jose.v2 v2.6.3/go.mod h1:zzZDPkNNw/c9IE7Z9jr11mBZQhKQTMzoEEIoEdZlFBI=
 gopkg.in/yaml.v3 v3.0.0-20200313102051-9f266ea9e77c/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=
 gopkg.in/yaml.v3 v3.0.1 h1:fxVm/GzAzEWqLHuvctI91KS9hhNmmWOoWu0XTYJS7CA=
 gopkg.in/yaml.v3 v3.0.1/go.mod h1:K4uyk7z7BCEPqu6E+C64Yfv1cQ7kz7rIZviUmN+EgEM=

internal/testutil/gen/gen.go

@@ -8,8 +8,8 @@ import (
 	"fmt"
 	"os"
 
-	tu "git.christmann.info/LARA/zitadel-oidc/v3/internal/testutil"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	tu "github.com/zitadel/oidc/v2/internal/testutil"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 var custom = map[string]any{

internal/testutil/token.go

@@ -8,9 +8,8 @@ import (
 	"errors"
 	"time"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	jose "github.com/go-jose/go-jose/v4"
-	"github.com/muhlemmer/gu"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
+	"gopkg.in/go-jose/go-jose.v2"
 )
 
 // KeySet implements oidc.Keys
@@ -18,7 +17,7 @@ type KeySet struct{}
 
 // VerifySignature implments op.KeySet.
 func (KeySet) VerifySignature(ctx context.Context, jws *jose.JSONWebSignature) (payload []byte, err error) {
-	if err = ctx.Err(); err != nil {
+	if ctx.Err() != nil {
 		return nil, err
 	}
 
@@ -46,16 +45,6 @@ func init() {
 	}
 }
 
-type JWTProfileKeyStorage struct{}
-
-func (JWTProfileKeyStorage) GetKeyByIDAndClientID(ctx context.Context, keyID string, clientID string) (*jose.JSONWebKey, error) {
-	if err := ctx.Err(); err != nil {
-		return nil, err
-	}
-
-	return gu.Ptr(WebKey.Public()), nil
-}
-
 func signEncodeTokenClaims(claims any) string {
 	payload, err := json.Marshal(claims)
 	if err != nil {
@@ -117,25 +106,6 @@ func NewAccessToken(issuer, subject string, audience []string, expiration time.T
 	return NewAccessTokenCustom(issuer, subject, audience, expiration, jwtid, clientID, skew, nil)
 }
 
-func NewJWTProfileAssertion(issuer, clientID string, audience []string, issuedAt, expiration time.Time) (string, *oidc.JWTTokenRequest) {
-	req := &oidc.JWTTokenRequest{
-		Issuer:    issuer,
-		Subject:   clientID,
-		Audience:  audience,
-		ExpiresAt: oidc.FromTime(expiration),
-		IssuedAt:  oidc.FromTime(issuedAt),
-	}
-	// make sure the private claim map is set correctly
-	data, err := json.Marshal(req)
-	if err != nil {
-		panic(err)
-	}
-	if err = json.Unmarshal(data, req); err != nil {
-		panic(err)
-	}
-	return signEncodeTokenClaims(req), req
-}
-
 const InvalidSignatureToken = `eyJhbGciOiJQUzUxMiJ9.eyJpc3MiOiJsb2NhbC5jb20iLCJzdWIiOiJ0aW1AbG9jYWwuY29tIiwiYXVkIjpbInVuaXQiLCJ0ZXN0IiwiNTU1NjY2Il0sImV4cCI6MTY3Nzg0MDQzMSwiaWF0IjoxNjc3ODQwMzcwLCJhdXRoX3RpbWUiOjE2Nzc4NDAzMTAsIm5vbmNlIjoiMTIzNDUiLCJhY3IiOiJzb21ldGhpbmciLCJhbXIiOlsiZm9vIiwiYmFyIl0sImF6cCI6IjU1NTY2NiJ9.DtZmvVkuE4Hw48ijBMhRJbxEWCr_WEYuPQBMY73J9TP6MmfeNFkjVJf4nh4omjB9gVLnQ-xhEkNOe62FS5P0BB2VOxPuHZUj34dNspCgG3h98fGxyiMb5vlIYAHDF9T-w_LntlYItohv63MmdYR-hPpAqjXE7KOfErf-wUDGE9R3bfiQ4HpTdyFJB1nsToYrZ9lhP2mzjTCTs58ckZfQ28DFHn_lfHWpR4rJBgvLx7IH4rMrUayr09Ap-PxQLbv0lYMtmgG1z3JK8MXnuYR0UJdZnEIezOzUTlThhCXB-nvuAXYjYxZZTR0FtlgZUHhIpYK0V2abf_Q_Or36akNCUg`
 
 // These variables always result in a valid token
@@ -167,10 +137,6 @@ func ValidAccessToken() (string, *oidc.AccessTokenClaims) {
 	return NewAccessToken(ValidIssuer, ValidSubject, ValidAudience, ValidExpiration, ValidJWTID, ValidClientID, ValidSkew)
 }
 
-func ValidJWTProfileAssertion() (string, *oidc.JWTTokenRequest) {
-	return NewJWTProfileAssertion(ValidClientID, ValidClientID, []string{ValidIssuer}, time.Now(), ValidExpiration)
-}
-
 // ACRVerify is a oidc.ACRVerifier func.
 func ACRVerify(acr string) error {
 	if acr != ValidACR {

pkg/client/client.go

@@ -2,6 +2,7 @@ package client
 
 import (
 	"context"
+	"encoding/json"
 	"errors"
 	"fmt"
 	"io"
@@ -10,44 +11,32 @@ import (
 	"strings"
 	"time"
 
-	"github.com/go-jose/go-jose/v4"
-	"github.com/zitadel/logging"
-	"go.opentelemetry.io/otel"
 	"golang.org/x/oauth2"
+	"gopkg.in/go-jose/go-jose.v2"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/crypto"
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/crypto"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
-var (
-	Encoder = httphelper.Encoder(oidc.NewEncoder())
-	Tracer  = otel.Tracer("github.com/zitadel/oidc/pkg/client")
-)
+var Encoder = httphelper.Encoder(oidc.NewEncoder())
 
 // Discover calls the discovery endpoint of the provided issuer and returns its configuration
 // It accepts an optional argument "wellknownUrl" which can be used to overide the dicovery endpoint url
-func Discover(ctx context.Context, issuer string, httpClient *http.Client, wellKnownUrl ...string) (*oidc.DiscoveryConfiguration, error) {
-	ctx, span := Tracer.Start(ctx, "Discover")
-	defer span.End()
-
+func Discover(issuer string, httpClient *http.Client, wellKnownUrl ...string) (*oidc.DiscoveryConfiguration, error) {
 	wellKnown := strings.TrimSuffix(issuer, "/") + oidc.DiscoveryEndpoint
 	if len(wellKnownUrl) == 1 && wellKnownUrl[0] != "" {
 		wellKnown = wellKnownUrl[0]
 	}
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, wellKnown, nil)
+	req, err := http.NewRequest("GET", wellKnown, nil)
 	if err != nil {
 		return nil, err
 	}
 	discoveryConfig := new(oidc.DiscoveryConfiguration)
 	err = httphelper.HttpRequest(httpClient, req, &discoveryConfig)
 	if err != nil {
-		return nil, errors.Join(oidc.ErrDiscoveryFailed, err)
+		return nil, err
 	}
-	if logger, ok := logging.FromContext(ctx); ok {
-		logger.Debug("discover", "config", discoveryConfig)
-	}
-
 	if discoveryConfig.Issuer != issuer {
 		return nil, oidc.ErrIssuerInvalid
 	}
@@ -59,15 +48,12 @@ type TokenEndpointCaller interface {
 	HttpClient() *http.Client
 }
 
-func CallTokenEndpoint(ctx context.Context, request any, caller TokenEndpointCaller) (newToken *oauth2.Token, err error) {
-	return callTokenEndpoint(ctx, request, nil, caller)
+func CallTokenEndpoint(request any, caller TokenEndpointCaller) (newToken *oauth2.Token, err error) {
+	return callTokenEndpoint(request, nil, caller)
 }
 
-func callTokenEndpoint(ctx context.Context, request any, authFn any, caller TokenEndpointCaller) (newToken *oauth2.Token, err error) {
-	ctx, span := Tracer.Start(ctx, "callTokenEndpoint")
-	defer span.End()
-
-	req, err := httphelper.FormRequest(ctx, caller.TokenEndpoint(), request, Encoder, authFn)
+func callTokenEndpoint(request any, authFn any, caller TokenEndpointCaller) (newToken *oauth2.Token, err error) {
+	req, err := httphelper.FormRequest(caller.TokenEndpoint(), request, Encoder, authFn)
 	if err != nil {
 		return nil, err
 	}
@@ -94,16 +80,8 @@ type EndSessionCaller interface {
 	HttpClient() *http.Client
 }
 
-func CallEndSessionEndpoint(ctx context.Context, request any, authFn any, caller EndSessionCaller) (*url.URL, error) {
-	ctx, span := Tracer.Start(ctx, "CallEndSessionEndpoint")
-	defer span.End()
-
-	endpoint := caller.GetEndSessionEndpoint()
-	if endpoint == "" {
-		return nil, fmt.Errorf("end session %w", ErrEndpointNotSet)
-	}
-
-	req, err := httphelper.FormRequest(ctx, endpoint, request, Encoder, authFn)
+func CallEndSessionEndpoint(request any, authFn any, caller EndSessionCaller) (*url.URL, error) {
+	req, err := httphelper.FormRequest(caller.GetEndSessionEndpoint(), request, Encoder, authFn)
 	if err != nil {
 		return nil, err
 	}
@@ -145,16 +123,8 @@ type RevokeRequest struct {
 	ClientSecret  string `schema:"client_secret"`
 }
 
-func CallRevokeEndpoint(ctx context.Context, request any, authFn any, caller RevokeCaller) error {
-	ctx, span := Tracer.Start(ctx, "CallRevokeEndpoint")
-	defer span.End()
-
-	endpoint := caller.GetRevokeEndpoint()
-	if endpoint == "" {
-		return fmt.Errorf("revoke %w", ErrEndpointNotSet)
-	}
-
-	req, err := httphelper.FormRequest(ctx, endpoint, request, Encoder, authFn)
+func CallRevokeEndpoint(request any, authFn any, caller RevokeCaller) error {
+	req, err := httphelper.FormRequest(caller.GetRevokeEndpoint(), request, Encoder, authFn)
 	if err != nil {
 		return err
 	}
@@ -181,11 +151,8 @@ func CallRevokeEndpoint(ctx context.Context, request any, authFn any, caller Rev
 	return nil
 }
 
-func CallTokenExchangeEndpoint(ctx context.Context, request any, authFn any, caller TokenEndpointCaller) (resp *oidc.TokenExchangeResponse, err error) {
-	ctx, span := Tracer.Start(ctx, "CallTokenExchangeEndpoint")
-	defer span.End()
-
-	req, err := httphelper.FormRequest(ctx, caller.TokenEndpoint(), request, Encoder, authFn)
+func CallTokenExchangeEndpoint(request any, authFn any, caller TokenEndpointCaller) (resp *oidc.TokenExchangeResponse, err error) {
+	req, err := httphelper.FormRequest(caller.TokenEndpoint(), request, Encoder, authFn)
 	if err != nil {
 		return nil, err
 	}
@@ -197,12 +164,12 @@ func CallTokenExchangeEndpoint(ctx context.Context, request any, authFn any, cal
 }
 
 func NewSignerFromPrivateKeyByte(key []byte, keyID string) (jose.Signer, error) {
-	privateKey, algorithm, err := crypto.BytesToPrivateKey(key)
+	privateKey, err := crypto.BytesToPrivateKey(key)
 	if err != nil {
 		return nil, err
 	}
 	signingKey := jose.SigningKey{
-		Algorithm: algorithm,
+		Algorithm: jose.RS256,
 		Key:       &jose.JSONWebKey{Key: privateKey, KeyID: keyID},
 	}
 	return jose.NewSigner(signingKey, &jose.SignerOptions{})
@@ -225,16 +192,8 @@ type DeviceAuthorizationCaller interface {
 	HttpClient() *http.Client
 }
 
-func CallDeviceAuthorizationEndpoint(ctx context.Context, request *oidc.ClientCredentialsRequest, caller DeviceAuthorizationCaller, authFn any) (*oidc.DeviceAuthorizationResponse, error) {
-	ctx, span := Tracer.Start(ctx, "CallDeviceAuthorizationEndpoint")
-	defer span.End()
-
-	endpoint := caller.GetDeviceAuthorizationEndpoint()
-	if endpoint == "" {
-		return nil, fmt.Errorf("device authorization %w", ErrEndpointNotSet)
-	}
-
-	req, err := httphelper.FormRequest(ctx, endpoint, request, Encoder, authFn)
+func CallDeviceAuthorizationEndpoint(request *oidc.ClientCredentialsRequest, caller DeviceAuthorizationCaller) (*oidc.DeviceAuthorizationResponse, error) {
+	req, err := httphelper.FormRequest(caller.GetDeviceAuthorizationEndpoint(), request, Encoder, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -255,10 +214,7 @@ type DeviceAccessTokenRequest struct {
 }
 
 func CallDeviceAccessTokenEndpoint(ctx context.Context, request *DeviceAccessTokenRequest, caller TokenEndpointCaller) (*oidc.AccessTokenResponse, error) {
-	ctx, span := Tracer.Start(ctx, "CallDeviceAccessTokenEndpoint")
-	defer span.End()
-
-	req, err := httphelper.FormRequest(ctx, caller.TokenEndpoint(), request, Encoder, nil)
+	req, err := httphelper.FormRequest(caller.TokenEndpoint(), request, Encoder, nil)
 	if err != nil {
 		return nil, err
 	}
@@ -266,17 +222,28 @@ func CallDeviceAccessTokenEndpoint(ctx context.Context, request *DeviceAccessTok
 		req.SetBasicAuth(request.ClientID, request.ClientSecret)
 	}
 
-	resp := new(oidc.AccessTokenResponse)
-	if err := httphelper.HttpRequest(caller.HttpClient(), req, &resp); err != nil {
+	httpResp, err := caller.HttpClient().Do(req)
+	if err != nil {
 		return nil, err
 	}
-	return resp, nil
+	defer httpResp.Body.Close()
+
+	resp := new(struct {
+		*oidc.AccessTokenResponse
+		*oidc.Error
+	})
+	if err = json.NewDecoder(httpResp.Body).Decode(resp); err != nil {
+		return nil, err
+	}
+
+	if httpResp.StatusCode == http.StatusOK {
+		return resp.AccessTokenResponse, nil
+	}
+
+	return nil, resp.Error
 }
 
 func PollDeviceAccessTokenEndpoint(ctx context.Context, interval time.Duration, request *DeviceAccessTokenRequest, caller TokenEndpointCaller) (*oidc.AccessTokenResponse, error) {
-	ctx, span := Tracer.Start(ctx, "PollDeviceAccessTokenEndpoint")
-	defer span.End()
-
 	for {
 		timer := time.After(interval)
 		select {

pkg/client/client_test.go

@@ -1,11 +1,9 @@
 package client
 
 import (
-	"context"
 	"net/http"
 	"testing"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -23,7 +21,7 @@ func TestDiscover(t *testing.T) {
 		name       string
 		args       args
 		wantFields *wantFields
-		wantErr    error
+		wantErr    bool
 	}{
 		{
 			name: "spotify", // https://github.com/zitadel/oidc/issues/406
@@ -33,20 +31,17 @@ func TestDiscover(t *testing.T) {
 			wantFields: &wantFields{
 				UILocalesSupported: true,
 			},
-			wantErr: nil,
-		},
-		{
-			name: "discovery failed",
-			args: args{
-				issuer: "https://example.com",
-			},
-			wantErr: oidc.ErrDiscoveryFailed,
+			wantErr: false,
 		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := Discover(context.Background(), tt.args.issuer, http.DefaultClient, tt.args.wellKnownUrl...)
-			require.ErrorIs(t, err, tt.wantErr)
+			got, err := Discover(tt.args.issuer, http.DefaultClient, tt.args.wellKnownUrl...)
+			if tt.wantErr {
+				assert.Error(t, err)
+				return
+			}
+			require.NoError(t, err)
 			if tt.wantFields == nil {
 				return
 			}

pkg/client/errors.go

@@ -1,5 +0,0 @@
-package client
-
-import "errors"
-
-var ErrEndpointNotSet = errors.New("endpoint not set")

pkg/client/integration_test.go

@@ -2,65 +2,33 @@ package client_test
 
 import (
 	"bytes"
-	"context"
-	"fmt"
 	"io"
-	"log/slog"
+	"io/ioutil"
 	"math/rand"
 	"net/http"
 	"net/http/cookiejar"
 	"net/http/httptest"
 	"net/url"
 	"os"
-	"os/signal"
 	"strconv"
-	"syscall"
 	"testing"
 	"time"
 
 	"github.com/jeremija/gosubmit"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"golang.org/x/oauth2"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/example/server/exampleop"
-	"git.christmann.info/LARA/zitadel-oidc/v3/example/server/storage"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client/rp"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client/rs"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client/tokenexchange"
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
+	"github.com/zitadel/oidc/v2/example/server/exampleop"
+	"github.com/zitadel/oidc/v2/example/server/storage"
+	"github.com/zitadel/oidc/v2/pkg/client/rp"
+	"github.com/zitadel/oidc/v2/pkg/client/rs"
+	"github.com/zitadel/oidc/v2/pkg/client/tokenexchange"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/op"
 )
 
-var Logger = slog.New(
-	slog.NewTextHandler(os.Stderr, &slog.HandlerOptions{
-		AddSource: true,
-		Level:     slog.LevelDebug,
-	}),
-)
-
-var CTX context.Context
-
-func TestMain(m *testing.M) {
-	os.Exit(func() int {
-		ctx, cancel := signal.NotifyContext(context.Background(), os.Interrupt, syscall.SIGINT)
-		defer cancel()
-		CTX, cancel = context.WithTimeout(ctx, time.Minute)
-		defer cancel()
-		return m.Run()
-	}())
-}
-
 func TestRelyingPartySession(t *testing.T) {
-	for _, wrapServer := range []bool{false, true} {
-		t.Run(fmt.Sprint("wrapServer ", wrapServer), func(t *testing.T) {
-			testRelyingPartySession(t, wrapServer)
-		})
-	}
-}
-
-func testRelyingPartySession(t *testing.T, wrapServer bool) {
 	t.Log("------- start example OP ------")
 	targetURL := "http://local-site"
 	exampleStorage := storage.NewStorage(storage.NewUserStore(targetURL))
@@ -68,17 +36,17 @@ func testRelyingPartySession(t *testing.T, wrapServer bool) {
 	opServer := httptest.NewServer(&dh)
 	defer opServer.Close()
 	t.Logf("auth server at %s", opServer.URL)
-	dh.Handler = exampleop.SetupServer(opServer.URL, exampleStorage, Logger, wrapServer)
+	dh.Handler = exampleop.SetupServer(opServer.URL, exampleStorage)
 
 	seed := rand.New(rand.NewSource(int64(os.Getpid()) + time.Now().UnixNano()))
 	clientID := t.Name() + "-" + strconv.FormatInt(seed.Int63(), 25)
 
 	t.Log("------- run authorization code flow ------")
-	provider, tokens := RunAuthorizationCodeFlow(t, opServer, clientID, "secret")
+	provider, _, refreshToken, idToken := RunAuthorizationCodeFlow(t, opServer, clientID, "secret")
 
 	t.Log("------- refresh tokens  ------")
 
-	newTokens, err := rp.RefreshTokens[*oidc.IDTokenClaims](CTX, provider, tokens.RefreshToken, "", "")
+	newTokens, err := rp.RefreshAccessToken(provider, refreshToken, "", "")
 	require.NoError(t, err, "refresh token")
 	assert.NotNil(t, newTokens, "access token")
 	t.Logf("new access token %s", newTokens.AccessToken)
@@ -86,13 +54,11 @@ func testRelyingPartySession(t *testing.T, wrapServer bool) {
 	t.Logf("new token type %s", newTokens.TokenType)
 	t.Logf("new expiry %s", newTokens.Expiry.Format(time.RFC3339))
 	require.NotEmpty(t, newTokens.AccessToken, "new accessToken")
-	assert.NotEmpty(t, newTokens.IDToken, "new idToken")
-	assert.NotNil(t, newTokens.IDTokenClaims)
-	assert.Equal(t, newTokens.IDTokenClaims.Subject, tokens.IDTokenClaims.Subject)
+	assert.NotEmpty(t, newTokens.Extra("id_token"), "new idToken")
 
 	t.Log("------ end session (logout) ------")
 
-	newLoc, err := rp.EndSession(CTX, provider, tokens.IDToken, "", "")
+	newLoc, err := rp.EndSession(provider, idToken, "", "")
 	require.NoError(t, err, "logout")
 	if newLoc != nil {
 		t.Logf("redirect to %s", newLoc)
@@ -101,111 +67,17 @@ func testRelyingPartySession(t *testing.T, wrapServer bool) {
 	}
 
 	t.Log("------ attempt refresh again (should fail) ------")
-	t.Log("trying original refresh token", tokens.RefreshToken)
-	_, err = rp.RefreshTokens[*oidc.IDTokenClaims](CTX, provider, tokens.RefreshToken, "", "")
+	t.Log("trying original refresh token", refreshToken)
+	_, err = rp.RefreshAccessToken(provider, refreshToken, "", "")
 	assert.Errorf(t, err, "refresh with original")
 	if newTokens.RefreshToken != "" {
 		t.Log("trying replacement refresh token", newTokens.RefreshToken)
-		_, err = rp.RefreshTokens[*oidc.IDTokenClaims](CTX, provider, newTokens.RefreshToken, "", "")
+		_, err = rp.RefreshAccessToken(provider, newTokens.RefreshToken, "", "")
 		assert.Errorf(t, err, "refresh with replacement")
 	}
 }
 
-func TestRelyingPartyWithSigningAlgsFromDiscovery(t *testing.T) {
-	targetURL := "http://local-site"
-	localURL, err := url.Parse(targetURL + "/login?requestID=1234")
-	require.NoError(t, err, "local url")
-
-	t.Log("------- start example OP ------")
-	seed := rand.New(rand.NewSource(int64(os.Getpid()) + time.Now().UnixNano()))
-	clientID := t.Name() + "-" + strconv.FormatInt(seed.Int63(), 25)
-	clientSecret := "secret"
-	client := storage.WebClient(clientID, clientSecret, targetURL)
-	storage.RegisterClients(client)
-	exampleStorage := storage.NewStorage(storage.NewUserStore(targetURL))
-	var dh deferredHandler
-	opServer := httptest.NewServer(&dh)
-	defer opServer.Close()
-	dh.Handler = exampleop.SetupServer(opServer.URL, exampleStorage, Logger, true)
-
-	t.Log("------- create RP ------")
-	provider, err := rp.NewRelyingPartyOIDC(
-		CTX,
-		opServer.URL,
-		clientID,
-		clientSecret,
-		targetURL,
-		[]string{"openid"},
-		rp.WithSigningAlgsFromDiscovery(),
-	)
-	require.NoError(t, err, "new rp")
-
-	t.Log("------- run authorization code flow ------")
-	jar, err := cookiejar.New(nil)
-	require.NoError(t, err, "create cookie jar")
-	httpClient := &http.Client{
-		Timeout: time.Second * 5,
-		CheckRedirect: func(_ *http.Request, _ []*http.Request) error {
-			return http.ErrUseLastResponse
-		},
-		Jar: jar,
-	}
-	state := "state-" + strconv.FormatInt(seed.Int63(), 25)
-	capturedW := httptest.NewRecorder()
-	get := httptest.NewRequest("GET", localURL.String(), nil)
-	rp.AuthURLHandler(func() string { return state }, provider,
-		rp.WithPromptURLParam("Hello, World!", "Goodbye, World!"),
-		rp.WithURLParam("custom", "param"),
-	)(capturedW, get)
-	defer func() {
-		if t.Failed() {
-			t.Log("response body (redirect from RP to OP)", capturedW.Body.String())
-		}
-	}()
-	resp := capturedW.Result()
-	startAuthURL, err := resp.Location()
-	require.NoError(t, err, "get redirect")
-	loginPageURL := getRedirect(t, "get redirect to login page", httpClient, startAuthURL)
-	form := getForm(t, "get login form", httpClient, loginPageURL)
-	defer func() {
-		if t.Failed() {
-			t.Logf("login form (unfilled): %s", string(form))
-		}
-	}()
-	postLoginRedirectURL := fillForm(t, "fill login form", httpClient, form, loginPageURL,
-		gosubmit.Set("username", "test-user@local-site"),
-		gosubmit.Set("password", "verysecure"),
-	)
-	codeBearingURL := getRedirect(t, "get redirect with code", httpClient, postLoginRedirectURL)
-	capturedW = httptest.NewRecorder()
-	get = httptest.NewRequest("GET", codeBearingURL.String(), nil)
-	var idToken string
-	redirect := func(w http.ResponseWriter, r *http.Request, newTokens *oidc.Tokens[*oidc.IDTokenClaims], state string, rp rp.RelyingParty, info *oidc.UserInfo) {
-		idToken = newTokens.IDToken
-		http.Redirect(w, r, targetURL, http.StatusFound)
-	}
-	rp.CodeExchangeHandler(rp.UserinfoCallback(redirect), provider)(capturedW, get)
-	defer func() {
-		if t.Failed() {
-			t.Log("token exchange response body", capturedW.Body.String())
-			require.GreaterOrEqual(t, capturedW.Code, 200, "captured response code")
-		}
-	}()
-
-	t.Log("------- verify id token ------")
-	_, err = rp.VerifyIDToken[*oidc.IDTokenClaims](CTX, idToken, provider.IDTokenVerifier())
-	require.NoError(t, err, "verify id token")
-}
-
 func TestResourceServerTokenExchange(t *testing.T) {
-	for _, wrapServer := range []bool{false, true} {
-		t.Run(fmt.Sprint("wrapServer ", wrapServer), func(t *testing.T) {
-			testResourceServerTokenExchange(t, wrapServer)
-		})
-	}
-}
-
-func testResourceServerTokenExchange(t *testing.T, wrapServer bool) {
 	t.Log("------- start example OP ------")
 	targetURL := "http://local-site"
 	exampleStorage := storage.NewStorage(storage.NewUserStore(targetURL))
@@ -213,24 +85,23 @@ func testResourceServerTokenExchange(t *testing.T, wrapServer bool) {
 	opServer := httptest.NewServer(&dh)
 	defer opServer.Close()
 	t.Logf("auth server at %s", opServer.URL)
-	dh.Handler = exampleop.SetupServer(opServer.URL, exampleStorage, Logger, wrapServer)
+	dh.Handler = exampleop.SetupServer(opServer.URL, exampleStorage)
 
 	seed := rand.New(rand.NewSource(int64(os.Getpid()) + time.Now().UnixNano()))
 	clientID := t.Name() + "-" + strconv.FormatInt(seed.Int63(), 25)
 	clientSecret := "secret"
 
 	t.Log("------- run authorization code flow ------")
-	provider, tokens := RunAuthorizationCodeFlow(t, opServer, clientID, clientSecret)
+	provider, _, refreshToken, idToken := RunAuthorizationCodeFlow(t, opServer, clientID, clientSecret)
 
-	resourceServer, err := rs.NewResourceServerClientCredentials(CTX, opServer.URL, clientID, clientSecret)
+	resourceServer, err := rs.NewResourceServerClientCredentials(opServer.URL, clientID, clientSecret)
 	require.NoError(t, err, "new resource server")
 
 	t.Log("------- exchage refresh tokens (impersonation)  ------")
 
 	tokenExchangeResponse, err := tokenexchange.ExchangeToken(
-		CTX,
 		resourceServer,
-		tokens.RefreshToken,
+		refreshToken,
 		oidc.RefreshTokenType,
 		"",
 		"",
@@ -248,7 +119,7 @@ func testResourceServerTokenExchange(t *testing.T, wrapServer bool) {
 
 	t.Log("------ end session (logout) ------")
 
-	newLoc, err := rp.EndSession(CTX, provider, tokens.IDToken, "", "")
+	newLoc, err := rp.EndSession(provider, idToken, "", "")
 	require.NoError(t, err, "logout")
 	if newLoc != nil {
 		t.Logf("redirect to %s", newLoc)
@@ -259,9 +130,8 @@ func testResourceServerTokenExchange(t *testing.T, wrapServer bool) {
 	t.Log("------- attempt exchage again (should fail)  ------")
 
 	tokenExchangeResponse, err = tokenexchange.ExchangeToken(
-		CTX,
 		resourceServer,
-		tokens.RefreshToken,
+		refreshToken,
 		oidc.RefreshTokenType,
 		"",
 		"",
@@ -275,7 +145,7 @@ func testResourceServerTokenExchange(t *testing.T, wrapServer bool) {
 	require.Nil(t, tokenExchangeResponse, "token exchange response")
 }
 
-func RunAuthorizationCodeFlow(t *testing.T, opServer *httptest.Server, clientID, clientSecret string) (provider rp.RelyingParty, tokens *oidc.Tokens[*oidc.IDTokenClaims]) {
+func RunAuthorizationCodeFlow(t *testing.T, opServer *httptest.Server, clientID, clientSecret string) (provider rp.RelyingParty, accessToken, refreshToken, idToken string) {
 	targetURL := "http://local-site"
 	localURL, err := url.Parse(targetURL + "/login?requestID=1234")
 	require.NoError(t, err, "local url")
@@ -297,14 +167,12 @@ func RunAuthorizationCodeFlow(t *testing.T, opServer *httptest.Server, clientID,
 	key := []byte("test1234test1234")
 	cookieHandler := httphelper.NewCookieHandler(key, key, httphelper.WithUnsecure())
 	provider, err = rp.NewRelyingPartyOIDC(
-		CTX,
 		opServer.URL,
 		clientID,
 		clientSecret,
 		targetURL,
 		[]string{"openid", "email", "profile", "offline_access"},
 		rp.WithPKCE(cookieHandler),
-		rp.WithAuthStyle(oauth2.AuthStyleInHeader),
 		rp.WithVerifierOpts(
 			rp.WithIssuedAtOffset(5*time.Second),
 			rp.WithSupportedSigningAlgorithms("RS256", "RS384", "RS512", "ES256", "ES384", "ES512"),
@@ -373,8 +241,7 @@ func RunAuthorizationCodeFlow(t *testing.T, opServer *httptest.Server, clientID,
 	}
 
 	var email string
-	redirect := func(w http.ResponseWriter, r *http.Request, newTokens *oidc.Tokens[*oidc.IDTokenClaims], state string, rp rp.RelyingParty, info *oidc.UserInfo) {
-		tokens = newTokens
+	redirect := func(w http.ResponseWriter, r *http.Request, tokens *oidc.Tokens[*oidc.IDTokenClaims], state string, rp rp.RelyingParty, info *oidc.UserInfo) {
 		require.NotNil(t, tokens, "tokens")
 		require.NotNil(t, info, "info")
 		t.Log("access token", tokens.AccessToken)
@@ -382,6 +249,9 @@ func RunAuthorizationCodeFlow(t *testing.T, opServer *httptest.Server, clientID,
 		t.Log("id token", tokens.IDToken)
 		t.Log("email", info.Email)
 
+		accessToken = tokens.AccessToken
+		refreshToken = tokens.RefreshToken
+		idToken = tokens.IDToken
 		email = info.Email
 		http.Redirect(w, r, targetURL, 302)
 	}
@@ -403,37 +273,12 @@ func RunAuthorizationCodeFlow(t *testing.T, opServer *httptest.Server, clientID,
 	require.NoError(t, err, "get fully-authorizied redirect location")
 	require.Equal(t, targetURL, authorizedURL.String(), "fully-authorizied redirect location")
 
-	require.NotEmpty(t, tokens.IDToken, "id token")
-	assert.NotEmpty(t, tokens.RefreshToken, "refresh token")
-	assert.NotEmpty(t, tokens.AccessToken, "access token")
+	require.NotEmpty(t, idToken, "id token")
+	assert.NotEmpty(t, refreshToken, "refresh token")
+	assert.NotEmpty(t, accessToken, "access token")
 	assert.NotEmpty(t, email, "email")
 
-	return provider, tokens
-}
-
-func TestClientCredentials(t *testing.T) {
-	targetURL := "http://local-site"
-	exampleStorage := storage.NewStorage(storage.NewUserStore(targetURL))
-	var dh deferredHandler
-	opServer := httptest.NewServer(&dh)
-	defer opServer.Close()
-	t.Logf("auth server at %s", opServer.URL)
-	dh.Handler = exampleop.SetupServer(opServer.URL, exampleStorage, Logger, true)
-
-	provider, err := rp.NewRelyingPartyOIDC(
-		CTX,
-		opServer.URL,
-		"sid1",
-		"verysecret",
-		targetURL,
-		[]string{"openid"},
-	)
-	require.NoError(t, err, "new rp")
-
-	token, err := rp.ClientCredentials(CTX, provider, nil)
-	require.NoError(t, err, "ClientCredentials call")
-	require.NotNil(t, token)
-	assert.NotEmpty(t, token.AccessToken)
+	return provider, accessToken, refreshToken, idToken
 }
 
 func TestErrorFromPromptNone(t *testing.T) {
@@ -454,7 +299,7 @@ func TestErrorFromPromptNone(t *testing.T) {
 	opServer := httptest.NewServer(&dh)
 	defer opServer.Close()
 	t.Logf("auth server at %s", opServer.URL)
-	dh.Handler = exampleop.SetupServer(opServer.URL, exampleStorage, Logger, false, op.WithHttpInterceptors(
+	dh.Handler = exampleop.SetupServer(opServer.URL, exampleStorage, op.WithHttpInterceptors(
 		func(next http.Handler) http.Handler {
 			return http.HandlerFunc(func(w http.ResponseWriter, r *http.Request) {
 				t.Logf("request to %s", r.URL)
@@ -472,7 +317,6 @@ func TestErrorFromPromptNone(t *testing.T) {
 	key := []byte("test1234test1234")
 	cookieHandler := httphelper.NewCookieHandler(key, key, httphelper.WithUnsecure())
 	provider, err := rp.NewRelyingPartyOIDC(
-		CTX,
 		opServer.URL,
 		clientID,
 		clientSecret,
@@ -568,7 +412,7 @@ func getForm(t *testing.T, desc string, httpClient *http.Client, uri *url.URL) [
 
 func fillForm(t *testing.T, desc string, httpClient *http.Client, body []byte, uri *url.URL, opts ...gosubmit.Option) *url.URL {
 	// TODO: switch to io.NopCloser when go1.15 support is dropped
-	req := gosubmit.ParseWithURL(io.NopCloser(bytes.NewReader(body)), uri.String()).FirstForm().Testing(t).NewTestRequest(
+	req := gosubmit.ParseWithURL(ioutil.NopCloser(bytes.NewReader(body)), uri.String()).FirstForm().Testing(t).NewTestRequest(
 		append([]gosubmit.Option{gosubmit.AutoFill()}, opts...)...,
 	)
 	if req.URL.Scheme == "" {

pkg/client/jwt_profile.go

@@ -1,18 +1,17 @@
 package client
 
 import (
-	"context"
 	"net/url"
 
 	"golang.org/x/oauth2"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 // JWTProfileExchange handles the oauth2 jwt profile exchange
-func JWTProfileExchange(ctx context.Context, jwtProfileGrantRequest *oidc.JWTProfileGrantRequest, caller TokenEndpointCaller) (*oauth2.Token, error) {
-	return CallTokenEndpoint(ctx, jwtProfileGrantRequest, caller)
+func JWTProfileExchange(jwtProfileGrantRequest *oidc.JWTProfileGrantRequest, caller TokenEndpointCaller) (*oauth2.Token, error) {
+	return CallTokenEndpoint(jwtProfileGrantRequest, caller)
 }
 
 func ClientAssertionCodeOptions(assertion string) []oauth2.AuthCodeOption {

pkg/client/key.go

@@ -2,7 +2,7 @@ package client
 
 import (
 	"encoding/json"
-	"os"
+	"io/ioutil"
 )
 
 const (
@@ -10,7 +10,7 @@ const (
 	applicationKey    = "application"
 )
 
-type KeyFile struct {
+type keyFile struct {
 	Type   string `json:"type"` // serviceaccount or application
 	KeyID  string `json:"keyId"`
 	Key    string `json:"key"`
@@ -23,16 +23,16 @@ type KeyFile struct {
 	ClientID string `json:"clientId"`
 }
 
-func ConfigFromKeyFile(path string) (*KeyFile, error) {
-	data, err := os.ReadFile(path)
+func ConfigFromKeyFile(path string) (*keyFile, error) {
+	data, err := ioutil.ReadFile(path)
 	if err != nil {
 		return nil, err
 	}
 	return ConfigFromKeyFileData(data)
 }
 
-func ConfigFromKeyFileData(data []byte) (*KeyFile, error) {
-	var f KeyFile
+func ConfigFromKeyFileData(data []byte) (*keyFile, error) {
+	var f keyFile
 	if err := json.Unmarshal(data, &f); err != nil {
 		return nil, err
 	}

pkg/client/profile/jwt_profile.go

@@ -1,22 +1,16 @@
 package profile
 
 import (
-	"context"
 	"net/http"
 	"time"
 
-	jose "github.com/go-jose/go-jose/v4"
 	"golang.org/x/oauth2"
+	"gopkg.in/go-jose/go-jose.v2"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/client"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
-type TokenSource interface {
-	oauth2.TokenSource
-	TokenCtx(context.Context) (*oauth2.Token, error)
-}
-
 // jwtProfileTokenSource implement the oauth2.TokenSource
 // it will request a token using the OAuth2 JWT Profile Grant
 // therefore sending an `assertion` by signing a JWT with the provided private key
@@ -29,38 +23,23 @@ type jwtProfileTokenSource struct {
 	tokenEndpoint string
 }
 
-// NewJWTProfileTokenSourceFromKeyFile returns an implementation of TokenSource
-// It will request a token using the OAuth2 JWT Profile Grant,
-// therefore sending an `assertion` by singing a JWT with the provided private key from jsonFile.
-//
-// The passed context is only used for the call to the Discover endpoint.
-func NewJWTProfileTokenSourceFromKeyFile(ctx context.Context, issuer, jsonFile string, scopes []string, options ...func(source *jwtProfileTokenSource)) (TokenSource, error) {
-	keyData, err := client.ConfigFromKeyFile(jsonFile)
+func NewJWTProfileTokenSourceFromKeyFile(issuer, keyPath string, scopes []string, options ...func(source *jwtProfileTokenSource)) (oauth2.TokenSource, error) {
+	keyData, err := client.ConfigFromKeyFile(keyPath)
 	if err != nil {
 		return nil, err
 	}
-	return NewJWTProfileTokenSource(ctx, issuer, keyData.UserID, keyData.KeyID, []byte(keyData.Key), scopes, options...)
+	return NewJWTProfileTokenSource(issuer, keyData.UserID, keyData.KeyID, []byte(keyData.Key), scopes, options...)
 }
 
-// NewJWTProfileTokenSourceFromKeyFileData returns an implementation of oauth2.TokenSource
-// It will request a token using the OAuth2 JWT Profile Grant,
-// therefore sending an `assertion` by singing a JWT with the provided private key in jsonData.
-//
-// The passed context is only used for the call to the Discover endpoint.
-func NewJWTProfileTokenSourceFromKeyFileData(ctx context.Context, issuer string, jsonData []byte, scopes []string, options ...func(source *jwtProfileTokenSource)) (TokenSource, error) {
-	keyData, err := client.ConfigFromKeyFileData(jsonData)
+func NewJWTProfileTokenSourceFromKeyFileData(issuer string, data []byte, scopes []string, options ...func(source *jwtProfileTokenSource)) (oauth2.TokenSource, error) {
+	keyData, err := client.ConfigFromKeyFileData(data)
 	if err != nil {
 		return nil, err
 	}
-	return NewJWTProfileTokenSource(ctx, issuer, keyData.UserID, keyData.KeyID, []byte(keyData.Key), scopes, options...)
+	return NewJWTProfileTokenSource(issuer, keyData.UserID, keyData.KeyID, []byte(keyData.Key), scopes, options...)
 }
 
-// NewJWTProfileSource returns an implementation of oauth2.TokenSource
-// It will request a token using the OAuth2 JWT Profile Grant,
-// therefore sending an `assertion` by singing a JWT with the provided private key.
-//
-// The passed context is only used for the call to the Discover endpoint.
-func NewJWTProfileTokenSource(ctx context.Context, issuer, clientID, keyID string, key []byte, scopes []string, options ...func(source *jwtProfileTokenSource)) (TokenSource, error) {
+func NewJWTProfileTokenSource(issuer, clientID, keyID string, key []byte, scopes []string, options ...func(source *jwtProfileTokenSource)) (oauth2.TokenSource, error) {
 	signer, err := client.NewSignerFromPrivateKeyByte(key, keyID)
 	if err != nil {
 		return nil, err
@@ -76,7 +55,7 @@ func NewJWTProfileTokenSource(ctx context.Context, issuer, clientID, keyID strin
 		opt(source)
 	}
 	if source.tokenEndpoint == "" {
-		config, err := client.Discover(ctx, issuer, source.httpClient)
+		config, err := client.Discover(issuer, source.httpClient)
 		if err != nil {
 			return nil, err
 		}
@@ -85,13 +64,13 @@ func NewJWTProfileTokenSource(ctx context.Context, issuer, clientID, keyID strin
 	return source, nil
 }
 
-func WithHTTPClient(client *http.Client) func(source *jwtProfileTokenSource) {
+func WithHTTPClient(client *http.Client) func(*jwtProfileTokenSource) {
 	return func(source *jwtProfileTokenSource) {
 		source.httpClient = client
 	}
 }
 
-func WithStaticTokenEndpoint(issuer, tokenEndpoint string) func(source *jwtProfileTokenSource) {
+func WithStaticTokenEndpoint(issuer, tokenEndpoint string) func(*jwtProfileTokenSource) {
 	return func(source *jwtProfileTokenSource) {
 		source.tokenEndpoint = tokenEndpoint
 	}
@@ -106,13 +85,9 @@ func (j *jwtProfileTokenSource) HttpClient() *http.Client {
 }
 
 func (j *jwtProfileTokenSource) Token() (*oauth2.Token, error) {
-	return j.TokenCtx(context.Background())
-}
-
-func (j *jwtProfileTokenSource) TokenCtx(ctx context.Context) (*oauth2.Token, error) {
 	assertion, err := client.SignedJWTProfileAssertion(j.clientID, j.audience, time.Hour, j.signer)
 	if err != nil {
 		return nil, err
 	}
-	return client.JWTProfileExchange(ctx, oidc.NewJWTProfileGrantRequest(assertion, j.scopes...), j)
+	return client.JWTProfileExchange(oidc.NewJWTProfileGrantRequest(assertion, j.scopes...), j)
 }

pkg/client/rp/cli/cli.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"net/http"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client/rp"
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/client/rp"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 const (

pkg/client/rp/delegation.go

@@ -1,7 +1,7 @@
 package rp
 
 import (
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc/grants/tokenexchange"
+	"github.com/zitadel/oidc/v2/pkg/oidc/grants/tokenexchange"
 )
 
 // DelegationTokenRequest is an implementation of TokenExchangeRequest

pkg/client/rp/device.go

@@ -5,8 +5,8 @@ import (
 	"fmt"
 	"time"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/client"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 func newDeviceClientCredentialsRequest(scopes []string, rp RelyingParty) (*oidc.ClientCredentialsRequest, error) {
@@ -32,27 +32,19 @@ func newDeviceClientCredentialsRequest(scopes []string, rp RelyingParty) (*oidc.
 // DeviceAuthorization starts a new Device Authorization flow as defined
 // in RFC 8628, section 3.1 and 3.2:
 // https://www.rfc-editor.org/rfc/rfc8628#section-3.1
-func DeviceAuthorization(ctx context.Context, scopes []string, rp RelyingParty, authFn any) (*oidc.DeviceAuthorizationResponse, error) {
-	ctx, span := client.Tracer.Start(ctx, "DeviceAuthorization")
-	defer span.End()
-
-	ctx = logCtxWithRPData(ctx, rp, "function", "DeviceAuthorization")
+func DeviceAuthorization(scopes []string, rp RelyingParty) (*oidc.DeviceAuthorizationResponse, error) {
 	req, err := newDeviceClientCredentialsRequest(scopes, rp)
 	if err != nil {
 		return nil, err
 	}
 
-	return client.CallDeviceAuthorizationEndpoint(ctx, req, rp, authFn)
+	return client.CallDeviceAuthorizationEndpoint(req, rp)
 }
 
 // DeviceAccessToken attempts to obtain tokens from a Device Authorization,
 // by means of polling as defined in RFC, section 3.3 and 3.4:
 // https://www.rfc-editor.org/rfc/rfc8628#section-3.4
 func DeviceAccessToken(ctx context.Context, deviceCode string, interval time.Duration, rp RelyingParty) (resp *oidc.AccessTokenResponse, err error) {
-	ctx, span := client.Tracer.Start(ctx, "DeviceAccessToken")
-	defer span.End()
-
-	ctx = logCtxWithRPData(ctx, rp, "function", "DeviceAccessToken")
 	req := &client.DeviceAccessTokenRequest{
 		DeviceAccessTokenRequest: oidc.DeviceAccessTokenRequest{
 			GrantType:  oidc.GrantTypeDeviceCode,

pkg/client/rp/errors.go

@@ -1,5 +0,0 @@
-package rp
-
-import "errors"
-
-var ErrRelyingPartyNotSupportRevokeCaller = errors.New("RelyingParty does not support RevokeCaller")

pkg/client/rp/jwks.go

@@ -7,11 +7,10 @@ import (
 	"net/http"
 	"sync"
 
-	jose "github.com/go-jose/go-jose/v4"
+	"gopkg.in/go-jose/go-jose.v2"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client"
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 func NewRemoteKeySet(client *http.Client, jwksURL string, opts ...func(*remoteKeySet)) oidc.KeySet {
@@ -84,9 +83,6 @@ func (i *inflight) result() ([]jose.JSONWebKey, error) {
 }
 
 func (r *remoteKeySet) VerifySignature(ctx context.Context, jws *jose.JSONWebSignature) ([]byte, error) {
-	ctx, span := client.Tracer.Start(ctx, "VerifySignature")
-	defer span.End()
-
 	keyID, alg := oidc.GetKeyIDAndAlg(jws)
 	if alg == "" {
 		alg = r.defaultAlg
@@ -139,9 +135,6 @@ func (r *remoteKeySet) exactMatch(jwkID, jwsID string) bool {
 }
 
 func (r *remoteKeySet) verifySignatureRemote(ctx context.Context, jws *jose.JSONWebSignature, keyID, alg string) ([]byte, error) {
-	ctx, span := client.Tracer.Start(ctx, "verifySignatureRemote")
-	defer span.End()
-
 	keys, err := r.keysFromRemote(ctx)
 	if err != nil {
 		return nil, fmt.Errorf("unable to fetch key for signature validation: %w", err)
@@ -166,9 +159,6 @@ func (r *remoteKeySet) keysFromCache() (keys []jose.JSONWebKey) {
 // keysFromRemote syncs the key set from the remote set, records the values in the
 // cache, and returns the key set.
 func (r *remoteKeySet) keysFromRemote(ctx context.Context) ([]jose.JSONWebKey, error) {
-	ctx, span := client.Tracer.Start(ctx, "keysFromRemote")
-	defer span.End()
-
 	// Need to lock to inspect the inflight request field.
 	r.mu.Lock()
 	// If there's not a current inflight request, create one.
@@ -192,9 +182,6 @@ func (r *remoteKeySet) keysFromRemote(ctx context.Context) ([]jose.JSONWebKey, e
 }
 
 func (r *remoteKeySet) updateKeys(ctx context.Context) {
-	ctx, span := client.Tracer.Start(ctx, "updateKeys")
-	defer span.End()
-
 	// Sync keys and finish inflight when that's done.
 	keys, err := r.fetchRemoteKeys(ctx)
 
@@ -214,10 +201,7 @@ func (r *remoteKeySet) updateKeys(ctx context.Context) {
 }
 
 func (r *remoteKeySet) fetchRemoteKeys(ctx context.Context) ([]jose.JSONWebKey, error) {
-	ctx, span := client.Tracer.Start(ctx, "fetchRemoteKeys")
-	defer span.End()
-
-	req, err := http.NewRequestWithContext(ctx, "GET", r.jwksURL, nil)
+	req, err := http.NewRequest("GET", r.jwksURL, nil)
 	if err != nil {
 		return nil, fmt.Errorf("oidc: can't create request: %v", err)
 	}

pkg/client/rp/log.go

@@ -1,17 +0,0 @@
-package rp
-
-import (
-	"context"
-	"log/slog"
-
-	"github.com/zitadel/logging"
-)
-
-func logCtxWithRPData(ctx context.Context, rp RelyingParty, attrs ...any) context.Context {
-	logger, ok := rp.Logger(ctx)
-	if !ok {
-		return ctx
-	}
-	logger = logger.With(slog.Group("rp", attrs...))
-	return logging.ToContext(ctx, logger)
-}

pkg/client/rp/relying_party.go

@@ -4,20 +4,19 @@ import (
 	"context"
 	"encoding/base64"
 	"errors"
-	"log/slog"
+	"fmt"
 	"net/http"
 	"net/url"
+	"strings"
 	"time"
 
-	"github.com/go-jose/go-jose/v4"
 	"github.com/google/uuid"
 	"golang.org/x/oauth2"
-	"golang.org/x/oauth2/clientcredentials"
+	"gopkg.in/go-jose/go-jose.v2"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client"
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"github.com/zitadel/logging"
+	"github.com/zitadel/oidc/v2/pkg/client"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 const (
@@ -60,55 +59,38 @@ type RelyingParty interface {
 	// UserinfoEndpoint returns the userinfo
 	UserinfoEndpoint() string
 
-	// GetDeviceAuthorizationEndpoint returns the endpoint which can
+	// GetDeviceAuthorizationEndpoint returns the enpoint which can
 	// be used to start a DeviceAuthorization flow.
 	GetDeviceAuthorizationEndpoint() string
 
-	// IDTokenVerifier returns the verifier used for oidc id_token verification
-	IDTokenVerifier() *IDTokenVerifier
-
+	// IDTokenVerifier returns the verifier interface used for oidc id_token verification
+	IDTokenVerifier() IDTokenVerifier
 	// ErrorHandler returns the handler used for callback errors
+
 	ErrorHandler() func(http.ResponseWriter, *http.Request, string, string, string)
-
-	// Logger from the context, or a fallback if set.
-	Logger(context.Context) (logger *slog.Logger, ok bool)
-}
-
-type HasUnauthorizedHandler interface {
-	// UnauthorizedHandler returns the handler used for unauthorized errors
-	UnauthorizedHandler() func(w http.ResponseWriter, r *http.Request, desc string, state string)
 }
 
 type ErrorHandler func(w http.ResponseWriter, r *http.Request, errorType string, errorDesc string, state string)
-type UnauthorizedHandler func(w http.ResponseWriter, r *http.Request, desc string, state string)
 
 var DefaultErrorHandler ErrorHandler = func(w http.ResponseWriter, r *http.Request, errorType string, errorDesc string, state string) {
 	http.Error(w, errorType+": "+errorDesc, http.StatusInternalServerError)
 }
-var DefaultUnauthorizedHandler UnauthorizedHandler = func(w http.ResponseWriter, r *http.Request, desc string, state string) {
-	http.Error(w, desc, http.StatusUnauthorized)
-}
 
 type relyingParty struct {
-	issuer                      string
-	DiscoveryEndpoint           string
-	endpoints                   Endpoints
-	oauthConfig                 *oauth2.Config
-	oauth2Only                  bool
-	pkce                        bool
-	useSigningAlgsFromDiscovery bool
+	issuer            string
+	DiscoveryEndpoint string
+	endpoints         Endpoints
+	oauthConfig       *oauth2.Config
+	oauth2Only        bool
+	pkce              bool
 
 	httpClient    *http.Client
 	cookieHandler *httphelper.CookieHandler
 
-	oauthAuthStyle oauth2.AuthStyle
-
-	errorHandler        func(http.ResponseWriter, *http.Request, string, string, string)
-	unauthorizedHandler func(http.ResponseWriter, *http.Request, string, string)
-	idTokenVerifier     *IDTokenVerifier
-	verifierOpts        []VerifierOption
-	signer              jose.Signer
-	logger              *slog.Logger
+	errorHandler    func(http.ResponseWriter, *http.Request, string, string, string)
+	idTokenVerifier IDTokenVerifier
+	verifierOpts    []VerifierOption
+	signer          jose.Signer
 }
 
 func (rp *relyingParty) OAuthConfig() *oauth2.Config {
@@ -155,7 +137,7 @@ func (rp *relyingParty) GetRevokeEndpoint() string {
 	return rp.endpoints.RevokeURL
 }
 
-func (rp *relyingParty) IDTokenVerifier() *IDTokenVerifier {
+func (rp *relyingParty) IDTokenVerifier() IDTokenVerifier {
 	if rp.idTokenVerifier == nil {
 		rp.idTokenVerifier = NewIDTokenVerifier(rp.issuer, rp.oauthConfig.ClientID, NewRemoteKeySet(rp.httpClient, rp.endpoints.JKWsURL), rp.verifierOpts...)
 	}
@@ -169,31 +151,14 @@ func (rp *relyingParty) ErrorHandler() func(http.ResponseWriter, *http.Request,
 	return rp.errorHandler
 }
 
-func (rp *relyingParty) UnauthorizedHandler() func(http.ResponseWriter, *http.Request, string, string) {
-	if rp.unauthorizedHandler == nil {
-		rp.unauthorizedHandler = DefaultUnauthorizedHandler
-	}
-	return rp.unauthorizedHandler
-}
-
-func (rp *relyingParty) Logger(ctx context.Context) (logger *slog.Logger, ok bool) {
-	logger, ok = logging.FromContext(ctx)
-	if ok {
-		return logger, ok
-	}
-	return rp.logger, rp.logger != nil
-}
-
 // NewRelyingPartyOAuth creates an (OAuth2) RelyingParty with the given
 // OAuth2 Config and possible configOptions
 // it will use the AuthURL and TokenURL set in config
 func NewRelyingPartyOAuth(config *oauth2.Config, options ...Option) (RelyingParty, error) {
 	rp := &relyingParty{
-		oauthConfig:         config,
-		httpClient:          httphelper.DefaultHTTPClient,
-		oauth2Only:          true,
-		unauthorizedHandler: DefaultUnauthorizedHandler,
-		oauthAuthStyle:      oauth2.AuthStyleAutoDetect,
+		oauthConfig: config,
+		httpClient:  httphelper.DefaultHTTPClient,
+		oauth2Only:  true,
 	}
 
 	for _, optFunc := range options {
@@ -202,12 +167,9 @@ func NewRelyingPartyOAuth(config *oauth2.Config, options ...Option) (RelyingPart
 		}
 	}
 
-	rp.oauthConfig.Endpoint.AuthStyle = rp.oauthAuthStyle
-
 	// avoid races by calling these early
-	_ = rp.IDTokenVerifier()     // sets idTokenVerifier
-	_ = rp.ErrorHandler()        // sets errorHandler
-	_ = rp.UnauthorizedHandler() // sets unauthorizedHandler
+	_ = rp.IDTokenVerifier() // sets idTokenVerifier
+	_ = rp.ErrorHandler()    // sets errorHandler
 
 	return rp, nil
 }
@@ -215,7 +177,7 @@ func NewRelyingPartyOAuth(config *oauth2.Config, options ...Option) (RelyingPart
 // NewRelyingPartyOIDC creates an (OIDC) RelyingParty with the given
 // issuer, clientID, clientSecret, redirectURI, scopes and possible configOptions
 // it will run discovery on the provided issuer and use the found endpoints
-func NewRelyingPartyOIDC(ctx context.Context, issuer, clientID, clientSecret, redirectURI string, scopes []string, options ...Option) (RelyingParty, error) {
+func NewRelyingPartyOIDC(issuer, clientID, clientSecret, redirectURI string, scopes []string, options ...Option) (RelyingParty, error) {
 	rp := &relyingParty{
 		issuer: issuer,
 		oauthConfig: &oauth2.Config{
@@ -224,9 +186,8 @@ func NewRelyingPartyOIDC(ctx context.Context, issuer, clientID, clientSecret, re
 			RedirectURL:  redirectURI,
 			Scopes:       scopes,
 		},
-		httpClient:     httphelper.DefaultHTTPClient,
-		oauth2Only:     false,
-		oauthAuthStyle: oauth2.AuthStyleAutoDetect,
+		httpClient: httphelper.DefaultHTTPClient,
+		oauth2Only: false,
 	}
 
 	for _, optFunc := range options {
@@ -234,25 +195,17 @@ func NewRelyingPartyOIDC(ctx context.Context, issuer, clientID, clientSecret, re
 			return nil, err
 		}
 	}
-	ctx = logCtxWithRPData(ctx, rp, "function", "NewRelyingPartyOIDC")
-	discoveryConfiguration, err := client.Discover(ctx, rp.issuer, rp.httpClient, rp.DiscoveryEndpoint)
+	discoveryConfiguration, err := client.Discover(rp.issuer, rp.httpClient, rp.DiscoveryEndpoint)
 	if err != nil {
 		return nil, err
 	}
-	if rp.useSigningAlgsFromDiscovery {
-		rp.verifierOpts = append(rp.verifierOpts, WithSupportedSigningAlgorithms(discoveryConfiguration.IDTokenSigningAlgValuesSupported...))
-	}
 	endpoints := GetEndpoints(discoveryConfiguration)
 	rp.oauthConfig.Endpoint = endpoints.Endpoint
 	rp.endpoints = endpoints
 
-	rp.oauthConfig.Endpoint.AuthStyle = rp.oauthAuthStyle
-	rp.endpoints.Endpoint.AuthStyle = rp.oauthAuthStyle
-
 	// avoid races by calling these early
-	_ = rp.IDTokenVerifier()     // sets idTokenVerifier
-	_ = rp.ErrorHandler()        // sets errorHandler
-	_ = rp.UnauthorizedHandler() // sets unauthorizedHandler
+	_ = rp.IDTokenVerifier() // sets idTokenVerifier
+	_ = rp.ErrorHandler()    // sets errorHandler
 
 	return rp, nil
 }
@@ -301,20 +254,6 @@ func WithErrorHandler(errorHandler ErrorHandler) Option {
 	}
 }
 
-func WithUnauthorizedHandler(unauthorizedHandler UnauthorizedHandler) Option {
-	return func(rp *relyingParty) error {
-		rp.unauthorizedHandler = unauthorizedHandler
-		return nil
-	}
-}
-
-func WithAuthStyle(oauthAuthStyle oauth2.AuthStyle) Option {
-	return func(rp *relyingParty) error {
-		rp.oauthAuthStyle = oauthAuthStyle
-		return nil
-	}
-}
-
 func WithVerifierOpts(opts ...VerifierOption) Option {
 	return func(rp *relyingParty) error {
 		rp.verifierOpts = opts
@@ -343,24 +282,6 @@ func WithJWTProfile(signerFromKey SignerFromKey) Option {
 	}
 }
 
-// WithLogger sets a logger that is used
-// in case the request context does not contain a logger.
-func WithLogger(logger *slog.Logger) Option {
-	return func(rp *relyingParty) error {
-		rp.logger = logger
-		return nil
-	}
-}
-
-// WithSigningAlgsFromDiscovery appends the [WithSupportedSigningAlgorithms] option to the Verifier Options.
-// The algorithms returned in the `id_token_signing_alg_values_supported` from the discovery response will be set.
-func WithSigningAlgsFromDiscovery() Option {
-	return func(rp *relyingParty) error {
-		rp.useSigningAlgsFromDiscovery = true
-		return nil
-	}
-}
-
 type SignerFromKey func() (jose.Signer, error)
 
 func SignerFromKeyPath(path string) SignerFromKey {
@@ -389,6 +310,26 @@ func SignerFromKeyAndKeyID(key []byte, keyID string) SignerFromKey {
 	}
 }
 
+// Discover calls the discovery endpoint of the provided issuer and returns the found endpoints
+//
+// deprecated: use client.Discover
+func Discover(issuer string, httpClient *http.Client) (Endpoints, error) {
+	wellKnown := strings.TrimSuffix(issuer, "/") + oidc.DiscoveryEndpoint
+	req, err := http.NewRequest("GET", wellKnown, nil)
+	if err != nil {
+		return Endpoints{}, err
+	}
+	discoveryConfig := new(oidc.DiscoveryConfiguration)
+	err = httphelper.HttpRequest(httpClient, req, &discoveryConfig)
+	if err != nil {
+		return Endpoints{}, err
+	}
+	if discoveryConfig.Issuer != issuer {
+		return Endpoints{}, fmt.Errorf("%w: Expected: %s, got: %s", oidc.ErrIssuerInvalid, discoveryConfig.Issuer, issuer)
+	}
+	return GetEndpoints(discoveryConfig), nil
+}
+
 // AuthURL returns the auth request url
 // (wrapping the oauth2 `AuthCodeURL`)
 func AuthURL(state string, rp RelyingParty, opts ...AuthURLOpt) string {
@@ -401,7 +342,7 @@ func AuthURL(state string, rp RelyingParty, opts ...AuthURLOpt) string {
 
 // AuthURLHandler extends the `AuthURL` method with a http redirect handler
 // including handling setting cookie for secure `state` transfer.
-// Custom parameters can optionally be set to the redirect URL.
+// Custom paramaters can optionally be set to the redirect URL.
 func AuthURLHandler(stateFn func() string, rp RelyingParty, urlParam ...URLParamOpt) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
 		opts := make([]AuthURLOpt, len(urlParam))
@@ -411,13 +352,13 @@ func AuthURLHandler(stateFn func() string, rp RelyingParty, urlParam ...URLParam
 
 		state := stateFn()
 		if err := trySetStateCookie(w, state, rp); err != nil {
-			unauthorizedError(w, r, "failed to create state cookie: "+err.Error(), state, rp)
+			http.Error(w, "failed to create state cookie: "+err.Error(), http.StatusUnauthorized)
 			return
 		}
 		if rp.IsPKCE() {
 			codeChallenge, err := GenerateAndStoreCodeChallenge(w, rp)
 			if err != nil {
-				unauthorizedError(w, r, "failed to create code challenge: "+err.Error(), state, rp)
+				http.Error(w, "failed to create code challenge: "+err.Error(), http.StatusUnauthorized)
 				return
 			}
 			opts = append(opts, WithCodeChallenge(codeChallenge))
@@ -436,73 +377,35 @@ func GenerateAndStoreCodeChallenge(w http.ResponseWriter, rp RelyingParty) (stri
 	return oidc.NewSHACodeChallenge(codeVerifier), nil
 }
 
-// ErrMissingIDToken is returned when an id_token was expected,
-// but not received in the token response.
-var ErrMissingIDToken = errors.New("id_token missing")
-
-func verifyTokenResponse[C oidc.IDClaims](ctx context.Context, token *oauth2.Token, rp RelyingParty) (*oidc.Tokens[C], error) {
-	ctx, span := client.Tracer.Start(ctx, "verifyTokenResponse")
-	defer span.End()
-
-	if rp.IsOAuth2Only() {
-		return &oidc.Tokens[C]{Token: token}, nil
-	}
-	idTokenString, ok := token.Extra(idTokenKey).(string)
-	if !ok {
-		return &oidc.Tokens[C]{Token: token}, ErrMissingIDToken
-	}
-	idToken, err := VerifyTokens[C](ctx, token.AccessToken, idTokenString, rp.IDTokenVerifier())
-	if err != nil {
-		return nil, err
-	}
-	return &oidc.Tokens[C]{Token: token, IDTokenClaims: idToken, IDToken: idTokenString}, nil
-}
-
 // CodeExchange handles the oauth2 code exchange, extracting and validating the id_token
 // returning it parsed together with the oauth2 tokens (access, refresh)
 func CodeExchange[C oidc.IDClaims](ctx context.Context, code string, rp RelyingParty, opts ...CodeExchangeOpt) (tokens *oidc.Tokens[C], err error) {
-	ctx, codeExchangeSpan := client.Tracer.Start(ctx, "CodeExchange")
-	defer codeExchangeSpan.End()
-
-	ctx = logCtxWithRPData(ctx, rp, "function", "CodeExchange")
 	ctx = context.WithValue(ctx, oauth2.HTTPClient, rp.HttpClient())
 	codeOpts := make([]oauth2.AuthCodeOption, 0)
 	for _, opt := range opts {
 		codeOpts = append(codeOpts, opt()...)
 	}
 
-	ctx, oauthExchangeSpan := client.Tracer.Start(ctx, "OAuthExchange")
 	token, err := rp.OAuthConfig().Exchange(ctx, code, codeOpts...)
 	if err != nil {
 		return nil, err
 	}
-	oauthExchangeSpan.End()
-	return verifyTokenResponse[C](ctx, token, rp)
-}
 
-// ClientCredentials requests an access token using the `client_credentials` grant,
-// as defined in [RFC 6749, section 4.4].
-//
-// As there is no user associated to the request an ID Token can never be returned.
-// Client Credentials are undefined in OpenID Connect and is a pure OAuth2 grant.
-// Furthermore the server SHOULD NOT return a refresh token.
-//
-// [RFC 6749, section 4.4]: https://datatracker.ietf.org/doc/html/rfc6749#section-4.4
-func ClientCredentials(ctx context.Context, rp RelyingParty, endpointParams url.Values) (token *oauth2.Token, err error) {
-	ctx = logCtxWithRPData(ctx, rp, "function", "ClientCredentials")
-	ctx, span := client.Tracer.Start(ctx, "ClientCredentials")
-	defer span.End()
-
-	ctx = context.WithValue(ctx, oauth2.HTTPClient, rp.HttpClient())
-	config := clientcredentials.Config{
-		ClientID:       rp.OAuthConfig().ClientID,
-		ClientSecret:   rp.OAuthConfig().ClientSecret,
-		TokenURL:       rp.OAuthConfig().Endpoint.TokenURL,
-		Scopes:         rp.OAuthConfig().Scopes,
-		EndpointParams: endpointParams,
-		AuthStyle:      rp.OAuthConfig().Endpoint.AuthStyle,
+	if rp.IsOAuth2Only() {
+		return &oidc.Tokens[C]{Token: token}, nil
 	}
-	return config.Token(ctx)
+
+	idTokenString, ok := token.Extra(idTokenKey).(string)
+	if !ok {
+		return nil, errors.New("id_token missing")
+	}
+
+	idToken, err := VerifyTokens[C](ctx, token.AccessToken, idTokenString, rp.IDTokenVerifier())
+	if err != nil {
+		return nil, err
+	}
+
+	return &oidc.Tokens[C]{Token: token, IDTokenClaims: idToken, IDToken: idTokenString}, nil
 }
 
 type CodeExchangeCallback[C oidc.IDClaims] func(w http.ResponseWriter, r *http.Request, tokens *oidc.Tokens[C], state string, rp RelyingParty)
@@ -510,20 +413,17 @@ type CodeExchangeCallback[C oidc.IDClaims] func(w http.ResponseWriter, r *http.R
 // CodeExchangeHandler extends the `CodeExchange` method with a http handler
 // including cookie handling for secure `state` transfer
 // and optional PKCE code verifier checking.
-// Custom parameters can optionally be set to the token URL.
+// Custom paramaters can optionally be set to the token URL.
 func CodeExchangeHandler[C oidc.IDClaims](callback CodeExchangeCallback[C], rp RelyingParty, urlParam ...URLParamOpt) http.HandlerFunc {
 	return func(w http.ResponseWriter, r *http.Request) {
-		ctx, span := client.Tracer.Start(r.Context(), "CodeExchangeHandler")
-		r = r.WithContext(ctx)
-		defer span.End()
-
 		state, err := tryReadStateCookie(w, r, rp)
 		if err != nil {
-			unauthorizedError(w, r, "failed to get state: "+err.Error(), state, rp)
+			http.Error(w, "failed to get state: "+err.Error(), http.StatusUnauthorized)
 			return
 		}
-		if errValue := r.FormValue("error"); errValue != "" {
-			rp.ErrorHandler()(w, r, errValue, r.FormValue("error_description"), state)
+		params := r.URL.Query()
+		if params.Get("error") != "" {
+			rp.ErrorHandler()(w, r, params.Get("error"), params.Get("error_description"), state)
 			return
 		}
 		codeOpts := make([]CodeExchangeOpt, len(urlParam))
@@ -534,75 +434,58 @@ func CodeExchangeHandler[C oidc.IDClaims](callback CodeExchangeCallback[C], rp R
 		if rp.IsPKCE() {
 			codeVerifier, err := rp.CookieHandler().CheckCookie(r, pkceCode)
 			if err != nil {
-				unauthorizedError(w, r, "failed to get code verifier: "+err.Error(), state, rp)
+				http.Error(w, "failed to get code verifier: "+err.Error(), http.StatusUnauthorized)
 				return
 			}
 			codeOpts = append(codeOpts, WithCodeVerifier(codeVerifier))
 			rp.CookieHandler().DeleteCookie(w, pkceCode)
 		}
 		if rp.Signer() != nil {
-			assertion, err := client.SignedJWTProfileAssertion(rp.OAuthConfig().ClientID, []string{rp.Issuer(), rp.OAuthConfig().Endpoint.TokenURL}, time.Hour, rp.Signer())
+			assertion, err := client.SignedJWTProfileAssertion(rp.OAuthConfig().ClientID, []string{rp.Issuer()}, time.Hour, rp.Signer())
 			if err != nil {
-				unauthorizedError(w, r, "failed to build assertion: "+err.Error(), state, rp)
+				http.Error(w, "failed to build assertion: "+err.Error(), http.StatusUnauthorized)
 				return
 			}
 			codeOpts = append(codeOpts, WithClientAssertionJWT(assertion))
 		}
-		tokens, err := CodeExchange[C](r.Context(), r.FormValue("code"), rp, codeOpts...)
+		tokens, err := CodeExchange[C](r.Context(), params.Get("code"), rp, codeOpts...)
 		if err != nil {
-			unauthorizedError(w, r, "failed to exchange token: "+err.Error(), state, rp)
+			http.Error(w, "failed to exchange token: "+err.Error(), http.StatusUnauthorized)
 			return
 		}
 		callback(w, r, tokens, state, rp)
 	}
 }
 
-type SubjectGetter interface {
-	GetSubject() string
-}
-
-type CodeExchangeUserinfoCallback[C oidc.IDClaims, U SubjectGetter] func(w http.ResponseWriter, r *http.Request, tokens *oidc.Tokens[C], state string, provider RelyingParty, info U)
+type CodeExchangeUserinfoCallback[C oidc.IDClaims] func(w http.ResponseWriter, r *http.Request, tokens *oidc.Tokens[C], state string, provider RelyingParty, info *oidc.UserInfo)
 
 // UserinfoCallback wraps the callback function of the CodeExchangeHandler
 // and calls the userinfo endpoint with the access token
 // on success it will pass the userinfo into its callback function as well
-func UserinfoCallback[C oidc.IDClaims, U SubjectGetter](f CodeExchangeUserinfoCallback[C, U]) CodeExchangeCallback[C] {
+func UserinfoCallback[C oidc.IDClaims](f CodeExchangeUserinfoCallback[C]) CodeExchangeCallback[C] {
 	return func(w http.ResponseWriter, r *http.Request, tokens *oidc.Tokens[C], state string, rp RelyingParty) {
-		ctx, span := client.Tracer.Start(r.Context(), "UserinfoCallback")
-		r = r.WithContext(ctx)
-		defer span.End()
-
-		info, err := Userinfo[U](r.Context(), tokens.AccessToken, tokens.TokenType, tokens.IDTokenClaims.GetSubject(), rp)
+		info, err := Userinfo(tokens.AccessToken, tokens.TokenType, tokens.IDTokenClaims.GetSubject(), rp)
 		if err != nil {
-			unauthorizedError(w, r, "userinfo failed: "+err.Error(), state, rp)
+			http.Error(w, "userinfo failed: "+err.Error(), http.StatusUnauthorized)
 			return
 		}
 		f(w, r, tokens, state, rp, info)
 	}
 }
 
-// Userinfo will call the OIDC [UserInfo] Endpoint with the provided token and returns
-// the response in an instance of type U.
-// [*oidc.UserInfo] can be used as a good example, or use a custom type if type-safe
-// access to custom claims is needed.
-//
-// [UserInfo]: https://openid.net/specs/openid-connect-core-1_0.html#UserInfo
-func Userinfo[U SubjectGetter](ctx context.Context, token, tokenType, subject string, rp RelyingParty) (userinfo U, err error) {
-	var nilU U
-	ctx = logCtxWithRPData(ctx, rp, "function", "Userinfo")
-	ctx, span := client.Tracer.Start(ctx, "Userinfo")
-	defer span.End()
-
-	req, err := http.NewRequestWithContext(ctx, http.MethodGet, rp.UserinfoEndpoint(), nil)
+// Userinfo will call the OIDC Userinfo Endpoint with the provided token
+func Userinfo(token, tokenType, subject string, rp RelyingParty) (*oidc.UserInfo, error) {
+	req, err := http.NewRequest("GET", rp.UserinfoEndpoint(), nil)
 	if err != nil {
-		return nilU, err
+		return nil, err
 	}
 	req.Header.Set("authorization", tokenType+" "+token)
+	userinfo := new(oidc.UserInfo)
 	if err := httphelper.HttpRequest(rp.HttpClient(), req, &userinfo); err != nil {
-		return nilU, err
+		return nil, err
 	}
-	if userinfo.GetSubject() != subject {
-		return nilU, ErrUserInfoSubNotMatching
+	if userinfo.Subject != subject {
+		return nil, ErrUserInfoSubNotMatching
 	}
 	return userinfo, nil
 }
@@ -643,8 +526,9 @@ type Endpoints struct {
 func GetEndpoints(discoveryConfig *oidc.DiscoveryConfiguration) Endpoints {
 	return Endpoints{
 		Endpoint: oauth2.Endpoint{
-			AuthURL:  discoveryConfig.AuthorizationEndpoint,
-			TokenURL: discoveryConfig.TokenEndpoint,
+			AuthURL:   discoveryConfig.AuthorizationEndpoint,
+			AuthStyle: oauth2.AuthStyleAutoDetect,
+			TokenURL:  discoveryConfig.TokenEndpoint,
 		},
 		IntrospectURL:          discoveryConfig.IntrospectionEndpoint,
 		UserinfoURL:            discoveryConfig.UserinfoEndpoint,
@@ -655,7 +539,7 @@ func GetEndpoints(discoveryConfig *oidc.DiscoveryConfiguration) Endpoints {
 	}
 }
 
-// withURLParam sets custom url parameters.
+// withURLParam sets custom url paramaters.
 // This is the generalized, unexported, function used by both
 // URLParamOpt and AuthURLOpt.
 func withURLParam(key, value string) func() []oauth2.AuthCodeOption {
@@ -670,7 +554,7 @@ func withURLParam(key, value string) func() []oauth2.AuthCodeOption {
 // This is the generalized, unexported, function used by both
 // URLParamOpt and AuthURLOpt.
 func withPrompt(prompt ...string) func() []oauth2.AuthCodeOption {
-	return withURLParam("prompt", oidc.SpaceDelimitedArray(prompt).String())
+	return withURLParam("prompt", oidc.SpaceDelimitedArray(prompt).Encode())
 }
 
 type URLParamOpt func() []oauth2.AuthCodeOption
@@ -734,26 +618,19 @@ func (t tokenEndpointCaller) TokenEndpoint() string {
 
 type RefreshTokenRequest struct {
 	RefreshToken        string                   `schema:"refresh_token"`
-	Scopes              oidc.SpaceDelimitedArray `schema:"scope,omitempty"`
-	ClientID            string                   `schema:"client_id,omitempty"`
-	ClientSecret        string                   `schema:"client_secret,omitempty"`
-	ClientAssertion     string                   `schema:"client_assertion,omitempty"`
-	ClientAssertionType string                   `schema:"client_assertion_type,omitempty"`
+	Scopes              oidc.SpaceDelimitedArray `schema:"scope"`
+	ClientID            string                   `schema:"client_id"`
+	ClientSecret        string                   `schema:"client_secret"`
+	ClientAssertion     string                   `schema:"client_assertion"`
+	ClientAssertionType string                   `schema:"client_assertion_type"`
 	GrantType           oidc.GrantType           `schema:"grant_type"`
 }
 
-// RefreshTokens performs a token refresh. If it doesn't error, it will always
+// RefreshAccessToken performs a token refresh. If it doesn't error, it will always
 // provide a new AccessToken. It may provide a new RefreshToken, and if it does, then
-// the old one should be considered invalid.
-//
-// In case the RP is not OAuth2 only and an IDToken was part of the response,
-// the IDToken and AccessToken will be verified
-// and the IDToken and IDTokenClaims fields will be populated in the returned object.
-func RefreshTokens[C oidc.IDClaims](ctx context.Context, rp RelyingParty, refreshToken, clientAssertion, clientAssertionType string) (*oidc.Tokens[C], error) {
-	ctx, span := client.Tracer.Start(ctx, "RefreshTokens")
-	defer span.End()
-
-	ctx = logCtxWithRPData(ctx, rp, "function", "RefreshTokens")
+// the old one should be considered invalid. It may also provide a new IDToken. The
+// new IDToken can be retrieved with token.Extra("id_token").
+func RefreshAccessToken(rp RelyingParty, refreshToken, clientAssertion, clientAssertionType string) (*oauth2.Token, error) {
 	request := RefreshTokenRequest{
 		RefreshToken:        refreshToken,
 		Scopes:              rp.OAuthConfig().Scopes,
@@ -763,31 +640,17 @@ func RefreshTokens[C oidc.IDClaims](ctx context.Context, rp RelyingParty, refres
 		ClientAssertionType: clientAssertionType,
 		GrantType:           oidc.GrantTypeRefreshToken,
 	}
-	newToken, err := client.CallTokenEndpoint(ctx, request, tokenEndpointCaller{RelyingParty: rp})
-	if err != nil {
-		return nil, err
-	}
-	tokens, err := verifyTokenResponse[C](ctx, newToken, rp)
-	if err == nil || errors.Is(err, ErrMissingIDToken) {
-		// https://openid.net/specs/openid-connect-core-1_0.html#RefreshTokenResponse
-		// ...except that it might not contain an id_token.
-		return tokens, nil
-	}
-	return nil, err
+	return client.CallTokenEndpoint(request, tokenEndpointCaller{RelyingParty: rp})
 }
 
-func EndSession(ctx context.Context, rp RelyingParty, idToken, optionalRedirectURI, optionalState string) (*url.URL, error) {
-	ctx = logCtxWithRPData(ctx, rp, "function", "EndSession")
-	ctx, span := client.Tracer.Start(ctx, "RefreshTokens")
-	defer span.End()
-
+func EndSession(rp RelyingParty, idToken, optionalRedirectURI, optionalState string) (*url.URL, error) {
 	request := oidc.EndSessionRequest{
 		IdTokenHint:           idToken,
 		ClientID:              rp.OAuthConfig().ClientID,
 		PostLogoutRedirectURI: optionalRedirectURI,
 		State:                 optionalState,
 	}
-	return client.CallEndSessionEndpoint(ctx, request, nil, rp)
+	return client.CallEndSessionEndpoint(request, nil, rp)
 }
 
 // RevokeToken requires a RelyingParty that is also a client.RevokeCaller.  The RelyingParty
@@ -795,10 +658,7 @@ func EndSession(ctx context.Context, rp RelyingParty, idToken, optionalRedirectU
 // NewRelyingPartyOAuth() does not.
 //
 // tokenTypeHint should be either "id_token" or "refresh_token".
-func RevokeToken(ctx context.Context, rp RelyingParty, token string, tokenTypeHint string) error {
-	ctx = logCtxWithRPData(ctx, rp, "function", "RevokeToken")
-	ctx, span := client.Tracer.Start(ctx, "RefreshTokens")
-	defer span.End()
+func RevokeToken(rp RelyingParty, token string, tokenTypeHint string) error {
 	request := client.RevokeRequest{
 		Token:         token,
 		TokenTypeHint: tokenTypeHint,
@@ -806,15 +666,7 @@ func RevokeToken(ctx context.Context, rp RelyingParty, token string, tokenTypeHi
 		ClientSecret:  rp.OAuthConfig().ClientSecret,
 	}
 	if rc, ok := rp.(client.RevokeCaller); ok && rc.GetRevokeEndpoint() != "" {
-		return client.CallRevokeEndpoint(ctx, request, nil, rc)
+		return client.CallRevokeEndpoint(request, nil, rc)
 	}
-	return ErrRelyingPartyNotSupportRevokeCaller
-}
-
-func unauthorizedError(w http.ResponseWriter, r *http.Request, desc string, state string, rp RelyingParty) {
-	if rp, ok := rp.(HasUnauthorizedHandler); ok {
-		rp.UnauthorizedHandler()(w, r, desc, state)
-		return
-	}
-	http.Error(w, desc, http.StatusUnauthorized)
+	return fmt.Errorf("RelyingParty does not support RevokeCaller")
 }

pkg/client/rp/relying_party_test.go

@@ -1,107 +0,0 @@
-package rp
-
-import (
-	"context"
-	"testing"
-	"time"
-
-	tu "git.christmann.info/LARA/zitadel-oidc/v3/internal/testutil"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-	"golang.org/x/oauth2"
-)
-
-func Test_verifyTokenResponse(t *testing.T) {
-	verifier := &IDTokenVerifier{
-		Issuer:            tu.ValidIssuer,
-		MaxAgeIAT:         2 * time.Minute,
-		ClientID:          tu.ValidClientID,
-		Offset:            time.Second,
-		SupportedSignAlgs: []string{string(tu.SignatureAlgorithm)},
-		KeySet:            tu.KeySet{},
-		MaxAge:            2 * time.Minute,
-		ACR:               tu.ACRVerify,
-		Nonce:             func(context.Context) string { return tu.ValidNonce },
-	}
-	tests := []struct {
-		name       string
-		oauth2Only bool
-		tokens     func() (token *oauth2.Token, want *oidc.Tokens[*oidc.IDTokenClaims])
-		wantErr    error
-	}{
-		{
-			name:       "succes, oauth2 only",
-			oauth2Only: true,
-			tokens: func() (*oauth2.Token, *oidc.Tokens[*oidc.IDTokenClaims]) {
-				accesToken, _ := tu.ValidAccessToken()
-				token := &oauth2.Token{
-					AccessToken: accesToken,
-				}
-				return token, &oidc.Tokens[*oidc.IDTokenClaims]{
-					Token: token,
-				}
-			},
-		},
-		{
-			name:       "id_token missing error",
-			oauth2Only: false,
-			tokens: func() (*oauth2.Token, *oidc.Tokens[*oidc.IDTokenClaims]) {
-				accesToken, _ := tu.ValidAccessToken()
-				token := &oauth2.Token{
-					AccessToken: accesToken,
-				}
-				return token, &oidc.Tokens[*oidc.IDTokenClaims]{
-					Token: token,
-				}
-			},
-			wantErr: ErrMissingIDToken,
-		},
-		{
-			name:       "verify tokens error",
-			oauth2Only: false,
-			tokens: func() (*oauth2.Token, *oidc.Tokens[*oidc.IDTokenClaims]) {
-				accesToken, _ := tu.ValidAccessToken()
-				token := &oauth2.Token{
-					AccessToken: accesToken,
-				}
-				token = token.WithExtra(map[string]any{
-					"id_token": "foobar",
-				})
-				return token, nil
-			},
-			wantErr: oidc.ErrParse,
-		},
-		{
-			name:       "success, with id_token",
-			oauth2Only: false,
-			tokens: func() (*oauth2.Token, *oidc.Tokens[*oidc.IDTokenClaims]) {
-				accesToken, _ := tu.ValidAccessToken()
-				token := &oauth2.Token{
-					AccessToken: accesToken,
-				}
-				idToken, claims := tu.ValidIDToken()
-				token = token.WithExtra(map[string]any{
-					"id_token": idToken,
-				})
-				return token, &oidc.Tokens[*oidc.IDTokenClaims]{
-					Token:         token,
-					IDTokenClaims: claims,
-					IDToken:       idToken,
-				}
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			rp := &relyingParty{
-				oauth2Only:      tt.oauth2Only,
-				idTokenVerifier: verifier,
-			}
-			token, want := tt.tokens()
-			got, err := verifyTokenResponse[*oidc.IDTokenClaims](context.Background(), token, rp)
-			require.ErrorIs(t, err, tt.wantErr)
-			assert.Equal(t, want, got)
-		})
-	}
-}

pkg/client/rp/tockenexchange.go

@@ -5,7 +5,7 @@ import (
 
 	"golang.org/x/oauth2"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc/grants/tokenexchange"
+	"github.com/zitadel/oidc/v2/pkg/oidc/grants/tokenexchange"
 )
 
 // TokenExchangeRP extends the `RelyingParty` interface for the *draft* oauth2 `Token Exchange`

pkg/client/rp/userinfo_example_test.go

@@ -1,45 +0,0 @@
-package rp_test
-
-import (
-	"context"
-	"fmt"
-
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client/rp"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-)
-
-type UserInfo struct {
-	Subject string `json:"sub,omitempty"`
-	oidc.UserInfoProfile
-	oidc.UserInfoEmail
-	oidc.UserInfoPhone
-	Address *oidc.UserInfoAddress `json:"address,omitempty"`
-
-	// Foo and Bar are custom claims
-	Foo string `json:"foo,omitempty"`
-	Bar struct {
-		Val1 string `json:"val_1,omitempty"`
-		Val2 string `json:"val_2,omitempty"`
-	} `json:"bar,omitempty"`
-
-	// Claims are all the combined claims, including custom.
-	Claims map[string]any `json:"-,omitempty"`
-}
-
-func (u *UserInfo) GetSubject() string {
-	return u.Subject
-}
-
-func ExampleUserinfo_custom() {
-	rpo, err := rp.NewRelyingPartyOIDC(context.TODO(), "http://localhost:8080", "clientid", "clientsecret", "http://example.com/redirect", []string{oidc.ScopeOpenID, oidc.ScopeProfile, oidc.ScopeEmail, oidc.ScopePhone})
-	if err != nil {
-		panic(err)
-	}
-
-	info, err := rp.Userinfo[*UserInfo](context.TODO(), "accesstokenstring", "Bearer", "userid", rpo)
-	if err != nil {
-		panic(err)
-	}
-
-	fmt.Println(info)
-}

pkg/client/rp/verifier.go

@@ -4,18 +4,24 @@ import (
 	"context"
 	"time"
 
-	jose "github.com/go-jose/go-jose/v4"
+	"gopkg.in/go-jose/go-jose.v2"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
+type IDTokenVerifier interface {
+	oidc.Verifier
+	ClientID() string
+	SupportedSignAlgs() []string
+	KeySet() oidc.KeySet
+	Nonce(context.Context) string
+	ACR() oidc.ACRVerifier
+	MaxAge() time.Duration
+}
+
 // VerifyTokens implement the Token Response Validation as defined in OIDC specification
 // https://openid.net/specs/openid-connect-core-1_0.html#TokenResponseValidation
-func VerifyTokens[C oidc.IDClaims](ctx context.Context, accessToken, idToken string, v *IDTokenVerifier) (claims C, err error) {
-	ctx, span := client.Tracer.Start(ctx, "VerifyTokens")
-	defer span.End()
-
+func VerifyTokens[C oidc.IDClaims](ctx context.Context, accessToken, idToken string, v IDTokenVerifier) (claims C, err error) {
 	var nilClaims C
 
 	claims, err = VerifyIDToken[C](ctx, idToken, v)
@@ -30,10 +36,7 @@ func VerifyTokens[C oidc.IDClaims](ctx context.Context, accessToken, idToken str
 
 // VerifyIDToken validates the id token according to
 // https://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation
-func VerifyIDToken[C oidc.Claims](ctx context.Context, token string, v *IDTokenVerifier) (claims C, err error) {
-	ctx, span := client.Tracer.Start(ctx, "VerifyIDToken")
-	defer span.End()
-
+func VerifyIDToken[C oidc.Claims](ctx context.Context, token string, v IDTokenVerifier) (claims C, err error) {
 	var nilClaims C
 
 	decrypted, err := oidc.DecryptToken(token)
@@ -49,48 +52,44 @@ func VerifyIDToken[C oidc.Claims](ctx context.Context, token string, v *IDTokenV
 		return nilClaims, err
 	}
 
-	if err = oidc.CheckIssuer(claims, v.Issuer); err != nil {
+	if err = oidc.CheckIssuer(claims, v.Issuer()); err != nil {
 		return nilClaims, err
 	}
 
-	if err = oidc.CheckAudience(claims, v.ClientID); err != nil {
+	if err = oidc.CheckAudience(claims, v.ClientID()); err != nil {
 		return nilClaims, err
 	}
 
-	if err = oidc.CheckAuthorizedParty(claims, v.ClientID); err != nil {
+	if err = oidc.CheckAuthorizedParty(claims, v.ClientID()); err != nil {
 		return nilClaims, err
 	}
 
-	if err = oidc.CheckSignature(ctx, decrypted, payload, claims, v.SupportedSignAlgs, v.KeySet); err != nil {
+	if err = oidc.CheckSignature(ctx, decrypted, payload, claims, v.SupportedSignAlgs(), v.KeySet()); err != nil {
 		return nilClaims, err
 	}
 
-	if err = oidc.CheckExpiration(claims, v.Offset); err != nil {
+	if err = oidc.CheckExpiration(claims, v.Offset()); err != nil {
 		return nilClaims, err
 	}
 
-	if err = oidc.CheckIssuedAt(claims, v.MaxAgeIAT, v.Offset); err != nil {
+	if err = oidc.CheckIssuedAt(claims, v.MaxAgeIAT(), v.Offset()); err != nil {
 		return nilClaims, err
 	}
 
-	if v.Nonce != nil {
-		if err = oidc.CheckNonce(claims, v.Nonce(ctx)); err != nil {
-			return nilClaims, err
-		}
-	}
-
-	if err = oidc.CheckAuthorizationContextClassReference(claims, v.ACR); err != nil {
+	if err = oidc.CheckNonce(claims, v.Nonce(ctx)); err != nil {
 		return nilClaims, err
 	}
 
-	if err = oidc.CheckAuthTime(claims, v.MaxAge); err != nil {
+	if err = oidc.CheckAuthorizationContextClassReference(claims, v.ACR()); err != nil {
+		return nilClaims, err
+	}
+
+	if err = oidc.CheckAuthTime(claims, v.MaxAge()); err != nil {
 		return nilClaims, err
 	}
 	return claims, nil
 }
 
-type IDTokenVerifier oidc.Verifier
-
 // VerifyAccessToken validates the access token according to
 // https://openid.net/specs/openid-connect-core-1_0.html#CodeFlowTokenValidation
 func VerifyAccessToken(accessToken, atHash string, sigAlgorithm jose.SignatureAlgorithm) error {
@@ -108,14 +107,15 @@ func VerifyAccessToken(accessToken, atHash string, sigAlgorithm jose.SignatureAl
 	return nil
 }
 
-// NewIDTokenVerifier returns a oidc.Verifier suitable for ID token verification.
-func NewIDTokenVerifier(issuer, clientID string, keySet oidc.KeySet, options ...VerifierOption) *IDTokenVerifier {
-	v := &IDTokenVerifier{
-		Issuer:   issuer,
-		ClientID: clientID,
-		KeySet:   keySet,
-		Offset:   time.Second,
-		Nonce: func(_ context.Context) string {
+// NewIDTokenVerifier returns an implementation of `IDTokenVerifier`
+// for `VerifyTokens` and `VerifyIDToken`
+func NewIDTokenVerifier(issuer, clientID string, keySet oidc.KeySet, options ...VerifierOption) IDTokenVerifier {
+	v := &idTokenVerifier{
+		issuer:   issuer,
+		clientID: clientID,
+		keySet:   keySet,
+		offset:   time.Second,
+		nonce: func(_ context.Context) string {
 			return ""
 		},
 	}
@@ -128,47 +128,95 @@ func NewIDTokenVerifier(issuer, clientID string, keySet oidc.KeySet, options ...
 }
 
 // VerifierOption is the type for providing dynamic options to the IDTokenVerifier
-type VerifierOption func(*IDTokenVerifier)
+type VerifierOption func(*idTokenVerifier)
 
 // WithIssuedAtOffset mitigates the risk of iat to be in the future
 // because of clock skews with the ability to add an offset to the current time
-func WithIssuedAtOffset(offset time.Duration) VerifierOption {
-	return func(v *IDTokenVerifier) {
-		v.Offset = offset
+func WithIssuedAtOffset(offset time.Duration) func(*idTokenVerifier) {
+	return func(v *idTokenVerifier) {
+		v.offset = offset
 	}
 }
 
 // WithIssuedAtMaxAge provides the ability to define the maximum duration between iat and now
-func WithIssuedAtMaxAge(maxAge time.Duration) VerifierOption {
-	return func(v *IDTokenVerifier) {
-		v.MaxAgeIAT = maxAge
+func WithIssuedAtMaxAge(maxAge time.Duration) func(*idTokenVerifier) {
+	return func(v *idTokenVerifier) {
+		v.maxAgeIAT = maxAge
 	}
 }
 
 // WithNonce sets the function to check the nonce
 func WithNonce(nonce func(context.Context) string) VerifierOption {
-	return func(v *IDTokenVerifier) {
-		v.Nonce = nonce
+	return func(v *idTokenVerifier) {
+		v.nonce = nonce
 	}
 }
 
 // WithACRVerifier sets the verifier for the acr claim
 func WithACRVerifier(verifier oidc.ACRVerifier) VerifierOption {
-	return func(v *IDTokenVerifier) {
-		v.ACR = verifier
+	return func(v *idTokenVerifier) {
+		v.acr = verifier
 	}
 }
 
 // WithAuthTimeMaxAge provides the ability to define the maximum duration between auth_time and now
 func WithAuthTimeMaxAge(maxAge time.Duration) VerifierOption {
-	return func(v *IDTokenVerifier) {
-		v.MaxAge = maxAge
+	return func(v *idTokenVerifier) {
+		v.maxAge = maxAge
 	}
 }
 
 // WithSupportedSigningAlgorithms overwrites the default RS256 signing algorithm
 func WithSupportedSigningAlgorithms(algs ...string) VerifierOption {
-	return func(v *IDTokenVerifier) {
-		v.SupportedSignAlgs = algs
+	return func(v *idTokenVerifier) {
+		v.supportedSignAlgs = algs
 	}
 }
+
+type idTokenVerifier struct {
+	issuer            string
+	maxAgeIAT         time.Duration
+	offset            time.Duration
+	clientID          string
+	supportedSignAlgs []string
+	keySet            oidc.KeySet
+	acr               oidc.ACRVerifier
+	maxAge            time.Duration
+	nonce             func(ctx context.Context) string
+}
+
+func (i *idTokenVerifier) Issuer() string {
+	return i.issuer
+}
+
+func (i *idTokenVerifier) MaxAgeIAT() time.Duration {
+	return i.maxAgeIAT
+}
+
+func (i *idTokenVerifier) Offset() time.Duration {
+	return i.offset
+}
+
+func (i *idTokenVerifier) ClientID() string {
+	return i.clientID
+}
+
+func (i *idTokenVerifier) SupportedSignAlgs() []string {
+	return i.supportedSignAlgs
+}
+
+func (i *idTokenVerifier) KeySet() oidc.KeySet {
+	return i.keySet
+}
+
+func (i *idTokenVerifier) Nonce(ctx context.Context) string {
+	return i.nonce(ctx)
+}
+
+func (i *idTokenVerifier) ACR() oidc.ACRVerifier {
+	return i.acr
+}
+
+func (i *idTokenVerifier) MaxAge() time.Duration {
+	return i.maxAge
+}

pkg/client/rp/verifier_test.go

@@ -5,24 +5,24 @@ import (
 	"testing"
 	"time"
 
-	tu "git.christmann.info/LARA/zitadel-oidc/v3/internal/testutil"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	jose "github.com/go-jose/go-jose/v4"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	tu "github.com/zitadel/oidc/v2/internal/testutil"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
+	"gopkg.in/go-jose/go-jose.v2"
 )
 
 func TestVerifyTokens(t *testing.T) {
-	verifier := &IDTokenVerifier{
-		Issuer:            tu.ValidIssuer,
-		MaxAgeIAT:         2 * time.Minute,
-		Offset:            time.Second,
-		SupportedSignAlgs: []string{string(tu.SignatureAlgorithm)},
-		KeySet:            tu.KeySet{},
-		MaxAge:            2 * time.Minute,
-		ACR:               tu.ACRVerify,
-		Nonce:             func(context.Context) string { return tu.ValidNonce },
-		ClientID:          tu.ValidClientID,
+	verifier := &idTokenVerifier{
+		issuer:            tu.ValidIssuer,
+		maxAgeIAT:         2 * time.Minute,
+		offset:            time.Second,
+		supportedSignAlgs: []string{string(tu.SignatureAlgorithm)},
+		keySet:            tu.KeySet{},
+		maxAge:            2 * time.Minute,
+		acr:               tu.ACRVerify,
+		nonce:             func(context.Context) string { return tu.ValidNonce },
+		clientID:          tu.ValidClientID,
 	}
 	accessToken, _ := tu.ValidAccessToken()
 	atHash, err := oidc.ClaimHash(accessToken, tu.SignatureAlgorithm)
@@ -91,30 +91,31 @@ func TestVerifyTokens(t *testing.T) {
 }
 
 func TestVerifyIDToken(t *testing.T) {
-	verifier := &IDTokenVerifier{
-		Issuer:            tu.ValidIssuer,
-		MaxAgeIAT:         2 * time.Minute,
-		Offset:            time.Second,
-		SupportedSignAlgs: []string{string(tu.SignatureAlgorithm)},
-		KeySet:            tu.KeySet{},
-		MaxAge:            2 * time.Minute,
-		ACR:               tu.ACRVerify,
-		Nonce:             func(context.Context) string { return tu.ValidNonce },
-		ClientID:          tu.ValidClientID,
+	verifier := &idTokenVerifier{
+		issuer:            tu.ValidIssuer,
+		maxAgeIAT:         2 * time.Minute,
+		offset:            time.Second,
+		supportedSignAlgs: []string{string(tu.SignatureAlgorithm)},
+		keySet:            tu.KeySet{},
+		maxAge:            2 * time.Minute,
+		acr:               tu.ACRVerify,
+		nonce:             func(context.Context) string { return tu.ValidNonce },
 	}
 
 	tests := []struct {
-		name           string
-		tokenClaims    func() (string, *oidc.IDTokenClaims)
-		customVerifier func(verifier *IDTokenVerifier)
-		wantErr        bool
+		name        string
+		clientID    string
+		tokenClaims func() (string, *oidc.IDTokenClaims)
+		wantErr     bool
 	}{
 		{
 			name:        "success",
+			clientID:    tu.ValidClientID,
 			tokenClaims: tu.ValidIDToken,
 		},
 		{
-			name: "custom claims",
+			name:     "custom claims",
+			clientID: tu.ValidClientID,
 			tokenClaims: func() (string, *oidc.IDTokenClaims) {
 				return tu.NewIDTokenCustom(
 					tu.ValidIssuer, tu.ValidSubject, tu.ValidAudience,
@@ -124,31 +125,21 @@ func TestVerifyIDToken(t *testing.T) {
 				)
 			},
 		},
-		{
-			name: "skip nonce check",
-			customVerifier: func(verifier *IDTokenVerifier) {
-				verifier.Nonce = nil
-			},
-			tokenClaims: func() (string, *oidc.IDTokenClaims) {
-				return tu.NewIDToken(
-					tu.ValidIssuer, tu.ValidSubject, tu.ValidAudience,
-					tu.ValidExpiration, tu.ValidAuthTime, "foo",
-					tu.ValidACR, tu.ValidAMR, tu.ValidClientID, tu.ValidSkew, "",
-				)
-			},
-		},
 		{
 			name:        "parse err",
+			clientID:    tu.ValidClientID,
 			tokenClaims: func() (string, *oidc.IDTokenClaims) { return "~~~~", nil },
 			wantErr:     true,
 		},
 		{
 			name:        "invalid signature",
+			clientID:    tu.ValidClientID,
 			tokenClaims: func() (string, *oidc.IDTokenClaims) { return tu.InvalidSignatureToken, nil },
 			wantErr:     true,
 		},
 		{
-			name: "empty subject",
+			name:     "empty subject",
+			clientID: tu.ValidClientID,
 			tokenClaims: func() (string, *oidc.IDTokenClaims) {
 				return tu.NewIDToken(
 					tu.ValidIssuer, "", tu.ValidAudience,
@@ -159,7 +150,8 @@ func TestVerifyIDToken(t *testing.T) {
 			wantErr: true,
 		},
 		{
-			name: "wrong issuer",
+			name:     "wrong issuer",
+			clientID: tu.ValidClientID,
 			tokenClaims: func() (string, *oidc.IDTokenClaims) {
 				return tu.NewIDToken(
 					"foo", tu.ValidSubject, tu.ValidAudience,
@@ -170,15 +162,14 @@ func TestVerifyIDToken(t *testing.T) {
 			wantErr: true,
 		},
 		{
-			name: "wrong clientID",
-			customVerifier: func(verifier *IDTokenVerifier) {
-				verifier.ClientID = "foo"
-			},
+			name:        "wrong clientID",
+			clientID:    "foo",
 			tokenClaims: tu.ValidIDToken,
 			wantErr:     true,
 		},
 		{
-			name: "expired",
+			name:     "expired",
+			clientID: tu.ValidClientID,
 			tokenClaims: func() (string, *oidc.IDTokenClaims) {
 				return tu.NewIDToken(
 					tu.ValidIssuer, tu.ValidSubject, tu.ValidAudience,
@@ -189,7 +180,8 @@ func TestVerifyIDToken(t *testing.T) {
 			wantErr: true,
 		},
 		{
-			name: "wrong IAT",
+			name:     "wrong IAT",
+			clientID: tu.ValidClientID,
 			tokenClaims: func() (string, *oidc.IDTokenClaims) {
 				return tu.NewIDToken(
 					tu.ValidIssuer, tu.ValidSubject, tu.ValidAudience,
@@ -200,7 +192,8 @@ func TestVerifyIDToken(t *testing.T) {
 			wantErr: true,
 		},
 		{
-			name: "wrong acr",
+			name:     "wrong acr",
+			clientID: tu.ValidClientID,
 			tokenClaims: func() (string, *oidc.IDTokenClaims) {
 				return tu.NewIDToken(
 					tu.ValidIssuer, tu.ValidSubject, tu.ValidAudience,
@@ -211,7 +204,8 @@ func TestVerifyIDToken(t *testing.T) {
 			wantErr: true,
 		},
 		{
-			name: "expired auth",
+			name:     "expired auth",
+			clientID: tu.ValidClientID,
 			tokenClaims: func() (string, *oidc.IDTokenClaims) {
 				return tu.NewIDToken(
 					tu.ValidIssuer, tu.ValidSubject, tu.ValidAudience,
@@ -222,7 +216,8 @@ func TestVerifyIDToken(t *testing.T) {
 			wantErr: true,
 		},
 		{
-			name: "wrong nonce",
+			name:     "wrong nonce",
+			clientID: tu.ValidClientID,
 			tokenClaims: func() (string, *oidc.IDTokenClaims) {
 				return tu.NewIDToken(
 					tu.ValidIssuer, tu.ValidSubject, tu.ValidAudience,
@@ -236,10 +231,7 @@ func TestVerifyIDToken(t *testing.T) {
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
 			token, want := tt.tokenClaims()
-			if tt.customVerifier != nil {
-				tt.customVerifier(verifier)
-			}
-
+			verifier.clientID = tt.clientID
 			got, err := VerifyIDToken[*oidc.IDTokenClaims](context.Background(), token, verifier)
 			if tt.wantErr {
 				assert.Error(t, err)
@@ -320,7 +312,7 @@ func TestNewIDTokenVerifier(t *testing.T) {
 	tests := []struct {
 		name string
 		args args
-		want *IDTokenVerifier
+		want IDTokenVerifier
 	}{
 		{
 			name: "nil nonce", // otherwise assert.Equal will fail on the function
@@ -337,16 +329,16 @@ func TestNewIDTokenVerifier(t *testing.T) {
 					WithSupportedSigningAlgorithms("ABC", "DEF"),
 				},
 			},
-			want: &IDTokenVerifier{
-				Issuer:            tu.ValidIssuer,
-				Offset:            time.Minute,
-				MaxAgeIAT:         time.Hour,
-				ClientID:          tu.ValidClientID,
-				KeySet:            tu.KeySet{},
-				Nonce:             nil,
-				ACR:               nil,
-				MaxAge:            2 * time.Hour,
-				SupportedSignAlgs: []string{"ABC", "DEF"},
+			want: &idTokenVerifier{
+				issuer:            tu.ValidIssuer,
+				offset:            time.Minute,
+				maxAgeIAT:         time.Hour,
+				clientID:          tu.ValidClientID,
+				keySet:            tu.KeySet{},
+				nonce:             nil,
+				acr:               nil,
+				maxAge:            2 * time.Hour,
+				supportedSignAlgs: []string{"ABC", "DEF"},
 			},
 		},
 	}

pkg/client/rp/verifier_tokens_example_test.go

@@ -4,9 +4,9 @@ import (
 	"context"
 	"fmt"
 
-	tu "git.christmann.info/LARA/zitadel-oidc/v3/internal/testutil"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client/rp"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	tu "github.com/zitadel/oidc/v2/internal/testutil"
+	"github.com/zitadel/oidc/v2/pkg/client/rp"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 // MyCustomClaims extends the TokenClaims base,

pkg/client/rs/introspect_example_test.go

@@ -1,52 +0,0 @@
-package rs_test
-
-import (
-	"context"
-	"fmt"
-
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client/rs"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-)
-
-type IntrospectionResponse struct {
-	Active     bool                     `json:"active"`
-	Scope      oidc.SpaceDelimitedArray `json:"scope,omitempty"`
-	ClientID   string                   `json:"client_id,omitempty"`
-	TokenType  string                   `json:"token_type,omitempty"`
-	Expiration oidc.Time                `json:"exp,omitempty"`
-	IssuedAt   oidc.Time                `json:"iat,omitempty"`
-	NotBefore  oidc.Time                `json:"nbf,omitempty"`
-	Subject    string                   `json:"sub,omitempty"`
-	Audience   oidc.Audience            `json:"aud,omitempty"`
-	Issuer     string                   `json:"iss,omitempty"`
-	JWTID      string                   `json:"jti,omitempty"`
-	Username   string                   `json:"username,omitempty"`
-	oidc.UserInfoProfile
-	oidc.UserInfoEmail
-	oidc.UserInfoPhone
-	Address *oidc.UserInfoAddress `json:"address,omitempty"`
-
-	// Foo and Bar are custom claims
-	Foo string `json:"foo,omitempty"`
-	Bar struct {
-		Val1 string `json:"val_1,omitempty"`
-		Val2 string `json:"val_2,omitempty"`
-	} `json:"bar,omitempty"`
-
-	// Claims are all the combined claims, including custom.
-	Claims map[string]any `json:"-,omitempty"`
-}
-
-func ExampleIntrospect_custom() {
-	rss, err := rs.NewResourceServerClientCredentials(context.TODO(), "http://localhost:8080", "clientid", "clientsecret")
-	if err != nil {
-		panic(err)
-	}
-
-	resp, err := rs.Introspect[*IntrospectionResponse](context.TODO(), rss, "accesstokenstring")
-	if err != nil {
-		panic(err)
-	}
-
-	fmt.Println(resp)
-}

pkg/client/rs/resource_server.go

@@ -6,9 +6,9 @@ import (
 	"net/http"
 	"time"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client"
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/client"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 type ResourceServer interface {
@@ -42,14 +42,14 @@ func (r *resourceServer) AuthFn() (any, error) {
 	return r.authFn()
 }
 
-func NewResourceServerClientCredentials(ctx context.Context, issuer, clientID, clientSecret string, option ...Option) (ResourceServer, error) {
+func NewResourceServerClientCredentials(issuer, clientID, clientSecret string, option ...Option) (ResourceServer, error) {
 	authorizer := func() (any, error) {
 		return httphelper.AuthorizeBasic(clientID, clientSecret), nil
 	}
-	return newResourceServer(ctx, issuer, authorizer, option...)
+	return newResourceServer(issuer, authorizer, option...)
 }
 
-func NewResourceServerJWTProfile(ctx context.Context, issuer, clientID, keyID string, key []byte, options ...Option) (ResourceServer, error) {
+func NewResourceServerJWTProfile(issuer, clientID, keyID string, key []byte, options ...Option) (ResourceServer, error) {
 	signer, err := client.NewSignerFromPrivateKeyByte(key, keyID)
 	if err != nil {
 		return nil, err
@@ -61,10 +61,10 @@ func NewResourceServerJWTProfile(ctx context.Context, issuer, clientID, keyID st
 		}
 		return client.ClientAssertionFormAuthorization(assertion), nil
 	}
-	return newResourceServer(ctx, issuer, authorizer, options...)
+	return newResourceServer(issuer, authorizer, options...)
 }
 
-func newResourceServer(ctx context.Context, issuer string, authorizer func() (any, error), options ...Option) (*resourceServer, error) {
+func newResourceServer(issuer string, authorizer func() (any, error), options ...Option) (*resourceServer, error) {
 	rs := &resourceServer{
 		issuer:     issuer,
 		httpClient: httphelper.DefaultHTTPClient,
@@ -73,7 +73,7 @@ func newResourceServer(ctx context.Context, issuer string, authorizer func() (an
 		optFunc(rs)
 	}
 	if rs.introspectURL == "" || rs.tokenURL == "" {
-		config, err := client.Discover(ctx, rs.issuer, rs.httpClient)
+		config, err := client.Discover(rs.issuer, rs.httpClient)
 		if err != nil {
 			return nil, err
 		}
@@ -91,12 +91,12 @@ func newResourceServer(ctx context.Context, issuer string, authorizer func() (an
 	return rs, nil
 }
 
-func NewResourceServerFromKeyFile(ctx context.Context, issuer, path string, options ...Option) (ResourceServer, error) {
+func NewResourceServerFromKeyFile(issuer, path string, options ...Option) (ResourceServer, error) {
 	c, err := client.ConfigFromKeyFile(path)
 	if err != nil {
 		return nil, err
 	}
-	return NewResourceServerJWTProfile(ctx, issuer, c.ClientID, c.KeyID, []byte(c.Key), options...)
+	return NewResourceServerJWTProfile(issuer, c.ClientID, c.KeyID, []byte(c.Key), options...)
 }
 
 type Option func(*resourceServer)
@@ -116,30 +116,21 @@ func WithStaticEndpoints(tokenURL, introspectURL string) Option {
 	}
 }
 
-// Introspect calls the [RFC7662] Token Introspection
-// endpoint and returns the response in an instance of type R.
-// [*oidc.IntrospectionResponse] can be used as a good example, or use a custom type if type-safe
-// access to custom claims is needed.
-//
-// [RFC7662]: https://www.rfc-editor.org/rfc/rfc7662
-func Introspect[R any](ctx context.Context, rp ResourceServer, token string) (resp R, err error) {
-	ctx, span := client.Tracer.Start(ctx, "Introspect")
-	defer span.End()
-
+func Introspect(ctx context.Context, rp ResourceServer, token string) (*oidc.IntrospectionResponse, error) {
 	if rp.IntrospectionURL() == "" {
-		return resp, errors.New("resource server: introspection URL is empty")
+		return nil, errors.New("resource server: introspection URL is empty")
 	}
 	authFn, err := rp.AuthFn()
 	if err != nil {
-		return resp, err
+		return nil, err
 	}
-	req, err := httphelper.FormRequest(ctx, rp.IntrospectionURL(), &oidc.IntrospectionRequest{Token: token}, client.Encoder, authFn)
+	req, err := httphelper.FormRequest(rp.IntrospectionURL(), &oidc.IntrospectionRequest{Token: token}, client.Encoder, authFn)
 	if err != nil {
-		return resp, err
+		return nil, err
 	}
-
-	if err := httphelper.HttpRequest(rp.HttpClient(), req, &resp); err != nil {
-		return resp, err
+	resp := new(oidc.IntrospectionResponse)
+	if err := httphelper.HttpRequest(rp.HttpClient(), req, resp); err != nil {
+		return nil, err
 	}
 	return resp, nil
 }

pkg/client/rs/resource_server_test.go

@@ -4,7 +4,6 @@ import (
 	"context"
 	"testing"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
 )
@@ -165,7 +164,7 @@ func TestNewResourceServer(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got, err := newResourceServer(context.Background(), tt.args.issuer, tt.args.authorizer, tt.args.options...)
+			got, err := newResourceServer(tt.args.issuer, tt.args.authorizer, tt.args.options...)
 			if tt.wantErr {
 				assert.Error(t, err)
 				return
@@ -188,7 +187,6 @@ func TestIntrospect(t *testing.T) {
 		token string
 	}
 	rp, err := newResourceServer(
-		context.Background(),
 		"https://accounts.spotify.com",
 		nil,
 	)
@@ -201,7 +199,7 @@ func TestIntrospect(t *testing.T) {
 		{
 			name: "missing-introspect-url",
 			args: args{
-				ctx:   context.Background(),
+				ctx:   nil,
 				rp:    rp,
 				token: "my-token",
 			},
@@ -210,7 +208,7 @@ func TestIntrospect(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			_, err := Introspect[*oidc.IntrospectionResponse](tt.args.ctx, tt.args.rp, tt.args.token)
+			_, err := Introspect(tt.args.ctx, tt.args.rp, tt.args.token)
 			if tt.wantErr {
 				assert.Error(t, err)
 				return

pkg/client/tokenexchange/tokenexchange.go

@@ -1,15 +1,12 @@
 package tokenexchange
 
 import (
-	"context"
 	"errors"
 	"net/http"
-	"time"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/client"
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"github.com/go-jose/go-jose/v4"
+	"github.com/zitadel/oidc/v2/pkg/client"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 type TokenExchanger interface {
@@ -24,29 +21,18 @@ type OAuthTokenExchange struct {
 	authFn        func() (any, error)
 }
 
-func NewTokenExchanger(ctx context.Context, issuer string, options ...func(source *OAuthTokenExchange)) (TokenExchanger, error) {
-	return newOAuthTokenExchange(ctx, issuer, nil, options...)
+func NewTokenExchanger(issuer string, options ...func(source *OAuthTokenExchange)) (TokenExchanger, error) {
+	return newOAuthTokenExchange(issuer, nil, options...)
 }
 
-func NewTokenExchangerClientCredentials(ctx context.Context, issuer, clientID, clientSecret string, options ...func(source *OAuthTokenExchange)) (TokenExchanger, error) {
+func NewTokenExchangerClientCredentials(issuer, clientID, clientSecret string, options ...func(source *OAuthTokenExchange)) (TokenExchanger, error) {
 	authorizer := func() (any, error) {
 		return httphelper.AuthorizeBasic(clientID, clientSecret), nil
 	}
-	return newOAuthTokenExchange(ctx, issuer, authorizer, options...)
+	return newOAuthTokenExchange(issuer, authorizer, options...)
 }
 
-func NewTokenExchangerJWTProfile(ctx context.Context, issuer, clientID string, signer jose.Signer, options ...func(source *OAuthTokenExchange)) (TokenExchanger, error) {
-	authorizer := func() (any, error) {
-		assertion, err := client.SignedJWTProfileAssertion(clientID, []string{issuer}, time.Hour, signer)
-		if err != nil {
-			return nil, err
-		}
-		return client.ClientAssertionFormAuthorization(assertion), nil
-	}
-	return newOAuthTokenExchange(ctx, issuer, authorizer, options...)
-}
-
-func newOAuthTokenExchange(ctx context.Context, issuer string, authorizer func() (any, error), options ...func(source *OAuthTokenExchange)) (*OAuthTokenExchange, error) {
+func newOAuthTokenExchange(issuer string, authorizer func() (any, error), options ...func(source *OAuthTokenExchange)) (*OAuthTokenExchange, error) {
 	te := &OAuthTokenExchange{
 		httpClient: httphelper.DefaultHTTPClient,
 	}
@@ -55,7 +41,7 @@ func newOAuthTokenExchange(ctx context.Context, issuer string, authorizer func()
 	}
 
 	if te.tokenEndpoint == "" {
-		config, err := client.Discover(ctx, issuer, te.httpClient)
+		config, err := client.Discover(issuer, te.httpClient)
 		if err != nil {
 			return nil, err
 		}
@@ -103,7 +89,6 @@ func (te *OAuthTokenExchange) AuthFn() (any, error) {
 // ExchangeToken sends a token exchange request (rfc 8693) to te's token endpoint.
 // SubjectToken and SubjectTokenType are required parameters.
 func ExchangeToken(
-	ctx context.Context,
 	te TokenExchanger,
 	SubjectToken string,
 	SubjectTokenType oidc.TokenType,
@@ -114,9 +99,6 @@ func ExchangeToken(
 	Scopes []string,
 	RequestedTokenType oidc.TokenType,
 ) (*oidc.TokenExchangeResponse, error) {
-	ctx, span := client.Tracer.Start(ctx, "ExchangeToken")
-	defer span.End()
-
 	if SubjectToken == "" {
 		return nil, errors.New("empty subject_token")
 	}
@@ -141,5 +123,5 @@ func ExchangeToken(
 		RequestedTokenType: RequestedTokenType,
 	}
 
-	return client.CallTokenExchangeEndpoint(ctx, request, authFn, te)
+	return client.CallTokenExchangeEndpoint(request, authFn, te)
 }

pkg/crypto/hash.go

@@ -8,7 +8,7 @@ import (
 	"fmt"
 	"hash"
 
-	jose "github.com/go-jose/go-jose/v4"
+	"gopkg.in/go-jose/go-jose.v2"
 )
 
 var ErrUnsupportedAlgorithm = errors.New("unsupported signing algorithm")
@@ -21,14 +21,6 @@ func GetHashAlgorithm(sigAlgorithm jose.SignatureAlgorithm) (hash.Hash, error) {
 		return sha512.New384(), nil
 	case jose.RS512, jose.ES512, jose.PS512:
 		return sha512.New(), nil
-
-	// There is no published spec for this yet, but we have confirmation it will get published.
-	// There is consensus here: https://bitbucket.org/openid/connect/issues/1125/_hash-algorithm-for-eddsa-id-tokens
-	// Currently Go and go-jose only supports the ed25519 curve key for EdDSA, so we can safely assume sha512 here.
-	// It is unlikely ed448 will ever be supported: https://github.com/golang/go/issues/29390
-	case jose.EdDSA:
-		return sha512.New(), nil
-
 	default:
 		return nil, fmt.Errorf("%w: %q", ErrUnsupportedAlgorithm, sigAlgorithm)
 	}

pkg/crypto/key.go

@@ -1,45 +1,17 @@
 package crypto
 
 import (
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/ed25519"
 	"crypto/rsa"
 	"crypto/x509"
 	"encoding/pem"
-	"errors"
-
-	"github.com/go-jose/go-jose/v4"
 )
 
-var (
-	ErrPEMDecode             = errors.New("PEM decode failed")
-	ErrUnsupportedFormat     = errors.New("key is neither in PKCS#1 nor PKCS#8 format")
-	ErrUnsupportedPrivateKey = errors.New("unsupported key type, must be RSA, ECDSA or ED25519 private key")
-)
-
-func BytesToPrivateKey(b []byte) (crypto.PublicKey, jose.SignatureAlgorithm, error) {
-	block, _ := pem.Decode(b)
-	if block == nil {
-		return nil, "", ErrPEMDecode
-	}
-
-	privateKey, err := x509.ParsePKCS1PrivateKey(block.Bytes)
-	if err == nil {
-		return privateKey, jose.RS256, nil
-	}
-	key, err := x509.ParsePKCS8PrivateKey(block.Bytes)
+func BytesToPrivateKey(priv []byte) (*rsa.PrivateKey, error) {
+	block, _ := pem.Decode(priv)
+	b := block.Bytes
+	key, err := x509.ParsePKCS1PrivateKey(b)
 	if err != nil {
-		return nil, "", ErrUnsupportedFormat
-	}
-	switch privateKey := key.(type) {
-	case *rsa.PrivateKey:
-		return privateKey, jose.RS256, nil
-	case ed25519.PrivateKey:
-		return privateKey, jose.EdDSA, nil
-	case *ecdsa.PrivateKey:
-		return privateKey, jose.ES256, nil
-	default:
-		return nil, "", ErrUnsupportedPrivateKey
+		return nil, err
 	}
+	return key, nil
 }

pkg/crypto/key_test.go

@@ -1,134 +0,0 @@
-package crypto_test
-
-import (
-	"crypto"
-	"crypto/ecdsa"
-	"crypto/ed25519"
-	"crypto/rsa"
-	"testing"
-
-	"github.com/go-jose/go-jose/v4"
-	"github.com/stretchr/testify/assert"
-
-	zcrypto "git.christmann.info/LARA/zitadel-oidc/v3/pkg/crypto"
-)
-
-func TestBytesToPrivateKey(t *testing.T) {
-	type args struct {
-		key []byte
-	}
-	type want struct {
-		key       crypto.Signer
-		algorithm jose.SignatureAlgorithm
-		err       error
-	}
-	tests := []struct {
-		name string
-		args args
-		want want
-	}{
-		{
-			name: "PEMDecodeError",
-			args: args{
-				key: []byte("The non-PEM sequence"),
-			},
-			want: want{
-				err: zcrypto.ErrPEMDecode,
-			},
-		},
-		{
-			name: "PKCS#1 RSA",
-			args: args{
-				key: []byte(`-----BEGIN RSA PRIVATE KEY-----
-MIIBOgIBAAJBAKj34GkxFhD90vcNLYLInFEX6Ppy1tPf9Cnzj4p4WGeKLs1Pt8Qu
-KUpRKfFLfRYC9AIKjbJTWit+CqvjWYzvQwECAwEAAQJAIJLixBy2qpFoS4DSmoEm
-o3qGy0t6z09AIJtH+5OeRV1be+N4cDYJKffGzDa88vQENZiRm0GRq6a+HPGQMd2k
-TQIhAKMSvzIBnni7ot/OSie2TmJLY4SwTQAevXysE2RbFDYdAiEBCUEaRQnMnbp7
-9mxDXDf6AU0cN/RPBjb9qSHDcWZHGzUCIG2Es59z8ugGrDY+pxLQnwfotadxd+Uy
-v/Ow5T0q5gIJAiEAyS4RaI9YG8EWx/2w0T67ZUVAw8eOMB6BIUg0Xcu+3okCIBOs
-/5OiPgoTdSy7bcF9IGpSE8ZgGKzgYQVZeN97YE00
------END RSA PRIVATE KEY-----`),
-			},
-			want: want{
-				key:       &rsa.PrivateKey{},
-				algorithm: jose.RS256,
-				err:       nil,
-			},
-		},
-		{
-			name: "PKCS#8 RSA",
-			args: args{
-				key: []byte(`-----BEGIN PRIVATE KEY-----
-MIIEvwIBADANBgkqhkiG9w0BAQEFAASCBKkwggSlAgEAAoIBAQCfaDB7pK/fmP/I
-7IusSK8lTCBnPZghqIbVLt2QHYAMoEF1CaF4F4rxo2vl1Mt8gwsq4T3osQFZMvnL
-YHb7KNyUoJgTjLxJQADv2u4Q3U38heAzK5Tp4ry4MCnuyJIqAPK1GiruwEq4zQrx
-+WzVix8otO37SuW9tzklqlNGMiAYBL0TBKHvS5XMbjP1idBMB8erMz29w/TVQnEB
-Kj0vCdZjrbVPKygptt5kcSrL5f4xCZwU+ufz7cp0GLwpRMJ+shG9YJJFBxb0itPF
-sy51vAyEtdBC7jgAU96ZVeQ06nryDq1D2EpoVMElqNyL46Jo3lnKbGquGKzXzQYU
-BN32/scDAgMBAAECggEBAJE/mo3PLgILo2YtQ8ekIxNVHmF0Gl7w9IrjvTdH6hmX
-HI3MTLjkmtI7GmG9V/0IWvCjdInGX3grnrjWGRQZ04QKIQgPQLFuBGyJjEsJm7nx
-MqztlS7YTyV1nX/aenSTkJO8WEpcJLnm+4YoxCaAMdAhrIdBY71OamALpv1bRysa
-FaiCGcemT2yqZn0GqIS8O26Tz5zIqrTN2G1eSmgh7DG+7FoddMz35cute8R10xUG
-hF5YU+6fcXiRQ/Kh7nlxelPGqdZFPMk7LpVHzkQKwdJ+N0P23lPDIfNsvpG1n0OP
-3g5km7gHSrSU2yZ3eFl6DB9x1IFNS9BaQQuSxYJtKwECgYEA1C8jjzpXZDLvlYsV
-2jlMzkrbsIrX2dzblVrNsPs2jRbjYU8mg2DUDO6lOhtxHfqZG6sO+gmWi/zvoy9l
-yolGbXe1Jqx66p9fznIcecSwar8+ACa356Wk74Nt1PlBOfCMqaJnYLOLaFJa29Vy
-u5ClZVzKd5AVXl7yFVd4XfLv/WECgYEAwFMMtFoasdF92c0d31rZ1uoPOtFz6xq6
-uQggdm5zzkhnfwUAGqppS/u1CHcJ7T/74++jLbFTsaohGr4jEzWSGvJpomEUChy3
-r25YofMclUhJ5pCEStsLtqiCR1Am6LlI8HMdBEP1QDgEC5q8bQW4+UHuew1E1zxz
-osZOhe09WuMCgYEA0G9aFCnwjUqIFjQiDFP7gi8BLqTFs4uE3Wvs4W11whV42i+B
-ms90nxuTjchFT3jMDOT1+mOO0wdudLRr3xEI8SIF/u6ydGaJG+j21huEXehtxIJE
-aDdNFcfbDbqo+3y1ATK7MMBPMvSrsoY0hdJq127WqasNgr3sO1DIuima3SECgYEA
-nkM5TyhekzlbIOHD1UsDu/D7+2DkzPE/+oePfyXBMl0unb3VqhvVbmuBO6gJiSx/
-8b//PdiQkMD5YPJaFrKcuoQFHVRZk0CyfzCEyzAts0K7XXpLAvZiGztriZeRjSz7
-srJnjF0H8oKmAY6hw+1Tm/n/b08p+RyL48TgVSE2vhUCgYA3BWpkD4PlCcn/FZsq
-OrLFyFXI6jIaxskFtsRW1IxxIlAdZmxfB26P/2gx6VjLdxJI/RRPkJyEN2dP7CbR
-BDjb565dy1O9D6+UrY70Iuwjz+OcALRBBGTaiF2pLn6IhSzNI2sy/tXX8q8dBlg9
-OFCrqT/emes3KytTPfa5NZtYeQ==
------END PRIVATE KEY-----`),
-			},
-			want: want{
-				key:       &rsa.PrivateKey{},
-				algorithm: jose.RS256,
-				err:       nil,
-			},
-		},
-		{
-			name: "PKCS#8 ECDSA",
-			args: args{
-				key: []byte(`-----BEGIN PRIVATE KEY-----
-MIGHAgEAMBMGByqGSM49AgEGCCqGSM49AwEHBG0wawIBAQQgwwOZSU4GlP7ps/Wp
-V6o0qRwxultdfYo/uUuj48QZjSuhRANCAATMiI2Han+ABKmrk5CNlxRAGC61w4d3
-G4TAeuBpyzqJ7x/6NjCxoQzJzZHtNjIfjVATI59XFZWF59GhtSZbShAr
------END PRIVATE KEY-----`),
-			},
-			want: want{
-				key:       &ecdsa.PrivateKey{},
-				algorithm: jose.ES256,
-				err:       nil,
-			},
-		},
-		{
-			name: "PKCS#8 ED25519",
-			args: args{
-				key: []byte(`-----BEGIN PRIVATE KEY-----
-MC4CAQAwBQYDK2VwBCIEIHu6ZtDsjjauMasBxnS9Fg87UJwKfcT/oiq6S0ktbky8
------END PRIVATE KEY-----`),
-			},
-			want: want{
-				key:       ed25519.PrivateKey{},
-				algorithm: jose.EdDSA,
-				err:       nil,
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			key, algorithm, err := zcrypto.BytesToPrivateKey(tt.args.key)
-			assert.IsType(t, tt.want.key, key)
-			assert.Equal(t, tt.want.algorithm, algorithm)
-			assert.ErrorIs(t, tt.want.err, err)
-		})
-
-	}
-}

pkg/crypto/sign.go

@@ -4,7 +4,7 @@ import (
 	"encoding/json"
 	"errors"
 
-	jose "github.com/go-jose/go-jose/v4"
+	"gopkg.in/go-jose/go-jose.v2"
 )
 
 func Sign(object any, signer jose.Signer) (string, error) {

pkg/http/http.go

@@ -10,8 +10,6 @@ import (
 	"net/url"
 	"strings"
 	"time"
-
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
 )
 
 var DefaultHTTPClient = &http.Client{
@@ -35,7 +33,7 @@ func AuthorizeBasic(user, password string) RequestAuthorization {
 	}
 }
 
-func FormRequest(ctx context.Context, endpoint string, request any, encoder Encoder, authFn any) (*http.Request, error) {
+func FormRequest(endpoint string, request any, encoder Encoder, authFn any) (*http.Request, error) {
 	form := url.Values{}
 	if err := encoder.Encode(request, form); err != nil {
 		return nil, err
@@ -44,7 +42,7 @@ func FormRequest(ctx context.Context, endpoint string, request any, encoder Enco
 		fn(form)
 	}
 	body := strings.NewReader(form.Encode())
-	req, err := http.NewRequestWithContext(ctx, http.MethodPost, endpoint, body)
+	req, err := http.NewRequest("POST", endpoint, body)
 	if err != nil {
 		return nil, err
 	}
@@ -68,12 +66,7 @@ func HttpRequest(client *http.Client, req *http.Request, response any) error {
 	}
 
 	if resp.StatusCode != http.StatusOK {
-		var oidcErr oidc.Error
-		err = json.Unmarshal(body, &oidcErr)
-		if err != nil || oidcErr.ErrorType == "" {
-			return fmt.Errorf("http status not ok: %s %s", resp.Status, body)
-		}
-		return &oidcErr
+		return fmt.Errorf("http status not ok: %s %s", resp.Status, body)
 	}
 
 	err = json.Unmarshal(body, response)

pkg/oidc/authorization.go

@@ -1,9 +1,5 @@
 package oidc
 
-import (
-	"log/slog"
-)
-
 const (
 	// ScopeOpenID defines the scope `openid`
 	// OpenID Connect requests MUST contain the `openid` scope value
@@ -48,7 +44,6 @@ const (
 
 	ResponseModeQuery    ResponseMode = "query"
 	ResponseModeFragment ResponseMode = "fragment"
-	ResponseModeFormPost ResponseMode = "form_post"
 
 	// PromptNone (`none`) disallows the Authorization Server to display any authentication or consent user interface pages.
 	// An error (login_required, interaction_required, ...) will be returned if the user is not already authenticated or consent is needed
@@ -82,7 +77,7 @@ type AuthRequest struct {
 	UILocales    Locales             `json:"ui_locales" schema:"ui_locales"`
 	IDTokenHint  string              `json:"id_token_hint" schema:"id_token_hint"`
 	LoginHint    string              `json:"login_hint" schema:"login_hint"`
-	ACRValues    SpaceDelimitedArray `json:"acr_values" schema:"acr_values"`
+	ACRValues    []string            `json:"acr_values" schema:"acr_values"`
 
 	CodeChallenge       string              `json:"code_challenge" schema:"code_challenge"`
 	CodeChallengeMethod CodeChallengeMethod `json:"code_challenge_method" schema:"code_challenge_method"`
@@ -91,15 +86,6 @@ type AuthRequest struct {
 	RequestParam string `schema:"request"`
 }
 
-func (a *AuthRequest) LogValue() slog.Value {
-	return slog.GroupValue(
-		slog.Any("scopes", a.Scopes),
-		slog.String("response_type", string(a.ResponseType)),
-		slog.String("client_id", a.ClientID),
-		slog.String("redirect_uri", a.RedirectURI),
-	)
-}
-
 // GetRedirectURI returns the redirect_uri value for the ErrAuthRequest interface
 func (a *AuthRequest) GetRedirectURI() string {
 	return a.RedirectURI

pkg/oidc/authorization_test.go

@@ -1,27 +0,0 @@
-//go:build go1.20
-
-package oidc
-
-import (
-	"log/slog"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestAuthRequest_LogValue(t *testing.T) {
-	a := &AuthRequest{
-		Scopes:       SpaceDelimitedArray{"a", "b"},
-		ResponseType: "respType",
-		ClientID:     "123",
-		RedirectURI:  "http://example.com/callback",
-	}
-	want := slog.GroupValue(
-		slog.Any("scopes", SpaceDelimitedArray{"a", "b"}),
-		slog.String("response_type", "respType"),
-		slog.String("client_id", "123"),
-		slog.String("redirect_uri", "http://example.com/callback"),
-	)
-	got := a.LogValue()
-	assert.Equal(t, want, got)
-}

pkg/oidc/code_challenge.go

@@ -3,7 +3,7 @@ package oidc
 import (
 	"crypto/sha256"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/crypto"
+	"github.com/zitadel/oidc/v2/pkg/crypto"
 )
 
 const (

pkg/oidc/device_authorization.go

@@ -1,7 +1,5 @@
 package oidc
 
-import "encoding/json"
-
 // DeviceAuthorizationRequest implements
 // https://www.rfc-editor.org/rfc/rfc8628#section-3.1,
 // 3.1 Device Authorization Request.
@@ -22,26 +20,6 @@ type DeviceAuthorizationResponse struct {
 	Interval                int    `json:"interval,omitempty"`
 }
 
-func (resp *DeviceAuthorizationResponse) UnmarshalJSON(data []byte) error {
-	type Alias DeviceAuthorizationResponse
-	aux := &struct {
-		// workaround misspelling of verification_uri
-		// https://stackoverflow.com/q/76696956/5690223
-		// https://developers.google.com/identity/protocols/oauth2/limited-input-device?hl=fr#success-response
-		VerificationURL string `json:"verification_url"`
-		*Alias
-	}{
-		Alias: (*Alias)(resp),
-	}
-	if err := json.Unmarshal(data, &aux); err != nil {
-		return err
-	}
-	if resp.VerificationURI == "" {
-		resp.VerificationURI = aux.VerificationURL
-	}
-	return nil
-}
-
 // DeviceAccessTokenRequest implements
 // https://www.rfc-editor.org/rfc/rfc8628#section-3.4,
 // Device Access Token Request.

pkg/oidc/device_authorization_test.go

@@ -1,30 +0,0 @@
-package oidc
-
-import (
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-)
-
-func TestDeviceAuthorizationResponse_UnmarshalJSON(t *testing.T) {
-	jsonStr := `{
-		"device_code": "deviceCode",
-		"user_code": "userCode",
-		"verification_url": "http://example.com/verify",
-		"expires_in": 3600,
-		"interval": 5
-	}`
-
-	expected := &DeviceAuthorizationResponse{
-		DeviceCode:      "deviceCode",
-		UserCode:        "userCode",
-		VerificationURI: "http://example.com/verify",
-		ExpiresIn:       3600,
-		Interval:        5,
-	}
-
-	var resp DeviceAuthorizationResponse
-	err := resp.UnmarshalJSON([]byte(jsonStr))
-	assert.NoError(t, err)
-	assert.Equal(t, expected, &resp)
-}

pkg/oidc/discovery.go

@@ -145,14 +145,6 @@ type DiscoveryConfiguration struct {
 
 	// OPTermsOfServiceURI is a URL the OpenID Provider provides to the person registering the Client to read about OpenID Provider's terms of service.
 	OPTermsOfServiceURI string `json:"op_tos_uri,omitempty"`
-
-	// BackChannelLogoutSupported specifies whether the OP supports back-channel logout (https://openid.net/specs/openid-connect-backchannel-1_0.html),
-	// with true indicating support. If omitted, the default value is false.
-	BackChannelLogoutSupported bool `json:"backchannel_logout_supported,omitempty"`
-
-	// BackChannelLogoutSessionSupported specifies whether the OP can pass a sid (session ID) Claim in the Logout Token to identify the RP session with the OP.
-	// If supported, the sid Claim is also included in ID Tokens issued by the OP. If omitted, the default value is false.
-	BackChannelLogoutSessionSupported bool `json:"backchannel_logout_session_supported,omitempty"`
 }
 
 type AuthMethod string

pkg/oidc/error.go

@@ -1,10 +1,8 @@
 package oidc
 
 import (
-	"encoding/json"
 	"errors"
 	"fmt"
-	"log/slog"
 )
 
 type errorType string
@@ -28,11 +26,6 @@ const (
 	SlowDown             errorType = "slow_down"
 	AccessDenied         errorType = "access_denied"
 	ExpiredToken         errorType = "expired_token"
-
-	// InvalidTarget error is returned by Token Exchange if
-	// the requested target or audience is invalid.
-	// [RFC 8693, Section 2.2.2: Error Response](https://www.rfc-editor.org/rfc/rfc8693#section-2.2.2)
-	InvalidTarget errorType = "invalid_target"
 )
 
 var (
@@ -118,14 +111,6 @@ var (
 			Description: "The \"device_code\" has expired.",
 		}
 	}
-
-	// Token exchange error
-	ErrInvalidTarget = func() *Error {
-		return &Error{
-			ErrorType:   InvalidTarget,
-			Description: "The requested audience or target is invalid.",
-		}
-	}
 )
 
 type Error struct {
@@ -133,28 +118,7 @@ type Error struct {
 	ErrorType        errorType `json:"error" schema:"error"`
 	Description      string    `json:"error_description,omitempty" schema:"error_description,omitempty"`
 	State            string    `json:"state,omitempty" schema:"state,omitempty"`
-	SessionState     string    `json:"session_state,omitempty" schema:"session_state,omitempty"`
 	redirectDisabled bool      `schema:"-"`
-	returnParent     bool      `schema:"-"`
-}
-
-func (e *Error) MarshalJSON() ([]byte, error) {
-	m := struct {
-		Error            errorType `json:"error"`
-		ErrorDescription string    `json:"error_description,omitempty"`
-		State            string    `json:"state,omitempty"`
-		SessionState     string    `json:"session_state,omitempty"`
-		Parent           string    `json:"parent,omitempty"`
-	}{
-		Error:            e.ErrorType,
-		ErrorDescription: e.Description,
-		State:            e.State,
-		SessionState:     e.SessionState,
-	}
-	if e.returnParent {
-		m.Parent = e.Parent.Error()
-	}
-	return json.Marshal(m)
 }
 
 func (e *Error) Error() string {
@@ -179,8 +143,7 @@ func (e *Error) Is(target error) bool {
 	}
 	return e.ErrorType == t.ErrorType &&
 		(e.Description == t.Description || t.Description == "") &&
-		(e.State == t.State || t.State == "") &&
-		(e.SessionState == t.SessionState || t.SessionState == "")
+		(e.State == t.State || t.State == "")
 }
 
 func (e *Error) WithParent(err error) *Error {
@@ -188,18 +151,6 @@ func (e *Error) WithParent(err error) *Error {
 	return e
 }
 
-// WithReturnParentToClient allows returning the set parent error to the HTTP client.
-// Currently it only supports setting the parent inside JSON responses, not redirect URLs.
-// As Go errors don't unmarshal well, only the marshaller is implemented for the moment.
-//
-// Warning: parent errors may contain sensitive data or unwanted details about the server status.
-// Also, the `parent` field is not a standard error field and might confuse certain clients
-// that require fully compliant responses.
-func (e *Error) WithReturnParentToClient(b bool) *Error {
-	e.returnParent = b
-	return e
-}
-
 func (e *Error) WithDescription(desc string, args ...any) *Error {
 	e.Description = fmt.Sprintf(desc, args...)
 	return e
@@ -220,37 +171,3 @@ func DefaultToServerError(err error, description string) *Error {
 	}
 	return oauth
 }
-
-func (e *Error) LogLevel() slog.Level {
-	level := slog.LevelWarn
-	if e.ErrorType == ServerError {
-		level = slog.LevelError
-	}
-	if e.ErrorType == AuthorizationPending {
-		level = slog.LevelInfo
-	}
-	return level
-}
-
-func (e *Error) LogValue() slog.Value {
-	attrs := make([]slog.Attr, 0, 5)
-	if e.Parent != nil {
-		attrs = append(attrs, slog.Any("parent", e.Parent))
-	}
-	if e.Description != "" {
-		attrs = append(attrs, slog.String("description", e.Description))
-	}
-	if e.ErrorType != "" {
-		attrs = append(attrs, slog.String("type", string(e.ErrorType)))
-	}
-	if e.State != "" {
-		attrs = append(attrs, slog.String("state", e.State))
-	}
-	if e.SessionState != "" {
-		attrs = append(attrs, slog.String("session_state", e.SessionState))
-	}
-	if e.redirectDisabled {
-		attrs = append(attrs, slog.Bool("redirect_disabled", e.redirectDisabled))
-	}
-	return slog.GroupValue(attrs...)
-}

pkg/oidc/error_test.go

@@ -1,192 +0,0 @@
-package oidc
-
-import (
-	"encoding/json"
-	"errors"
-	"io"
-	"log/slog"
-	"testing"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestDefaultToServerError(t *testing.T) {
-	type args struct {
-		err         error
-		description string
-	}
-	tests := []struct {
-		name string
-		args args
-		want *Error
-	}{
-		{
-			name: "default",
-			args: args{
-				err:         io.ErrClosedPipe,
-				description: "oops",
-			},
-			want: &Error{
-				ErrorType:   ServerError,
-				Description: "oops",
-				Parent:      io.ErrClosedPipe,
-			},
-		},
-		{
-			name: "our Error",
-			args: args{
-				err:         ErrAccessDenied(),
-				description: "oops",
-			},
-			want: &Error{
-				ErrorType:   AccessDenied,
-				Description: "The authorization request was denied.",
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := DefaultToServerError(tt.args.err, tt.args.description)
-			assert.ErrorIs(t, got, tt.want)
-		})
-	}
-}
-
-func TestError_LogLevel(t *testing.T) {
-	tests := []struct {
-		name string
-		err  *Error
-		want slog.Level
-	}{
-		{
-			name: "server error",
-			err:  ErrServerError(),
-			want: slog.LevelError,
-		},
-		{
-			name: "authorization pending",
-			err:  ErrAuthorizationPending(),
-			want: slog.LevelInfo,
-		},
-		{
-			name: "some other error",
-			err:  ErrAccessDenied(),
-			want: slog.LevelWarn,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got := tt.err.LogLevel()
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func TestError_LogValue(t *testing.T) {
-	type fields struct {
-		Parent           error
-		ErrorType        errorType
-		Description      string
-		State            string
-		redirectDisabled bool
-	}
-	tests := []struct {
-		name   string
-		fields fields
-		want   slog.Value
-	}{
-		{
-			name: "parent",
-			fields: fields{
-				Parent: io.EOF,
-			},
-			want: slog.GroupValue(slog.Any("parent", io.EOF)),
-		},
-		{
-			name: "description",
-			fields: fields{
-				Description: "oops",
-			},
-			want: slog.GroupValue(slog.String("description", "oops")),
-		},
-		{
-			name: "errorType",
-			fields: fields{
-				ErrorType: ExpiredToken,
-			},
-			want: slog.GroupValue(slog.String("type", string(ExpiredToken))),
-		},
-		{
-			name: "state",
-			fields: fields{
-				State: "123",
-			},
-			want: slog.GroupValue(slog.String("state", "123")),
-		},
-		{
-			name: "all fields",
-			fields: fields{
-				Parent:      io.EOF,
-				Description: "oops",
-				ErrorType:   ExpiredToken,
-				State:       "123",
-			},
-			want: slog.GroupValue(
-				slog.Any("parent", io.EOF),
-				slog.String("description", "oops"),
-				slog.String("type", string(ExpiredToken)),
-				slog.String("state", "123"),
-			),
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			e := &Error{
-				Parent:           tt.fields.Parent,
-				ErrorType:        tt.fields.ErrorType,
-				Description:      tt.fields.Description,
-				State:            tt.fields.State,
-				redirectDisabled: tt.fields.redirectDisabled,
-			}
-			got := e.LogValue()
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func TestError_MarshalJSON(t *testing.T) {
-	tests := []struct {
-		name string
-		e    *Error
-		want string
-	}{
-		{
-			name: "simple error",
-			e:    ErrAccessDenied(),
-			want: `{"error":"access_denied","error_description":"The authorization request was denied."}`,
-		},
-		{
-			name: "with description",
-			e:    ErrAccessDenied().WithDescription("oops"),
-			want: `{"error":"access_denied","error_description":"oops"}`,
-		},
-		{
-			name: "with parent",
-			e:    ErrServerError().WithParent(errors.New("oops")),
-			want: `{"error":"server_error"}`,
-		},
-		{
-			name: "with return parent",
-			e:    ErrServerError().WithParent(errors.New("oops")).WithReturnParentToClient(true),
-			want: `{"error":"server_error","parent":"oops"}`,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := json.Marshal(tt.e)
-			require.NoError(t, err)
-			assert.JSONEq(t, tt.want, string(got))
-		})
-	}
-}

pkg/oidc/introspection.go

@@ -16,21 +16,18 @@ type ClientAssertionParams struct {
 // https://www.rfc-editor.org/rfc/rfc7662.html#section-2.2.
 // https://openid.net/specs/openid-connect-core-1_0.html#StandardClaims.
 type IntrospectionResponse struct {
-	Active                          bool                `json:"active"`
-	Scope                           SpaceDelimitedArray `json:"scope,omitempty"`
-	ClientID                        string              `json:"client_id,omitempty"`
-	TokenType                       string              `json:"token_type,omitempty"`
-	Expiration                      Time                `json:"exp,omitempty"`
-	IssuedAt                        Time                `json:"iat,omitempty"`
-	AuthTime                        Time                `json:"auth_time,omitempty"`
-	NotBefore                       Time                `json:"nbf,omitempty"`
-	Subject                         string              `json:"sub,omitempty"`
-	Audience                        Audience            `json:"aud,omitempty"`
-	AuthenticationMethodsReferences []string            `json:"amr,omitempty"`
-	Issuer                          string              `json:"iss,omitempty"`
-	JWTID                           string              `json:"jti,omitempty"`
-	Username                        string              `json:"username,omitempty"`
-	Actor                           *ActorClaims        `json:"act,omitempty"`
+	Active     bool                `json:"active"`
+	Scope      SpaceDelimitedArray `json:"scope,omitempty"`
+	ClientID   string              `json:"client_id,omitempty"`
+	TokenType  string              `json:"token_type,omitempty"`
+	Expiration Time                `json:"exp,omitempty"`
+	IssuedAt   Time                `json:"iat,omitempty"`
+	NotBefore  Time                `json:"nbf,omitempty"`
+	Subject    string              `json:"sub,omitempty"`
+	Audience   Audience            `json:"aud,omitempty"`
+	Issuer     string              `json:"iss,omitempty"`
+	JWTID      string              `json:"jti,omitempty"`
+	Username   string              `json:"username,omitempty"`
 	UserInfoProfile
 	UserInfoEmail
 	UserInfoPhone

pkg/oidc/keyset.go

@@ -6,9 +6,8 @@ import (
 	"crypto/ed25519"
 	"crypto/rsa"
 	"errors"
-	"strings"
 
-	jose "github.com/go-jose/go-jose/v4"
+	"gopkg.in/go-jose/go-jose.v2"
 )
 
 const (
@@ -93,17 +92,17 @@ func FindMatchingKey(keyID, use, expectedAlg string, keys ...jose.JSONWebKey) (k
 }
 
 func algToKeyType(key any, alg string) bool {
-	if strings.HasPrefix(alg, "RS") || strings.HasPrefix(alg, "PS") {
+	switch alg[0] {
+	case 'R', 'P':
 		_, ok := key.(*rsa.PublicKey)
 		return ok
-	}
-	if strings.HasPrefix(alg, "ES") {
+	case 'E':
 		_, ok := key.(*ecdsa.PublicKey)
 		return ok
-	}
-	if alg == string(jose.EdDSA) {
-		_, ok := key.(ed25519.PublicKey)
+	case 'O':
+		_, ok := key.(*ed25519.PublicKey)
 		return ok
+	default:
+		return false
 	}
-	return false
 }

pkg/oidc/keyset_test.go

@@ -7,7 +7,7 @@ import (
 	"reflect"
 	"testing"
 
-	jose "github.com/go-jose/go-jose/v4"
+	"gopkg.in/go-jose/go-jose.v2"
 )
 
 func TestFindKey(t *testing.T) {

pkg/oidc/session.go

@@ -1,12 +1,10 @@
 package oidc
 
 // EndSessionRequest for the RP-Initiated Logout according to:
-// https://openid.net/specs/openid-connect-rpinitiated-1_0.html#RPLogout
+//https://openid.net/specs/openid-connect-rpinitiated-1_0.html#RPLogout
 type EndSessionRequest struct {
-	IdTokenHint           string  `schema:"id_token_hint"`
-	LogoutHint            string  `schema:"logout_hint"`
-	ClientID              string  `schema:"client_id"`
-	PostLogoutRedirectURI string  `schema:"post_logout_redirect_uri"`
-	State                 string  `schema:"state"`
-	UILocales             Locales `schema:"ui_locales"`
+	IdTokenHint           string `schema:"id_token_hint"`
+	ClientID              string `schema:"client_id"`
+	PostLogoutRedirectURI string `schema:"post_logout_redirect_uri"`
+	State                 string `schema:"state"`
 }

pkg/oidc/token.go

@@ -5,12 +5,11 @@ import (
 	"os"
 	"time"
 
-	jose "github.com/go-jose/go-jose/v4"
 	"golang.org/x/oauth2"
+	"gopkg.in/go-jose/go-jose.v2"
 
 	"github.com/muhlemmer/gu"
-
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/crypto"
+	"github.com/zitadel/oidc/v2/pkg/crypto"
 )
 
 const (
@@ -35,20 +34,19 @@ type Tokens[C IDClaims] struct {
 // TokenClaims implements the Claims interface,
 // and can be used to extend larger claim types by embedding.
 type TokenClaims struct {
-	Issuer                              string       `json:"iss,omitempty"`
-	Subject                             string       `json:"sub,omitempty"`
-	Audience                            Audience     `json:"aud,omitempty"`
-	Expiration                          Time         `json:"exp,omitempty"`
-	IssuedAt                            Time         `json:"iat,omitempty"`
-	AuthTime                            Time         `json:"auth_time,omitempty"`
-	NotBefore                           Time         `json:"nbf,omitempty"`
-	Nonce                               string       `json:"nonce,omitempty"`
-	AuthenticationContextClassReference string       `json:"acr,omitempty"`
-	AuthenticationMethodsReferences     []string     `json:"amr,omitempty"`
-	AuthorizedParty                     string       `json:"azp,omitempty"`
-	ClientID                            string       `json:"client_id,omitempty"`
-	JWTID                               string       `json:"jti,omitempty"`
-	Actor                               *ActorClaims `json:"act,omitempty"`
+	Issuer                              string   `json:"iss,omitempty"`
+	Subject                             string   `json:"sub,omitempty"`
+	Audience                            Audience `json:"aud,omitempty"`
+	Expiration                          Time     `json:"exp,omitempty"`
+	IssuedAt                            Time     `json:"iat,omitempty"`
+	AuthTime                            Time     `json:"auth_time,omitempty"`
+	NotBefore                           Time     `json:"nbf,omitempty"`
+	Nonce                               string   `json:"nonce,omitempty"`
+	AuthenticationContextClassReference string   `json:"acr,omitempty"`
+	AuthenticationMethodsReferences     []string `json:"amr,omitempty"`
+	AuthorizedParty                     string   `json:"azp,omitempty"`
+	ClientID                            string   `json:"client_id,omitempty"`
+	JWTID                               string   `json:"jti,omitempty"`
 
 	// Additional information set by this framework
 	SignatureAlg jose.SignatureAlgorithm `json:"-"`
@@ -117,7 +115,6 @@ func NewAccessTokenClaims(issuer, subject string, audience []string, expiration
 			Expiration: FromTime(expiration),
 			IssuedAt:   FromTime(now),
 			NotBefore:  FromTime(now),
-			ClientID:   clientID,
 			JWTID:      jwtid,
 		},
 	}
@@ -207,36 +204,13 @@ func (i *IDTokenClaims) UnmarshalJSON(data []byte) error {
 	return unmarshalJSONMulti(data, (*itcAlias)(i), &i.Claims)
 }
 
-// ActorClaims provides the `act` claims used for impersonation or delegation Token Exchange.
-//
-// An actor can be nested in case an obtained token is used as actor token to obtain impersonation or delegation.
-// This allows creating a chain of actors.
-// See [RFC 8693, section 4.1](https://www.rfc-editor.org/rfc/rfc8693#name-act-actor-claim).
-type ActorClaims struct {
-	Actor   *ActorClaims   `json:"act,omitempty"`
-	Issuer  string         `json:"iss,omitempty"`
-	Subject string         `json:"sub,omitempty"`
-	Claims  map[string]any `json:"-"`
-}
-
-type acAlias ActorClaims
-
-func (c *ActorClaims) MarshalJSON() ([]byte, error) {
-	return mergeAndMarshalClaims((*acAlias)(c), c.Claims)
-}
-
-func (c *ActorClaims) UnmarshalJSON(data []byte) error {
-	return unmarshalJSONMulti(data, (*acAlias)(c), &c.Claims)
-}
-
 type AccessTokenResponse struct {
-	AccessToken  string              `json:"access_token,omitempty" schema:"access_token,omitempty"`
-	TokenType    string              `json:"token_type,omitempty" schema:"token_type,omitempty"`
-	RefreshToken string              `json:"refresh_token,omitempty" schema:"refresh_token,omitempty"`
-	ExpiresIn    uint64              `json:"expires_in,omitempty" schema:"expires_in,omitempty"`
-	IDToken      string              `json:"id_token,omitempty" schema:"id_token,omitempty"`
-	State        string              `json:"state,omitempty" schema:"state,omitempty"`
-	Scope        SpaceDelimitedArray `json:"scope,omitempty" schema:"scope,omitempty"`
+	AccessToken  string `json:"access_token,omitempty" schema:"access_token,omitempty"`
+	TokenType    string `json:"token_type,omitempty" schema:"token_type,omitempty"`
+	RefreshToken string `json:"refresh_token,omitempty" schema:"refresh_token,omitempty"`
+	ExpiresIn    uint64 `json:"expires_in,omitempty" schema:"expires_in,omitempty"`
+	IDToken      string `json:"id_token,omitempty" schema:"id_token,omitempty"`
+	State        string `json:"state,omitempty" schema:"state,omitempty"`
 }
 
 type JWTProfileAssertionClaims struct {
@@ -347,12 +321,12 @@ func AppendClientIDToAudience(clientID string, audience []string) []string {
 }
 
 func GenerateJWTProfileToken(assertion *JWTProfileAssertionClaims) (string, error) {
-	privateKey, algorithm, err := crypto.BytesToPrivateKey(assertion.PrivateKey)
+	privateKey, err := crypto.BytesToPrivateKey(assertion.PrivateKey)
 	if err != nil {
 		return "", err
 	}
 	key := jose.SigningKey{
-		Algorithm: algorithm,
+		Algorithm: jose.RS256,
 		Key:       &jose.JSONWebKey{Key: privateKey, KeyID: assertion.PrivateKeyID},
 	}
 	signer, err := jose.NewSigner(key, &jose.SignerOptions{})
@@ -378,45 +352,4 @@ type TokenExchangeResponse struct {
 	ExpiresIn       uint64              `json:"expires_in,omitempty"`
 	Scopes          SpaceDelimitedArray `json:"scope,omitempty"`
 	RefreshToken    string              `json:"refresh_token,omitempty"`
-
-	// IDToken field allows returning an additional ID token
-	// if the requested_token_type was Access Token and scope contained openid.
-	IDToken string `json:"id_token,omitempty"`
-}
-
-type LogoutTokenClaims struct {
-	Issuer     string         `json:"iss,omitempty"`
-	Subject    string         `json:"sub,omitempty"`
-	Audience   Audience       `json:"aud,omitempty"`
-	IssuedAt   Time           `json:"iat,omitempty"`
-	Expiration Time           `json:"exp,omitempty"`
-	JWTID      string         `json:"jti,omitempty"`
-	Events     map[string]any `json:"events,omitempty"`
-	SessionID  string         `json:"sid,omitempty"`
-	Claims     map[string]any `json:"-"`
-}
-
-type ltcAlias LogoutTokenClaims
-
-func (i *LogoutTokenClaims) MarshalJSON() ([]byte, error) {
-	return mergeAndMarshalClaims((*ltcAlias)(i), i.Claims)
-}
-
-func (i *LogoutTokenClaims) UnmarshalJSON(data []byte) error {
-	return unmarshalJSONMulti(data, (*ltcAlias)(i), &i.Claims)
-}
-
-func NewLogoutTokenClaims(issuer, subject string, audience Audience, expiration time.Time, jwtID, sessionID string, skew time.Duration) *LogoutTokenClaims {
-	return &LogoutTokenClaims{
-		Issuer:     issuer,
-		Subject:    subject,
-		Audience:   audience,
-		IssuedAt:   FromTime(time.Now().Add(-skew)),
-		Expiration: FromTime(expiration),
-		JWTID:      jwtID,
-		Events: map[string]any{
-			"http://schemas.openid.net/event/backchannel-logout": struct{}{},
-		},
-		SessionID: sessionID,
-	}
 }

pkg/oidc/token_request.go

@@ -3,10 +3,9 @@ package oidc
 import (
 	"encoding/json"
 	"fmt"
-	"slices"
 	"time"
 
-	jose "github.com/go-jose/go-jose/v4"
+	"gopkg.in/go-jose/go-jose.v2"
 )
 
 const (
@@ -58,7 +57,13 @@ var AllTokenTypes = []TokenType{
 type TokenType string
 
 func (t TokenType) IsSupported() bool {
-	return slices.Contains(AllTokenTypes, t)
+	for _, tt := range AllTokenTypes {
+		if t == tt {
+			return true
+		}
+	}
+
+	return false
 }
 
 type TokenRequest interface {
@@ -72,10 +77,10 @@ type AccessTokenRequest struct {
 	Code                string `schema:"code"`
 	RedirectURI         string `schema:"redirect_uri"`
 	ClientID            string `schema:"client_id"`
-	ClientSecret        string `schema:"client_secret,omitempty"`
-	CodeVerifier        string `schema:"code_verifier,omitempty"`
-	ClientAssertion     string `schema:"client_assertion,omitempty"`
-	ClientAssertionType string `schema:"client_assertion_type,omitempty"`
+	ClientSecret        string `schema:"client_secret"`
+	CodeVerifier        string `schema:"code_verifier"`
+	ClientAssertion     string `schema:"client_assertion"`
+	ClientAssertionType string `schema:"client_assertion_type"`
 }
 
 func (a *AccessTokenRequest) GrantType() GrantType {

pkg/oidc/token_test.go

@@ -4,9 +4,9 @@ import (
 	"testing"
 	"time"
 
-	jose "github.com/go-jose/go-jose/v4"
 	"github.com/stretchr/testify/assert"
 	"golang.org/x/text/language"
+	"gopkg.in/go-jose/go-jose.v2"
 )
 
 var (
@@ -145,7 +145,6 @@ func TestNewAccessTokenClaims(t *testing.T) {
 			Subject:    "hello@me.com",
 			Audience:   Audience{"foo"},
 			Expiration: 12345,
-			ClientID:   "foo",
 			JWTID:      "900",
 		},
 	}
@@ -242,39 +241,3 @@ func TestIDTokenClaims_GetUserInfo(t *testing.T) {
 	got := idTokenData.GetUserInfo()
 	assert.Equal(t, want, got)
 }
-
-func TestNewLogoutTokenClaims(t *testing.T) {
-	want := &LogoutTokenClaims{
-		Issuer:     "zitadel",
-		Subject:    "hello@me.com",
-		Audience:   Audience{"foo", "just@me.com"},
-		Expiration: 12345,
-		JWTID:      "jwtID",
-		Events: map[string]any{
-			"http://schemas.openid.net/event/backchannel-logout": struct{}{},
-		},
-		SessionID: "sessionID",
-		Claims:    nil,
-	}
-
-	got := NewLogoutTokenClaims(
-		want.Issuer,
-		want.Subject,
-		want.Audience,
-		want.Expiration.AsTime(),
-		want.JWTID,
-		want.SessionID,
-		1*time.Second,
-	)
-
-	// test if the dynamic timestamp is around now,
-	// allowing for a delta of 1, just in case we flip on
-	// either side of a second boundry.
-	nowMinusSkew := NowTime() - 1
-	assert.InDelta(t, int64(nowMinusSkew), int64(got.IssuedAt), 1)
-
-	// Make equal not fail on dynamic timestamp
-	got.IssuedAt = 0
-
-	assert.Equal(t, want, got)
-}

pkg/oidc/types.go

@@ -3,16 +3,15 @@ package oidc
 import (
 	"database/sql/driver"
 	"encoding/json"
-	"errors"
 	"fmt"
 	"reflect"
 	"strings"
 	"time"
 
-	jose "github.com/go-jose/go-jose/v4"
+	"github.com/gorilla/schema"
 	"github.com/muhlemmer/gu"
-	"github.com/zitadel/schema"
 	"golang.org/x/text/language"
+	"gopkg.in/go-jose/go-jose.v2"
 )
 
 type Audience []string
@@ -35,17 +34,6 @@ func (a *Audience) UnmarshalJSON(text []byte) error {
 	return nil
 }
 
-func (a *Audience) MarshalJSON() ([]byte, error) {
-	len := len(*a)
-	if len > 1 {
-		return json.Marshal(*a)
-	} else if len == 1 {
-		return json.Marshal((*a)[0])
-	}
-
-	return nil, errors.New("aud is empty")
-}
-
 type Display string
 
 func (d *Display) UnmarshalText(text []byte) error {
@@ -88,26 +76,8 @@ func (l *Locale) MarshalJSON() ([]byte, error) {
 	return json.Marshal(tag)
 }
 
-// UnmarshalJSON implements json.Unmarshaler.
-// When [language.ValueError] is encountered, the containing tag will be set
-// to an empty value (language "und") and no error will be returned.
-// This state can be checked with the `l.Tag().IsRoot()` method.
 func (l *Locale) UnmarshalJSON(data []byte) error {
-	if len(data) == 0 || string(data) == "\"\"" {
-		return nil
-	}
-	err := json.Unmarshal(data, &l.tag)
-	if err == nil {
-		return nil
-	}
-
-	// catch "well-formed but unknown" errors
-	var target language.ValueError
-	if errors.As(err, &target) {
-		l.tag = language.Tag{}
-		return nil
-	}
-	return err
+	return json.Unmarshal(data, &l.tag)
 }
 
 type Locales []language.Tag
@@ -126,14 +96,6 @@ func ParseLocales(locales []string) Locales {
 	return out
 }
 
-func (l Locales) String() string {
-	tags := make([]string, len(l))
-	for i, tag := range l {
-		tags[i] = tag.String()
-	}
-	return strings.Join(tags, " ")
-}
-
 // UnmarshalText implements the [encoding.TextUnmarshaler] interface.
 // It decodes an unquoted space seperated string into Locales.
 // Undefined language tags in the input are ignored and ommited from
@@ -189,7 +151,7 @@ type ResponseType string
 
 type ResponseMode string
 
-func (s SpaceDelimitedArray) String() string {
+func (s SpaceDelimitedArray) Encode() string {
 	return strings.Join(s, " ")
 }
 
@@ -199,11 +161,11 @@ func (s *SpaceDelimitedArray) UnmarshalText(text []byte) error {
 }
 
 func (s SpaceDelimitedArray) MarshalText() ([]byte, error) {
-	return []byte(s.String()), nil
+	return []byte(s.Encode()), nil
 }
 
 func (s SpaceDelimitedArray) MarshalJSON() ([]byte, error) {
-	return json.Marshal((s).String())
+	return json.Marshal((s).Encode())
 }
 
 func (s *SpaceDelimitedArray) UnmarshalJSON(data []byte) error {
@@ -248,10 +210,7 @@ func (s SpaceDelimitedArray) Value() (driver.Value, error) {
 func NewEncoder() *schema.Encoder {
 	e := schema.NewEncoder()
 	e.RegisterEncoder(SpaceDelimitedArray{}, func(value reflect.Value) string {
-		return value.Interface().(SpaceDelimitedArray).String()
-	})
-	e.RegisterEncoder(Locales{}, func(value reflect.Value) string {
-		return value.Interface().(Locales).String()
+		return value.Interface().(SpaceDelimitedArray).Encode()
 	})
 	return e
 }

pkg/oidc/types_test.go

@@ -9,9 +9,9 @@ import (
 	"testing"
 	"time"
 
+	"github.com/gorilla/schema"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/zitadel/schema"
 	"golang.org/x/text/language"
 )
 
@@ -208,71 +208,20 @@ func TestLocale_MarshalJSON(t *testing.T) {
 }
 
 func TestLocale_UnmarshalJSON(t *testing.T) {
-	type dst struct {
+	type a struct {
 		Locale *Locale `json:"locale,omitempty"`
 	}
-	tests := []struct {
-		name    string
-		input   string
-		want    dst
-		wantErr bool
-	}{
-		{
-			name:    "value not present",
-			input:   `{}`,
-			wantErr: false,
-			want: dst{
-				Locale: nil,
-			},
-		},
-		{
-			name:    "null",
-			input:   `{"locale": null}`,
-			wantErr: false,
-			want: dst{
-				Locale: nil,
-			},
-		},
-		{
-			name:    "empty, ignored",
-			input:   `{"locale": ""}`,
-			wantErr: false,
-			want: dst{
-				Locale: &Locale{},
-			},
-		},
-		{
-			name:  "afrikaans, ok",
-			input: `{"locale": "af"}`,
-			want: dst{
-				Locale: NewLocale(language.Afrikaans),
-			},
-		},
-		{
-			name:  "gb, ignored",
-			input: `{"locale": "gb"}`,
-			want: dst{
-				Locale: &Locale{},
-			},
-		},
-		{
-			name:    "bad form, error",
-			input:   `{"locale": "g!!!!!"}`,
-			wantErr: true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			var got dst
-			err := json.Unmarshal([]byte(tt.input), &got)
-			if tt.wantErr {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-			assert.Equal(t, tt.want, got)
-		})
+	want := a{
+		Locale: NewLocale(language.Afrikaans),
 	}
+
+	const input = `{"locale": "af"}`
+	var got a
+
+	require.NoError(t,
+		json.Unmarshal([]byte(input), &got),
+	)
+	assert.Equal(t, want, got)
 }
 
 func TestParseLocales(t *testing.T) {

pkg/oidc/userinfo.go

@@ -29,11 +29,6 @@ func (u *UserInfo) GetAddress() *UserInfoAddress {
 	return u.Address
 }
 
-// GetSubject implements [rp.SubjectGetter]
-func (u *UserInfo) GetSubject() string {
-	return u.Subject
-}
-
 type uiAlias UserInfo
 
 func (u *UserInfo) MarshalJSON() ([]byte, error) {

pkg/oidc/verifier.go

@@ -7,11 +7,12 @@ import (
 	"encoding/json"
 	"errors"
 	"fmt"
-	"slices"
 	"strings"
 	"time"
 
-	jose "github.com/go-jose/go-jose/v4"
+	"gopkg.in/go-jose/go-jose.v2"
+
+	str "github.com/zitadel/oidc/v2/pkg/strings"
 )
 
 type Claims interface {
@@ -40,7 +41,6 @@ type IDClaims interface {
 var (
 	ErrParse                   = errors.New("parsing of request failed")
 	ErrIssuerInvalid           = errors.New("issuer does not match")
-	ErrDiscoveryFailed         = errors.New("OpenID Provider Configuration Discovery has failed")
 	ErrSubjectMissing          = errors.New("subject missing")
 	ErrAudience                = errors.New("audience is not valid")
 	ErrAzpMissing              = errors.New("authorized party is not set. If Token is valid for multiple audiences, azp must not be empty")
@@ -57,23 +57,14 @@ var (
 	ErrNonceInvalid            = errors.New("nonce does not match")
 	ErrAcrInvalid              = errors.New("acr is invalid")
 	ErrAuthTimeNotPresent      = errors.New("claim `auth_time` of token is missing")
-	ErrAuthTimeToOld           = errors.New("auth time of token is too old")
+	ErrAuthTimeToOld           = errors.New("auth time of token is to old")
 	ErrAtHash                  = errors.New("at_hash does not correspond to access token")
 )
 
-// Verifier caries configuration for the various token verification
-// functions. Use package specific constructor functions to know
-// which values need to be set.
-type Verifier struct {
-	Issuer            string
-	MaxAgeIAT         time.Duration
-	Offset            time.Duration
-	ClientID          string
-	SupportedSignAlgs []string
-	MaxAge            time.Duration
-	ACR               ACRVerifier
-	KeySet            KeySet
-	Nonce             func(ctx context.Context) string
+type Verifier interface {
+	Issuer() string
+	MaxAgeIAT() time.Duration
+	Offset() time.Duration
 }
 
 // ACRVerifier specifies the function to be used by the `DefaultVerifier` for validating the acr claim
@@ -83,7 +74,7 @@ type ACRVerifier func(string) error
 // if none of the provided values matches the acr claim
 func DefaultACRVerifier(possibleValues []string) ACRVerifier {
 	return func(acr string) error {
-		if !slices.Contains(possibleValues, acr) {
+		if !str.Contains(possibleValues, acr) {
 			return fmt.Errorf("expected one of: %v, got: %q", possibleValues, acr)
 		}
 		return nil
@@ -122,7 +113,7 @@ func CheckIssuer(claims Claims, issuer string) error {
 }
 
 func CheckAudience(claims Claims, clientID string) error {
-	if !slices.Contains(claims.GetAudience(), clientID) {
+	if !str.Contains(claims.GetAudience(), clientID) {
 		return fmt.Errorf("%w: Audience must contain client_id %q", ErrAudience, clientID)
 	}
 
@@ -130,11 +121,6 @@ func CheckAudience(claims Claims, clientID string) error {
 	return nil
 }
 
-// CheckAuthorizedParty checks azp (authorized party) claim requirements.
-//
-// If the ID Token contains multiple audiences, the Client SHOULD verify that an azp Claim is present.
-// If an azp Claim is present, the Client SHOULD verify that its client_id is the Claim Value.
-// https://openid.net/specs/openid-connect-core-1_0.html#IDTokenValidation
 func CheckAuthorizedParty(claims Claims, clientID string) error {
 	if len(claims.GetAudience()) > 1 {
 		if claims.GetAuthorizedParty() == "" {
@@ -148,13 +134,8 @@ func CheckAuthorizedParty(claims Claims, clientID string) error {
 }
 
 func CheckSignature(ctx context.Context, token string, payload []byte, claims ClaimsSignature, supportedSigAlgs []string, set KeySet) error {
-	jws, err := jose.ParseSigned(token, toJoseSignatureAlgorithms(supportedSigAlgs))
+	jws, err := jose.ParseSigned(token)
 	if err != nil {
-		if strings.HasPrefix(err.Error(), "go-jose/go-jose: unexpected signature algorithm") {
-			// TODO(v4): we should wrap errors instead of returning static ones.
-			// This is a workaround so we keep returning the same error for now.
-			return ErrSignatureUnsupportedAlg
-		}
 		return ErrParse
 	}
 	if len(jws.Signatures) == 0 {
@@ -164,6 +145,12 @@ func CheckSignature(ctx context.Context, token string, payload []byte, claims Cl
 		return ErrSignatureMultiple
 	}
 	sig := jws.Signatures[0]
+	if len(supportedSigAlgs) == 0 {
+		supportedSigAlgs = []string{"RS256"}
+	}
+	if !str.Contains(supportedSigAlgs, sig.Header.Algorithm) {
+		return fmt.Errorf("%w: id token signed with unsupported algorithm, expected %q got %q", ErrSignatureUnsupportedAlg, supportedSigAlgs, sig.Header.Algorithm)
+	}
 
 	signedPayload, err := set.VerifySignature(ctx, jws)
 	if err != nil {
@@ -179,39 +166,27 @@ func CheckSignature(ctx context.Context, token string, payload []byte, claims Cl
 	return nil
 }
 
-// TODO(v4): Use the new jose.SignatureAlgorithm type directly, instead of string.
-func toJoseSignatureAlgorithms(algorithms []string) []jose.SignatureAlgorithm {
-	out := make([]jose.SignatureAlgorithm, len(algorithms))
-	for i := range algorithms {
-		out[i] = jose.SignatureAlgorithm(algorithms[i])
-	}
-	if len(out) == 0 {
-		out = append(out, jose.RS256, jose.ES256, jose.PS256)
-	}
-	return out
-}
-
 func CheckExpiration(claims Claims, offset time.Duration) error {
-	expiration := claims.GetExpiration()
-	if !time.Now().Add(offset).Before(expiration) {
+	expiration := claims.GetExpiration().Round(time.Second)
+	if !time.Now().UTC().Add(offset).Before(expiration) {
 		return ErrExpired
 	}
 	return nil
 }
 
 func CheckIssuedAt(claims Claims, maxAgeIAT, offset time.Duration) error {
-	issuedAt := claims.GetIssuedAt()
+	issuedAt := claims.GetIssuedAt().Round(time.Second)
 	if issuedAt.IsZero() {
 		return ErrIatMissing
 	}
-	nowWithOffset := time.Now().Add(offset).Round(time.Second)
+	nowWithOffset := time.Now().UTC().Add(offset).Round(time.Second)
 	if issuedAt.After(nowWithOffset) {
 		return fmt.Errorf("%w: (iat: %v, now with offset: %v)", ErrIatInFuture, issuedAt, nowWithOffset)
 	}
 	if maxAgeIAT == 0 {
 		return nil
 	}
-	maxAge := time.Now().Add(-maxAgeIAT).Round(time.Second)
+	maxAge := time.Now().UTC().Add(-maxAgeIAT).Round(time.Second)
 	if issuedAt.Before(maxAge) {
 		return fmt.Errorf("%w: must not be older than %v, but was %v (%v to old)", ErrIatToOld, maxAge, issuedAt, maxAge.Sub(issuedAt))
 	}
@@ -241,8 +216,8 @@ func CheckAuthTime(claims Claims, maxAge time.Duration) error {
 	if claims.GetAuthTime().IsZero() {
 		return ErrAuthTimeNotPresent
 	}
-	authTime := claims.GetAuthTime()
-	maxAuthTime := time.Now().Add(-maxAge).Round(time.Second)
+	authTime := claims.GetAuthTime().Round(time.Second)
+	maxAuthTime := time.Now().UTC().Add(-maxAge).Round(time.Second)
 	if authTime.Before(maxAuthTime) {
 		return fmt.Errorf("%w: must not be older than %v, but was %v (%v to old)", ErrAuthTimeToOld, maxAge, authTime, maxAuthTime.Sub(authTime))
 	}

pkg/oidc/verifier_parse_test.go

@@ -1,128 +0,0 @@
-package oidc_test
-
-import (
-	"context"
-	"encoding/json"
-	"testing"
-
-	tu "git.christmann.info/LARA/zitadel-oidc/v3/internal/testutil"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestParseToken(t *testing.T) {
-	token, wantClaims := tu.ValidIDToken()
-	wantClaims.SignatureAlg = "" // unset, because is not part of the JSON payload
-
-	wantPayload, err := json.Marshal(wantClaims)
-	require.NoError(t, err)
-
-	tests := []struct {
-		name        string
-		tokenString string
-		wantErr     bool
-	}{
-		{
-			name:        "split error",
-			tokenString: "nope",
-			wantErr:     true,
-		},
-		{
-			name:        "base64 error",
-			tokenString: "foo.~.bar",
-			wantErr:     true,
-		},
-		{
-			name:        "success",
-			tokenString: token,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			gotClaims := new(oidc.IDTokenClaims)
-			gotPayload, err := oidc.ParseToken(tt.tokenString, gotClaims)
-			if tt.wantErr {
-				assert.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-			assert.Equal(t, wantClaims, gotClaims)
-			assert.JSONEq(t, string(wantPayload), string(gotPayload))
-		})
-	}
-}
-
-func TestCheckSignature(t *testing.T) {
-	errCtx, cancel := context.WithCancel(context.Background())
-	cancel()
-
-	token, _ := tu.ValidIDToken()
-	payload, err := oidc.ParseToken(token, &oidc.IDTokenClaims{})
-	require.NoError(t, err)
-
-	type args struct {
-		ctx              context.Context
-		token            string
-		payload          []byte
-		supportedSigAlgs []string
-	}
-	tests := []struct {
-		name    string
-		args    args
-		wantErr error
-	}{
-		{
-			name: "parse error",
-			args: args{
-				ctx:     context.Background(),
-				token:   "~",
-				payload: payload,
-			},
-			wantErr: oidc.ErrParse,
-		},
-		{
-			name: "default sigAlg",
-			args: args{
-				ctx:     context.Background(),
-				token:   token,
-				payload: payload,
-			},
-		},
-		{
-			name: "unsupported sigAlg",
-			args: args{
-				ctx:              context.Background(),
-				token:            token,
-				payload:          payload,
-				supportedSigAlgs: []string{"foo", "bar"},
-			},
-			wantErr: oidc.ErrSignatureUnsupportedAlg,
-		},
-		{
-			name: "verify error",
-			args: args{
-				ctx:     errCtx,
-				token:   token,
-				payload: payload,
-			},
-			wantErr: oidc.ErrSignatureInvalid,
-		},
-		{
-			name: "inequal payloads",
-			args: args{
-				ctx:     context.Background(),
-				token:   token,
-				payload: []byte{0, 1, 2},
-			},
-			wantErr: oidc.ErrSignatureInvalidPayload,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			claims := new(oidc.TokenClaims)
-			err := oidc.CheckSignature(tt.args.ctx, tt.args.token, tt.args.payload, claims, tt.args.supportedSigAlgs, tu.KeySet{})
-			assert.ErrorIs(t, err, tt.wantErr)
-		})
-	}
-}

pkg/oidc/verifier_test.go

@@ -1,374 +0,0 @@
-package oidc
-
-import (
-	"errors"
-	"testing"
-	"time"
-
-	"github.com/stretchr/testify/assert"
-	"github.com/stretchr/testify/require"
-)
-
-func TestDecryptToken(t *testing.T) {
-	const tokenString = "ABC"
-	got, err := DecryptToken(tokenString)
-	require.NoError(t, err)
-	assert.Equal(t, tokenString, got)
-}
-
-func TestDefaultACRVerifier(t *testing.T) {
-	acrVerfier := DefaultACRVerifier([]string{"foo", "bar"})
-
-	tests := []struct {
-		name    string
-		acr     string
-		wantErr string
-	}{
-		{
-			name: "ok",
-			acr:  "bar",
-		},
-		{
-			name:    "error",
-			acr:     "hello",
-			wantErr: "expected one of: [foo bar], got: \"hello\"",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := acrVerfier(tt.acr)
-			if tt.wantErr != "" {
-				assert.EqualError(t, err, tt.wantErr)
-				return
-			}
-			require.NoError(t, err)
-		})
-	}
-}
-
-func TestCheckSubject(t *testing.T) {
-	tests := []struct {
-		name    string
-		claims  Claims
-		wantErr error
-	}{
-		{
-			name:    "missing",
-			claims:  &TokenClaims{},
-			wantErr: ErrSubjectMissing,
-		},
-		{
-			name: "ok",
-			claims: &TokenClaims{
-				Subject: "foo",
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := CheckSubject(tt.claims)
-			assert.ErrorIs(t, err, tt.wantErr)
-		})
-	}
-}
-
-func TestCheckIssuer(t *testing.T) {
-	const issuer = "foo.bar"
-	tests := []struct {
-		name    string
-		claims  Claims
-		wantErr error
-	}{
-		{
-			name:    "missing",
-			claims:  &TokenClaims{},
-			wantErr: ErrIssuerInvalid,
-		},
-		{
-			name: "wrong",
-			claims: &TokenClaims{
-				Issuer: "wrong",
-			},
-			wantErr: ErrIssuerInvalid,
-		},
-		{
-			name: "ok",
-			claims: &TokenClaims{
-				Issuer: issuer,
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := CheckIssuer(tt.claims, issuer)
-			assert.ErrorIs(t, err, tt.wantErr)
-		})
-	}
-}
-
-func TestCheckAudience(t *testing.T) {
-	const clientID = "foo.bar"
-	tests := []struct {
-		name    string
-		claims  Claims
-		wantErr error
-	}{
-		{
-			name:    "missing",
-			claims:  &TokenClaims{},
-			wantErr: ErrAudience,
-		},
-		{
-			name: "wrong",
-			claims: &TokenClaims{
-				Audience: []string{"wrong"},
-			},
-			wantErr: ErrAudience,
-		},
-		{
-			name: "ok",
-			claims: &TokenClaims{
-				Audience: []string{clientID},
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := CheckAudience(tt.claims, clientID)
-			assert.ErrorIs(t, err, tt.wantErr)
-		})
-	}
-}
-
-func TestCheckAuthorizedParty(t *testing.T) {
-	const clientID = "foo.bar"
-	tests := []struct {
-		name    string
-		claims  Claims
-		wantErr error
-	}{
-		{
-			name: "single audience, no azp",
-			claims: &TokenClaims{
-				Audience: []string{clientID},
-			},
-		},
-		{
-			name: "multiple audience, no azp",
-			claims: &TokenClaims{
-				Audience: []string{clientID, "other"},
-			},
-			wantErr: ErrAzpMissing,
-		},
-		{
-			name: "single audience, with azp",
-			claims: &TokenClaims{
-				Audience:        []string{clientID},
-				AuthorizedParty: clientID,
-			},
-		},
-		{
-			name: "multiple audience, with azp",
-			claims: &TokenClaims{
-				Audience:        []string{clientID, "other"},
-				AuthorizedParty: clientID,
-			},
-		},
-		{
-			name: "wrong azp",
-			claims: &TokenClaims{
-				AuthorizedParty: "wrong",
-			},
-			wantErr: ErrAzpInvalid,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := CheckAuthorizedParty(tt.claims, clientID)
-			assert.ErrorIs(t, err, tt.wantErr)
-		})
-	}
-}
-
-func TestCheckExpiration(t *testing.T) {
-	const offset = time.Minute
-	tests := []struct {
-		name    string
-		claims  Claims
-		wantErr error
-	}{
-		{
-			name:    "missing",
-			claims:  &TokenClaims{},
-			wantErr: ErrExpired,
-		},
-		{
-			name: "expired",
-			claims: &TokenClaims{
-				Expiration: FromTime(time.Now().Add(-2 * offset)),
-			},
-			wantErr: ErrExpired,
-		},
-		{
-			name: "valid",
-			claims: &TokenClaims{
-				Expiration: FromTime(time.Now().Add(2 * offset)),
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := CheckExpiration(tt.claims, offset)
-			assert.ErrorIs(t, err, tt.wantErr)
-		})
-	}
-}
-
-func TestCheckIssuedAt(t *testing.T) {
-	const offset = time.Minute
-	tests := []struct {
-		name      string
-		maxAgeIAT time.Duration
-		claims    Claims
-		wantErr   error
-	}{
-		{
-			name:    "missing",
-			claims:  &TokenClaims{},
-			wantErr: ErrIatMissing,
-		},
-		{
-			name: "future",
-			claims: &TokenClaims{
-				IssuedAt: FromTime(time.Now().Add(time.Hour)),
-			},
-			wantErr: ErrIatInFuture,
-		},
-		{
-			name: "no max",
-			claims: &TokenClaims{
-				IssuedAt: FromTime(time.Now()),
-			},
-		},
-		{
-			name:      "past max",
-			maxAgeIAT: time.Minute,
-			claims: &TokenClaims{
-				IssuedAt: FromTime(time.Now().Add(-time.Hour)),
-			},
-			wantErr: ErrIatToOld,
-		},
-		{
-			name:      "within max",
-			maxAgeIAT: time.Hour,
-			claims: &TokenClaims{
-				IssuedAt: FromTime(time.Now()),
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := CheckIssuedAt(tt.claims, tt.maxAgeIAT, offset)
-			assert.ErrorIs(t, err, tt.wantErr)
-		})
-	}
-}
-
-func TestCheckNonce(t *testing.T) {
-	const nonce = "123"
-	tests := []struct {
-		name    string
-		claims  Claims
-		wantErr error
-	}{
-		{
-			name:    "missing",
-			claims:  &TokenClaims{},
-			wantErr: ErrNonceInvalid,
-		},
-		{
-			name: "wrong",
-			claims: &TokenClaims{
-				Nonce: "wrong",
-			},
-			wantErr: ErrNonceInvalid,
-		},
-		{
-			name: "ok",
-			claims: &TokenClaims{
-				Nonce: nonce,
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := CheckNonce(tt.claims, nonce)
-			assert.ErrorIs(t, err, tt.wantErr)
-		})
-	}
-}
-
-func TestCheckAuthorizationContextClassReference(t *testing.T) {
-	tests := []struct {
-		name    string
-		acr     ACRVerifier
-		wantErr error
-	}{
-		{
-			name:    "error",
-			acr:     func(s string) error { return errors.New("oops") },
-			wantErr: ErrAcrInvalid,
-		},
-		{
-			name: "ok",
-			acr:  func(s string) error { return nil },
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := CheckAuthorizationContextClassReference(&IDTokenClaims{}, tt.acr)
-			assert.ErrorIs(t, err, tt.wantErr)
-		})
-	}
-}
-
-func TestCheckAuthTime(t *testing.T) {
-	tests := []struct {
-		name    string
-		claims  Claims
-		maxAge  time.Duration
-		wantErr error
-	}{
-		{
-			name:   "no max age",
-			claims: &TokenClaims{},
-		},
-		{
-			name:    "missing",
-			claims:  &TokenClaims{},
-			maxAge:  time.Minute,
-			wantErr: ErrAuthTimeNotPresent,
-		},
-		{
-			name:   "expired",
-			maxAge: time.Minute,
-			claims: &TokenClaims{
-				AuthTime: FromTime(time.Now().Add(-time.Hour)),
-			},
-			wantErr: ErrAuthTimeToOld,
-		},
-		{
-			name:   "ok",
-			maxAge: time.Minute,
-			claims: &TokenClaims{
-				AuthTime: NowTime(),
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			err := CheckAuthTime(tt.claims, tt.maxAge)
-			assert.ErrorIs(t, err, tt.wantErr)
-		})
-	}
-}

pkg/op/auth_request.go

@@ -1,23 +1,20 @@
 package op
 
 import (
-	"bytes"
 	"context"
-	_ "embed"
-	"errors"
 	"fmt"
-	"html/template"
-	"log/slog"
 	"net"
 	"net/http"
 	"net/url"
-	"slices"
+	"path"
 	"strings"
 	"time"
 
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"github.com/bmatcuk/doublestar/v4"
+	"github.com/gorilla/mux"
+
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
+	str "github.com/zitadel/oidc/v2/pkg/strings"
 )
 
 type AuthRequest interface {
@@ -38,34 +35,20 @@ type AuthRequest interface {
 	Done() bool
 }
 
-// AuthRequestSessionState should be implemented if [OpenID Connect Session Management](https://openid.net/specs/openid-connect-session-1_0.html) is supported
-type AuthRequestSessionState interface {
-	// GetSessionState returns session_state.
-	// session_state is related to OpenID Connect Session Management.
-	GetSessionState() string
-}
-
 type Authorizer interface {
 	Storage() Storage
 	Decoder() httphelper.Decoder
 	Encoder() httphelper.Encoder
-	IDTokenHintVerifier(context.Context) *IDTokenHintVerifier
+	IDTokenHintVerifier(context.Context) IDTokenHintVerifier
 	Crypto() Crypto
 	RequestObjectSupported() bool
-	Logger() *slog.Logger
 }
 
 // AuthorizeValidator is an extension of Authorizer interface
 // implementing its own validation mechanism for the auth request
 type AuthorizeValidator interface {
 	Authorizer
-	ValidateAuthRequest(context.Context, *oidc.AuthRequest, Storage, *IDTokenHintVerifier) (string, error)
-}
-
-type CodeResponseType struct {
-	Code         string `schema:"code"`
-	State        string `schema:"state,omitempty"`
-	SessionState string `schema:"session_state,omitempty"`
+	ValidateAuthRequest(context.Context, *oidc.AuthRequest, Storage, IDTokenHintVerifier) (string, error)
 }
 
 func authorizeHandler(authorizer Authorizer) func(http.ResponseWriter, *http.Request) {
@@ -74,7 +57,7 @@ func authorizeHandler(authorizer Authorizer) func(http.ResponseWriter, *http.Req
 	}
 }
 
-func AuthorizeCallbackHandler(authorizer Authorizer) func(http.ResponseWriter, *http.Request) {
+func authorizeCallbackHandler(authorizer Authorizer) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		AuthorizeCallback(w, r, authorizer)
 	}
@@ -83,54 +66,51 @@ func AuthorizeCallbackHandler(authorizer Authorizer) func(http.ResponseWriter, *
 // Authorize handles the authorization request, including
 // parsing, validating, storing and finally redirecting to the login handler
 func Authorize(w http.ResponseWriter, r *http.Request, authorizer Authorizer) {
-	ctx, span := tracer.Start(r.Context(), "Authorize")
-	r = r.WithContext(ctx)
-	defer span.End()
-
 	authReq, err := ParseAuthorizeRequest(r, authorizer.Decoder())
 	if err != nil {
-		AuthRequestError(w, r, nil, err, authorizer)
+		AuthRequestError(w, r, nil, err, authorizer.Encoder())
 		return
 	}
+	ctx := r.Context()
 	if authReq.RequestParam != "" && authorizer.RequestObjectSupported() {
-		err = ParseRequestObject(ctx, authReq, authorizer.Storage(), IssuerFromContext(ctx))
+		authReq, err = ParseRequestObject(ctx, authReq, authorizer.Storage(), IssuerFromContext(ctx))
 		if err != nil {
-			AuthRequestError(w, r, nil, err, authorizer)
+			AuthRequestError(w, r, nil, err, authorizer.Encoder())
 			return
 		}
 	}
 	if authReq.ClientID == "" {
-		AuthRequestError(w, r, nil, fmt.Errorf("auth request is missing client_id"), authorizer)
+		AuthRequestError(w, r, nil, fmt.Errorf("auth request is missing client_id"), authorizer.Encoder())
 		return
 	}
 	if authReq.RedirectURI == "" {
-		AuthRequestError(w, r, nil, fmt.Errorf("auth request is missing redirect_uri"), authorizer)
+		AuthRequestError(w, r, nil, fmt.Errorf("auth request is missing redirect_uri"), authorizer.Encoder())
 		return
 	}
 
 	var client Client
-	validation := func(ctx context.Context, authReq *oidc.AuthRequest, storage Storage, verifier *IDTokenHintVerifier) (sub string, err error) {
+	validation := func(ctx context.Context, authReq *oidc.AuthRequest, storage Storage, verifier IDTokenHintVerifier) (sub string, err error) {
 		client, err = authorizer.Storage().GetClientByClientID(ctx, authReq.ClientID)
 		if err != nil {
 			return "", oidc.ErrInvalidRequestRedirectURI().WithDescription("unable to retrieve client by id").WithParent(err)
 		}
 		return ValidateAuthRequestClient(ctx, authReq, client, verifier)
 	}
-	if validator, ok := authorizer.(AuthorizeValidator); ok {
-		validation = validator.ValidateAuthRequest
+	if validater, ok := authorizer.(AuthorizeValidator); ok {
+		validation = validater.ValidateAuthRequest
 	}
 	userID, err := validation(ctx, authReq, authorizer.Storage(), authorizer.IDTokenHintVerifier(ctx))
 	if err != nil {
-		AuthRequestError(w, r, authReq, err, authorizer)
+		AuthRequestError(w, r, authReq, err, authorizer.Encoder())
 		return
 	}
 	if authReq.RequestParam != "" {
-		AuthRequestError(w, r, authReq, oidc.ErrRequestNotSupported(), authorizer)
+		AuthRequestError(w, r, authReq, oidc.ErrRequestNotSupported(), authorizer.Encoder())
 		return
 	}
 	req, err := authorizer.Storage().CreateAuthRequest(ctx, authReq, userID)
 	if err != nil {
-		AuthRequestError(w, r, authReq, oidc.DefaultToServerError(err, "unable to save auth request"), authorizer)
+		AuthRequestError(w, r, authReq, oidc.DefaultToServerError(err, "unable to save auth request"), authorizer.Encoder())
 		return
 	}
 	RedirectToLogin(req.GetID(), client, w, r)
@@ -152,37 +132,37 @@ func ParseAuthorizeRequest(r *http.Request, decoder httphelper.Decoder) (*oidc.A
 
 // ParseRequestObject parse the `request` parameter, validates the token including the signature
 // and copies the token claims into the auth request
-func ParseRequestObject(ctx context.Context, authReq *oidc.AuthRequest, storage Storage, issuer string) error {
+func ParseRequestObject(ctx context.Context, authReq *oidc.AuthRequest, storage Storage, issuer string) (*oidc.AuthRequest, error) {
 	requestObject := new(oidc.RequestObject)
 	payload, err := oidc.ParseToken(authReq.RequestParam, requestObject)
 	if err != nil {
-		return err
+		return nil, err
 	}
 
 	if requestObject.ClientID != "" && requestObject.ClientID != authReq.ClientID {
-		return oidc.ErrInvalidRequest().WithDescription("missing or wrong client id in request")
+		return authReq, oidc.ErrInvalidRequest()
 	}
 	if requestObject.ResponseType != "" && requestObject.ResponseType != authReq.ResponseType {
-		return oidc.ErrInvalidRequest().WithDescription("missing or wrong response type in request")
+		return authReq, oidc.ErrInvalidRequest()
 	}
 	if requestObject.Issuer != requestObject.ClientID {
-		return oidc.ErrInvalidRequest().WithDescription("missing or wrong issuer in request")
+		return authReq, oidc.ErrInvalidRequest()
 	}
-	if !slices.Contains(requestObject.Audience, issuer) {
-		return oidc.ErrInvalidRequest().WithDescription("issuer missing in audience")
+	if !str.Contains(requestObject.Audience, issuer) {
+		return authReq, oidc.ErrInvalidRequest()
 	}
 	keySet := &jwtProfileKeySet{storage: storage, clientID: requestObject.Issuer}
 	if err = oidc.CheckSignature(ctx, authReq.RequestParam, payload, requestObject, nil, keySet); err != nil {
-		return oidc.ErrInvalidRequest().WithParent(err).WithDescription(err.Error())
+		return authReq, err
 	}
 	CopyRequestObjectToAuthRequest(authReq, requestObject)
-	return nil
+	return authReq, nil
 }
 
 // CopyRequestObjectToAuthRequest overwrites present values from the Request Object into the auth request
 // and clears the `RequestParam` of the auth request
 func CopyRequestObjectToAuthRequest(authReq *oidc.AuthRequest, requestObject *oidc.RequestObject) {
-	if slices.Contains(authReq.Scopes, oidc.ScopeOpenID) && len(requestObject.Scopes) > 0 {
+	if str.Contains(authReq.Scopes, oidc.ScopeOpenID) && len(requestObject.Scopes) > 0 {
 		authReq.Scopes = requestObject.Scopes
 	}
 	if requestObject.RedirectURI != "" {
@@ -230,7 +210,7 @@ func CopyRequestObjectToAuthRequest(authReq *oidc.AuthRequest, requestObject *oi
 // ValidateAuthRequest validates the authorize parameters and returns the userID of the id_token_hint if passed.
 //
 // Deprecated: Use [ValidateAuthRequestClient] to prevent querying for the Client twice.
-func ValidateAuthRequest(ctx context.Context, authReq *oidc.AuthRequest, storage Storage, verifier *IDTokenHintVerifier) (sub string, err error) {
+func ValidateAuthRequest(ctx context.Context, authReq *oidc.AuthRequest, storage Storage, verifier IDTokenHintVerifier) (sub string, err error) {
 	ctx, span := tracer.Start(ctx, "ValidateAuthRequest")
 	defer span.End()
 
@@ -243,7 +223,7 @@ func ValidateAuthRequest(ctx context.Context, authReq *oidc.AuthRequest, storage
 
 // ValidateAuthRequestClient validates the Auth request against the passed client.
 // If id_token_hint is part of the request, the subject of the token is returned.
-func ValidateAuthRequestClient(ctx context.Context, authReq *oidc.AuthRequest, client Client, verifier *IDTokenHintVerifier) (sub string, err error) {
+func ValidateAuthRequestClient(ctx context.Context, authReq *oidc.AuthRequest, client Client, verifier IDTokenHintVerifier) (sub string, err error) {
 	ctx, span := tracer.Start(ctx, "ValidateAuthRequestClient")
 	defer span.End()
 
@@ -277,35 +257,49 @@ func ValidateAuthReqPrompt(prompts []string, maxAge *uint) (_ *uint, err error)
 	return maxAge, nil
 }
 
-// ValidateAuthReqScopes validates the passed scopes and deletes any unsupported scopes.
-// An error is returned if scopes is empty.
+// ValidateAuthReqScopes validates the passed scopes
 func ValidateAuthReqScopes(client Client, scopes []string) ([]string, error) {
 	if len(scopes) == 0 {
 		return nil, oidc.ErrInvalidRequest().
 			WithDescription("The scope of your request is missing. Please ensure some scopes are requested. " +
 				"If you have any questions, you may contact the administrator of the application.")
 	}
-	scopes = slices.DeleteFunc(scopes, func(scope string) bool {
-		return !(scope == oidc.ScopeOpenID ||
-			scope == oidc.ScopeProfile ||
+	openID := false
+	for i := len(scopes) - 1; i >= 0; i-- {
+		scope := scopes[i]
+		if scope == oidc.ScopeOpenID {
+			openID = true
+			continue
+		}
+		if !(scope == oidc.ScopeProfile ||
 			scope == oidc.ScopeEmail ||
 			scope == oidc.ScopePhone ||
 			scope == oidc.ScopeAddress ||
 			scope == oidc.ScopeOfflineAccess) &&
-			!client.IsScopeAllowed(scope)
-	})
+			!client.IsScopeAllowed(scope) {
+			scopes[i] = scopes[len(scopes)-1]
+			scopes[len(scopes)-1] = ""
+			scopes = scopes[:len(scopes)-1]
+		}
+	}
+	if !openID {
+		return nil, oidc.ErrInvalidScope().WithDescription("The scope openid is missing in your request. " +
+			"Please ensure the scope openid is added to the request. " +
+			"If you have any questions, you may contact the administrator of the application.")
+	}
+
 	return scopes, nil
 }
 
 // checkURIAgainstRedirects just checks aginst the valid redirect URIs and ignores
 // other factors.
 func checkURIAgainstRedirects(client Client, uri string) error {
-	if slices.Contains(client.RedirectURIs(), uri) {
+	if str.Contains(client.RedirectURIs(), uri) {
 		return nil
 	}
 	if globClient, ok := client.(HasRedirectGlobs); ok {
 		for _, uriGlob := range globClient.RedirectURIGlobs() {
-			isMatch, err := doublestar.Match(uriGlob, uri)
+			isMatch, err := path.Match(uriGlob, uri)
 			if err != nil {
 				return oidc.ErrServerError().WithParent(err)
 			}
@@ -325,12 +319,12 @@ func ValidateAuthReqRedirectURI(client Client, uri string, responseType oidc.Res
 		return oidc.ErrInvalidRequestRedirectURI().WithDescription("The redirect_uri is missing in the request. " +
 			"Please ensure it is added to the request. If you have any questions, you may contact the administrator of the application.")
 	}
-	if client.ApplicationType() == ApplicationTypeNative {
-		return validateAuthReqRedirectURINative(client, uri)
-	}
 	if strings.HasPrefix(uri, "https://") {
 		return checkURIAgainstRedirects(client, uri)
 	}
+	if client.ApplicationType() == ApplicationTypeNative {
+		return validateAuthReqRedirectURINative(client, uri, responseType)
+	}
 	if err := checkURIAgainstRedirects(client, uri); err != nil {
 		return err
 	}
@@ -349,17 +343,14 @@ func ValidateAuthReqRedirectURI(client Client, uri string, responseType oidc.Res
 }
 
 // ValidateAuthReqRedirectURINative validates the passed redirect_uri and response_type to the registered uris and client type
-func validateAuthReqRedirectURINative(client Client, uri string) error {
+func validateAuthReqRedirectURINative(client Client, uri string, responseType oidc.ResponseType) error {
 	parsedURL, isLoopback := HTTPLoopbackOrLocalhost(uri)
-	isCustomSchema := !(strings.HasPrefix(uri, "http://") || strings.HasPrefix(uri, "https://"))
+	isCustomSchema := !strings.HasPrefix(uri, "http://")
 	if err := checkURIAgainstRedirects(client, uri); err == nil {
 		if client.DevMode() {
 			return nil
 		}
-		if !isLoopback && strings.HasPrefix(uri, "https://") {
-			return nil
-		}
-		// The RedirectURIs are only valid for native clients when localhost or non-"http://" and "https://"
+		// The RedirectURIs are only valid for native clients when localhost or non-"http://"
 		if isLoopback || isCustomSchema {
 			return nil
 		}
@@ -384,16 +375,16 @@ func equalURI(url1, url2 *url.URL) bool {
 	return url1.Path == url2.Path && url1.RawQuery == url2.RawQuery
 }
 
-func HTTPLoopbackOrLocalhost(rawURL string) (*url.URL, bool) {
-	parsedURL, err := url.Parse(rawURL)
+func HTTPLoopbackOrLocalhost(rawurl string) (*url.URL, bool) {
+	parsedURL, err := url.Parse(rawurl)
 	if err != nil {
 		return nil, false
 	}
-	if parsedURL.Scheme == "http" || parsedURL.Scheme == "https" {
-		hostName := parsedURL.Hostname()
-		return parsedURL, hostName == "localhost" || net.ParseIP(hostName).IsLoopback()
+	if parsedURL.Scheme != "http" {
+		return nil, false
 	}
-	return nil, false
+	hostName := parsedURL.Hostname()
+	return parsedURL, hostName == "localhost" || net.ParseIP(hostName).IsLoopback()
 }
 
 // ValidateAuthReqResponseType validates the passed response_type to the registered response types
@@ -411,14 +402,14 @@ func ValidateAuthReqResponseType(client Client, responseType oidc.ResponseType)
 
 // ValidateAuthReqIDTokenHint validates the id_token_hint (if passed as parameter in the request)
 // and returns the `sub` claim
-func ValidateAuthReqIDTokenHint(ctx context.Context, idTokenHint string, verifier *IDTokenHintVerifier) (string, error) {
+func ValidateAuthReqIDTokenHint(ctx context.Context, idTokenHint string, verifier IDTokenHintVerifier) (string, error) {
 	if idTokenHint == "" {
 		return "", nil
 	}
 	claims, err := VerifyIDTokenHint[*oidc.TokenClaims](ctx, idTokenHint, verifier)
-	if err != nil && !errors.As(err, &IDTokenHintExpiredError{}) {
+	if err != nil {
 		return "", oidc.ErrLoginRequired().WithDescription("The id_token_hint is invalid. " +
-			"If you have any questions, you may contact the administrator of the application.").WithParent(err)
+			"If you have any questions, you may contact the administrator of the application.")
 	}
 	return claims.GetSubject(), nil
 }
@@ -431,49 +422,32 @@ func RedirectToLogin(authReqID string, client Client, w http.ResponseWriter, r *
 
 // AuthorizeCallback handles the callback after authentication in the Login UI
 func AuthorizeCallback(w http.ResponseWriter, r *http.Request, authorizer Authorizer) {
-	ctx, span := tracer.Start(r.Context(), "AuthorizeCallback")
-	r = r.WithContext(ctx)
-	defer span.End()
-
-	id, err := ParseAuthorizeCallbackRequest(r)
-	if err != nil {
-		AuthRequestError(w, r, nil, err, authorizer)
+	params := mux.Vars(r)
+	id := params["id"]
+	if id == "" {
+		AuthRequestError(w, r, nil, fmt.Errorf("auth request callback is missing id"), authorizer.Encoder())
 		return
 	}
+
 	authReq, err := authorizer.Storage().AuthRequestByID(r.Context(), id)
 	if err != nil {
-		AuthRequestError(w, r, nil, err, authorizer)
+		AuthRequestError(w, r, nil, err, authorizer.Encoder())
 		return
 	}
 	if !authReq.Done() {
 		AuthRequestError(w, r, authReq,
 			oidc.ErrInteractionRequired().WithDescription("Unfortunately, the user may be not logged in and/or additional interaction is required."),
-			authorizer)
+			authorizer.Encoder())
 		return
 	}
 	AuthResponse(authReq, authorizer, w, r)
 }
 
-func ParseAuthorizeCallbackRequest(r *http.Request) (id string, err error) {
-	if err = r.ParseForm(); err != nil {
-		return "", fmt.Errorf("cannot parse form: %w", err)
-	}
-	id = r.Form.Get("id")
-	if id == "" {
-		return "", errors.New("auth request callback is missing id")
-	}
-	return id, nil
-}
-
 // AuthResponse creates the successful authentication response (either code or tokens)
 func AuthResponse(authReq AuthRequest, authorizer Authorizer, w http.ResponseWriter, r *http.Request) {
-	ctx, span := tracer.Start(r.Context(), "AuthResponse")
-	r = r.WithContext(ctx)
-	defer span.End()
-
 	client, err := authorizer.Storage().GetClientByClientID(r.Context(), authReq.GetClientID())
 	if err != nil {
-		AuthRequestError(w, r, authReq, err, authorizer)
+		AuthRequestError(w, r, authReq, err, authorizer.Encoder())
 		return
 	}
 	if authReq.GetResponseType() == oidc.ResponseTypeCode {
@@ -483,70 +457,26 @@ func AuthResponse(authReq AuthRequest, authorizer Authorizer, w http.ResponseWri
 	AuthResponseToken(w, r, authReq, authorizer, client)
 }
 
-// AuthResponseCode handles the creation of a successful authentication response using an authorization code
+// AuthResponseCode creates the successful code authentication response
 func AuthResponseCode(w http.ResponseWriter, r *http.Request, authReq AuthRequest, authorizer Authorizer) {
-	ctx, span := tracer.Start(r.Context(), "AuthResponseCode")
-	defer span.End()
-	r = r.WithContext(ctx)
-
-	var err error
-	if authReq.GetResponseMode() == oidc.ResponseModeFormPost {
-		err = handleFormPostResponse(w, r, authReq, authorizer)
-	} else {
-		err = handleRedirectResponse(w, r, authReq, authorizer)
-	}
-
+	code, err := CreateAuthRequestCode(r.Context(), authReq, authorizer.Storage(), authorizer.Crypto())
 	if err != nil {
-		AuthRequestError(w, r, authReq, err, authorizer)
+		AuthRequestError(w, r, authReq, err, authorizer.Encoder())
+		return
 	}
-}
-
-// handleFormPostResponse processes the authentication response using form post method
-func handleFormPostResponse(w http.ResponseWriter, r *http.Request, authReq AuthRequest, authorizer Authorizer) error {
-	codeResponse, err := BuildAuthResponseCodeResponsePayload(r.Context(), authReq, authorizer)
+	codeResponse := struct {
+		Code  string `schema:"code"`
+		State string `schema:"state,omitempty"`
+	}{
+		Code:  code,
+		State: authReq.GetState(),
+	}
+	callback, err := AuthResponseURL(authReq.GetRedirectURI(), authReq.GetResponseType(), authReq.GetResponseMode(), &codeResponse, authorizer.Encoder())
 	if err != nil {
-		return err
+		AuthRequestError(w, r, authReq, err, authorizer.Encoder())
+		return
 	}
-	return AuthResponseFormPost(w, authReq.GetRedirectURI(), codeResponse, authorizer.Encoder())
-}
-
-// handleRedirectResponse processes the authentication response using the redirect method
-func handleRedirectResponse(w http.ResponseWriter, r *http.Request, authReq AuthRequest, authorizer Authorizer) error {
-	callbackURL, err := BuildAuthResponseCallbackURL(r.Context(), authReq, authorizer)
-	if err != nil {
-		return err
-	}
-	http.Redirect(w, r, callbackURL, http.StatusFound)
-	return nil
-}
-
-// BuildAuthResponseCodeResponsePayload generates the authorization code response payload for the authentication request
-func BuildAuthResponseCodeResponsePayload(ctx context.Context, authReq AuthRequest, authorizer Authorizer) (*CodeResponseType, error) {
-	code, err := CreateAuthRequestCode(ctx, authReq, authorizer.Storage(), authorizer.Crypto())
-	if err != nil {
-		return nil, err
-	}
-
-	sessionState := ""
-	if authRequestSessionState, ok := authReq.(AuthRequestSessionState); ok {
-		sessionState = authRequestSessionState.GetSessionState()
-	}
-
-	return &CodeResponseType{
-		Code:         code,
-		State:        authReq.GetState(),
-		SessionState: sessionState,
-	}, nil
-}
-
-// BuildAuthResponseCallbackURL generates the callback URL for a successful authorization code response
-func BuildAuthResponseCallbackURL(ctx context.Context, authReq AuthRequest, authorizer Authorizer) (string, error) {
-	codeResponse, err := BuildAuthResponseCodeResponsePayload(ctx, authReq, authorizer)
-	if err != nil {
-		return "", err
-	}
-
-	return AuthResponseURL(authReq.GetRedirectURI(), authReq.GetResponseType(), authReq.GetResponseMode(), codeResponse, authorizer.Encoder())
+	http.Redirect(w, r, callback, http.StatusFound)
 }
 
 // AuthResponseToken creates the successful token(s) authentication response
@@ -558,23 +488,12 @@ func AuthResponseToken(w http.ResponseWriter, r *http.Request, authReq AuthReque
 	createAccessToken := authReq.GetResponseType() != oidc.ResponseTypeIDTokenOnly
 	resp, err := CreateTokenResponse(r.Context(), authReq, client, authorizer, createAccessToken, "", "")
 	if err != nil {
-		AuthRequestError(w, r, authReq, err, authorizer)
+		AuthRequestError(w, r, authReq, err, authorizer.Encoder())
 		return
 	}
-
-	if authReq.GetResponseMode() == oidc.ResponseModeFormPost {
-		err := AuthResponseFormPost(w, authReq.GetRedirectURI(), resp, authorizer.Encoder())
-		if err != nil {
-			AuthRequestError(w, r, authReq, err, authorizer)
-			return
-		}
-
-		return
-	}
-
 	callback, err := AuthResponseURL(authReq.GetRedirectURI(), authReq.GetResponseType(), authReq.GetResponseMode(), resp, authorizer.Encoder())
 	if err != nil {
-		AuthRequestError(w, r, authReq, err, authorizer)
+		AuthRequestError(w, r, authReq, err, authorizer.Encoder())
 		return
 	}
 	http.Redirect(w, r, callback, http.StatusFound)
@@ -582,9 +501,6 @@ func AuthResponseToken(w http.ResponseWriter, r *http.Request, authReq AuthReque
 
 // CreateAuthRequestCode creates and stores a code for the auth code response
 func CreateAuthRequestCode(ctx context.Context, authReq AuthRequest, storage Storage, crypto Crypto) (string, error) {
-	ctx, span := tracer.Start(ctx, "CreateAuthRequestCode")
-	defer span.End()
-
 	code, err := BuildAuthRequestCode(authReq, crypto)
 	if err != nil {
 		return "", err
@@ -626,43 +542,6 @@ func AuthResponseURL(redirectURI string, responseType oidc.ResponseType, respons
 	return mergeQueryParams(uri, params), nil
 }
 
-//go:embed form_post.html.tmpl
-var formPostHtmlTemplate string
-
-var formPostTmpl = template.Must(template.New("form_post").Parse(formPostHtmlTemplate))
-
-// AuthResponseFormPost responds a html page that automatically submits the form which contains the auth response parameters
-func AuthResponseFormPost(res http.ResponseWriter, redirectURI string, response any, encoder httphelper.Encoder) error {
-	values := make(map[string][]string)
-	err := encoder.Encode(response, values)
-	if err != nil {
-		return oidc.ErrServerError().WithParent(err)
-	}
-
-	params := &struct {
-		RedirectURI string
-		Params      any
-	}{
-		RedirectURI: redirectURI,
-		Params:      values,
-	}
-
-	var buf bytes.Buffer
-	err = formPostTmpl.Execute(&buf, params)
-	if err != nil {
-		return oidc.ErrServerError().WithParent(err)
-	}
-
-	res.Header().Set("Cache-Control", "no-store")
-	res.WriteHeader(http.StatusOK)
-	_, err = buf.WriteTo(res)
-	if err != nil {
-		return oidc.ErrServerError().WithParent(err)
-	}
-
-	return nil
-}
-
 func setFragment(uri *url.URL, params url.Values) string {
 	uri.Fragment = params.Encode()
 	return uri.String()

pkg/op/auth_request_test.go

@@ -4,23 +4,21 @@ import (
 	"context"
 	"errors"
 	"io"
-	"log/slog"
 	"net/http"
 	"net/http/httptest"
 	"net/url"
 	"reflect"
 	"testing"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/example/server/storage"
-	tu "git.christmann.info/LARA/zitadel-oidc/v3/internal/testutil"
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op/mock"
 	"github.com/golang/mock/gomock"
+	"github.com/gorilla/schema"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/zitadel/schema"
+	"github.com/zitadel/oidc/v2/example/server/storage"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/op"
+	"github.com/zitadel/oidc/v2/pkg/op/mock"
 )
 
 func TestAuthorize(t *testing.T) {
@@ -41,7 +39,7 @@ func TestAuthorize(t *testing.T) {
 
 			expect := authorizer.EXPECT()
 			expect.Decoder().Return(schema.NewDecoder())
-			expect.Logger().Return(slog.Default())
+			expect.Encoder().Return(schema.NewEncoder())
 
 			if tt.expect != nil {
 				tt.expect(expect)
@@ -125,7 +123,7 @@ func TestValidateAuthRequest(t *testing.T) {
 	type args struct {
 		authRequest *oidc.AuthRequest
 		storage     op.Storage
-		verifier    *op.IDTokenHintVerifier
+		verifier    op.IDTokenHintVerifier
 	}
 	tests := []struct {
 		name    string
@@ -134,22 +132,22 @@ func TestValidateAuthRequest(t *testing.T) {
 	}{
 		{
 			"scope missing fails",
-			args{&oidc.AuthRequest{}, mock.NewMockStorageExpectValidClientID(t), nil},
+			args{&oidc.AuthRequest{ClientID: "client_id", RedirectURI: "https://registered.com/callback"}, mock.NewMockStorageExpectValidClientID(t), nil},
 			oidc.ErrInvalidRequest(),
 		},
+		{
+			"scope openid missing fails",
+			args{&oidc.AuthRequest{ClientID: "client_id", RedirectURI: "https://registered.com/callback", Scopes: []string{"profile"}}, mock.NewMockStorageExpectValidClientID(t), nil},
+			oidc.ErrInvalidScope(),
+		},
 		{
 			"response_type missing fails",
-			args{&oidc.AuthRequest{Scopes: []string{"openid"}}, mock.NewMockStorageExpectValidClientID(t), nil},
-			oidc.ErrInvalidRequest(),
-		},
-		{
-			"client_id missing fails",
-			args{&oidc.AuthRequest{Scopes: []string{"openid"}, ResponseType: oidc.ResponseTypeCode}, mock.NewMockStorageExpectValidClientID(t), nil},
+			args{&oidc.AuthRequest{ClientID: "client_id", RedirectURI: "https://registered.com/callback", Scopes: []string{"openid"}}, mock.NewMockStorageExpectValidClientID(t), nil},
 			oidc.ErrInvalidRequest(),
 		},
 		{
 			"redirect_uri missing fails",
-			args{&oidc.AuthRequest{Scopes: []string{"openid"}, ResponseType: oidc.ResponseTypeCode, ClientID: "client_id"}, mock.NewMockStorageExpectValidClientID(t), nil},
+			args{&oidc.AuthRequest{ClientID: "client_id", Scopes: []string{"openid"}, ResponseType: oidc.ResponseTypeCode}, mock.NewMockStorageExpectValidClientID(t), nil},
 			oidc.ErrInvalidRequest(),
 		},
 	}
@@ -282,6 +280,16 @@ func TestValidateAuthReqScopes(t *testing.T) {
 				err: true,
 			},
 		},
+		{
+			"scope openid missing fails",
+			args{
+				mock.NewClientExpectAny(t, op.ApplicationTypeWeb),
+				[]string{"email"},
+			},
+			res{
+				err: true,
+			},
+		},
 		{
 			"scope ok",
 			args{
@@ -433,24 +441,6 @@ func TestValidateAuthReqRedirectURI(t *testing.T) {
 			},
 			false,
 		},
-		{
-			"code flow registered https loopback v4 native ok",
-			args{
-				"https://127.0.0.1:4200/callback",
-				mock.NewClientWithConfig(t, []string{"https://127.0.0.1/callback"}, op.ApplicationTypeNative, nil, false),
-				oidc.ResponseTypeCode,
-			},
-			false,
-		},
-		{
-			"code flow registered https loopback v6 native ok",
-			args{
-				"https://[::1]:4200/callback",
-				mock.NewClientWithConfig(t, []string{"https://[::1]/callback"}, op.ApplicationTypeNative, nil, false),
-				oidc.ResponseTypeCode,
-			},
-			false,
-		},
 		{
 			"code flow unregistered http native fails",
 			args{
@@ -586,60 +576,6 @@ func TestValidateAuthReqRedirectURI(t *testing.T) {
 			},
 			false,
 		},
-		{
-			"code flow dev mode has redirect globs regular ok",
-			args{
-				"http://registered.com/callback",
-				mock.NewHasRedirectGlobsWithConfig(t, []string{"http://registered.com/*"}, op.ApplicationTypeUserAgent, nil, true),
-				oidc.ResponseTypeCode,
-			},
-			false,
-		},
-		{
-			"code flow dev mode has redirect globs wildcard ok",
-			args{
-				"http://registered.com/callback",
-				mock.NewHasRedirectGlobsWithConfig(t, []string{"http://registered.com/*"}, op.ApplicationTypeUserAgent, nil, true),
-				oidc.ResponseTypeCode,
-			},
-			false,
-		},
-		{
-			"code flow dev mode has redirect globs double star ok",
-			args{
-				"http://registered.com/callback",
-				mock.NewHasRedirectGlobsWithConfig(t, []string{"http://**/*"}, op.ApplicationTypeUserAgent, nil, true),
-				oidc.ResponseTypeCode,
-			},
-			false,
-		},
-		{
-			"code flow dev mode has redirect globs double star ok",
-			args{
-				"http://registered.com/callback",
-				mock.NewHasRedirectGlobsWithConfig(t, []string{"http://**/*"}, op.ApplicationTypeUserAgent, nil, true),
-				oidc.ResponseTypeCode,
-			},
-			false,
-		},
-		{
-			"code flow dev mode has redirect globs IPv6 ok",
-			args{
-				"http://[::1]:80/callback",
-				mock.NewHasRedirectGlobsWithConfig(t, []string{"http://\\[::1\\]:80/*"}, op.ApplicationTypeUserAgent, nil, true),
-				oidc.ResponseTypeCode,
-			},
-			false,
-		},
-		{
-			"code flow dev mode has redirect globs bad pattern",
-			args{
-				"http://registered.com/callback",
-				mock.NewHasRedirectGlobsWithConfig(t, []string{"http://**/\\"}, op.ApplicationTypeUserAgent, nil, true),
-				oidc.ResponseTypeCode,
-			},
-			true,
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -1030,10 +966,9 @@ func TestAuthResponseCode(t *testing.T) {
 		authorizer func(*testing.T) op.Authorizer
 	}
 	type res struct {
-		wantCode               int
-		wantLocationHeader     string
-		wantCacheControlHeader string
-		wantBody               string
+		wantCode           int
+		wantLocationHeader string
+		wantBody           string
 	}
 	tests := []struct {
 		name string
@@ -1056,7 +991,7 @@ func TestAuthResponseCode(t *testing.T) {
 					authorizer.EXPECT().Crypto().Return(&mockCrypto{
 						returnErr: io.ErrClosedPipe,
 					})
-					authorizer.EXPECT().Logger().Return(slog.Default())
+					authorizer.EXPECT().Encoder().Return(schema.NewEncoder())
 					return authorizer
 				},
 			},
@@ -1075,7 +1010,7 @@ func TestAuthResponseCode(t *testing.T) {
 				authorizer: func(t *testing.T) op.Authorizer {
 					ctrl := gomock.NewController(t)
 					storage := mock.NewMockStorage(ctrl)
-					storage.EXPECT().SaveAuthCode(gomock.Any(), "id1", "id1")
+					storage.EXPECT().SaveAuthCode(context.Background(), "id1", "id1")
 
 					authorizer := mock.NewMockAuthorizer(ctrl)
 					authorizer.EXPECT().Storage().Return(storage)
@@ -1090,34 +1025,6 @@ func TestAuthResponseCode(t *testing.T) {
 				wantBody:           "",
 			},
 		},
-		{
-			name: "success with state and session_state",
-			args: args{
-				authReq: &storage.AuthRequestWithSessionState{
-					AuthRequest: &storage.AuthRequest{
-						ID:            "id1",
-						TransferState: "state1",
-					},
-					SessionState: "session_state1",
-				},
-				authorizer: func(t *testing.T) op.Authorizer {
-					ctrl := gomock.NewController(t)
-					storage := mock.NewMockStorage(ctrl)
-					storage.EXPECT().SaveAuthCode(gomock.Any(), "id1", "id1")
-
-					authorizer := mock.NewMockAuthorizer(ctrl)
-					authorizer.EXPECT().Storage().Return(storage)
-					authorizer.EXPECT().Crypto().Return(&mockCrypto{})
-					authorizer.EXPECT().Encoder().Return(schema.NewEncoder())
-					return authorizer
-				},
-			},
-			res: res{
-				wantCode:           http.StatusFound,
-				wantLocationHeader: "/auth/callback/?code=id1&session_state=session_state1&state=state1",
-				wantBody:           "",
-			},
-		},
 		{
 			name: "success without state", // reproduce issue #415
 			args: args{
@@ -1128,7 +1035,7 @@ func TestAuthResponseCode(t *testing.T) {
 				authorizer: func(t *testing.T) op.Authorizer {
 					ctrl := gomock.NewController(t)
 					storage := mock.NewMockStorage(ctrl)
-					storage.EXPECT().SaveAuthCode(gomock.Any(), "id1", "id1")
+					storage.EXPECT().SaveAuthCode(context.Background(), "id1", "id1")
 
 					authorizer := mock.NewMockAuthorizer(ctrl)
 					authorizer.EXPECT().Storage().Return(storage)
@@ -1143,33 +1050,6 @@ func TestAuthResponseCode(t *testing.T) {
 				wantBody:           "",
 			},
 		},
-		{
-			name: "success form_post",
-			args: args{
-				authReq: &storage.AuthRequest{
-					ID:            "id1",
-					CallbackURI:   "https://example.com/callback",
-					TransferState: "state1",
-					ResponseMode:  "form_post",
-				},
-				authorizer: func(t *testing.T) op.Authorizer {
-					ctrl := gomock.NewController(t)
-					storage := mock.NewMockStorage(ctrl)
-					storage.EXPECT().SaveAuthCode(gomock.Any(), "id1", "id1")
-
-					authorizer := mock.NewMockAuthorizer(ctrl)
-					authorizer.EXPECT().Storage().Return(storage)
-					authorizer.EXPECT().Crypto().Return(&mockCrypto{})
-					authorizer.EXPECT().Encoder().Return(schema.NewEncoder())
-					return authorizer
-				},
-			},
-			res: res{
-				wantCode:               http.StatusOK,
-				wantCacheControlHeader: "no-store",
-				wantBody:               "<!doctype html>\n<html>\n<head><meta charset=\"UTF-8\" /></head>\n<body onload=\"javascript:document.forms[0].submit()\">\n<form method=\"post\" action=\"https://example.com/callback\">\n<input type=\"hidden\" name=\"state\" value=\"state1\"/>\n<input type=\"hidden\" name=\"code\" value=\"id1\" />\n\n\n\n\n</form>\n</body>\n</html>",
-			},
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
@@ -1180,433 +1060,9 @@ func TestAuthResponseCode(t *testing.T) {
 			defer resp.Body.Close()
 			assert.Equal(t, tt.res.wantCode, resp.StatusCode)
 			assert.Equal(t, tt.res.wantLocationHeader, resp.Header.Get("Location"))
-			assert.Equal(t, tt.res.wantCacheControlHeader, resp.Header.Get("Cache-Control"))
 			body, err := io.ReadAll(resp.Body)
 			require.NoError(t, err)
 			assert.Equal(t, tt.res.wantBody, string(body))
 		})
 	}
 }
-
-func Test_parseAuthorizeCallbackRequest(t *testing.T) {
-	tests := []struct {
-		name    string
-		url     string
-		wantId  string
-		wantErr bool
-	}{
-		{
-			name:    "parse error",
-			url:     "/?id;=99",
-			wantErr: true,
-		},
-		{
-			name:    "missing id",
-			url:     "/",
-			wantErr: true,
-		},
-		{
-			name:   "ok",
-			url:    "/?id=99",
-			wantId: "99",
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			r := httptest.NewRequest(http.MethodGet, tt.url, nil)
-			gotId, err := op.ParseAuthorizeCallbackRequest(r)
-			if tt.wantErr {
-				assert.Error(t, err)
-			} else {
-				require.NoError(t, err)
-			}
-			assert.Equal(t, tt.wantId, gotId)
-		})
-	}
-}
-
-func TestBuildAuthResponseCodeResponsePayload(t *testing.T) {
-	type args struct {
-		authReq    op.AuthRequest
-		authorizer func(*testing.T) op.Authorizer
-	}
-	type res struct {
-		wantCode         string
-		wantState        string
-		wantSessionState string
-		wantErr          bool
-	}
-	tests := []struct {
-		name string
-		args args
-		res  res
-	}{
-		{
-			name: "create code error",
-			args: args{
-				authReq: &storage.AuthRequest{
-					ID: "id1",
-				},
-				authorizer: func(t *testing.T) op.Authorizer {
-					ctrl := gomock.NewController(t)
-					storage := mock.NewMockStorage(ctrl)
-
-					authorizer := mock.NewMockAuthorizer(ctrl)
-					authorizer.EXPECT().Storage().Return(storage)
-					authorizer.EXPECT().Crypto().Return(&mockCrypto{
-						returnErr: io.ErrClosedPipe,
-					})
-					return authorizer
-				},
-			},
-			res: res{
-				wantErr: true,
-			},
-		},
-		{
-			name: "success with state",
-			args: args{
-				authReq: &storage.AuthRequest{
-					ID:            "id1",
-					TransferState: "state1",
-				},
-				authorizer: func(t *testing.T) op.Authorizer {
-					ctrl := gomock.NewController(t)
-					storage := mock.NewMockStorage(ctrl)
-					storage.EXPECT().SaveAuthCode(gomock.Any(), "id1", "id1")
-
-					authorizer := mock.NewMockAuthorizer(ctrl)
-					authorizer.EXPECT().Storage().Return(storage)
-					authorizer.EXPECT().Crypto().Return(&mockCrypto{})
-					return authorizer
-				},
-			},
-			res: res{
-				wantCode:  "id1",
-				wantState: "state1",
-			},
-		},
-		{
-			name: "success without state",
-			args: args{
-				authReq: &storage.AuthRequest{
-					ID:            "id1",
-					TransferState: "",
-				},
-				authorizer: func(t *testing.T) op.Authorizer {
-					ctrl := gomock.NewController(t)
-					storage := mock.NewMockStorage(ctrl)
-					storage.EXPECT().SaveAuthCode(gomock.Any(), "id1", "id1")
-
-					authorizer := mock.NewMockAuthorizer(ctrl)
-					authorizer.EXPECT().Storage().Return(storage)
-					authorizer.EXPECT().Crypto().Return(&mockCrypto{})
-					return authorizer
-				},
-			},
-			res: res{
-				wantCode:  "id1",
-				wantState: "",
-			},
-		},
-		{
-			name: "success with session_state",
-			args: args{
-				authReq: &storage.AuthRequestWithSessionState{
-					AuthRequest: &storage.AuthRequest{
-						ID:            "id1",
-						TransferState: "state1",
-					},
-					SessionState: "session_state1",
-				},
-				authorizer: func(t *testing.T) op.Authorizer {
-					ctrl := gomock.NewController(t)
-					storage := mock.NewMockStorage(ctrl)
-					storage.EXPECT().SaveAuthCode(gomock.Any(), "id1", "id1")
-
-					authorizer := mock.NewMockAuthorizer(ctrl)
-					authorizer.EXPECT().Storage().Return(storage)
-					authorizer.EXPECT().Crypto().Return(&mockCrypto{})
-					return authorizer
-				},
-			},
-			res: res{
-				wantCode:         "id1",
-				wantState:        "state1",
-				wantSessionState: "session_state1",
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := op.BuildAuthResponseCodeResponsePayload(context.Background(), tt.args.authReq, tt.args.authorizer(t))
-			if tt.res.wantErr {
-				assert.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-			assert.Equal(t, tt.res.wantCode, got.Code)
-			assert.Equal(t, tt.res.wantState, got.State)
-			assert.Equal(t, tt.res.wantSessionState, got.SessionState)
-		})
-	}
-}
-
-func TestValidateAuthReqIDTokenHint(t *testing.T) {
-	token, _ := tu.ValidIDToken()
-	tests := []struct {
-		name        string
-		idTokenHint string
-		want        string
-		wantErr     error
-	}{
-		{
-			name: "empty",
-		},
-		{
-			name:        "verify err",
-			idTokenHint: "foo",
-			wantErr:     oidc.ErrLoginRequired(),
-		},
-		{
-			name:        "ok",
-			idTokenHint: token,
-			want:        tu.ValidSubject,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := op.ValidateAuthReqIDTokenHint(context.Background(), tt.idTokenHint, op.NewIDTokenHintVerifier(tu.ValidIssuer, tu.KeySet{}))
-			require.ErrorIs(t, err, tt.wantErr)
-			assert.Equal(t, tt.want, got)
-		})
-	}
-}
-
-func TestBuildAuthResponseCallbackURL(t *testing.T) {
-	type args struct {
-		authReq    op.AuthRequest
-		authorizer func(*testing.T) op.Authorizer
-	}
-	type res struct {
-		wantURL string
-		wantErr bool
-	}
-	tests := []struct {
-		name string
-		args args
-		res  res
-	}{
-		{
-			name: "error when generating code response",
-			args: args{
-				authReq: &storage.AuthRequest{
-					ID: "id1",
-				},
-				authorizer: func(t *testing.T) op.Authorizer {
-					ctrl := gomock.NewController(t)
-					storage := mock.NewMockStorage(ctrl)
-
-					authorizer := mock.NewMockAuthorizer(ctrl)
-					authorizer.EXPECT().Storage().Return(storage)
-					authorizer.EXPECT().Crypto().Return(&mockCrypto{
-						returnErr: io.ErrClosedPipe,
-					})
-					return authorizer
-				},
-			},
-			res: res{
-				wantErr: true,
-			},
-		},
-		{
-			name: "error when generating callback URL",
-			args: args{
-				authReq: &storage.AuthRequest{
-					ID:          "id1",
-					CallbackURI: "://invalid-url",
-				},
-				authorizer: func(t *testing.T) op.Authorizer {
-					ctrl := gomock.NewController(t)
-					storage := mock.NewMockStorage(ctrl)
-					storage.EXPECT().SaveAuthCode(gomock.Any(), "id1", "id1")
-
-					authorizer := mock.NewMockAuthorizer(ctrl)
-					authorizer.EXPECT().Storage().Return(storage)
-					authorizer.EXPECT().Crypto().Return(&mockCrypto{})
-					authorizer.EXPECT().Encoder().Return(schema.NewEncoder())
-					return authorizer
-				},
-			},
-			res: res{
-				wantErr: true,
-			},
-		},
-		{
-			name: "success with state",
-			args: args{
-				authReq: &storage.AuthRequest{
-					ID:            "id1",
-					CallbackURI:   "https://example.com/callback",
-					TransferState: "state1",
-				},
-				authorizer: func(t *testing.T) op.Authorizer {
-					ctrl := gomock.NewController(t)
-					storage := mock.NewMockStorage(ctrl)
-					storage.EXPECT().SaveAuthCode(gomock.Any(), "id1", "id1")
-
-					authorizer := mock.NewMockAuthorizer(ctrl)
-					authorizer.EXPECT().Storage().Return(storage)
-					authorizer.EXPECT().Crypto().Return(&mockCrypto{})
-					authorizer.EXPECT().Encoder().Return(schema.NewEncoder())
-					return authorizer
-				},
-			},
-			res: res{
-				wantURL: "https://example.com/callback?code=id1&state=state1",
-				wantErr: false,
-			},
-		},
-		{
-			name: "success without state",
-			args: args{
-				authReq: &storage.AuthRequest{
-					ID:          "id1",
-					CallbackURI: "https://example.com/callback",
-				},
-				authorizer: func(t *testing.T) op.Authorizer {
-					ctrl := gomock.NewController(t)
-					storage := mock.NewMockStorage(ctrl)
-					storage.EXPECT().SaveAuthCode(gomock.Any(), "id1", "id1")
-
-					authorizer := mock.NewMockAuthorizer(ctrl)
-					authorizer.EXPECT().Storage().Return(storage)
-					authorizer.EXPECT().Crypto().Return(&mockCrypto{})
-					authorizer.EXPECT().Encoder().Return(schema.NewEncoder())
-					return authorizer
-				},
-			},
-			res: res{
-				wantURL: "https://example.com/callback?code=id1",
-				wantErr: false,
-			},
-		},
-		{
-			name: "success with session_state",
-			args: args{
-				authReq: &storage.AuthRequestWithSessionState{
-					AuthRequest: &storage.AuthRequest{
-						ID:            "id1",
-						CallbackURI:   "https://example.com/callback",
-						TransferState: "state1",
-					},
-					SessionState: "session_state1",
-				},
-				authorizer: func(t *testing.T) op.Authorizer {
-					ctrl := gomock.NewController(t)
-					storage := mock.NewMockStorage(ctrl)
-					storage.EXPECT().SaveAuthCode(gomock.Any(), "id1", "id1")
-
-					authorizer := mock.NewMockAuthorizer(ctrl)
-					authorizer.EXPECT().Storage().Return(storage)
-					authorizer.EXPECT().Crypto().Return(&mockCrypto{})
-					authorizer.EXPECT().Encoder().Return(schema.NewEncoder())
-					return authorizer
-				},
-			},
-			res: res{
-				wantURL: "https://example.com/callback?code=id1&session_state=session_state1&state=state1",
-				wantErr: false,
-			},
-		},
-		{
-			name: "success with existing query parameters",
-			args: args{
-				authReq: &storage.AuthRequest{
-					ID:            "id1",
-					CallbackURI:   "https://example.com/callback?param=value",
-					TransferState: "state1",
-				},
-				authorizer: func(t *testing.T) op.Authorizer {
-					ctrl := gomock.NewController(t)
-					storage := mock.NewMockStorage(ctrl)
-					storage.EXPECT().SaveAuthCode(gomock.Any(), "id1", "id1")
-
-					authorizer := mock.NewMockAuthorizer(ctrl)
-					authorizer.EXPECT().Storage().Return(storage)
-					authorizer.EXPECT().Crypto().Return(&mockCrypto{})
-					authorizer.EXPECT().Encoder().Return(schema.NewEncoder())
-					return authorizer
-				},
-			},
-			res: res{
-				wantURL: "https://example.com/callback?param=value&code=id1&state=state1",
-				wantErr: false,
-			},
-		},
-		{
-			name: "success with fragment response mode",
-			args: args{
-				authReq: &storage.AuthRequest{
-					ID:            "id1",
-					CallbackURI:   "https://example.com/callback",
-					TransferState: "state1",
-					ResponseMode:  "fragment",
-				},
-				authorizer: func(t *testing.T) op.Authorizer {
-					ctrl := gomock.NewController(t)
-					storage := mock.NewMockStorage(ctrl)
-					storage.EXPECT().SaveAuthCode(gomock.Any(), "id1", "id1")
-
-					authorizer := mock.NewMockAuthorizer(ctrl)
-					authorizer.EXPECT().Storage().Return(storage)
-					authorizer.EXPECT().Crypto().Return(&mockCrypto{})
-					authorizer.EXPECT().Encoder().Return(schema.NewEncoder())
-					return authorizer
-				},
-			},
-			res: res{
-				wantURL: "https://example.com/callback#code=id1&state=state1",
-				wantErr: false,
-			},
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			got, err := op.BuildAuthResponseCallbackURL(context.Background(), tt.args.authReq, tt.args.authorizer(t))
-			if tt.res.wantErr {
-				assert.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-
-			if tt.res.wantURL != "" {
-				// Parse the URLs to compare components instead of direct string comparison
-				expectedURL, err := url.Parse(tt.res.wantURL)
-				require.NoError(t, err)
-				actualURL, err := url.Parse(got)
-				require.NoError(t, err)
-
-				// Compare the base parts (scheme, host, path)
-				assert.Equal(t, expectedURL.Scheme, actualURL.Scheme)
-				assert.Equal(t, expectedURL.Host, actualURL.Host)
-				assert.Equal(t, expectedURL.Path, actualURL.Path)
-
-				// Compare the fragment if any
-				assert.Equal(t, expectedURL.Fragment, actualURL.Fragment)
-
-				// For query parameters, compare them independently of order
-				expectedQuery := expectedURL.Query()
-				actualQuery := actualURL.Query()
-
-				assert.Equal(t, len(expectedQuery), len(actualQuery), "Query parameter count does not match")
-
-				for key, expectedValues := range expectedQuery {
-					actualValues, exists := actualQuery[key]
-					assert.True(t, exists, "Expected query parameter %s not found", key)
-					assert.ElementsMatch(t, expectedValues, actualValues, "Values for parameter %s don't match", key)
-				}
-			}
-		})
-	}
-}

pkg/op/client.go

@@ -7,8 +7,8 @@ import (
 	"net/url"
 	"time"
 
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 //go:generate go get github.com/dmarkham/enumer
@@ -63,7 +63,6 @@ type Client interface {
 // such as DevMode for the client being enabled.
 // https://openid.net/specs/openid-connect-core-1_0.html#AuthRequest
 type HasRedirectGlobs interface {
-	Client
 	RedirectURIGlobs() []string
 	PostLogoutRedirectURIGlobs() []string
 }
@@ -88,13 +87,10 @@ var (
 )
 
 type ClientJWTProfile interface {
-	JWTProfileVerifier(context.Context) *JWTProfileVerifier
+	JWTProfileVerifier(context.Context) JWTProfileVerifier
 }
 
 func ClientJWTAuth(ctx context.Context, ca oidc.ClientAssertionParams, verifier ClientJWTProfile) (clientID string, err error) {
-	ctx, span := tracer.Start(ctx, "ClientJWTAuth")
-	defer span.End()
-
 	if ca.ClientAssertion == "" {
 		return "", oidc.ErrInvalidClient().WithParent(ErrNoClientCredentials)
 	}
@@ -107,10 +103,6 @@ func ClientJWTAuth(ctx context.Context, ca oidc.ClientAssertionParams, verifier
 }
 
 func ClientBasicAuth(r *http.Request, storage Storage) (clientID string, err error) {
-	ctx, span := tracer.Start(r.Context(), "ClientBasicAuth")
-	r = r.WithContext(ctx)
-	defer span.End()
-
 	clientID, clientSecret, ok := r.BasicAuth()
 	if !ok {
 		return "", oidc.ErrInvalidClient().WithParent(ErrNoClientCredentials)
@@ -158,10 +150,6 @@ func ClientIDFromRequest(r *http.Request, p ClientProvider) (clientID string, au
 		return "", false, oidc.ErrInvalidRequest().WithDescription("cannot parse form").WithParent(err)
 	}
 
-	ctx, span := tracer.Start(r.Context(), "ClientIDFromRequest")
-	r = r.WithContext(ctx)
-	defer span.End()
-
 	data := new(clientData)
 	if err = p.Decoder().Decode(data, r.Form); err != nil {
 		return "", false, err
@@ -182,7 +170,7 @@ func ClientIDFromRequest(r *http.Request, p ClientProvider) (clientID string, au
 	}
 	// if the client did not send a Basic Auth Header, ignore the `ErrNoClientCredentials`
 	// but return other errors immediately
-	if !errors.Is(err, ErrNoClientCredentials) {
+	if err != nil && !errors.Is(err, ErrNoClientCredentials) {
 		return "", false, err
 	}
 
@@ -192,10 +180,3 @@ func ClientIDFromRequest(r *http.Request, p ClientProvider) (clientID string, au
 	}
 	return data.ClientID, false, nil
 }
-
-type ClientCredentials struct {
-	ClientID            string `schema:"client_id"`
-	ClientSecret        string `schema:"client_secret"`    // Client secret from Basic auth or request body
-	ClientAssertion     string `schema:"client_assertion"` // JWT
-	ClientAssertionType string `schema:"client_assertion_type"`
-}

pkg/op/client_test.go

@@ -10,19 +10,19 @@ import (
 	"strings"
 	"testing"
 
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op/mock"
 	"github.com/golang/mock/gomock"
+	"github.com/gorilla/schema"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
-	"github.com/zitadel/schema"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/op"
+	"github.com/zitadel/oidc/v2/pkg/op/mock"
 )
 
 type testClientJWTProfile struct{}
 
-func (testClientJWTProfile) JWTProfileVerifier(context.Context) *op.JWTProfileVerifier { return nil }
+func (testClientJWTProfile) JWTProfileVerifier(context.Context) op.JWTProfileVerifier { return nil }
 
 func TestClientJWTAuth(t *testing.T) {
 	type args struct {
@@ -108,7 +108,7 @@ func TestClientBasicAuth(t *testing.T) {
 			},
 			storage: func() op.Storage {
 				s := mock.NewMockStorage(gomock.NewController(t))
-				s.EXPECT().AuthorizeClientIDSecret(gomock.Any(), "foo", "wrong").Return(errWrong)
+				s.EXPECT().AuthorizeClientIDSecret(context.Background(), "foo", "wrong").Return(errWrong)
 				return s
 			}(),
 			wantErr: errWrong,
@@ -121,7 +121,7 @@ func TestClientBasicAuth(t *testing.T) {
 			},
 			storage: func() op.Storage {
 				s := mock.NewMockStorage(gomock.NewController(t))
-				s.EXPECT().AuthorizeClientIDSecret(gomock.Any(), "foo", "bar").Return(nil)
+				s.EXPECT().AuthorizeClientIDSecret(context.Background(), "foo", "bar").Return(nil)
 				return s
 			}(),
 			wantClientID: "foo",
@@ -207,7 +207,7 @@ func TestClientIDFromRequest(t *testing.T) {
 				p: testClientProvider{
 					storage: func() op.Storage {
 						s := mock.NewMockStorage(gomock.NewController(t))
-						s.EXPECT().AuthorizeClientIDSecret(gomock.Any(), "foo", "bar").Return(nil)
+						s.EXPECT().AuthorizeClientIDSecret(context.Background(), "foo", "bar").Return(nil)
 						return s
 					}(),
 				},

pkg/op/config.go

@@ -22,15 +22,14 @@ var (
 type Configuration interface {
 	IssuerFromRequest(r *http.Request) string
 	Insecure() bool
-	AuthorizationEndpoint() *Endpoint
-	TokenEndpoint() *Endpoint
-	IntrospectionEndpoint() *Endpoint
-	UserinfoEndpoint() *Endpoint
-	RevocationEndpoint() *Endpoint
-	EndSessionEndpoint() *Endpoint
-	KeysEndpoint() *Endpoint
-	DeviceAuthorizationEndpoint() *Endpoint
-	CheckSessionIframe() *Endpoint
+	AuthorizationEndpoint() Endpoint
+	TokenEndpoint() Endpoint
+	IntrospectionEndpoint() Endpoint
+	UserinfoEndpoint() Endpoint
+	RevocationEndpoint() Endpoint
+	EndSessionEndpoint() Endpoint
+	KeysEndpoint() Endpoint
+	DeviceAuthorizationEndpoint() Endpoint
 
 	AuthMethodPostSupported() bool
 	CodeMethodS256Supported() bool
@@ -50,32 +49,12 @@ type Configuration interface {
 
 	SupportedUILocales() []language.Tag
 	DeviceAuthorization() DeviceAuthorizationConfig
-
-	BackChannelLogoutSupported() bool
-	BackChannelLogoutSessionSupported() bool
 }
 
 type IssuerFromRequest func(r *http.Request) string
 
 func IssuerFromHost(path string) func(bool) (IssuerFromRequest, error) {
-	return issuerFromForwardedOrHost(path, new(issuerConfig))
-}
-
-type IssuerFromOption func(c *issuerConfig)
-
-// WithIssuerFromCustomHeaders can be used to customize the header names used.
-// The same rules apply where the first successful host is returned.
-func WithIssuerFromCustomHeaders(headers ...string) IssuerFromOption {
-	return func(c *issuerConfig) {
-		for i, h := range headers {
-			headers[i] = http.CanonicalHeaderKey(h)
-		}
-		c.headers = headers
-	}
-}
-
-type issuerConfig struct {
-	headers []string
+	return issuerFromForwardedOrHost(path, false)
 }
 
 // IssuerFromForwardedOrHost tries to establish the Issuer based
@@ -85,18 +64,11 @@ type issuerConfig struct {
 // If the Forwarded header is not present, no host field is found,
 // or there is a parser error the Request Host will be used as a fallback.
 // https://developer.mozilla.org/en-US/docs/Web/HTTP/Headers/Forwarded
-func IssuerFromForwardedOrHost(path string, opts ...IssuerFromOption) func(bool) (IssuerFromRequest, error) {
-	c := &issuerConfig{
-		headers: []string{http.CanonicalHeaderKey("forwarded")},
-	}
-	for _, opt := range opts {
-		opt(c)
-	}
-
-	return issuerFromForwardedOrHost(path, c)
+func IssuerFromForwardedOrHost(path string) func(bool) (IssuerFromRequest, error) {
+	return issuerFromForwardedOrHost(path, true)
 }
 
-func issuerFromForwardedOrHost(path string, c *issuerConfig) func(bool) (IssuerFromRequest, error) {
+func issuerFromForwardedOrHost(path string, parseForwarded bool) func(bool) (IssuerFromRequest, error) {
 	return func(allowInsecure bool) (IssuerFromRequest, error) {
 		issuerPath, err := url.Parse(path)
 		if err != nil {
@@ -106,26 +78,26 @@ func issuerFromForwardedOrHost(path string, c *issuerConfig) func(bool) (IssuerF
 			return nil, err
 		}
 		return func(r *http.Request) string {
-			if host, ok := hostFromForwarded(r, c.headers); ok {
-				return dynamicIssuer(host, path, allowInsecure)
+			if parseForwarded {
+				if host, ok := hostFromForwarded(r); ok {
+					return dynamicIssuer(host, path, allowInsecure)
+				}
 			}
 			return dynamicIssuer(r.Host, path, allowInsecure)
 		}, nil
 	}
 }
 
-func hostFromForwarded(r *http.Request, headers []string) (host string, ok bool) {
-	for _, header := range headers {
-		hosts, err := httpforwarded.ParseParameter("host", r.Header[header])
-		if err != nil {
-			log.Printf("Err: issuer from forwarded header: %v", err) // TODO change to slog on next branch
-			continue
-		}
-		if len(hosts) > 0 {
-			return hosts[0], true
-		}
+func hostFromForwarded(r *http.Request) (host string, ok bool) {
+	fwd, err := httpforwarded.ParseFromRequest(r)
+	if err != nil {
+		log.Printf("Err: issuer from forwarded header: %v", err) // TODO change to slog on next branch
+		return "", false
 	}
-	return "", false
+	if fwd == nil || len(fwd["host"]) == 0 {
+		return "", false
+	}
+	return fwd["host"][0], true
 }
 
 func StaticIssuer(issuer string) func(bool) (IssuerFromRequest, error) {

pkg/op/config_test.go

@@ -1,7 +1,6 @@
 package op
 
 import (
-	"net/http"
 	"net/http/httptest"
 	"net/url"
 	"testing"
@@ -265,10 +264,9 @@ func TestIssuerFromHost(t *testing.T) {
 
 func TestIssuerFromForwardedOrHost(t *testing.T) {
 	type args struct {
-		path   string
-		opts   []IssuerFromOption
-		target string
-		header map[string][]string
+		path      string
+		target    string
+		forwarded []string
 	}
 	type res struct {
 		issuer string
@@ -281,9 +279,9 @@ func TestIssuerFromForwardedOrHost(t *testing.T) {
 		{
 			"header parse error",
 			args{
-				path:   "/custom/",
-				target: "https://issuer.com",
-				header: map[string][]string{"Forwarded": {"~~~~"}},
+				path:      "/custom/",
+				target:    "https://issuer.com",
+				forwarded: []string{"~~~"},
 			},
 			res{
 				issuer: "https://issuer.com/custom/",
@@ -305,9 +303,9 @@ func TestIssuerFromForwardedOrHost(t *testing.T) {
 			args{
 				path:   "/custom/",
 				target: "https://issuer.com",
-				header: map[string][]string{"Forwarded": {
+				forwarded: []string{
 					`by=identifier;for=identifier;proto=https`,
-				}},
+				},
 			},
 			res{
 				issuer: "https://issuer.com/custom/",
@@ -318,9 +316,9 @@ func TestIssuerFromForwardedOrHost(t *testing.T) {
 			args{
 				path:   "/custom/",
 				target: "https://issuer.com",
-				header: map[string][]string{"Forwarded": {
+				forwarded: []string{
 					`by=identifier;for=identifier;host=first.com;proto=https`,
-				}},
+				},
 			},
 			res{
 				issuer: "https://first.com/custom/",
@@ -331,9 +329,9 @@ func TestIssuerFromForwardedOrHost(t *testing.T) {
 			args{
 				path:   "/custom/",
 				target: "https://issuer.com",
-				header: map[string][]string{"Forwarded": {
+				forwarded: []string{
 					`by=identifier;for=identifier;host=first.com;proto=https,host=second.com`,
-				}},
+				},
 			},
 			res{
 				issuer: "https://first.com/custom/",
@@ -344,45 +342,23 @@ func TestIssuerFromForwardedOrHost(t *testing.T) {
 			args{
 				path:   "/custom/",
 				target: "https://issuer.com",
-				header: map[string][]string{"Forwarded": {
+				forwarded: []string{
 					`by=identifier;for=identifier;host=first.com;proto=https,host=second.com`,
 					`by=identifier;for=identifier;host=third.com;proto=https`,
-				}},
+				},
 			},
 			res{
 				issuer: "https://first.com/custom/",
 			},
 		},
-		{
-			"custom header first",
-			args{
-				path:   "/custom/",
-				target: "https://issuer.com",
-				header: map[string][]string{
-					"Forwarded": {
-						`by=identifier;for=identifier;host=first.com;proto=https,host=second.com`,
-						`by=identifier;for=identifier;host=third.com;proto=https`,
-					},
-					"X-Custom-Forwarded": {
-						`by=identifier;for=identifier;host=custom.com;proto=https,host=custom2.com`,
-					},
-				},
-				opts: []IssuerFromOption{
-					WithIssuerFromCustomHeaders("x-custom-forwarded"),
-				},
-			},
-			res{
-				issuer: "https://custom.com/custom/",
-			},
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			issuer, err := IssuerFromForwardedOrHost(tt.args.path, tt.args.opts...)(false)
+			issuer, err := IssuerFromForwardedOrHost(tt.args.path)(false)
 			require.NoError(t, err)
 			req := httptest.NewRequest("", tt.args.target, nil)
-			for k, v := range tt.args.header {
-				req.Header[http.CanonicalHeaderKey(k)] = v
+			if tt.args.forwarded != nil {
+				req.Header["Forwarded"] = tt.args.forwarded
 			}
 			assert.Equal(t, tt.res.issuer, issuer(req))
 		})

pkg/op/crypto.go

@@ -1,7 +1,7 @@
 package op
 
 import (
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/crypto"
+	"github.com/zitadel/oidc/v2/pkg/crypto"
 )
 
 type Crypto interface {

pkg/op/device.go

@@ -9,12 +9,11 @@ import (
 	"math/big"
 	"net/http"
 	"net/url"
-	"slices"
 	"strings"
 	"time"
 
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 type DeviceAuthorizationConfig struct {
@@ -58,61 +57,47 @@ var (
 func DeviceAuthorizationHandler(o OpenIDProvider) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
 		if err := DeviceAuthorization(w, r, o); err != nil {
-			RequestError(w, r, err, o.Logger())
+			RequestError(w, r, err)
 		}
 	}
 }
 
 func DeviceAuthorization(w http.ResponseWriter, r *http.Request, o OpenIDProvider) error {
-	ctx, span := tracer.Start(r.Context(), "DeviceAuthorization")
-	r = r.WithContext(ctx)
-	defer span.End()
+	storage, err := assertDeviceStorage(o.Storage())
+	if err != nil {
+		return err
+	}
 
 	req, err := ParseDeviceCodeRequest(r, o)
 	if err != nil {
 		return err
 	}
-	response, err := createDeviceAuthorization(r.Context(), req, req.ClientID, o)
+
+	config := o.DeviceAuthorization()
+
+	deviceCode, err := NewDeviceCode(RecommendedDeviceCodeBytes)
+	if err != nil {
+		return err
+	}
+	userCode, err := NewUserCode([]rune(config.UserCode.CharSet), config.UserCode.CharAmount, config.UserCode.DashInterval)
 	if err != nil {
 		return err
 	}
 
-	httphelper.MarshalJSON(w, response)
-	return nil
-}
-
-func createDeviceAuthorization(ctx context.Context, req *oidc.DeviceAuthorizationRequest, clientID string, o OpenIDProvider) (*oidc.DeviceAuthorizationResponse, error) {
-	ctx, span := tracer.Start(ctx, "createDeviceAuthorization")
-	defer span.End()
-
-	storage, err := assertDeviceStorage(o.Storage())
-	if err != nil {
-		return nil, err
-	}
-	config := o.DeviceAuthorization()
-
-	deviceCode, _ := NewDeviceCode(RecommendedDeviceCodeBytes)
-	userCode, err := NewUserCode([]rune(config.UserCode.CharSet), config.UserCode.CharAmount, config.UserCode.DashInterval)
-	if err != nil {
-		return nil, NewStatusError(err, http.StatusInternalServerError)
-	}
-
 	expires := time.Now().Add(config.Lifetime)
-	err = storage.StoreDeviceAuthorization(ctx, clientID, deviceCode, userCode, expires, req.Scopes)
+	err = storage.StoreDeviceAuthorization(r.Context(), req.ClientID, deviceCode, userCode, expires, req.Scopes)
 	if err != nil {
-		return nil, NewStatusError(err, http.StatusInternalServerError)
+		return err
 	}
 
 	var verification *url.URL
 	if config.UserFormURL != "" {
 		if verification, err = url.Parse(config.UserFormURL); err != nil {
-			err = oidc.ErrServerError().WithParent(err).WithDescription("invalid URL for device user form")
-			return nil, NewStatusError(err, http.StatusInternalServerError)
+			return oidc.ErrServerError().WithParent(err).WithDescription("invalid URL for device user form")
 		}
 	} else {
-		if verification, err = url.Parse(IssuerFromContext(ctx)); err != nil {
-			err = oidc.ErrServerError().WithParent(err).WithDescription("invalid URL for issuer")
-			return nil, NewStatusError(err, http.StatusInternalServerError)
+		if verification, err = url.Parse(IssuerFromContext(r.Context())); err != nil {
+			return oidc.ErrServerError().WithParent(err).WithDescription("invalid URL for issuer")
 		}
 		verification.Path = config.UserFormPath
 	}
@@ -127,14 +112,12 @@ func createDeviceAuthorization(ctx context.Context, req *oidc.DeviceAuthorizatio
 
 	verification.RawQuery = "user_code=" + userCode
 	response.VerificationURIComplete = verification.String()
-	return response, nil
+
+	httphelper.MarshalJSON(w, response)
+	return nil
 }
 
 func ParseDeviceCodeRequest(r *http.Request, o OpenIDProvider) (*oidc.DeviceAuthorizationRequest, error) {
-	ctx, span := tracer.Start(r.Context(), "ParseDeviceCodeRequest")
-	r = r.WithContext(ctx)
-	defer span.End()
-
 	clientID, _, err := ClientIDFromRequest(r, o)
 	if err != nil {
 		return nil, err
@@ -160,14 +143,11 @@ func ParseDeviceCodeRequest(r *http.Request, o OpenIDProvider) (*oidc.DeviceAuth
 // results in a 22 character base64 encoded string.
 const RecommendedDeviceCodeBytes = 16
 
-// NewDeviceCode generates a new cryptographically secure device code as a base64 encoded string.
-// The length of the string is nBytes * 4 / 3.
-// An error is never returned.
-//
-// TODO(v4): change return type to string alone.
 func NewDeviceCode(nBytes int) (string, error) {
 	bytes := make([]byte, nBytes)
-	rand.Read(bytes)
+	if _, err := rand.Read(bytes); err != nil {
+		return "", fmt.Errorf("%w getting entropy for device code", err)
+	}
 	return base64.RawURLEncoding.EncodeToString(bytes), nil
 }
 
@@ -197,13 +177,31 @@ func NewUserCode(charSet []rune, charAmount, dashInterval int) (string, error) {
 	return buf.String(), nil
 }
 
+type deviceAccessTokenRequest struct {
+	subject  string
+	audience []string
+	scopes   []string
+}
+
+func (r *deviceAccessTokenRequest) GetSubject() string {
+	return r.subject
+}
+
+func (r *deviceAccessTokenRequest) GetAudience() []string {
+	return r.audience
+}
+
+func (r *deviceAccessTokenRequest) GetScopes() []string {
+	return r.scopes
+}
+
 func DeviceAccessToken(w http.ResponseWriter, r *http.Request, exchanger Exchanger) {
 	ctx, span := tracer.Start(r.Context(), "DeviceAccessToken")
 	defer span.End()
 	r = r.WithContext(ctx)
 
 	if err := deviceAccessToken(w, r, exchanger); err != nil {
-		RequestError(w, r, err, exchanger.Logger())
+		RequestError(w, r, err)
 	}
 }
 
@@ -223,7 +221,7 @@ func deviceAccessToken(w http.ResponseWriter, r *http.Request, exchanger Exchang
 	if err != nil {
 		return err
 	}
-	tokenRequest, err := CheckDeviceAuthorizationState(ctx, clientID, req.DeviceCode, exchanger)
+	state, err := CheckDeviceAuthorizationState(ctx, clientID, req.DeviceCode, exchanger)
 	if err != nil {
 		return err
 	}
@@ -237,6 +235,11 @@ func deviceAccessToken(w http.ResponseWriter, r *http.Request, exchanger Exchang
 			WithDescription("confidential client requires authentication")
 	}
 
+	tokenRequest := &deviceAccessTokenRequest{
+		subject:  state.Subject,
+		audience: []string{clientID},
+		scopes:   state.Scopes,
+	}
 	resp, err := CreateDeviceTokenResponse(r.Context(), tokenRequest, exchanger, client)
 	if err != nil {
 		return err
@@ -254,54 +257,7 @@ func ParseDeviceAccessTokenRequest(r *http.Request, exchanger Exchanger) (*oidc.
 	return req, nil
 }
 
-// DeviceAuthorizationState describes the current state of
-// the device authorization flow.
-// It implements the [IDTokenRequest] interface.
-type DeviceAuthorizationState struct {
-	ClientID string
-	Audience []string
-	Scopes   []string
-	Expires  time.Time // The time after we consider the authorization request timed-out
-	Done     bool      // The user authenticated and approved the authorization request
-	Denied   bool      // The user authenticated and denied the authorization request
-
-	// The following fields are populated after Done == true
-	Subject  string
-	AMR      []string
-	AuthTime time.Time
-}
-
-func (r *DeviceAuthorizationState) GetAMR() []string {
-	return r.AMR
-}
-
-func (r *DeviceAuthorizationState) GetAudience() []string {
-	if !slices.Contains(r.Audience, r.ClientID) {
-		r.Audience = append(r.Audience, r.ClientID)
-	}
-	return r.Audience
-}
-
-func (r *DeviceAuthorizationState) GetAuthTime() time.Time {
-	return r.AuthTime
-}
-
-func (r *DeviceAuthorizationState) GetClientID() string {
-	return r.ClientID
-}
-
-func (r *DeviceAuthorizationState) GetScopes() []string {
-	return r.Scopes
-}
-
-func (r *DeviceAuthorizationState) GetSubject() string {
-	return r.Subject
-}
-
 func CheckDeviceAuthorizationState(ctx context.Context, clientID, deviceCode string, exchanger Exchanger) (*DeviceAuthorizationState, error) {
-	ctx, span := tracer.Start(ctx, "CheckDeviceAuthorizationState")
-	defer span.End()
-
 	storage, err := assertDeviceStorage(exchanger.Storage())
 	if err != nil {
 		return nil, err
@@ -327,33 +283,15 @@ func CheckDeviceAuthorizationState(ctx context.Context, clientID, deviceCode str
 }
 
 func CreateDeviceTokenResponse(ctx context.Context, tokenRequest TokenRequest, creator TokenCreator, client Client) (*oidc.AccessTokenResponse, error) {
-	/* TODO(v4):
-	Change the TokenRequest argument type to *DeviceAuthorizationState.
-	Breaking change that can not be done for v3.
-	*/
-	ctx, span := tracer.Start(ctx, "CreateDeviceTokenResponse")
-	defer span.End()
-
 	accessToken, refreshToken, validity, err := CreateAccessToken(ctx, tokenRequest, client.AccessTokenType(), creator, client, "")
 	if err != nil {
 		return nil, err
 	}
 
-	response := &oidc.AccessTokenResponse{
+	return &oidc.AccessTokenResponse{
 		AccessToken:  accessToken,
 		RefreshToken: refreshToken,
 		TokenType:    oidc.BearerToken,
 		ExpiresIn:    uint64(validity.Seconds()),
-		Scope:        tokenRequest.GetScopes(),
-	}
-
-	// TODO(v4): remove type assertion
-	if idTokenRequest, ok := tokenRequest.(IDTokenRequest); ok && slices.Contains(tokenRequest.GetScopes(), oidc.ScopeOpenID) {
-		response.IDToken, err = CreateIDToken(ctx, IssuerFromContext(ctx), idTokenRequest, client.IDTokenLifetime(), accessToken, "", creator.Storage(), client)
-		if err != nil {
-			return nil, err
-		}
-	}
-
-	return response, nil
+	}, nil
 }

pkg/op/device_test.go

@@ -13,12 +13,11 @@ import (
 	"testing"
 	"time"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/example/server/storage"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
 	"github.com/muhlemmer/gu"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/op"
 )
 
 func Test_deviceAuthorizationHandler(t *testing.T) {
@@ -145,11 +144,21 @@ func runWithRandReader(r io.Reader, f func()) {
 }
 
 func TestNewDeviceCode(t *testing.T) {
-	for i := 1; i <= 32; i++ {
-		got, err := op.NewDeviceCode(i)
-		require.NoError(t, err)
-		assert.Len(t, got, base64.RawURLEncoding.EncodedLen(i))
-	}
+	t.Run("reader error", func(t *testing.T) {
+		runWithRandReader(errReader{}, func() {
+			_, err := op.NewDeviceCode(16)
+			require.Error(t, err)
+		})
+	})
+
+	t.Run("different lengths, rand reader", func(t *testing.T) {
+		for i := 1; i <= 32; i++ {
+			got, err := op.NewDeviceCode(i)
+			require.NoError(t, err)
+			assert.Len(t, got, base64.RawURLEncoding.EncodedLen(i))
+		}
+	})
+
 }
 
 func TestNewUserCode(t *testing.T) {
@@ -310,7 +319,7 @@ func BenchmarkNewUserCode(b *testing.B) {
 }
 
 func TestDeviceAccessToken(t *testing.T) {
-	storage := testProvider.Storage().(*storage.Storage)
+	storage := testProvider.Storage().(op.DeviceAuthorizationStorage)
 	storage.StoreDeviceAuthorization(context.Background(), "native", "qwerty", "yuiop", time.Now().Add(time.Minute), []string{"foo"})
 	storage.CompleteDeviceAuthorization(context.Background(), "yuiop", "tim")
 
@@ -335,7 +344,7 @@ func TestDeviceAccessToken(t *testing.T) {
 func TestCheckDeviceAuthorizationState(t *testing.T) {
 	now := time.Now()
 
-	storage := testProvider.Storage().(*storage.Storage)
+	storage := testProvider.Storage().(op.DeviceAuthorizationStorage)
 	storage.StoreDeviceAuthorization(context.Background(), "native", "pending", "pending", now.Add(time.Minute), []string{"foo"})
 	storage.StoreDeviceAuthorization(context.Background(), "native", "denied", "denied", now.Add(time.Minute), []string{"foo"})
 	storage.StoreDeviceAuthorization(context.Background(), "native", "completed", "completed", now.Add(time.Minute), []string{"foo"})
@@ -443,96 +452,3 @@ func TestCheckDeviceAuthorizationState(t *testing.T) {
 		})
 	}
 }
-
-func TestCreateDeviceTokenResponse(t *testing.T) {
-	tests := []struct {
-		name             string
-		tokenRequest     op.TokenRequest
-		wantAccessToken  bool
-		wantRefreshToken bool
-		wantIDToken      bool
-		wantErr          bool
-	}{
-		{
-			name: "access token",
-			tokenRequest: &op.DeviceAuthorizationState{
-				ClientID: "client1",
-				Subject:  "id1",
-				AMR:      []string{"password"},
-				AuthTime: time.Now(),
-			},
-			wantAccessToken: true,
-		},
-		{
-			name: "access and refresh tokens",
-			tokenRequest: &op.DeviceAuthorizationState{
-				ClientID: "client1",
-				Subject:  "id1",
-				AMR:      []string{"password"},
-				AuthTime: time.Now(),
-				Scopes:   []string{oidc.ScopeOfflineAccess},
-			},
-			wantAccessToken:  true,
-			wantRefreshToken: true,
-		},
-		{
-			name: "access and id token",
-			tokenRequest: &op.DeviceAuthorizationState{
-				ClientID: "client1",
-				Subject:  "id1",
-				AMR:      []string{"password"},
-				AuthTime: time.Now(),
-				Scopes:   []string{oidc.ScopeOpenID},
-			},
-			wantAccessToken: true,
-			wantIDToken:     true,
-		},
-		{
-			name: "access, refresh and id token",
-			tokenRequest: &op.DeviceAuthorizationState{
-				ClientID: "client1",
-				Subject:  "id1",
-				AMR:      []string{"password"},
-				AuthTime: time.Now(),
-				Scopes:   []string{oidc.ScopeOfflineAccess, oidc.ScopeOpenID},
-			},
-			wantAccessToken:  true,
-			wantRefreshToken: true,
-			wantIDToken:      true,
-		},
-		{
-			name: "id token creation error",
-			tokenRequest: &op.DeviceAuthorizationState{
-				ClientID: "client1",
-				Subject:  "foobar",
-				AMR:      []string{"password"},
-				AuthTime: time.Now(),
-				Scopes:   []string{oidc.ScopeOfflineAccess, oidc.ScopeOpenID},
-			},
-			wantErr: true,
-		},
-	}
-	for _, tt := range tests {
-		t.Run(tt.name, func(t *testing.T) {
-			client, err := testProvider.Storage().GetClientByClientID(context.Background(), "native")
-			require.NoError(t, err)
-
-			got, err := op.CreateDeviceTokenResponse(context.Background(), tt.tokenRequest, testProvider, client)
-			if tt.wantErr {
-				require.Error(t, err)
-				return
-			}
-			require.NoError(t, err)
-			assert.InDelta(t, 300, got.ExpiresIn, 2)
-			if tt.wantAccessToken {
-				assert.NotEmpty(t, got.AccessToken, "access token")
-			}
-			if tt.wantRefreshToken {
-				assert.NotEmpty(t, got.RefreshToken, "refresh token")
-			}
-			if tt.wantIDToken {
-				assert.NotEmpty(t, got.IDToken, "id token")
-			}
-		})
-	}
-}

pkg/op/discovery.go

@@ -4,10 +4,10 @@ import (
 	"context"
 	"net/http"
 
-	jose "github.com/go-jose/go-jose/v4"
+	"gopkg.in/go-jose/go-jose.v2"
 
-	httphelper "git.christmann.info/LARA/zitadel-oidc/v3/pkg/http"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
+	httphelper "github.com/zitadel/oidc/v2/pkg/http"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
 )
 
 type DiscoverStorage interface {
@@ -25,7 +25,7 @@ var DefaultSupportedScopes = []string{
 
 func discoveryHandler(c Configuration, s DiscoverStorage) func(http.ResponseWriter, *http.Request) {
 	return func(w http.ResponseWriter, r *http.Request) {
-		Discover(w, CreateDiscoveryConfig(r.Context(), c, s))
+		Discover(w, CreateDiscoveryConfig(r, c, s))
 	}
 }
 
@@ -33,8 +33,8 @@ func Discover(w http.ResponseWriter, config *oidc.DiscoveryConfiguration) {
 	httphelper.MarshalJSON(w, config)
 }
 
-func CreateDiscoveryConfig(ctx context.Context, config Configuration, storage DiscoverStorage) *oidc.DiscoveryConfiguration {
-	issuer := IssuerFromContext(ctx)
+func CreateDiscoveryConfig(r *http.Request, config Configuration, storage DiscoverStorage) *oidc.DiscoveryConfiguration {
+	issuer := config.IssuerFromRequest(r)
 	return &oidc.DiscoveryConfiguration{
 		Issuer:                                     issuer,
 		AuthorizationEndpoint:                      config.AuthorizationEndpoint().Absolute(issuer),
@@ -45,12 +45,11 @@ func CreateDiscoveryConfig(ctx context.Context, config Configuration, storage Di
 		EndSessionEndpoint:                         config.EndSessionEndpoint().Absolute(issuer),
 		JwksURI:                                    config.KeysEndpoint().Absolute(issuer),
 		DeviceAuthorizationEndpoint:                config.DeviceAuthorizationEndpoint().Absolute(issuer),
-		CheckSessionIframe:                         config.CheckSessionIframe().Absolute(issuer),
 		ScopesSupported:                            Scopes(config),
 		ResponseTypesSupported:                     ResponseTypes(config),
 		GrantTypesSupported:                        GrantTypes(config),
 		SubjectTypesSupported:                      SubjectTypes(config),
-		IDTokenSigningAlgValuesSupported:           SigAlgorithms(ctx, storage),
+		IDTokenSigningAlgValuesSupported:           SigAlgorithms(r.Context(), storage),
 		RequestObjectSigningAlgValuesSupported:     RequestObjectSigAlgorithms(config),
 		TokenEndpointAuthMethodsSupported:          AuthMethodsTokenEndpoint(config),
 		TokenEndpointAuthSigningAlgValuesSupported: TokenSigAlgorithms(config),
@@ -62,50 +61,11 @@ func CreateDiscoveryConfig(ctx context.Context, config Configuration, storage Di
 		CodeChallengeMethodsSupported:                      CodeChallengeMethods(config),
 		UILocalesSupported:                                 config.SupportedUILocales(),
 		RequestParameterSupported:                          config.RequestObjectSupported(),
-		BackChannelLogoutSupported:                         config.BackChannelLogoutSupported(),
-		BackChannelLogoutSessionSupported:                  config.BackChannelLogoutSessionSupported(),
-	}
-}
-
-func createDiscoveryConfigV2(ctx context.Context, config Configuration, storage DiscoverStorage, endpoints *Endpoints) *oidc.DiscoveryConfiguration {
-	issuer := IssuerFromContext(ctx)
-	return &oidc.DiscoveryConfiguration{
-		Issuer:                                     issuer,
-		AuthorizationEndpoint:                      endpoints.Authorization.Absolute(issuer),
-		TokenEndpoint:                              endpoints.Token.Absolute(issuer),
-		IntrospectionEndpoint:                      endpoints.Introspection.Absolute(issuer),
-		UserinfoEndpoint:                           endpoints.Userinfo.Absolute(issuer),
-		RevocationEndpoint:                         endpoints.Revocation.Absolute(issuer),
-		EndSessionEndpoint:                         endpoints.EndSession.Absolute(issuer),
-		JwksURI:                                    endpoints.JwksURI.Absolute(issuer),
-		DeviceAuthorizationEndpoint:                endpoints.DeviceAuthorization.Absolute(issuer),
-		ScopesSupported:                            Scopes(config),
-		ResponseTypesSupported:                     ResponseTypes(config),
-		GrantTypesSupported:                        GrantTypes(config),
-		SubjectTypesSupported:                      SubjectTypes(config),
-		IDTokenSigningAlgValuesSupported:           SigAlgorithms(ctx, storage),
-		RequestObjectSigningAlgValuesSupported:     RequestObjectSigAlgorithms(config),
-		TokenEndpointAuthMethodsSupported:          AuthMethodsTokenEndpoint(config),
-		TokenEndpointAuthSigningAlgValuesSupported: TokenSigAlgorithms(config),
-		IntrospectionEndpointAuthSigningAlgValuesSupported: IntrospectionSigAlgorithms(config),
-		IntrospectionEndpointAuthMethodsSupported:          AuthMethodsIntrospectionEndpoint(config),
-		RevocationEndpointAuthSigningAlgValuesSupported:    RevocationSigAlgorithms(config),
-		RevocationEndpointAuthMethodsSupported:             AuthMethodsRevocationEndpoint(config),
-		ClaimsSupported:                                    SupportedClaims(config),
-		CodeChallengeMethodsSupported:                      CodeChallengeMethods(config),
-		UILocalesSupported:                                 config.SupportedUILocales(),
-		RequestParameterSupported:                          config.RequestObjectSupported(),
-		BackChannelLogoutSupported:                         config.BackChannelLogoutSupported(),
-		BackChannelLogoutSessionSupported:                  config.BackChannelLogoutSessionSupported(),
 	}
 }
 
 func Scopes(c Configuration) []string {
-	provider, ok := c.(*Provider)
-	if ok && provider.config.SupportedScopes != nil {
-		return provider.config.SupportedScopes
-	}
-	return DefaultSupportedScopes
+	return DefaultSupportedScopes // TODO: config
 }
 
 func ResponseTypes(c Configuration) []string {
@@ -140,13 +100,10 @@ func GrantTypes(c Configuration) []oidc.GrantType {
 }
 
 func SubjectTypes(c Configuration) []string {
-	return []string{"public"} // TODO: config
+	return []string{"public"} //TODO: config
 }
 
 func SigAlgorithms(ctx context.Context, storage DiscoverStorage) []string {
-	ctx, span := tracer.Start(ctx, "SigAlgorithms")
-	defer span.End()
-
 	algorithms, err := storage.SignatureAlgorithms(ctx)
 	if err != nil {
 		return nil
@@ -225,12 +182,32 @@ func AuthMethodsRevocationEndpoint(c Configuration) []oidc.AuthMethod {
 }
 
 func SupportedClaims(c Configuration) []string {
-	provider, ok := c.(*Provider)
-	if ok && provider.config.SupportedClaims != nil {
-		return provider.config.SupportedClaims
+	return []string{ // TODO: config
+		"sub",
+		"aud",
+		"exp",
+		"iat",
+		"iss",
+		"auth_time",
+		"nonce",
+		"acr",
+		"amr",
+		"c_hash",
+		"at_hash",
+		"act",
+		"scopes",
+		"client_id",
+		"azp",
+		"preferred_username",
+		"name",
+		"family_name",
+		"given_name",
+		"locale",
+		"email",
+		"email_verified",
+		"phone_number",
+		"phone_number_verified",
 	}
-
-	return DefaultSupportedClaims
 }
 
 func CodeChallengeMethods(c Configuration) []oidc.CodeChallengeMethod {

pkg/op/discovery_test.go

@@ -6,14 +6,14 @@ import (
 	"net/http/httptest"
 	"testing"
 
-	jose "github.com/go-jose/go-jose/v4"
 	"github.com/golang/mock/gomock"
 	"github.com/stretchr/testify/assert"
 	"github.com/stretchr/testify/require"
+	"gopkg.in/go-jose/go-jose.v2"
 
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/oidc"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op"
-	"git.christmann.info/LARA/zitadel-oidc/v3/pkg/op/mock"
+	"github.com/zitadel/oidc/v2/pkg/oidc"
+	"github.com/zitadel/oidc/v2/pkg/op"
+	"github.com/zitadel/oidc/v2/pkg/op/mock"
 )
 
 func TestDiscover(t *testing.T) {
@@ -48,9 +48,9 @@ func TestDiscover(t *testing.T) {
 
 func TestCreateDiscoveryConfig(t *testing.T) {
 	type args struct {
-		ctx context.Context
-		c   op.Configuration
-		s   op.DiscoverStorage
+		request *http.Request
+		c       op.Configuration
+		s       op.DiscoverStorage
 	}
 	tests := []struct {
 		name string
@@ -61,7 +61,7 @@ func TestCreateDiscoveryConfig(t *testing.T) {
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {
-			got := op.CreateDiscoveryConfig(tt.args.ctx, tt.args.c, tt.args.s)
+			got := op.CreateDiscoveryConfig(tt.args.request, tt.args.c, tt.args.s)
 			assert.Equal(t, tt.want, got)
 		})
 	}
@@ -81,11 +81,6 @@ func Test_scopes(t *testing.T) {
 			args{},
 			op.DefaultSupportedScopes,
 		},
-		{
-			"custom scopes",
-			args{newTestProvider(&op.Config{SupportedScopes: []string{"test1", "test2"}})},
-			[]string{"test1", "test2"},
-		},
 	}
 	for _, tt := range tests {
 		t.Run(tt.name, func(t *testing.T) {