Fixes unmerged app.config file

Mainframe-Archive · Apr 14, 2015 · df442fe · df442fe
1 parent 9b1409f
commit df442fe
Showing 1 changed file with 6 additions and 11 deletions.
diff --git 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},