Commit 9844c237 authored by David F.'s avatar David F.

Merge branch '1.1.x' into '1.1.x'

Make Google Oauth 2 client id private cutomization data.

See merge request !76
parents 229b1216 317ee0d4
......@@ -31,3 +31,6 @@ APP_SECRET_TOKEN='cookies_secret'
# Secret used to prevent cross-site scripting attacks
# with URL store for breadcrumb
GRETEL_TRAILS_SECRET='gretel_secret'
# Google service account Oauth 2.0 client ID for Google
# Calendar synchronization
# GOOGLE_CLIENT_ID=''
......@@ -46,7 +46,7 @@ module GoogleAgenda
:token_credential_uri => 'https://accounts.google.com/o/oauth2/token',
:audience => 'https://accounts.google.com/o/oauth2/token',
:scope => 'https://www.googleapis.com/auth/calendar',
:issuer => '477610709683-4rn3impci9hpaltkqc3qrm01dajdoi0j@developer.gserviceaccount.com',
:issuer => ENV['GOOGLE_CLIENT_ID'],
:signing_key => key,
:person => Website.first.gcal_user)
......@@ -66,4 +66,4 @@ module GoogleAgenda
Singleton.send :__init__, self
end
end
end
\ No newline at end of file
end
Markdown is supported
0% or
You are about to add 0 people to the discussion. Proceed with caution.
Finish editing this message first!
Please register or to comment