From 5457e3c1b6c97a47096d01d08a688e1ab90a1f9e Mon Sep 17 00:00:00 2001 From: Adam Strawson Date: Wed, 26 Jul 2023 13:41:26 +0100 Subject: [PATCH] docs: makes Courier http doc consistent with kratos configuration (#1475) * Example configuration consistent with kratos configuration * Fix formatting failures --- docs/hydra/login-consent-flow.md | 6 +++--- docs/kratos/self-hosted/03_mail-courier-http.mdx | 9 ++++----- 2 files changed, 7 insertions(+), 8 deletions(-) diff --git a/docs/hydra/login-consent-flow.md b/docs/hydra/login-consent-flow.md index fbcf2b888..57633c971 100644 --- a/docs/hydra/login-consent-flow.md +++ b/docs/hydra/login-consent-flow.md @@ -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 diff --git a/docs/kratos/self-hosted/03_mail-courier-http.mdx b/docs/kratos/self-hosted/03_mail-courier-http.mdx index 78b95276b..a5d1ceea1 100644 --- a/docs/kratos/self-hosted/03_mail-courier-http.mdx +++ b/docs/kratos/self-hosted/03_mail-courier-http.mdx @@ -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