Skip to content

Commit

Permalink
fix: minor fixes in FAQ update (ory#2130)
Browse files Browse the repository at this point in the history
  • Loading branch information
vinckr committed Jan 10, 2022
1 parent 2b521e0 commit 26d192b
Show file tree
Hide file tree
Showing 3 changed files with 6 additions and 9 deletions.
2 changes: 1 addition & 1 deletion docs/docs/concepts/email-sms.md
Original file line number Diff line number Diff line change
Expand Up @@ -104,7 +104,7 @@ are common template file names expected in the sub directories of the root
directory, corresponding to the respective methods for filling e-mail subject
and body. Both plain text and HTML templates are required. The courier uses them
as
[alternatives](https://github.com/ory/kratos/blob/master/courier/courier.go#L205)
[alternatives](https://github.com/ory/kratos/blob/871ee0475a27771dd6395aad617f41a22ccc3b9a/courier/courier.go#L205)
for fallback.

> Templates use the golang template engine in the `text/template` package for
Expand Down
4 changes: 2 additions & 2 deletions docs/docs/concepts/identity-schema.mdx
Original file line number Diff line number Diff line change
Expand Up @@ -333,6 +333,6 @@ alphanumeric characters), they can be sanitized. To sanitize usernames add
[Regular Expressions](https://json-schema.org/understanding-json-schema/reference/string.html#regular-expressions)
to the Ory Kratos Identity Schema. To sanitize usernames coming from third-party
OIDC providers like
[Google or GitHub](https://www.ory.sh/kratos/docs/next/guides/sign-in-with-github-google-facebook-linkedin)
write [Jsonnet](https://jsonnet.org). Learn more about
[Google or GitHub](../guides/sign-in-with-github-google-facebook-linkedin) write
[Jsonnet](https://jsonnet.org). Learn more about
[Data Mapping with Jsonnet](../reference/jsonnet/).
Original file line number Diff line number Diff line change
Expand Up @@ -1181,12 +1181,9 @@ exchanges it for a session. For example:
- Google sends back the OIDC `id_token` (if successfully authenticated).
- Ory Kratos gets the user information from the `id_token` (specified in claims,
default email, or username).
- Ory Kratos checks the database if the identity exists;

--> if yes, Ory Kratos returns a session token to the user;

-->if no, the identity is created and it returns a session token.

- Ory Kratos checks the database if the identity exists:
:arrow_right: if yes, Ory Kratos returns a session token to the user.
:arrow_right: if no, the identity is created and it returns a session token.
- The `id_token` from Google is discarded upon completion of the flow.

## Log in through social providers if the identifiers match
Expand Down

0 comments on commit 26d192b

Please sign in to comment.