Skip to content

[pull] master from ory:master #98

New issue

Have a question about this project? Sign up for a free GitHub account to open an issue and contact its maintainers and the community.

By clicking “Sign up for GitHub”, you agree to our terms of service and privacy statement. We’ll occasionally send you account related emails.

Already on GitHub? Sign in to your account

Merged
merged 2 commits into from
Jun 14, 2022
Merged
Show file tree
Hide file tree
Changes from all commits
Commits
File filter

Filter by extension

Filter by extension

Conversations
Failed to load comments.
Loading
Jump to
Jump to file
Failed to load files.
Loading
Diff view
Diff view
53 changes: 29 additions & 24 deletions CHANGELOG.md
Original file line number Diff line number Diff line change
Expand Up @@ -4,14 +4,15 @@
<!-- DON'T EDIT THIS SECTION, INSTEAD RE-RUN doctoc TO UPDATE -->
**Table of Contents**

- [0.0.0 (2022-06-08)](#000-2022-06-08)
- [0.0.0 (2022-06-14)](#000-2022-06-14)
- [Bug Fixes](#bug-fixes)
- [Documentation](#documentation)
- [Features](#features)
- [1.11.8 (2022-05-04)](#1118-2022-05-04)
- [Bug Fixes](#bug-fixes-1)
- [Code Generation](#code-generation)
- [Documentation](#documentation-1)
- [Features](#features)
- [Features](#features-1)
- [Tests](#tests)
- [1.11.7 (2022-02-23)](#1117-2022-02-23)
- [Code Generation](#code-generation-1)
Expand Down Expand Up @@ -39,14 +40,14 @@
- [Bug Fixes](#bug-fixes-7)
- [Code Generation](#code-generation-8)
- [Documentation](#documentation-3)
- [Features](#features-1)
- [Features](#features-2)
- [1.10.7 (2021-10-27)](#1107-2021-10-27)
- [Breaking Changes](#breaking-changes-1)
- [Bug Fixes](#bug-fixes-8)
- [Code Generation](#code-generation-9)
- [Code Refactoring](#code-refactoring-1)
- [Documentation](#documentation-4)
- [Features](#features-2)
- [Features](#features-3)
- [1.10.6 (2021-08-28)](#1106-2021-08-28)
- [Bug Fixes](#bug-fixes-9)
- [Code Generation](#code-generation-10)
Expand All @@ -55,30 +56,30 @@
- [Bug Fixes](#bug-fixes-10)
- [Code Generation](#code-generation-11)
- [Documentation](#documentation-6)
- [Features](#features-3)
- [Features](#features-4)
- [1.10.3 (2021-07-14)](#1103-2021-07-14)
- [Bug Fixes](#bug-fixes-11)
- [Code Generation](#code-generation-12)
- [Code Refactoring](#code-refactoring-2)
- [Documentation](#documentation-7)
- [Features](#features-4)
- [Features](#features-5)
- [1.10.2 (2021-05-04)](#1102-2021-05-04)
- [Breaking Changes](#breaking-changes-2)
- [Bug Fixes](#bug-fixes-12)
- [Code Generation](#code-generation-13)
- [Code Refactoring](#code-refactoring-3)
- [Documentation](#documentation-8)
- [Features](#features-5)
- [Features](#features-6)
- [1.10.1 (2021-03-25)](#1101-2021-03-25)
- [Bug Fixes](#bug-fixes-13)
- [Code Generation](#code-generation-14)
- [Documentation](#documentation-9)
- [Features](#features-6)
- [Features](#features-7)
- [Tests](#tests-1)
- [Unclassified](#unclassified)
- [1.9.2 (2021-01-29)](#192-2021-01-29)
- [Code Generation](#code-generation-15)
- [Features](#features-7)
- [Features](#features-8)
- [1.9.1 (2021-01-27)](#191-2021-01-27)
- [Code Generation](#code-generation-16)
- [Documentation](#documentation-10)
Expand All @@ -96,34 +97,34 @@
- [Code Generation](#code-generation-20)
- [Code Refactoring](#code-refactoring-4)
- [Documentation](#documentation-12)
- [Features](#features-8)
- [Features](#features-9)
- [Tests](#tests-2)
- [Unclassified](#unclassified-1)
- [1.9.0-alpha.2 (2020-10-29)](#190-alpha2-2020-10-29)
- [Bug Fixes](#bug-fixes-16)
- [Code Generation](#code-generation-21)
- [Documentation](#documentation-13)
- [Features](#features-9)
- [Features](#features-10)
- [Tests](#tests-3)
- [1.9.0-alpha.1 (2020-10-20)](#190-alpha1-2020-10-20)
- [Bug Fixes](#bug-fixes-17)
- [Code Generation](#code-generation-22)
- [Code Refactoring](#code-refactoring-5)
- [Documentation](#documentation-14)
- [Features](#features-10)
- [Features](#features-11)
- [Tests](#tests-4)
- [1.8.5 (2020-10-03)](#185-2020-10-03)
- [Code Generation](#code-generation-23)
- [1.8.0-pre.1 (2020-10-03)](#180-pre1-2020-10-03)
- [Bug Fixes](#bug-fixes-18)
- [Code Generation](#code-generation-24)
- [Features](#features-11)
- [Features](#features-12)
- [1.8.0-pre.0 (2020-10-02)](#180-pre0-2020-10-02)
- [Breaking Changes](#breaking-changes-4)
- [Bug Fixes](#bug-fixes-19)
- [Code Generation](#code-generation-25)
- [Documentation](#documentation-15)
- [Features](#features-12)
- [Features](#features-13)
- [1.7.4 (2020-08-31)](#174-2020-08-31)
- [Bug Fixes](#bug-fixes-20)
- [Code Generation](#code-generation-26)
Expand All @@ -135,15 +136,15 @@
- [Code Generation](#code-generation-28)
- [Code Refactoring](#code-refactoring-6)
- [Documentation](#documentation-16)
- [Features](#features-13)
- [Features](#features-14)
- [Unclassified](#unclassified-2)
- [1.7.0 (2020-08-14)](#170-2020-08-14)
- [Breaking Changes](#breaking-changes-6)
- [Bug Fixes](#bug-fixes-22)
- [Code Generation](#code-generation-29)
- [Code Refactoring](#code-refactoring-7)
- [Documentation](#documentation-17)
- [Features](#features-14)
- [Features](#features-15)
- [Unclassified](#unclassified-3)
- [1.6.0 (2020-07-20)](#160-2020-07-20)
- [Bug Fixes](#bug-fixes-23)
Expand All @@ -153,20 +154,20 @@
- [1.5.2 (2020-06-23)](#152-2020-06-23)
- [Bug Fixes](#bug-fixes-24)
- [Code Generation](#code-generation-31)
- [Features](#features-15)
- [Features](#features-16)
- [1.5.1 (2020-06-16)](#151-2020-06-16)
- [Code Generation](#code-generation-32)
- [1.5.0 (2020-06-16)](#150-2020-06-16)
- [Bug Fixes](#bug-fixes-25)
- [Chores](#chores)
- [Documentation](#documentation-19)
- [Features](#features-16)
- [Features](#features-17)
- [Unclassified](#unclassified-5)
- [1.5.0-beta.5 (2020-05-28)](#150-beta5-2020-05-28)
- [Bug Fixes](#bug-fixes-26)
- [Chores](#chores-1)
- [Documentation](#documentation-20)
- [Features](#features-17)
- [Features](#features-18)
- [1.5.0-beta.3 (2020-05-23)](#150-beta3-2020-05-23)
- [Chores](#chores-2)
- [1.5.0-beta.2 (2020-05-23)](#150-beta2-2020-05-23)
Expand All @@ -190,7 +191,7 @@
- [Bug Fixes](#bug-fixes-30)
- [Chores](#chores-7)
- [Documentation](#documentation-23)
- [Features](#features-18)
- [Features](#features-19)
- [1.4.7 (2020-04-24)](#147-2020-04-24)
- [Bug Fixes](#bug-fixes-31)
- [Chores](#chores-8)
Expand All @@ -205,7 +206,7 @@
- [Bug Fixes](#bug-fixes-34)
- [Code Refactoring](#code-refactoring-10)
- [Documentation](#documentation-27)
- [Features](#features-19)
- [Features](#features-20)
- [1.4.2 (2020-04-03)](#142-2020-04-03)
- [Chores](#chores-9)
- [Documentation](#documentation-28)
Expand All @@ -230,7 +231,7 @@
- [Bug Fixes](#bug-fixes-36)
- [Code Refactoring](#code-refactoring-11)
- [Documentation](#documentation-29)
- [Features](#features-20)
- [Features](#features-21)
- [Unclassified](#unclassified-7)
- [1.3.2 (2020-02-17)](#132-2020-02-17)
- [Bug Fixes](#bug-fixes-37)
Expand All @@ -241,7 +242,7 @@
- [1.3.0 (2020-02-14)](#130-2020-02-14)
- [Bug Fixes](#bug-fixes-38)
- [Documentation](#documentation-31)
- [Features](#features-21)
- [Features](#features-22)
- [Unclassified](#unclassified-8)
- [1.2.3 (2020-01-31)](#123-2020-01-31)
- [Unclassified](#unclassified-9)
Expand Down Expand Up @@ -634,7 +635,7 @@

<!-- END doctoc generated TOC please keep comment here to allow auto update -->

# [0.0.0](https://github.com/ory/hydra/compare/v1.11.8...v0.0.0) (2022-06-08)
# [0.0.0](https://github.com/ory/hydra/compare/v1.11.8...v0.0.0) (2022-06-14)


### Bug Fixes
Expand All @@ -651,6 +652,10 @@

* Fix missing image ([7925597](https://github.com/ory/hydra/commit/79255970787c4793a57fe79d756aa0364b4a9490))

### Features

* Add token_endpoint_auth_signing_alg to cli ([#3148](https://github.com/ory/hydra/issues/3148)) ([ed6eb30](https://github.com/ory/hydra/commit/ed6eb3017dfb82f1c1fa97f1d88d023211f1e034))


# [1.11.8](https://github.com/ory/hydra/compare/v1.11.7...v1.11.8) (2022-05-04)

Expand Down
2 changes: 2 additions & 0 deletions cmd/cli/handler_client.go
Original file line number Diff line number Diff line change
Expand Up @@ -123,6 +123,7 @@ func (h *ClientHandler) CreateClient(cmd *cobra.Command, args []string) {
BackchannelLogoutURI: flagx.MustGetString(cmd, "backchannel-logout-callback"),
FrontchannelLogoutSessionRequired: flagx.MustGetBool(cmd, "frontchannel-logout-session-required"),
FrontchannelLogoutURI: flagx.MustGetString(cmd, "frontchannel-logout-callback"),
TokenEndpointAuthSigningAlg: flagx.MustGetString(cmd, "token-endpoint-auth-signing-alg"),
}

response, err := m.Admin.CreateOAuth2Client(admin.NewCreateOAuth2ClientParams().WithBody(&cc))
Expand Down Expand Up @@ -188,6 +189,7 @@ func (h *ClientHandler) UpdateClient(cmd *cobra.Command, args []string) {
BackchannelLogoutURI: flagx.MustGetString(cmd, "backchannel-logout-callback"),
FrontchannelLogoutSessionRequired: flagx.MustGetBool(cmd, "frontchannel-logout-session-required"),
FrontchannelLogoutURI: flagx.MustGetString(cmd, "frontchannel-logout-callback"),
TokenEndpointAuthSigningAlg: flagx.MustGetString(cmd, "token-endpoint-auth-signing-alg"),
}

response, err := m.Admin.UpdateOAuth2Client(admin.NewUpdateOAuth2ClientParams().WithID(id).WithBody(&cc))
Expand Down
3 changes: 3 additions & 0 deletions cmd/clients_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -76,5 +76,8 @@ To encrypt auto generated client secret, use "--pgp-key", "--pgp-key-url" or "--
cmd.Flags().String("pgp-key-url", "", "PGP encryption key URL for encrypting client secret")
cmd.Flags().String("keybase", "", "Keybase username for encrypting client secret")

// authentication signing algorithm for the Token Endpoint
cmd.Flags().String("token-endpoint-auth-signing-alg", "", "Authentication signing algorithm for the Token Endpoint")

return cmd
}
3 changes: 3 additions & 0 deletions cmd/clients_update.go
Original file line number Diff line number Diff line change
Expand Up @@ -55,5 +55,8 @@ To encrypt auto generated client secret, use "--pgp-key", "--pgp-key-url" or "--
cmd.Flags().String("pgp-key-url", "", "PGP encryption key URL for encrypting client secret")
cmd.Flags().String("keybase", "", "Keybase username for encrypting client secret")

// authentication signing algorithm for the Token Endpoint
cmd.Flags().String("token-endpoint-auth-signing-alg", "", "Authentication signing algorithm for the Token Endpoint")

return cmd
}