Skip to content
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.

Sign up for GitHub

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

Jump to bottom

docs: makes Courier http doc consistent with kratos configuration #1475

Merged
merged 2 commits into from
Jul 26, 2023
Merged

docs: makes Courier http doc consistent with kratos configuration #1475

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
2 commits
Select commit Hold shift + click to select a range
c851e7a
Example configuration consistent with kratos configuration
Jul 25, 2023
ee1c48b
Fix formatting failures
Jul 25, 2023
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
6 changes: 3 additions & 3 deletions docs/hydra/login-consent-flow.md
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -29,9 +29,9 @@ The flow itself works as follows:
4. The user's user agent follows the redirect and lands back at Ory OAuth2 & OpenID Connect. Next, Ory OAuth2 & OpenID Connect
redirects the user's user agent to the Consent Provider, hosted at - for example -
`http://consent-service/consent?consent_challenge=4567...`
5. The Consent Provider shows a user interface which asks the user if they would like to grant the OAuth 2.0 Client the
requested permissions ("OAuth 2.0 Scope"). You've probably seen this screen around, which is usually something similar to:
_"Would you like to grant Facebook Image Backup access to all your private and public images?"_.
5. The Consent Provider shows a user interface which asks the user if they would like to grant the OAuth 2.0 Client the requested
permissions ("OAuth 2.0 Scope"). You've probably seen this screen around, which is usually something similar to: _"Would you
like to grant Facebook Image Backup access to all your private and public images?"_.
6. The Consent Provider makes another REST request to Ory OAuth2 & OpenID Connect to let it know which permissions the user
authorized, and if the user authorized the request at all. The user can usually choose to not grant an application any access
to his/her personal data. In the response of that REST request, a redirect URL is included along the lines of
Expand Down
9 changes: 4 additions & 5 deletions docs/kratos/self-hosted/03_mail-courier-http.mdx
View file
Open in desktop
Original file line number Diff line number Diff line change
Expand Up @@ -10,21 +10,20 @@ configurable using options below.

## Configuration

Default configuration doesn't use API calls to send mail. To enable it you need to set the "email.strategy" flag to "http", sender
URL, authorization (if needed) and request body format. (if needed) and request body format.
Default configuration doesn't use API calls to send mail. To enable it you need to set the "delivery_strategy" flag to "http",
sender URL, authorization (if needed) and request body format. (if needed) and request body format.

### Request configuration

```yaml title="config.yml"
courier:
email:
strategy: http
delivery_strategy: http
http:
request_config:
url: https://api.crm.com/email
method: POST
body: file://.mail.api.request.jsonnet
header:
headers:
"Content-Type": "application/json"
auth:
type: basic_auth
Expand Down
Loading