state.rb in authlogic-connect-0.0.6

- old
+ new

@@ -9,11 +9,11 @@
   end
   
   # 2. from call
   # checks that the correct session variables are there
   def oauth_response?
-    !oauth_response.nil? && !auth_session.nil? && auth_session[:auth_request_class] == self.class.name && auth_session[:auth_method] == "oauth"
+    !oauth_response.nil? && auth_session? && auth_session[:auth_request_class] == self.class.name && auth_session[:auth_method] == "oauth"
   end
   
   def oauth_complete?
     oauth_response? || stored_oauth_token_and_secret?
   end
@@ -52,9 +52,9 @@
   def validate_password_with_oauth?
     !using_oauth? && require_password?
   end
   
   def stored_oauth_token_and_secret?
-    !is_auth_session? && auth_params && auth_params.has_key?(:_key) && auth_params.has_key?(:_token) && auth_params.has_key?(:_secret)
+    !is_auth_session? && auth_params? && auth_params.has_key?(:_key) && auth_params.has_key?(:_token) && auth_params.has_key?(:_secret)
   end
   
 end