devise_token_auth 0.1.30.beta3 → 0.1.30.beta4

data/test/dummy/tmp/generators/app/views/devise/mailer/confirmation_instructions.html.erb

@@ -0,0 +1,5 @@
+<p>Welcome <%= @email %>!</p>
+
+<p>You can confirm your account email through the link below:</p>
+
+<p><%= link_to 'Confirm my account', confirmation_url(@resource, confirmation_token: @token, config: message['client-config'].to_s, redirect_url: message['redirect-url']) %></p>

data/test/dummy/tmp/generators/app/views/devise/mailer/reset_password_instructions.html.erb

@@ -0,0 +1,8 @@
+<p>Hello <%= @resource.email %>!</p>
+
+<p>Someone has requested a link to change your password. You can do this through the link below.</p>
+
+<p><%= link_to 'Change my password', edit_password_url(@resource, reset_password_token: @token, config: message['client-config'].to_s, redirect_url: message['redirect-url'].to_s) %></p>
+
+<p>If you didn't request this, please ignore this email.</p>
+<p>Your password won't change until you access the link above and create a new one.</p>

data/test/models/user_test.rb

@@ -6,74 +6,84 @@ class UserTest < ActiveSupport::TestCase
       @password    = Faker::Internet.password(10, 20)
       @email       = Faker::Internet.email
       @success_url = Faker::Internet.url
-      @user        = User.new()
+      @resource    = User.new()
     end
 
     describe 'serialization' do
       test 'hash should not include sensitive info' do
-        refute @user.as_json[:tokens]
+        refute @resource.as_json[:tokens]
+      end
+    end
+
+    describe 'creation' do
+      test 'save fails if uid is missing' do
+        @resource.uid = nil
+        @resource.save
+
+        assert @resource.errors.messages[:uid]
       end
     end
 
     describe 'email registration' do
       test 'model should not save if email is blank' do
-        @user.provider              = 'email'
-        @user.password              = @password
-        @user.password_confirmation = @password
+        @resource.provider              = 'email'
+        @resource.password              = @password
+        @resource.password_confirmation = @password
 
-        refute @user.save
-        assert @user.errors.messages[:email]
+        refute @resource.save
+        assert @resource.errors.messages[:email]
       end
     end
 
     describe 'oauth2 authentication' do
       test 'model should save even if email is blank' do
-        @user.provider              = 'facebook'
-        @user.password              = @password
-        @user.password_confirmation = @password
+        @resource.provider              = 'facebook'
+        @resource.uid                   = 123
+        @resource.password              = @password
+        @resource.password_confirmation = @password
 
-        assert @user.save
-        refute @user.errors.messages[:email]
+        assert @resource.save
+        refute @resource.errors.messages[:email]
       end
     end
 
     describe 'token expiry' do
       before do
-        @user = users(:confirmed_email_user)
-        @user.skip_confirmation!
-        @user.save!
+        @resource = users(:confirmed_email_user)
+        @resource.skip_confirmation!
+        @resource.save!
 
-        @auth_headers = @user.create_new_auth_token
+        @auth_headers = @resource.create_new_auth_token
 
         @token     = @auth_headers['access-token']
         @client_id = @auth_headers['client']
       end
 
       test 'should properly indicate whether token is current' do
-        assert @user.token_is_current?(@token, @client_id)
+        assert @resource.token_is_current?(@token, @client_id)
         # we want to update the expiry without forcing a cleanup (see below)
-        @user.tokens[@client_id]['expiry'] = Time.now.to_i - 10.seconds
-        refute @user.token_is_current?(@token, @client_id)
+        @resource.tokens[@client_id]['expiry'] = Time.now.to_i - 10.seconds
+        refute @resource.token_is_current?(@token, @client_id)
       end
     end
 
     describe 'expired tokens are destroyed on save' do
       before do
-        @user = users(:confirmed_email_user)
-        @user.skip_confirmation!
-        @user.save!
+        @resource = users(:confirmed_email_user)
+        @resource.skip_confirmation!
+        @resource.save!
 
-        @old_auth_headers = @user.create_new_auth_token
-        @new_auth_headers = @user.create_new_auth_token
-        expire_token(@user, @old_auth_headers['client'])
+        @old_auth_headers = @resource.create_new_auth_token
+        @new_auth_headers = @resource.create_new_auth_token
+        expire_token(@resource, @old_auth_headers['client'])
       end
 
       test 'expired token was removed' do
-        refute @user.tokens[@old_auth_headers['client']]
+        refute @resource.tokens[@old_auth_headers['client']]
       end
 
       test 'current token was not removed' do
-        assert @user.tokens[@new_auth_headers['client']]
+        assert @resource.tokens[@new_auth_headers['client']]
       end
     end
   end

metadata

@@ -1,14 +1,14 @@
 --- !ruby/object:Gem::Specification
 name: devise_token_auth
 version: !ruby/object:Gem::Version
-  version: 0.1.30.beta3
+  version: 0.1.30.beta4
 platform: ruby
 authors:
 - Lynn Hurley
 autorequire: 
 bindir: bin
 cert_chain: []
-date: 2014-10-28 00:00:00.000000000 Z
+date: 2014-11-11 00:00:00.000000000 Z
 dependencies:
 - !ruby/object:Gem::Dependency
   name: rails
@@ -30,14 +30,14 @@ dependencies:
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
   type: :runtime
   prerelease: false
   version_requirements: !ruby/object:Gem::Requirement
     requirements:
     - - "~>"
       - !ruby/object:Gem::Version
-        version: '3.2'
+        version: '3.3'
 - !ruby/object:Gem::Dependency
   name: sqlite3
   requirement: !ruby/object:Gem::Requirement
@@ -162,6 +162,7 @@ files:
 - test/dummy/bin/spring
 - test/dummy/config.ru
 - test/dummy/config/application.rb
+- test/dummy/config/application.yml
 - test/dummy/config/application.yml.bk
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -198,9 +199,8 @@ files:
 - test/dummy/public/422.html
 - test/dummy/public/500.html
 - test/dummy/public/favicon.ico
-- test/dummy/tmp/generators/app/models/user.rb
-- test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
-- test/dummy/tmp/generators/db/migrate/20141028214843_devise_token_auth_create_users.rb
+- test/dummy/tmp/generators/app/views/devise/mailer/confirmation_instructions.html.erb
+- test/dummy/tmp/generators/app/views/devise/mailer/reset_password_instructions.html.erb
 - test/dummy/tmp/restart.txt
 - test/fixtures/evil_users.yml
 - test/fixtures/mangs.yml
@@ -273,6 +273,7 @@ test_files:
 - test/dummy/bin/rake
 - test/dummy/bin/spring
 - test/dummy/config/application.rb
+- test/dummy/config/application.yml
 - test/dummy/config/application.yml.bk
 - test/dummy/config/boot.rb
 - test/dummy/config/database.yml
@@ -312,9 +313,8 @@ test_files:
 - test/dummy/public/favicon.ico
 - test/dummy/Rakefile
 - test/dummy/README.rdoc
-- test/dummy/tmp/generators/app/models/user.rb
-- test/dummy/tmp/generators/config/initializers/devise_token_auth.rb
-- test/dummy/tmp/generators/db/migrate/20141028214843_devise_token_auth_create_users.rb
+- test/dummy/tmp/generators/app/views/devise/mailer/confirmation_instructions.html.erb
+- test/dummy/tmp/generators/app/views/devise/mailer/reset_password_instructions.html.erb
 - test/dummy/tmp/restart.txt
 - test/fixtures/evil_users.yml
 - test/fixtures/mangs.yml

data/test/dummy/tmp/generators/app/models/user.rb

@@ -1,7 +0,0 @@
-class User < ActiveRecord::Base
-  include DeviseTokenAuth::Concerns::User
-
-  def whatever
-    puts 'whatever'
-  end
-end

data/test/dummy/tmp/generators/config/initializers/devise_token_auth.rb

@@ -1,22 +0,0 @@
-DeviseTokenAuth.setup do |config|
-  # By default the authorization headers will change after each request. The
-  # client is responsible for keeping track of the changing tokens. Change
-  # this to false to prevent the Authorization header from changing after
-  # each request.
-  #config.change_headers_on_each_request = true
-
-  # By default, users will need to re-authenticate after 2 weeks. This setting
-  # determines how long tokens will remain valid after they are issued.
-  #config.token_lifespan = 2.weeks
-
-  # Sometimes it's necessary to make several requests to the API at the same
-  # time. In this case, each request in the batch will need to share the same
-  # auth token. This setting determines how far apart the requests can be while
-  # still using the same auth token.
-  #config.batch_request_buffer_throttle = 5.seconds
-
-  # This route will be the prefix for all oauth2 redirect callbacks. For
-  # example, using the default '/omniauth', the github oauth2 provider will
-  # redirect successful authentications to '/omniauth/github/callback'
-  #config.omniauth_prefix = "/omniauth"
-end

data/test/dummy/tmp/generators/db/migrate/20141028214843_devise_token_auth_create_users.rb

@@ -1,54 +0,0 @@
-class DeviseTokenAuthCreateUsers < ActiveRecord::Migration
-  def change
-    create_table(:users) do |t|
-      ## Database authenticatable
-      t.string :email
-      t.string :encrypted_password, :null => false, :default => ""
-
-      ## Recoverable
-      t.string   :reset_password_token
-      t.datetime :reset_password_sent_at
-
-      ## Rememberable
-      t.datetime :remember_created_at
-
-      ## Trackable
-      t.integer  :sign_in_count, :default => 0, :null => false
-      t.datetime :current_sign_in_at
-      t.datetime :last_sign_in_at
-      t.string   :current_sign_in_ip
-      t.string   :last_sign_in_ip
-
-      ## Confirmable
-      t.string   :confirmation_token
-      t.datetime :confirmed_at
-      t.datetime :confirmation_sent_at
-      t.string   :unconfirmed_email # Only if using reconfirmable
-
-      ## Lockable
-      # t.integer  :failed_attempts, :default => 0, :null => false # Only if lock strategy is :failed_attempts
-      # t.string   :unlock_token # Only if unlock strategy is :email or :both
-      # t.datetime :locked_at
-
-      ## User Info
-      t.string :name
-      t.string :nickname
-      t.string :image
-
-      ## unique oauth id
-      t.string :provider
-      t.string :uid, :null => false, :default => ""
-
-      ## Tokens
-      t.text :tokens
-
-      t.timestamps
-    end
-
-    add_index :users, :email
-    add_index :users, :uid,                  :unique => true
-    add_index :users, :reset_password_token, :unique => true
-    # add_index :users, :confirmation_token,   :unique => true
-    # add_index :users, :unlock_token,         :unique => true
-  end
-end