set or update the secret when finding/creating token

Conflicts: lib/oauth/models/consumers/token.rb
in-src · Apr 5, 2011 · 35c08bc · 35c08bc
1 parent 531ece1
commit 35c08bc
Show file tree

Hide file tree

Showing 2 changed files with 6 additions and 6 deletions.
diff --git a/CHANGELOG b/CHANGELOG
@@ -1,4 +1,5 @@
 0.4.0-pre5
+  - fix issues with new consumer tokens [afeld]
   - More forgiving about oob callback values[chrisrhoden]
   - Update Twitter consumer to use latest Twitter Gem [afeld]
   - Fixes various mongoid issues [3en]

diff --git a/lib/oauth/models/consumers/token.rb b/lib/oauth/models/consumers/token.rb
@@ -40,15 +40,14 @@ def find_or_create_from_request_token(user,token,secret,oauth_verifier)
           def find_or_create_from_access_token(user,access_token)
             secret = access_token.respond_to?(:secret) ? access_token.secret : nil
             if user
-              token = self.find_or_create_by_user_id_and_token_and_secret(user.id, access_token.token, secret)
+              token = self.find_or_initialize_by_user_id_and_token(user.id, access_token.token)
             else
-              token = self.find_or_create_by_token_and_secret(access_token.token, secret)
+              token = self.find_or_initialize_by_token(access_token.token)
             end
 
-            if token.new_record?
-              token.secret = secret
-              token.save
-            end
+            # set or update the secret
+            token.secret = secret
+            token.save! if token.new_record? or token.changed?
 
             token
           end