From: kaniini Date: Tue, 16 Apr 2019 18:44:07 +0000 (+0000) Subject: Merge branch 'feature/788-separate-email-addresses' into 'develop' X-Git-Url: http://git.squeep.com/?a=commitdiff_plain;h=73df3046e014ae16e03f16a9c82921652cefcb54;p=akkoma Merge branch 'feature/788-separate-email-addresses' into 'develop' Feature/788 separate email addresses Closes #788 See merge request pleroma/pleroma!1040 --- 73df3046e014ae16e03f16a9c82921652cefcb54 diff --cc docs/config.md index 117fda960,66e68229d..d618c5dde --- a/docs/config.md +++ b/docs/config.md @@@ -442,10 -441,8 +443,10 @@@ Note: each strategy is shipped as a sep e.g. `OAUTH_CONSUMER_STRATEGIES="twitter facebook google microsoft" mix deps.get`. The server should also be started with `OAUTH_CONSUMER_STRATEGIES="..." mix phx.server` in case you enable any strategies. - Note: each strategy requires separate setup (on external provider side and Pleroma side). Below are the guidelines on setting up most popular strategies. + Note: each strategy requires separate setup (on external provider side and Pleroma side). Below are the guidelines on setting up most popular strategies. +Note: make sure that `"SameSite=Lax"` is set in `extra_cookie_attrs` when you have this feature enabled. OAuth consumer mode will not work with `"SameSite=Strict"` + * For Twitter, [register an app](https://developer.twitter.com/en/apps), configure callback URL to https:///oauth/twitter/callback * For Facebook, [register an app](https://developers.facebook.com/apps), configure callback URL to https:///oauth/facebook/callback, enable Facebook Login service at https://developers.facebook.com/apps//fb-login/settings/