From 6a09daf57081a3767960acf6653464608af18934 Mon Sep 17 00:00:00 2001 From: Carlos Antonio da Silva Date: Sun, 26 Sep 2010 11:47:56 -0300 Subject: [PATCH] Don't need to extend ActiveSupport::Concern anymore in oauth helpers --- lib/devise/models/database_authenticatable.rb | 2 +- lib/devise/oauth/helpers.rb | 5 ++--- 2 files changed, 3 insertions(+), 4 deletions(-) diff --git a/lib/devise/models/database_authenticatable.rb b/lib/devise/models/database_authenticatable.rb index 316ff512..1739625f 100644 --- a/lib/devise/models/database_authenticatable.rb +++ b/lib/devise/models/database_authenticatable.rb @@ -24,7 +24,7 @@ module Devise attr_accessor :password_confirmation end - # Generators password encryption based on the value given. + # Generates password encryption based on the given value. def password=(new_password) @password = new_password self.encrypted_password = password_digest(@password) if @password.present? diff --git a/lib/devise/oauth/helpers.rb b/lib/devise/oauth/helpers.rb index 7075f614..6704cdff 100644 --- a/lib/devise/oauth/helpers.rb +++ b/lib/devise/oauth/helpers.rb @@ -3,17 +3,16 @@ module Devise # Provides a few helpers that are included in ActionController::Base # for convenience. module Helpers - extend ActiveSupport::Concern protected # Overwrite expire_session_data_after_sign_in! so it removes all # oauth tokens from session ensuring registrations done in a row - # do not try to store the same token in the database. + # do not try to store the same token in the database. def expire_session_data_after_sign_in! super session.keys.grep(/_oauth_token$/).each { |k| session.delete(k) } end end end -end \ No newline at end of file +end