kotovalexarian-likes-github/heartcombo--devise
1
0
Fork 0
mirror of https://github.com/heartcombo/devise.git synced 2022-11-09 12:18:31 -05:00
Code Releases Activity

Rollback to use the regexp result.

Browse source
This commit is contained in:
José Valim 2010-11-15 10:01:45 +01:00
parent 19219cbe0f
commit b70b72b6b0
3 changed files with 28 additions and 28 deletions
Show stats Download patch file Download diff file Expand all files Collapse all files

2
Gemfile
View file

@ -2,7 +2,7 @@ source "http://rubygems.org"
gemspec gemspec
gem "rails" gem "rails", "3.0.1"
gem "webrat", "0.7.1" gem "webrat", "0.7.1"
gem "mocha", :require => false gem "mocha", :require => false
gem "oa-oauth", :require => "omniauth/oauth" gem "oa-oauth", :require => "omniauth/oauth"

50
Gemfile.lock
View file

@ -10,12 +10,12 @@ GEM
remote: http://rubygems.org/ remote: http://rubygems.org/
specs: specs:
abstract (1.0.0) abstract (1.0.0)
actionmailer (3.0.0) actionmailer (3.0.1)
actionpack (= 3.0.0) actionpack (= 3.0.1)
mail (~> 2.2.5) mail (~> 2.2.5)
actionpack (3.0.0) actionpack (3.0.1)
activemodel (= 3.0.0) activemodel (= 3.0.1)
activesupport (= 3.0.0) activesupport (= 3.0.1)
builder (~> 2.1.2) builder (~> 2.1.2)
erubis (~> 2.6.6) erubis (~> 2.6.6)
i18n (~> 0.4.1) i18n (~> 0.4.1)
@ -23,23 +23,23 @@ GEM
rack-mount (~> 0.6.12) rack-mount (~> 0.6.12)
rack-test (~> 0.5.4) rack-test (~> 0.5.4)
tzinfo (~> 0.3.23) tzinfo (~> 0.3.23)
activemodel (3.0.0) activemodel (3.0.1)
activesupport (= 3.0.0) activesupport (= 3.0.1)
builder (~> 2.1.2) builder (~> 2.1.2)
i18n (~> 0.4.1) i18n (~> 0.4.1)
activerecord (3.0.0) activerecord (3.0.1)
activemodel (= 3.0.0) activemodel (= 3.0.1)
activesupport (= 3.0.0) activesupport (= 3.0.1)
arel (~> 1.0.0) arel (~> 1.0.0)
tzinfo (~> 0.3.23) tzinfo (~> 0.3.23)
activerecord-jdbc-adapter (1.0.2-java) activerecord-jdbc-adapter (1.0.2-java)
activerecord-jdbcsqlite3-adapter (1.0.2-java) activerecord-jdbcsqlite3-adapter (1.0.2-java)
activerecord-jdbc-adapter (= 1.0.2) activerecord-jdbc-adapter (= 1.0.2)
jdbc-sqlite3 (~> 3.6.0) jdbc-sqlite3 (~> 3.6.0)
activeresource (3.0.0) activeresource (3.0.1)
activemodel (= 3.0.0) activemodel (= 3.0.1)
activesupport (= 3.0.0) activesupport (= 3.0.1)
activesupport (3.0.0) activesupport (3.0.1)
addressable (2.2.2) addressable (2.2.2)
arel (1.0.1) arel (1.0.1)
activesupport (~> 3.0.0) activesupport (~> 3.0.0)
@ -104,17 +104,17 @@ GEM
ruby-openid (>= 2.1.8) ruby-openid (>= 2.1.8)
rack-test (0.5.6) rack-test (0.5.6)
rack (>= 1.0) rack (>= 1.0)
rails (3.0.0) rails (3.0.1)
actionmailer (= 3.0.0) actionmailer (= 3.0.1)
actionpack (= 3.0.0) actionpack (= 3.0.1)
activerecord (= 3.0.0) activerecord (= 3.0.1)
activeresource (= 3.0.0) activeresource (= 3.0.1)
activesupport (= 3.0.0) activesupport (= 3.0.1)
bundler (~> 1.0.0) bundler (~> 1.0.0)
railties (= 3.0.0) railties (= 3.0.1)
railties (3.0.0) railties (3.0.1)
actionpack (= 3.0.0) actionpack (= 3.0.1)
activesupport (= 3.0.0) activesupport (= 3.0.1)
rake (>= 0.8.4) rake (>= 0.8.4)
thor (~> 0.14.0) thor (~> 0.14.0)
rake (0.8.7) rake (0.8.7)
@ -155,7 +155,7 @@ DEPENDENCIES
oa-oauth oa-oauth
oa-openid oa-openid
orm_adapter (~> 0.0.2) orm_adapter (~> 0.0.2)
rails rails (= 3.0.1)
ruby-debug (>= 0.10.3) ruby-debug (>= 0.10.3)
sqlite3-ruby sqlite3-ruby
warden (~> 1.0.2) warden (~> 1.0.2)

4
lib/devise/strategies/authenticatable.rb
View file

@ -96,8 +96,8 @@ module Devise
# Helper to decode credentials from HTTP. # Helper to decode credentials from HTTP.
def decode_credentials def decode_credentials
return [] unless request.authorization && request.authorization =~ /^Basic (.*)/ return [] unless request.authorization && request.authorization =~ /^Basic (.*)/m
ActiveSupport::Base64.decode64(request.authorization.split(' ', 2).last).split(/:/, 2) ActiveSupport::Base64.decode64($1).split(/:/, 2)
end end
# Sets the authentication hash and the password from params_auth_hash or http_auth_hash. # Sets the authentication hash and the password from params_auth_hash or http_auth_hash.