Skip to content

Commit

Permalink
Merge branch 'master' of https://github.com/ory/hydra
Browse files Browse the repository at this point in the history
  • Loading branch information
aeneasr committed May 23, 2020
2 parents feff5ea + 8d95942 commit 9a37d45
Show file tree
Hide file tree
Showing 16 changed files with 274 additions and 418 deletions.
16 changes: 4 additions & 12 deletions .schema/api.swagger.json
Original file line number Diff line number Diff line change
Expand Up @@ -2504,16 +2504,12 @@
"access_token": {
"description": "AccessToken sets session data for the access and refresh token, as well as any future tokens issued by the\nrefresh grant. Keep in mind that this data will be available to anyone performing OAuth 2.0 Challenge Introspection.\nIf only your services can perform OAuth 2.0 Challenge Introspection, this is usually fine. But if third parties\ncan access that endpoint as well, sensitive data from the session might be exposed to them. Use with care!",
"type": "object",
"additionalProperties": {
"type": "object"
}
"additionalProperties": true
},
"id_token": {
"description": "IDToken sets session data for the OpenID Connect ID token. Keep in mind that the session'id payloads are readable\nby anyone that has access to the ID Challenge. Use with care!",
"type": "object",
"additionalProperties": {
"type": "object"
}
"additionalProperties": true
}
}
},
Expand Down Expand Up @@ -2820,9 +2816,7 @@
"ext": {
"description": "Extra is arbitrary data set by the session.",
"type": "object",
"additionalProperties": {
"type": "object"
}
"additionalProperties": true
},
"iat": {
"description": "Issued at is an integer timestamp, measured in the number of seconds\nsince January 1 1970 UTC, indicating when this token was\noriginally issued.",
Expand Down Expand Up @@ -2903,9 +2897,7 @@
"id_token_hint_claims": {
"description": "IDTokenHintClaims are the claims of the ID Token previously issued by the Authorization Server being passed as a hint about the\nEnd-User's current or past authenticated session with the Client.",
"type": "object",
"additionalProperties": {
"type": "object"
}
"additionalProperties": true
},
"login_hint": {
"description": "LoginHint hints about the login identifier the End-User might use to log in (if necessary).\nThis hint can be used by an RP if it first asks the End-User for their e-mail address (or other identifier)\nand then wants to pass that value as a hint to the discovered authorization service. This value MAY also be a\nphone number in the format specified for the phone_number Claim. The use of this parameter is optional.",
Expand Down
6 changes: 3 additions & 3 deletions docs/docs/advanced.md
Original file line number Diff line number Diff line change
Expand Up @@ -58,9 +58,9 @@ or by setting in the HTTP API JSON body when POSTing to `/clients`:
}
```

Be aware that when making requests to `/oauth2/token` or `/oauth2/revoke` with a public OAuth 2.0
Client, you can not authenticate with the HTTP Basic Authorization but must
include the `client_id` in the POST body.
Be aware that when making requests to `/oauth2/token` or `/oauth2/revoke` with a
public OAuth 2.0 Client, you can not authenticate with the HTTP Basic
Authorization but must include the `client_id` in the POST body.

## Key rotation

Expand Down
14 changes: 7 additions & 7 deletions docs/docs/configure-deploy.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -78,11 +78,11 @@ $ export SECRETS_SYSTEM=$(export LC_CTYPE=C; cat /dev/urandom | tr -dc 'a-zA-Z0-
$ export DSN=postgres://hydra:secret@ory-hydra-example--postgres:5432/hydra?sslmode=disable

# Before starting, let's pull the latest ORY Hydra tag from docker.
$ docker pull oryd/hydra:v1.5.0-beta.1
$ docker pull oryd/hydra:v1.5.0-beta.2

# This command will show you all the environment variables that you can set. Read this carefully.
# It is the equivalent to `hydra help serve`.
$ docker run -it --rm --entrypoint hydra oryd/hydra:v1.5.0-beta.1 help serve
$ docker run -it --rm --entrypoint hydra oryd/hydra:v1.5.0-beta.2 help serve

Starts all HTTP/2 APIs and connects to a database backend.
[...]
Expand All @@ -92,7 +92,7 @@ Starts all HTTP/2 APIs and connects to a database backend.
# It is the equivalent to `hydra migrate sql --yes postgres://hydra:secret@ory-hydra-example--postgres:5432/hydra?sslmode=disable`
$ docker run -it --rm \
--network hydraguide \
oryd/hydra:v1.5.0-beta.1 \
oryd/hydra:v1.5.0-beta.2 \
migrate sql --yes $DSN

Applying `client` SQL migrations...
Expand All @@ -110,7 +110,7 @@ $ docker run -d \
-e URLS_SELF_ISSUER=https://localhost:9000/ \
-e URLS_CONSENT=http://localhost:9020/consent \
-e URLS_LOGIN=http://localhost:9020/login \
oryd/hydra:v1.5.0-beta.1 serve all
oryd/hydra:v1.5.0-beta.2 serve all

# And check if it's running:
$ docker logs ory-hydra-example--hydra
Expand Down Expand Up @@ -178,7 +178,7 @@ ORY Hydra can be managed using the Hydra Command Line Interface (CLI), which is
using ORY Hydra's REST APIs. To see the available commands, run:

```shell
$ docker run --rm -it --entrypoint hydra oryd/hydra:v1.5.0-beta.1 help
$ docker run --rm -it --entrypoint hydra oryd/hydra:v1.5.0-beta.2 help
Hydra is a cloud native high throughput OAuth2 and OpenID Connect provider

Usage:
Expand Down Expand Up @@ -237,7 +237,7 @@ URLs the client may request:
$ docker run --rm -it \
-e HYDRA_ADMIN_URL=https://ory-hydra-example--hydra:4445 \
--network hydraguide \
oryd/hydra:v1.5.0-beta.1 \
oryd/hydra:v1.5.0-beta.2 \
clients create --skip-tls-verify \
--id facebook-photo-backup \
--secret some-secret \
Expand Down Expand Up @@ -284,7 +284,7 @@ for an access token. The same thing happens with this command:
$ docker run --rm -it \
--network hydraguide \
-p 9010:9010 \
oryd/hydra:v1.5.0-beta.1 \
oryd/hydra:v1.5.0-beta.2 \
token user --skip-tls-verify \
--port 9010 \
--auth-url https://localhost:9000/oauth2/auth \
Expand Down
5 changes: 3 additions & 2 deletions docs/docs/implement-consent.md
Original file line number Diff line number Diff line change
Expand Up @@ -359,8 +359,9 @@ Legend:
`localhost`, `google.com`).**
- `****`: The `post_logout_redirect` defaults to the configuration value of
`urls.post_logout_redirect`. If it's an RP-initiated flow and a
`post_logout_redirect_uri` was set and that URL is in the array of the OAuth2 Client's
`urls.post_logout_redirect`, the browser will be redirected there instead.
`post_logout_redirect_uri` was set and that URL is in the array of the OAuth2
Client's `urls.post_logout_redirect`, the browser will be redirected there
instead.

### Logout Flow

Expand Down
4 changes: 2 additions & 2 deletions docs/docs/install.md
Original file line number Diff line number Diff line change
Expand Up @@ -11,8 +11,8 @@ binaries, Docker Images and support various package managers.
We recommend using Docker to run ORY Hydra:

```shell
$ docker pull oryd/hydra:v1.5.0-beta.1
$ docker run --rm -it oryd/hydra:v1.5.0-beta.1 help
$ docker pull oryd/hydra:v1.5.0-beta.2
$ docker run --rm -it oryd/hydra:v1.5.0-beta.2 help
```

## macOS
Expand Down
Loading

0 comments on commit 9a37d45

Please sign in to comment.