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

fix: minor fixes in FAQ update #2130

Merged
merged 3 commits into from
Jan 10, 2022
Merged

fix: minor fixes in FAQ update #2130

Show file tree
Hide file tree
Changes from all commits
Commits
Show all changes
3 commits
Select commit Hold shift + click to select a range
6bbf571
fix: use direct link instead of master
vinckr Jan 10, 2022
9926185
fix: use relative link
vinckr Jan 10, 2022
f6f510b
fix: beautiful arrows
vinckr Jan 10, 2022
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
2 changes: 1 addition & 1 deletion docs/docs/concepts/email-sms.md
View file
Open in desktop
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
View file
Open in desktop
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/).
9 changes: 3 additions & 6 deletions docs/docs/guides/sign-in-with-github-google-facebook-linkedin.mdx
View file
Open in desktop
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