Merge pull request #89 from dataswift/fix-gcalendar

Changed some env variables to match what is expected by google

Author: whiteshadow-gr

dataplug-gcalendar/conf/application.conf

@@ -27,16 +27,16 @@ play.mailer {
   from = ${?MAILER_FROM}
 }
 
-auth.allowedResources = ["https://gcalendar.dataswift.io", "https://gcalendar.dataswift.dev", "https://gcalendar.hubofallthings.net",  "http://dataplug.hat.org", "https://gcalendar.hubat.net"]
+auth.allowedResources = ["https://google-calendar.dataswift.io", "https://google-calendar.dataswift.dev", "https://google-calendar.hubofallthings.net",  "https://dataplug.hat.org:9443", "https://google-calendar.hubat.net"]
 
 hat.secure = true
 
 service {
-  name = "gcalendar"
+  name = "google-calendar"
   name = ${?TOKEN_APP_NAME}
   provider = "google"
   scheme = "https://"
-  address = "gcalendar.dataswift.io"
+  address = "google-calendar.hubofallthings.com"
   secure = true
   chooseVariants = false
   hatCredentials {

dataplug-gcalendar/conf/application.dev.conf

@@ -2,11 +2,10 @@
 
 include "application.conf"
 
-service.scheme = "http://"
-service.address = "dataplug.hat.org:9000"
-service.secure = false
-service.name = "gcalendar-dev"
+service.scheme = "https://"
+service.address = "dataplug.hat.org:9443"
+service.secure = true
+service.name = "google-calendar-dev"
 service.name = ${?TOKEN_APP_NAME}
 
-
 play.mailer.mock = true

dataplug-gcalendar/conf/application.test.conf

@@ -51,7 +51,7 @@ silhouette {
   google {
     authorizationURL = "https://accounts.google.com/o/oauth2/auth"
     accessTokenURL = "https://accounts.google.com/o/oauth2/token"
-    redirectURL = "http://dataplug.hat.org:9000/authenticate/google"
+    redirectURL = "https://dataplug.hat.org:9443/authenticate/google"
     refreshURL = "https://www.googleapis.com/oauth2/v4/token"
     clientID = "783885139147-saq7s5fidvu1kj362mf334ef69sqk90l.apps.googleusercontent.com"
     clientID = ${?GOOGLE_CLIENT_ID}

dataplug-gcalendar/conf/silhouette.conf

@@ -41,7 +41,7 @@ silhouette {
   # Google provider
   google.authorizationURL = "https://accounts.google.com/o/oauth2/auth"
   google.accessTokenURL = "https://accounts.google.com/o/oauth2/token"
-  google.redirectURL = "http://dataplug.hat.org:9000/authenticate/gcalendar"
+  google.redirectURL = "https://dataplug.hat.org:9443/authenticate/google"
   google.redirectURL = ${?GOOGLE_CALLBACK_URL}
   google.redirectURL = ${?API_CALLBACK_URL}
   google.refreshURL = "https://www.googleapis.com/oauth2/v4/token"