Skip to content

Commit

Permalink
Merge branch 'ory:master' into main
Browse files Browse the repository at this point in the history
  • Loading branch information
wanderer163 authored Nov 7, 2021
2 parents 282c269 + d687366 commit e45b500
Show file tree
Hide file tree
Showing 15 changed files with 2,089 additions and 5,930 deletions.
2 changes: 1 addition & 1 deletion cmd/keys_create.go
Original file line number Diff line number Diff line change
Expand Up @@ -33,7 +33,7 @@ func NewKeysCreateCmd() *cobra.Command {
Short: "Create a new JSON Web Key Set",
Run: cli.NewHandler().Keys.CreateKeys,
}
cmd.Flags().StringP("alg", "a", "RS256", "The algorithm to be used to generated they key. Supports: RS256, ES512, HS256, EdDSA")
cmd.Flags().StringP("alg", "a", "RS256", "The algorithm to be used to generated they key. Supports: RS256, ES256, ES512, HS256, EdDSA")
cmd.Flags().StringP("use", "u", "sig", "The intended use of this key")
return cmd
}
693 changes: 534 additions & 159 deletions docs/docs/.static/api.json

Large diffs are not rendered by default.

2 changes: 1 addition & 1 deletion docs/docs/cli/hydra-keys-create.md
Original file line number Diff line number Diff line change
Expand Up @@ -21,7 +21,7 @@ hydra keys create <set> <key> [flags]
### Options

```
-a, --alg string The algorithm to be used to generated they key. Supports: RS256, ES512, HS256, EdDSA (default "RS256")
-a, --alg string The algorithm to be used to generated they key. Supports: RS256, ES256, ES512, HS256, EdDSA (default "RS256")
-h, --help help for create
-u, --use string The intended use of this key (default "sig")
```
Expand Down
7 changes: 7 additions & 0 deletions docs/docs/guides/oauth2-public-spa-mobile.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -36,3 +36,10 @@ POST /oauth2/token
client_id=...&
...
```

:::note

The public clients using a non-https redirect scheme cannot skip
consent as per OpenID Sepcification & Certification.

:::
2 changes: 1 addition & 1 deletion docs/docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -30,7 +30,7 @@ On linux, you can use `bash <(curl ...)` to fetch the latest stable binary
using:

```shell
$ bash <(curl https://raw.githubusercontent.com/ory/hydra/v1.9.0/install.sh) -b . v1.9.0
$ bash <(curl https://raw.githubusercontent.com/ory/hydra/v1.10.6/install.sh) -b . v1.10.6
$ ./hydra help
```

Expand Down
3 changes: 2 additions & 1 deletion docs/docusaurus.config.js
Original file line number Diff line number Diff line change
Expand Up @@ -110,7 +110,8 @@ module.exports = {
: `Sign up for <a href="${config.newsletter}">important security announcements</a> and if you like ${config.projectName} give it a ⭐️ on <a target="_blank" rel="noopener noreferrer" href="https://github.com/ory/${githubRepoName}">GitHub</a>!`
},
algolia: {
apiKey: '8463c6ece843b377565726bb4ed325b0',
appId: 'V2EFIWEJ25',
apiKey: 'dc6b220f7d2bcd12da60b9cce431d8c5',
indexName: 'ory',
contextualSearch: true,
searchParameters: {
Expand Down
Loading

0 comments on commit e45b500

Please sign in to comment.