dynamic config

lancejpollard · Jun 3, 2010 · 08c6fa7 · 08c6fa7
1 parent 1c93ddb
commit 08c6fa7
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 2 deletions.
diff --git a/README.markdown b/README.markdown
@@ -241,4 +241,8 @@ Feel free to add to the wiki if you figure things out or make new distinctions.
 
 - Try to create a session
 - Session logs into provider
-- On success, if no user, redirect to User#create
+- On success, if no user, redirect to User#create
+
+#### Notes
+
+- Build mechanize tool to automatically create applications with service providers.
diff --git a/lib/authlogic_connect/oauth/tokens/oauth_token.rb b/lib/authlogic_connect/oauth/tokens/oauth_token.rb
@@ -52,7 +52,7 @@ def consumer
         if oauth_version == 1.0
           @consumer = OAuth::Consumer.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {}))
         else
-          @consumer = OAuth2::Client.new(credentials[:key], credentials[:secret], config)
+          @consumer = OAuth2::Client.new(credentials[:key], credentials[:secret], config.merge(credentials[:options] || {})
         end
       end