Skip to content

Commit

Permalink
Update to latest Devise.
Browse files Browse the repository at this point in the history
  • Loading branch information
josevalim committed Nov 25, 2009
1 parent ec3bde8 commit bd41066
Show file tree
Hide file tree
Showing 5 changed files with 49 additions and 5 deletions.
2 changes: 1 addition & 1 deletion app/models/admin.rb
@@ -1,3 +1,3 @@
class Admin < ActiveRecord::Base
devise :authenticatable, :validatable
devise :authenticatable, :timeoutable, :validatable, :timeout_in => 20.minutes
end
2 changes: 1 addition & 1 deletion config/environment.rb
Expand Up @@ -8,7 +8,7 @@

Rails::Initializer.run do |config|
config.gem 'warden', :version => '0.6.4'
config.gem 'devise', :version => '0.6.1'
config.gem 'devise', :version => '0.6.2'
config.gem 'rails-footnotes', :version => '3.6.3'

config.time_zone = 'UTC'
Expand Down
44 changes: 41 additions & 3 deletions config/initializers/devise.rb
@@ -1,33 +1,71 @@
# Use this hook to configure devise mailer, warden hooks and so forth. The first
# four configuration values can also be set straight in your models.
Devise.setup do |config|
# Configure the frameworks used by default. You should always set this value
# because if Devise add a new strategy, it won't be added to your application
# by default, unless you configure it here.
config.all = [:authenticatable, :confirmable, :recoverable, :rememberable, :timeoutable, :trackable, :validatable]

# Invoke `rake secret` and use the printed value to setup a pepper to generate
# the encrypted password. By default no pepper is used.
config.pepper = "r32e1cf6149e400510045342f2fffae09725d118b983d064c4057231ce733773ed7c7cd78e2788017ac1183e71d462c18efd014dc29fced70c67d1d20caa3a4ba"
# config.pepper = "rake secret output"

# Configure how many times you want the password is reencrypted. Default is 10.
# config.stretches = 10

# Define which will be the encryption algorithm. Supported algorithms are :sha1
# (default) and :sha512. Devise also supports encryptors from others authentication
# frameworks as :clearance_sha1, :authlogic_sha512 (then you should set stretches
# above to 20 for default behavior) and :restful_authentication_sha1 (then you
# should set stretches to 10, and copy REST_AUTH_SITE_KEY to pepper)
# config.encryptor = :sha1

# Configure which keys are used when authenticating an user. By default is
# just :email. You can configure it to use [:username, :subdomain], so for
# authenticating an user, both parameters are required. Remember that those
# parameters are used only when authenticating and not when retrieving from
# session. If you need permissions, you should implement that in a before filter.
# config.authentication_keys = [ :email ]

# The time you want give to your user to confirm his account. During this time
# he will be able to access your application without confirming. Default is nil.
# config.confirm_within = 2.days

# The time the user will be remembered without asking for credentials again.
# config.remember_for = 2.weeks

# The time you want to timeout the user session without activity. After this
# time the user will be asked for credentials again.
# config.timeout_in = 10.minutes

# Configure the e-mail address which will be shown in DeviseMailer.
# config.mail_sender = "foo.bar@yourapp.com"
# config.mailer_sender = "foo.bar@yourapp.com"

# Configure the ORM. Supports :active_record, :data_mapper and :mongo_mapper.
# config.orm = :active_record

# Turn scoped views on. Before rendering "sessions/new", it will first check for
# "sessions/users/new". It's turned off by default because it's slower if you
# are using only default views.
# config.scoped_views = true

# If you want to use other strategies, that are not (yet) supported by Devise,
# you can configure them inside the config.warden block. The example below
# allows you to setup OAuth, using http://github.com/roman/warden_oauth
#
# config.manager do |manager|
# config.warden do |manager|
# manager.oauth(:twitter) do |twitter|
# twitter.consumer_secret = <YOUR CONSUMER SECRET>
# twitter.consumer_key = <YOUR CONSUMER KEY>
# twitter.options :site => 'http://twitter.com'
# end
# manager.default_strategies.unshift :twitter_oauth
# end

# Configure default_url_options if you are using dynamic segments in :path_prefix
# for devise_for.
#
# config.default_url_options do
# { :locale => I18n.locale }
# end
end
1 change: 1 addition & 0 deletions db/migrate/20090916131255_create_users.rb
Expand Up @@ -5,6 +5,7 @@ def self.up
t.confirmable
t.recoverable
t.rememberable
t.trackable
t.timestamps
end
end
Expand Down
5 changes: 5 additions & 0 deletions db/schema.rb
Expand Up @@ -29,6 +29,11 @@
t.string "reset_password_token", :limit => 20
t.string "remember_token", :limit => 20
t.datetime "remember_created_at"
t.integer "sign_in_count"
t.datetime "current_sign_in_at"
t.datetime "last_sign_in_at"
t.string "current_sign_in_ip"
t.string "last_sign_in_ip"
t.datetime "created_at"
t.datetime "updated_at"
end
Expand Down

0 comments on commit bd41066

Please sign in to comment.