diff options
| author | lambda <lain@soykaf.club> | 2019-04-08 11:41:50 +0000 |
|---|---|---|
| committer | lambda <lain@soykaf.club> | 2019-04-08 11:41:50 +0000 |
| commit | fd45cab9eccecc835dde457d72ba38bd31c8f7f6 (patch) | |
| tree | bcc6b53058cdf0a717e871d566fe923491bad99e /config | |
| parent | ff9290836b97f7358b056709e0891e01d641dd6d (diff) | |
| parent | 44829d91818e66da1cbeb13aafecc52a931af17d (diff) | |
| download | pleroma-fd45cab9eccecc835dde457d72ba38bd31c8f7f6.tar.gz pleroma-fd45cab9eccecc835dde457d72ba38bd31c8f7f6.zip | |
Merge branch 'twitter_oauth' into 'develop'
OAuth consumer (sign in / sign up with external provider)
See merge request pleroma/pleroma!923
Diffstat (limited to 'config')
| -rw-r--r-- | config/config.exs | 16 | ||||
| -rw-r--r-- | config/dev.exs | 1 |
2 files changed, 16 insertions, 1 deletions
diff --git a/config/config.exs b/config/config.exs index 5d959a859..900140797 100644 --- a/config/config.exs +++ b/config/config.exs @@ -395,6 +395,22 @@ config :pleroma, :ldap, base: System.get_env("LDAP_BASE") || "dc=example,dc=com", uid: System.get_env("LDAP_UID") || "cn" +oauth_consumer_strategies = String.split(System.get_env("OAUTH_CONSUMER_STRATEGIES") || "") + +ueberauth_providers = + for strategy <- oauth_consumer_strategies do + strategy_module_name = "Elixir.Ueberauth.Strategy.#{String.capitalize(strategy)}" + strategy_module = String.to_atom(strategy_module_name) + {String.to_atom(strategy), {strategy_module, [callback_params: ["state"]]}} + end + +config :ueberauth, + Ueberauth, + base_path: "/oauth", + providers: ueberauth_providers + +config :pleroma, :auth, oauth_consumer_strategies: oauth_consumer_strategies + config :pleroma, Pleroma.Mailer, adapter: Swoosh.Adapters.Sendmail config :prometheus, Pleroma.Web.Endpoint.MetricsExporter, path: "/api/pleroma/app_metrics" diff --git a/config/dev.exs b/config/dev.exs index f77bb9976..a7eb4b644 100644 --- a/config/dev.exs +++ b/config/dev.exs @@ -12,7 +12,6 @@ config :pleroma, Pleroma.Web.Endpoint, protocol_options: [max_request_line_length: 8192, max_header_value_length: 8192] ], protocol: "http", - secure_cookie_flag: false, debug_errors: true, code_reloader: true, check_origin: false, |