From df442fecdc265786bc746177ffcd6e7246704f24 Mon Sep 17 00:00:00 2001 From: Leandro Ostera Date: Tue, 14 Apr 2015 17:02:44 -0300 Subject: [PATCH] Fixes unmerged app.config file --- files/app.config | 17 ++++++----------- 1 file changed, 6 insertions(+), 11 deletions(-) diff --git a/files/app.config b/files/app.config index 64f12ec..f929587 100755 --- a/files/app.config +++ b/files/app.config @@ -1,20 +1,15 @@ %% -*- mode: erlang -*- [ - {switchboard, [{cowboy_port, {{ http_port|default:8080 }}}{% if google_client_id and google_client_secret %}, + {switchboard, [{cowboy_port, {{ http_port|default:8080 }}}, {oauth_providers, - [{<<"google">>, + [{% if google_client_id and google_client_secret %} + {<<"google">>, [{client_id, <<"{{ google_client_id }}">> }, {client_secret, <<"{{ google_client_secret }}">> }, - {callback_uri, <<"/auth/google/callback">>}, - {scope, <<"https://mail.google.com" - " https://www.googleapis.com/auth/userinfo.email" - " https://www.googleapis.com/auth/userinfo.profile">>}, - {authorize_uri, <<"https://accounts.google.com/o/oauth2/auth">>}, - {token_uri, <<"https://accounts.google.com/o/oauth2/token">>}, + {refresh_url, <<"https://accounts.google.com/o/oauth2/token">>}, {imap_host, <<"imap.gmail.com">>}, - {imap_port, 993}, - {callback_hooks, [switchboard_social_oauth]}]}]} - {% endif %} + {imap_port, 993}]}{% endif %} + ]} ]}, {lager, [{handlers, [{lager_console_backend, info},