authpwn_rails 0.9.6 → 0.10.0

data/test/test_helper.rb

@@ -7,6 +7,7 @@ require 'active_support'
 
 require 'fbgraph_rails'
 require 'fbgraph_rails/controller'
+require 'flexmock/test_unit'
 require 'sqlite3'
 
 require 'authpwn_rails'

data/test/user_test.rb

@@ -2,125 +2,36 @@ require File.expand_path('../test_helper', __FILE__)
 
 class UserTest < ActiveSupport::TestCase  
   def setup
-    @user = User.new :password => 'awesome',
-                     :password_confirmation => 'awesome',
-                     :email => 'dvdjohn@mit.edu'
+    @user = User.new
   end
   
-  test 'password_salt not required' do
-    @user.password_salt = nil
+  test 'setup' do
     assert @user.valid?
   end
   
-  test 'password_salt length' do
-    @user.password_salt = '12345' * 4
-    assert !@user.valid?, 'Long salt'
-    @user.password_salt = ''
-    assert !@user.valid?, 'Empty salt'
-  end
-  
-  test 'password_hash not required' do
-    @user.password_hash = nil
+  test 'exuid generation' do
     assert @user.valid?
+    assert @user.exuid
   end
   
-  test 'password_hash length' do
-    @user.password_hash = '12345' * 13
-    assert !@user.valid?, 'Long hash'
-    @user.password_hash = ''
-    assert !@user.valid?, 'Empty hash'
-  end
-  
-  test 'email presence' do
-    @user.email = nil
-    assert !@user.valid?
-  end
-  
-  test 'email length' do
-    @user.email = 'abcde' * 25 + '@mit.edu'
-    assert !@user.valid?, 'Overly long user name'
-  end
-  
-  test 'email format' do
-    ['cos tan@gmail.com', 'costan@x@mit.edu'].each do |email|
-      @user.email = email
-      assert !@user.valid?, "Bad email format - #{email}"
-    end    
-  end
-  
-  test 'email uniqueness' do
-    @user.email = users(:john).email
+  test 'exuid uniqueness' do
+    @user.exuid = users(:john).exuid
     assert !@user.valid?
   end
   
-  test 'password not required' do
-    @user.reset_password
-    assert @user.valid?
-  end
-  
-  test 'password confirmation' do
-    @user.password_confirmation = 'not awesome'
+  test 'exuid presence' do
+    @user.exuid = ''
     assert !@user.valid?
   end
-  
-  test 'password can be nil' do
-    @user.password = @user.password_confirmation = nil
-    assert @user.valid?
-  end
-  
+    
   test 'to_param' do
-    sha2 = 'fc1ef1be38cd81490f31498d13e58bf273f94d5fa63c75dd8519271a96ff7bd2'
-    assert_equal sha2, @user.to_param
+    assert_equal '56789', users(:john).to_param
   end
   
-  test 'password_matches?' do
-    assert_equal true, @user.password_matches?('awesome')
-    assert_equal false, @user.password_matches?('not awesome'), 'Bogus password'
-    assert_equal false, @user.password_matches?('password'),
-                 "Another user's password" 
-  end
-    
   test 'find_by_param' do
     assert_equal users(:john), User.find_by_param(users(:john).to_param)
     assert_equal users(:jane), User.find_by_param(users(:jane).to_param)
-    assert_equal nil, User.find_by_param('bogus hash')
+    assert_equal nil, User.find_by_param('bogus id')
     assert_equal nil, User.find_by_param(nil)
   end
-  
-  test 'to_json does not show implementation details' do
-    json_data = ActiveSupport::JSON.decode users(:john).to_json
-    assert_operator json_data, :has_key?, 'user'
-    assert_nil json_data['user']['password_hash']
-    assert_nil json_data['user']['password_salt']
-    assert_nil json_data['user']['id']
-  end
-  
-  test 'find_by_email_and_password' do
-    assert_equal users(:john),
-        User.find_by_email_and_password('john@gmail.com', 'password')
-    assert_equal nil,
-        User.find_by_email_and_password('john@gmail.com', 'pa55w0rd'),
-        "Jane's password on John's account"
-    assert_equal users(:jane),
-        User.find_by_email_and_password('jane@gmail.com', 'pa55w0rd')
-    assert_equal nil,
-        User.find_by_email_and_password('jane@gmail.com', 'password'),
-        "John's password on Jane's account"
-    assert_equal nil,
-        User.find_by_email_and_password('john@gmail.com', 'awesome'),
-        'Bogus password'
-  end
-    
-  test 'facebook_token' do
-    assert_nil @user.facebook_token
-    
-    user = users(:john)
-    assert_equal facebook_tokens(:john), user.facebook_token
-  end
-  
-  
-  test 'for_facebook_token' do
-    assert_equal users(:john),
-        User.for_facebook_token(users(:john). facebook_token.access_token)
-  end
 end

metadata

@@ -1,7 +1,7 @@
 --- !ruby/object:Gem::Specification
 name: authpwn_rails
 version: !ruby/object:Gem::Version
-  version: 0.9.6
+  version: 0.10.0
   prerelease: 
 platform: ruby
 authors:
@@ -9,11 +9,11 @@ authors:
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2011-10-12 00:00:00.000000000Z
+date: 2011-11-21 00:00:00.000000000Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: fbgraph_rails
-  requirement: &18691840 !ruby/object:Gem::Requirement
+  requirement: &16565780 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -21,21 +21,21 @@ dependencies:
         version: 0.2.2
   type: :runtime
   prerelease: false
-  version_requirements: *18691840
+  version_requirements: *16565780
 - !ruby/object:Gem::Dependency
   name: rails
-  requirement: &18690960 !ruby/object:Gem::Requirement
+  requirement: &16564740 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
       - !ruby/object:Gem::Version
-        version: 3.1.0
+        version: 3.1.3
   type: :runtime
   prerelease: false
-  version_requirements: *18690960
+  version_requirements: *16564740
 - !ruby/object:Gem::Dependency
   name: bundler
-  requirement: &18690160 !ruby/object:Gem::Requirement
+  requirement: &16563820 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -43,10 +43,21 @@ dependencies:
         version: 1.0.0
   type: :development
   prerelease: false
-  version_requirements: *18690160
+  version_requirements: *16563820
+- !ruby/object:Gem::Dependency
+  name: flexmock
+  requirement: &16563000 !ruby/object:Gem::Requirement
+    none: false
+    requirements:
+    - - ~>
+      - !ruby/object:Gem::Version
+        version: 0.9.0
+  type: :development
+  prerelease: false
+  version_requirements: *16563000
 - !ruby/object:Gem::Dependency
   name: jeweler
-  requirement: &18689280 !ruby/object:Gem::Requirement
+  requirement: &16561920 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ~>
@@ -54,10 +65,10 @@ dependencies:
         version: 1.6.0
   type: :development
   prerelease: false
-  version_requirements: *18689280
+  version_requirements: *16561920
 - !ruby/object:Gem::Dependency
   name: rcov
-  requirement: &18688280 !ruby/object:Gem::Requirement
+  requirement: &16560900 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -65,10 +76,10 @@ dependencies:
         version: '0'
   type: :development
   prerelease: false
-  version_requirements: *18688280
+  version_requirements: *16560900
 - !ruby/object:Gem::Dependency
   name: sqlite3
-  requirement: &18686660 !ruby/object:Gem::Requirement
+  requirement: &16540280 !ruby/object:Gem::Requirement
     none: false
     requirements:
     - - ! '>='
@@ -76,7 +87,7 @@ dependencies:
         version: 1.3.3
   type: :development
   prerelease: false
-  version_requirements: *18686660
+  version_requirements: *16540280
 description: Works with Facebook.
 email: victor@costan.us
 executables: []
@@ -87,6 +98,7 @@ extra_rdoc_files:
 files:
 - .document
 - .project
+- .travis.yml
 - Gemfile
 - Gemfile.lock
 - LICENSE
@@ -96,15 +108,18 @@ files:
 - app/helpers/session_helper.rb
 - authpwn_rails.gemspec
 - lib/authpwn_rails.rb
+- lib/authpwn_rails/credential_model.rb
+- lib/authpwn_rails/credentials.rb
+- lib/authpwn_rails/credentials/email.rb
+- lib/authpwn_rails/credentials/facebook.rb
+- lib/authpwn_rails/credentials/password.rb
 - lib/authpwn_rails/engine.rb
 - lib/authpwn_rails/facebook_session.rb
-- lib/authpwn_rails/facebook_token_model.rb
-- lib/authpwn_rails/generators/facebook_generator.rb
-- lib/authpwn_rails/generators/session_generator.rb
+- lib/authpwn_rails/generators/all_generator.rb
 - lib/authpwn_rails/generators/templates/001_create_users.rb
-- lib/authpwn_rails/generators/templates/002_create_facebook_tokens.rb
-- lib/authpwn_rails/generators/templates/facebook_token.rb
-- lib/authpwn_rails/generators/templates/facebook_tokens.yml
+- lib/authpwn_rails/generators/templates/002_create_credentials.rb
+- lib/authpwn_rails/generators/templates/credential.rb
+- lib/authpwn_rails/generators/templates/credentials.yml
 - lib/authpwn_rails/generators/templates/session/forbidden.html.erb
 - lib/authpwn_rails/generators/templates/session/home.html.erb
 - lib/authpwn_rails/generators/templates/session/new.html.erb
@@ -113,19 +128,20 @@ files:
 - lib/authpwn_rails/generators/templates/session_controller_test.rb
 - lib/authpwn_rails/generators/templates/user.rb
 - lib/authpwn_rails/generators/templates/users.yml
-- lib/authpwn_rails/generators/users_generator.rb
 - lib/authpwn_rails/session.rb
 - lib/authpwn_rails/session_controller.rb
 - lib/authpwn_rails/test_extensions.rb
 - lib/authpwn_rails/user_model.rb
 - test/cookie_controller_test.rb
+- test/email_credential_test.rb
 - test/facebook_controller_test.rb
-- test/facebook_token_test.rb
+- test/facebook_credential_test.rb
 - test/helpers/application_controller.rb
 - test/helpers/db_setup.rb
 - test/helpers/fbgraph.rb
 - test/helpers/routes.rb
 - test/helpers/view_helpers.rb
+- test/password_credential_test.rb
 - test/session_controller_api_test.rb
 - test/test_helper.rb
 - test/user_test.rb
@@ -144,7 +160,7 @@ required_ruby_version: !ruby/object:Gem::Requirement
       version: '0'
       segments:
       - 0
-      hash: 2191750273896721265
+      hash: -1320439618928497186
 required_rubygems_version: !ruby/object:Gem::Requirement
   none: false
   requirements:
@@ -153,7 +169,7 @@ required_rubygems_version: !ruby/object:Gem::Requirement
       version: '0'
 requirements: []
 rubyforge_project: 
-rubygems_version: 1.8.6
+rubygems_version: 1.8.11
 signing_key: 
 specification_version: 3
 summary: User authentication for Rails 3 applications.

data/lib/authpwn_rails/facebook_token_model.rb

@@ -1,66 +0,0 @@
-require 'active_support'
-
-# :nodoc: namespace
-module AuthpwnRails
-
-# Included by the model class that represents facebook tokens.
-#
-# Right now, some parts of the codebase assume the model will be named
-# FacebookToken.
-module FacebookTokenModel
-  extend ActiveSupport::Concern
-
-  included do
-    # The user whose token this is.
-    belongs_to :user, :inverse_of => :facebook_token
-    validates :user, :presence => true
-    
-    # A unique ID on the Facebook site for the user owning this token.
-    validates :external_uid, :length => 1..32, :presence => true
-  
-    # The OAuth2 access token.
-    validates :access_token, :length => 1..128, :presence => true
-  end
-
-  # Included in the metaclass of models that call pwnauth_facebook_token_model.
-  module ClassMethods
-    # Finds or creates the model containing a token.
-    #
-    # If a model for the same user exists, the model is updated with the given
-    # token. Otherwise, a new model will be created, together with a user.
-    def for(access_token)
-      uid = uid_from_token access_token
-      token = self.where(:external_uid => uid.to_str).first
-      if token
-        token.access_token = access_token
-      else
-        token = FacebookToken.new :external_uid => uid,
-                                  :access_token => access_token
-        token.user = User.create_with_facebook_token token
-      end
-      token.save!
-      token
-    end
-    
-    # Extracts the Facebook user ID from a OAuth2 token.
-    #
-    # This used to be a hack that pulled the UID out of an OAuth2 token. The new
-    # encrypted OAuth2 tokens don't have UIDs anymore, so this method is an
-    # interim hack for old code that still depends on it.
-    def uid_from_token(access_token)
-      FBGraphRails.fbclient(access_token).selection.me.info!.id.to_s
-    end
-  end  # module AuthpwnRails::FacebookTokenModel::ClassMethods
-
-  
-  # Included in models that include AuthpwnRails::FacebookTokenModel.
-  module InstanceMethods
-    # FBGraph client loaded with this access token.
-    def facebook_client
-      @client ||= FBGraphRails.fbclient(access_token)
-    end  
-  end  # module AuthpwnRails::FacebookTokenModel::InstanceMethods
-  
-end  # namespace AuthpwnRails::FacebookTokenModel
-
-end  # namespace AuthpwnRails

data/lib/authpwn_rails/generators/facebook_generator.rb

@@ -1,18 +0,0 @@
-# :nodoc: namespace
-module Authpwn
-
-# rails g authpwn:facebook
-class FacebookGenerator < Rails::Generators::Base
-  source_root File.expand_path("../templates", __FILE__)
-
-  def create_facebook_model
-    copy_file 'facebook_token.rb',
-              File.join('app', 'models', 'facebook_token.rb')
-    copy_file '002_create_facebook_tokens.rb',
-        File.join('db', 'migrate', '20100725000002_create_facebook_tokens.rb')
-    copy_file 'facebook_tokens.yml',
-              File.join('test', 'fixtures', 'facebook_tokens.yml')
-  end
-end  # class Authpwn::FacebookGenerator
-
-end  # namespace Authpwn

data/lib/authpwn_rails/generators/templates/002_create_facebook_tokens.rb

@@ -1,15 +0,0 @@
-class CreateFacebookTokens < ActiveRecord::Migration
-  def self.up
-    create_table :facebook_tokens do |t|
-      t.integer :user_id, :null => false
-      t.string :external_uid, :limit => 32, :null => false
-      t.string :access_token, :limit => 128, :null => false
-    end
-    
-    add_index :facebook_tokens, :external_uid, :unique => true, :null => false
-  end
-
-  def self.down
-    drop_table :facebook_tokens
-  end
-end

data/lib/authpwn_rails/generators/templates/facebook_token.rb

@@ -1,6 +0,0 @@
-# Wraps an OAuth2 access token for Facebook.
-class FacebookToken < ActiveRecord::Base
-  include AuthpwnRails::FacebookTokenModel
-
-  # Add your extensions to the FacebookToken class here.  
-end

data/lib/authpwn_rails/generators/templates/facebook_tokens.yml

@@ -1,10 +0,0 @@
-# Test account vic.tor@costan.us
-jane:
-  user: jane
-  external_uid: 100001181310542
-  access_token: 125502267478972|d2ecea6d763d2fb17cfa70fa-100001181310542|h849k0nQBq4FkAVEGVgeyoSd_RA.
-
-john:
-  user: john
-  external_uid: 702659
-  access_token: 702659|ffffffffffffffffffffffff-702659|ZZZZZZZZZZZZZZZZZZZZZZZZZZZZ