diff options
| author | kaniini <nenolod@gmail.com> | 2019-06-04 05:42:49 +0000 |
|---|---|---|
| committer | kaniini <nenolod@gmail.com> | 2019-06-04 05:42:49 +0000 |
| commit | a536f515dd2334e723f4e4c593724760511c5c1b (patch) | |
| tree | 61f677d61b1dde0e18fa0abc4e7bc5a296212652 /config/config.exs | |
| parent | 2be142ebec5292f519d10974c73ab6068a2b96c4 (diff) | |
| parent | 83663caa81f1ccca37fe3898feb4ec2d829ad893 (diff) | |
| download | pleroma-a536f515dd2334e723f4e4c593724760511c5c1b.tar.gz pleroma-a536f515dd2334e723f4e4c593724760511c5c1b.zip | |
Merge branch 'ueberauth_config_extension' into 'develop'
Ueberauth: extended format of OAUTH_CONSUMER_STRATEGIES to allow explicit dependency specification
See merge request pleroma/pleroma!1234
Diffstat (limited to 'config/config.exs')
| -rw-r--r-- | config/config.exs | 6 |
1 files changed, 5 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 09c3be7de..2c71f4a27 100644 --- a/config/config.exs +++ b/config/config.exs @@ -459,7 +459,11 @@ config :pleroma, :ldap, config :esshd, enabled: false -oauth_consumer_strategies = String.split(System.get_env("OAUTH_CONSUMER_STRATEGIES") || "") +oauth_consumer_strategies = + System.get_env("OAUTH_CONSUMER_STRATEGIES") + |> to_string() + |> String.split() + |> Enum.map(&hd(String.split(&1, ":"))) ueberauth_providers = for strategy <- oauth_consumer_strategies do |