Merge branch 'master' into convert_roundabout_exits

[rails.git] / app / models / client_application.rb

diff --git a/app/models/client_application.rb b/app/models/client_application.rb
index 67b86417a3a6a069a23d45e5e059c7b4aa415b87..ef1a0110ec8bbeac3ed28303e13b49ce7e2b365f 100644 (file)
--- a/app/models/client_application.rb
+++ b/app/models/client_application.rb
@@ -68,11 +68,11 @@ class ClientApplication < ActiveRecord::Base
   end
 
   def oauth_server
-    @oauth_server ||= OAuth::Server.new("http://" + SERVER_URL)
+    @oauth_server ||= OAuth::Server.new("https://" + SERVER_URL)
   end
 
   def credentials
-    @oauth_client ||= OAuth::Consumer.new(key, secret)
+    @credentials ||= OAuth::Consumer.new(key, secret)
   end
 
   def create_request_token(_params = {})