devise_token_auth 0.1.42 → 0.1.43.beta1

data/test/controllers/overrides/sessions_controller_test.rb

@@ -13,21 +13,21 @@ class Overrides::RegistrationsControllerTest < ActionDispatch::IntegrationTest
       @existing_user.skip_confirmation!
       @existing_user.save!
 
-      post '/evil_user_auth/sign_in', {
-        email: @existing_user.email,
-        password: 'secret123'
-      }
+      post '/evil_user_auth/sign_in',
+           params: { email: @existing_user.email,
+                     password: 'secret123' }
 
       @resource = assigns(:resource)
       @data = JSON.parse(response.body)
     end
 
-    test "request should succeed" do
+    test 'request should succeed' do
       assert_equal 200, response.status
     end
 
     test 'controller was overridden' do
-      assert_equal Overrides::RegistrationsController::OVERRIDE_PROOF, @data['override_proof']
+      assert_equal Overrides::RegistrationsController::OVERRIDE_PROOF,
+                   @data['override_proof']
     end
   end
 end

data/test/controllers/overrides/token_validations_controller_test.rb

@@ -22,17 +22,20 @@ class Overrides::TokenValidationsControllerTest < ActionDispatch::IntegrationTes
       # ensure that request is not treated as batch request
       age_token(@resource, @client_id)
 
-      get '/evil_user_auth/validate_token', {}, @auth_headers
+      get '/evil_user_auth/validate_token',
+          params: {},
+          headers: @auth_headers
 
       @resp = JSON.parse(response.body)
     end
 
-    test "token valid" do
+    test 'token valid' do
       assert_equal 200, response.status
     end
 
-    test "controller was overridden" do
-      assert_equal Overrides::TokenValidationsController::OVERRIDE_PROOF, @resp["override_proof"]
+    test 'controller was overridden' do
+      assert_equal Overrides::TokenValidationsController::OVERRIDE_PROOF,
+                   @resp['override_proof']
     end
   end
 end

data/test/dummy/app/controllers/auth_origin_controller.rb

@@ -1,5 +1,5 @@
 class AuthOriginController < ApplicationController
   def redirected
-    render :nothing => true
+    head :ok
   end
-end
+end

data/test/dummy/app/controllers/custom/omniauth_callbacks_controller.rb

@@ -1,5 +1,4 @@
 class Custom::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCallbacksController
-
   def omniauth_success
     super do |resource|
       @omniauth_success_block_called = true unless resource.nil?
@@ -9,5 +8,4 @@ class Custom::OmniauthCallbacksController < DeviseTokenAuth::OmniauthCallbacksCo
   def omniauth_success_block_called?
     @omniauth_success_block_called == true
   end
-
 end

data/test/dummy/app/controllers/overrides/confirmations_controller.rb

@@ -8,7 +8,7 @@ module Overrides
         client_id  = SecureRandom.urlsafe_base64(nil, false)
         token      = SecureRandom.urlsafe_base64(nil, false)
         token_hash = BCrypt::Password.create(token)
-        expiry     = (Time.now + DeviseTokenAuth.token_lifespan).to_i
+        expiry     = (Time.now + @resource.token_lifespan).to_i
 
         @resource.tokens[client_id] = {
           token:  token_hash,
@@ -17,13 +17,17 @@ module Overrides
 
         @resource.save!
 
-        redirect_to(@resource.build_auth_url(params[:redirect_url], {
-          token:                        token,
-          client_id:                    client_id,
+        redirect_header_options = {
           account_confirmation_success: true,
-          config:                       params[:config],
-          override_proof:               "(^^,)"
-        }))
+          config: params[:config],
+          override_proof: "(^^,)"
+        }
+        redirect_headers = build_redirect_headers(token,
+                                                  client_id,
+                                                  redirect_header_options)
+
+        redirect_to(@resource.build_auth_url(params[:redirect_url],
+                                             redirect_headers))
       else
         raise ActionController::RoutingError.new('Not Found')
       end

data/test/dummy/app/controllers/overrides/passwords_controller.rb

@@ -12,7 +12,7 @@ module Overrides
         client_id  = SecureRandom.urlsafe_base64(nil, false)
         token      = SecureRandom.urlsafe_base64(nil, false)
         token_hash = BCrypt::Password.create(token)
-        expiry     = (Time.now + DeviseTokenAuth.token_lifespan).to_i
+        expiry     = (Time.now + @resource.token_lifespan).to_i
 
         @resource.tokens[client_id] = {
           token:  token_hash,
@@ -24,13 +24,15 @@ module Overrides
 
         @resource.save!
 
-        redirect_to(@resource.build_auth_url(params[:redirect_url], {
-          token:          token,
-          client_id:      client_id,
-          reset_password: true,
-          config:         params[:config],
-          override_proof: OVERRIDE_PROOF
-        }))
+        redirect_header_options = {
+          override_proof: OVERRIDE_PROOF,
+          reset_password: true
+        }
+        redirect_headers = build_redirect_headers(token,
+                                                  client_id,
+                                                  redirect_header_options)
+        redirect_to(@resource.build_auth_url(params[:redirect_url],
+                                             redirect_headers))
       else
         raise ActionController::RoutingError.new('Not Found')
       end

data/test/dummy/app/controllers/overrides/sessions_controller.rb

@@ -12,7 +12,7 @@ module Overrides
 
         @resource.tokens[@client_id] = {
           token: BCrypt::Password.create(@token),
-          expiry: (Time.now + DeviseTokenAuth.token_lifespan).to_i
+          expiry: (Time.now + @resource.token_lifespan).to_i
         }
         @resource.save
 

data/test/dummy/db/migrate/20140715061447_devise_token_auth_create_users.rb

@@ -1,6 +1,6 @@
 include MigrationDatabaseHelper
 
-class DeviseTokenAuthCreateUsers < ActiveRecord::Migration
+class DeviseTokenAuthCreateUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:users) do |t|
       ## Database authenticatable
@@ -11,6 +11,7 @@ class DeviseTokenAuthCreateUsers < ActiveRecord::Migration
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
       t.string   :reset_password_redirect_url
+      t.boolean  :allow_password_change, :default => false
 
       ## Rememberable
       t.datetime :remember_created_at
@@ -26,7 +27,6 @@ class DeviseTokenAuthCreateUsers < ActiveRecord::Migration
       t.string   :confirmation_token
       t.datetime :confirmed_at
       t.datetime :confirmation_sent_at
-      t.string   :confirm_success_url
       t.string   :unconfirmed_email # Only if using reconfirmable
 
       ## Lockable

data/test/dummy/db/migrate/20140715061805_devise_token_auth_create_mangs.rb

@@ -1,6 +1,6 @@
 include MigrationDatabaseHelper
 
-class DeviseTokenAuthCreateMangs < ActiveRecord::Migration
+class DeviseTokenAuthCreateMangs < ActiveRecord::Migration[4.2]
   def change
     create_table(:mangs) do |t|
       ## Database authenticatable
@@ -11,6 +11,7 @@ class DeviseTokenAuthCreateMangs < ActiveRecord::Migration
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
       t.string   :reset_password_redirect_url
+      t.boolean  :allow_password_change, :default => false
 
       ## Rememberable
       t.datetime :remember_created_at
@@ -26,7 +27,6 @@ class DeviseTokenAuthCreateMangs < ActiveRecord::Migration
       t.string   :confirmation_token
       t.datetime :confirmed_at
       t.datetime :confirmation_sent_at
-      t.string   :confirm_success_url
       t.string   :unconfirmed_email # Only if using reconfirmable
 
       ## Lockable

data/test/dummy/db/migrate/20140829044006_add_operating_thetan_to_user.rb

@@ -1,4 +1,4 @@
-class AddOperatingThetanToUser < ActiveRecord::Migration
+class AddOperatingThetanToUser < ActiveRecord::Migration[4.2]
   def change
     add_column :users, :operating_thetan, :integer
     add_column :users, :favorite_color, :string

data/test/dummy/db/migrate/20140916224624_add_favorite_color_to_mangs.rb

@@ -1,4 +1,4 @@
-class AddFavoriteColorToMangs < ActiveRecord::Migration
+class AddFavoriteColorToMangs < ActiveRecord::Migration[4.2]
   def change
     add_column :mangs, :favorite_color, :string
   end

data/test/dummy/db/migrate/20140928231203_devise_token_auth_create_evil_users.rb

@@ -1,6 +1,6 @@
 include MigrationDatabaseHelper
 
-class DeviseTokenAuthCreateEvilUsers < ActiveRecord::Migration
+class DeviseTokenAuthCreateEvilUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:evil_users) do |t|
       ## Database authenticatable
@@ -10,6 +10,7 @@ class DeviseTokenAuthCreateEvilUsers < ActiveRecord::Migration
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
+      t.boolean  :allow_password_change, :default => false
 
       ## Rememberable
       t.datetime :remember_created_at

data/test/dummy/db/migrate/20141222035835_devise_token_auth_create_only_email_users.rb

@@ -1,6 +1,6 @@
 include MigrationDatabaseHelper
 
-class DeviseTokenAuthCreateOnlyEmailUsers < ActiveRecord::Migration
+class DeviseTokenAuthCreateOnlyEmailUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:only_email_users) do |t|
       ## Required

data/test/dummy/db/migrate/20141222053502_devise_token_auth_create_unregisterable_users.rb

@@ -1,6 +1,6 @@
 include MigrationDatabaseHelper
 
-class DeviseTokenAuthCreateUnregisterableUsers < ActiveRecord::Migration
+class DeviseTokenAuthCreateUnregisterableUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:unregisterable_users) do |t|
       ## Required
@@ -13,6 +13,7 @@ class DeviseTokenAuthCreateUnregisterableUsers < ActiveRecord::Migration
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
+      t.boolean  :allow_password_change, :default => false
 
       ## Rememberable
       t.datetime :remember_created_at

data/test/dummy/db/migrate/20150409095712_devise_token_auth_create_nice_users.rb

@@ -1,6 +1,6 @@
 include MigrationDatabaseHelper
 
-class DeviseTokenAuthCreateNiceUsers < ActiveRecord::Migration
+class DeviseTokenAuthCreateNiceUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:nice_users) do |t|
       ## Required
@@ -13,6 +13,7 @@ class DeviseTokenAuthCreateNiceUsers < ActiveRecord::Migration
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
+      t.boolean  :allow_password_change, :default => false
 
       ## Rememberable
       t.datetime :remember_created_at

data/test/dummy/db/migrate/20150708104536_devise_token_auth_create_unconfirmable_users.rb

@@ -1,6 +1,6 @@
 include MigrationDatabaseHelper
 
-class DeviseTokenAuthCreateUnconfirmableUsers < ActiveRecord::Migration
+class DeviseTokenAuthCreateUnconfirmableUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:unconfirmable_users) do |t|
       ## Required
@@ -13,6 +13,7 @@ class DeviseTokenAuthCreateUnconfirmableUsers < ActiveRecord::Migration
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
+      t.boolean  :allow_password_change, :default => false
 
       ## Rememberable
       t.datetime :remember_created_at

data/test/dummy/db/migrate/20160103235141_devise_token_auth_create_scoped_users.rb

@@ -1,6 +1,6 @@
 include MigrationDatabaseHelper
 
-class DeviseTokenAuthCreateScopedUsers < ActiveRecord::Migration
+class DeviseTokenAuthCreateScopedUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:scoped_users) do |t|
       ## Required
@@ -13,6 +13,7 @@ class DeviseTokenAuthCreateScopedUsers < ActiveRecord::Migration
       ## Recoverable
       t.string   :reset_password_token
       t.datetime :reset_password_sent_at
+      t.boolean  :allow_password_change, :default => false
 
       ## Rememberable
       t.datetime :remember_created_at

data/test/dummy/db/migrate/20160629184441_devise_token_auth_create_lockable_users.rb

@@ -1,6 +1,6 @@
 include MigrationDatabaseHelper
 
-class DeviseTokenAuthCreateLockableUsers < ActiveRecord::Migration
+class DeviseTokenAuthCreateLockableUsers < ActiveRecord::Migration[4.2]
   def change
     create_table(:lockable_users) do |t|
       ## Required
@@ -13,6 +13,7 @@ class DeviseTokenAuthCreateLockableUsers < ActiveRecord::Migration
       ## Recoverable
       # t.string   :reset_password_token
       # t.datetime :reset_password_sent_at
+      # t.boolean  :allow_password_change, :default => false
 
       ## Rememberable
       # t.datetime :remember_created_at

data/test/dummy/db/schema.rb

@@ -1,4 +1,3 @@
-# encoding: UTF-8
 # This file is auto-generated from the current state of the database. Instead
 # of editing this file, please use the migrations feature of Active Record to
 # incrementally modify your database, and then regenerate this schema definition.
@@ -14,250 +13,246 @@
 ActiveRecord::Schema.define(version: 20160629184441) do
 
   create_table "evil_users", force: :cascade do |t|
-    t.string   "email"
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+    t.string "email"
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
+    t.boolean "allow_password_change", default: false
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    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"
-    t.string   "confirmation_token"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.string "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "unconfirmed_email"
-    t.string   "name"
-    t.string   "nickname"
-    t.string   "image"
-    t.string   "provider"
-    t.string   "uid",                    default: "", null: false
-    t.text     "tokens"
-    t.string   "favorite_color"
+    t.string "unconfirmed_email"
+    t.string "name"
+    t.string "nickname"
+    t.string "image"
+    t.string "provider"
+    t.string "uid", default: "", null: false
+    t.text "tokens"
+    t.string "favorite_color"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["confirmation_token"], name: "index_evil_users_on_confirmation_token", unique: true
+    t.index ["email"], name: "index_evil_users_on_email"
+    t.index ["reset_password_token"], name: "index_evil_users_on_reset_password_token", unique: true
+    t.index ["uid", "provider"], name: "index_evil_users_on_uid_and_provider", unique: true
   end
 
-  add_index "evil_users", ["confirmation_token"], name: "index_evil_users_on_confirmation_token", unique: true
-  add_index "evil_users", ["email"], name: "index_evil_users_on_email"
-  add_index "evil_users", ["reset_password_token"], name: "index_evil_users_on_reset_password_token", unique: true
-  add_index "evil_users", ["uid", "provider"], name: "index_evil_users_on_uid_and_provider", unique: true
-
   create_table "lockable_users", force: :cascade do |t|
-    t.string   "provider",                        null: false
-    t.string   "uid",                default: "", null: false
-    t.string   "encrypted_password", default: "", null: false
-    t.integer  "failed_attempts",    default: 0,  null: false
-    t.string   "unlock_token"
+    t.string "provider", null: false
+    t.string "uid", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.integer "failed_attempts", default: 0, null: false
+    t.string "unlock_token"
     t.datetime "locked_at"
-    t.string   "name"
-    t.string   "nickname"
-    t.string   "image"
-    t.string   "email"
-    t.text     "tokens"
+    t.string "name"
+    t.string "nickname"
+    t.string "image"
+    t.string "email"
+    t.text "tokens"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["email"], name: "index_lockable_users_on_email"
+    t.index ["uid", "provider"], name: "index_lockable_users_on_uid_and_provider", unique: true
+    t.index ["unlock_token"], name: "index_lockable_users_on_unlock_token", unique: true
   end
 
-  add_index "lockable_users", ["email"], name: "index_lockable_users_on_email"
-  add_index "lockable_users", ["uid", "provider"], name: "index_lockable_users_on_uid_and_provider", unique: true
-  add_index "lockable_users", ["unlock_token"], name: "index_lockable_users_on_unlock_token", unique: true
-
   create_table "mangs", force: :cascade do |t|
-    t.string   "email"
-    t.string   "encrypted_password",          default: "", null: false
-    t.string   "reset_password_token"
+    t.string "email"
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
-    t.string   "reset_password_redirect_url"
+    t.string "reset_password_redirect_url"
+    t.boolean "allow_password_change", default: false
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",               default: 0,  null: false
+    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"
-    t.string   "confirmation_token"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.string "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "confirm_success_url"
-    t.string   "unconfirmed_email"
-    t.string   "name"
-    t.string   "nickname"
-    t.string   "image"
-    t.string   "provider"
-    t.string   "uid",                         default: "", null: false
-    t.text     "tokens"
+    t.string "unconfirmed_email"
+    t.string "name"
+    t.string "nickname"
+    t.string "image"
+    t.string "provider"
+    t.string "uid", default: "", null: false
+    t.text "tokens"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.string   "favorite_color"
+    t.string "favorite_color"
+    t.index ["confirmation_token"], name: "index_mangs_on_confirmation_token", unique: true
+    t.index ["email"], name: "index_mangs_on_email"
+    t.index ["reset_password_token"], name: "index_mangs_on_reset_password_token", unique: true
+    t.index ["uid", "provider"], name: "index_mangs_on_uid_and_provider", unique: true
   end
 
-  add_index "mangs", ["confirmation_token"], name: "index_mangs_on_confirmation_token", unique: true
-  add_index "mangs", ["email"], name: "index_mangs_on_email"
-  add_index "mangs", ["reset_password_token"], name: "index_mangs_on_reset_password_token", unique: true
-  add_index "mangs", ["uid", "provider"], name: "index_mangs_on_uid_and_provider", unique: true
-
   create_table "nice_users", force: :cascade do |t|
-    t.string   "provider",                            null: false
-    t.string   "uid",                    default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+    t.string "provider", null: false
+    t.string "uid", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
+    t.boolean "allow_password_change", default: false
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    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"
-    t.string   "confirmation_token"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.string "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "unconfirmed_email"
-    t.string   "name"
-    t.string   "nickname"
-    t.string   "image"
-    t.string   "email"
-    t.text     "tokens"
+    t.string "unconfirmed_email"
+    t.string "name"
+    t.string "nickname"
+    t.string "image"
+    t.string "email"
+    t.text "tokens"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["email"], name: "index_nice_users_on_email"
+    t.index ["reset_password_token"], name: "index_nice_users_on_reset_password_token", unique: true
+    t.index ["uid", "provider"], name: "index_nice_users_on_uid_and_provider", unique: true
   end
 
-  add_index "nice_users", ["email"], name: "index_nice_users_on_email"
-  add_index "nice_users", ["reset_password_token"], name: "index_nice_users_on_reset_password_token", unique: true
-  add_index "nice_users", ["uid", "provider"], name: "index_nice_users_on_uid_and_provider", unique: true
-
   create_table "only_email_users", force: :cascade do |t|
-    t.string   "provider",                        null: false
-    t.string   "uid",                default: "", null: false
-    t.string   "encrypted_password", default: "", null: false
-    t.string   "name"
-    t.string   "nickname"
-    t.string   "image"
-    t.string   "email"
-    t.text     "tokens"
+    t.string "provider", null: false
+    t.string "uid", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "name"
+    t.string "nickname"
+    t.string "image"
+    t.string "email"
+    t.text "tokens"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["email"], name: "index_only_email_users_on_email"
+    t.index ["uid", "provider"], name: "index_only_email_users_on_uid_and_provider", unique: true
   end
 
-  add_index "only_email_users", ["email"], name: "index_only_email_users_on_email"
-  add_index "only_email_users", ["uid", "provider"], name: "index_only_email_users_on_uid_and_provider", unique: true
-
   create_table "scoped_users", force: :cascade do |t|
-    t.string   "provider",                            null: false
-    t.string   "uid",                    default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+    t.string "provider", null: false
+    t.string "uid", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
+    t.boolean "allow_password_change", default: false
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    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"
-    t.string   "confirmation_token"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.string "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "unconfirmed_email"
-    t.string   "name"
-    t.string   "nickname"
-    t.string   "image"
-    t.string   "email"
-    t.text     "tokens"
+    t.string "unconfirmed_email"
+    t.string "name"
+    t.string "nickname"
+    t.string "image"
+    t.string "email"
+    t.text "tokens"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["email"], name: "index_scoped_users_on_email"
+    t.index ["reset_password_token"], name: "index_scoped_users_on_reset_password_token", unique: true
+    t.index ["uid", "provider"], name: "index_scoped_users_on_uid_and_provider", unique: true
   end
 
-  add_index "scoped_users", ["email"], name: "index_scoped_users_on_email"
-  add_index "scoped_users", ["reset_password_token"], name: "index_scoped_users_on_reset_password_token", unique: true
-  add_index "scoped_users", ["uid", "provider"], name: "index_scoped_users_on_uid_and_provider", unique: true
-
   create_table "unconfirmable_users", force: :cascade do |t|
-    t.string   "provider",                            null: false
-    t.string   "uid",                    default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+    t.string "provider", null: false
+    t.string "uid", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
+    t.boolean "allow_password_change", default: false
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    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"
-    t.string   "name"
-    t.string   "nickname"
-    t.string   "image"
-    t.string   "email"
-    t.text     "tokens"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.string "name"
+    t.string "nickname"
+    t.string "image"
+    t.string "email"
+    t.text "tokens"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["email"], name: "index_unconfirmable_users_on_email"
+    t.index ["reset_password_token"], name: "index_unconfirmable_users_on_reset_password_token", unique: true
+    t.index ["uid", "provider"], name: "index_unconfirmable_users_on_uid_and_provider", unique: true
   end
 
-  add_index "unconfirmable_users", ["email"], name: "index_unconfirmable_users_on_email"
-  add_index "unconfirmable_users", ["reset_password_token"], name: "index_unconfirmable_users_on_reset_password_token", unique: true
-  add_index "unconfirmable_users", ["uid", "provider"], name: "index_unconfirmable_users_on_uid_and_provider", unique: true
-
   create_table "unregisterable_users", force: :cascade do |t|
-    t.string   "provider",                            null: false
-    t.string   "uid",                    default: "", null: false
-    t.string   "encrypted_password",     default: "", null: false
-    t.string   "reset_password_token"
+    t.string "provider", null: false
+    t.string "uid", default: "", null: false
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
+    t.boolean "allow_password_change", default: false
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",          default: 0,  null: false
+    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"
-    t.string   "confirmation_token"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.string "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "unconfirmed_email"
-    t.string   "name"
-    t.string   "nickname"
-    t.string   "image"
-    t.string   "email"
-    t.text     "tokens"
+    t.string "unconfirmed_email"
+    t.string "name"
+    t.string "nickname"
+    t.string "image"
+    t.string "email"
+    t.text "tokens"
     t.datetime "created_at"
     t.datetime "updated_at"
+    t.index ["email"], name: "index_unregisterable_users_on_email"
+    t.index ["reset_password_token"], name: "index_unregisterable_users_on_reset_password_token", unique: true
+    t.index ["uid", "provider"], name: "index_unregisterable_users_on_uid_and_provider", unique: true
   end
 
-  add_index "unregisterable_users", ["email"], name: "index_unregisterable_users_on_email"
-  add_index "unregisterable_users", ["reset_password_token"], name: "index_unregisterable_users_on_reset_password_token", unique: true
-  add_index "unregisterable_users", ["uid", "provider"], name: "index_unregisterable_users_on_uid_and_provider", unique: true
-
   create_table "users", force: :cascade do |t|
-    t.string   "email"
-    t.string   "encrypted_password",          default: "", null: false
-    t.string   "reset_password_token"
+    t.string "email"
+    t.string "encrypted_password", default: "", null: false
+    t.string "reset_password_token"
     t.datetime "reset_password_sent_at"
-    t.string   "reset_password_redirect_url"
+    t.string "reset_password_redirect_url"
+    t.boolean "allow_password_change", default: false
     t.datetime "remember_created_at"
-    t.integer  "sign_in_count",               default: 0,  null: false
+    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"
-    t.string   "confirmation_token"
+    t.string "current_sign_in_ip"
+    t.string "last_sign_in_ip"
+    t.string "confirmation_token"
     t.datetime "confirmed_at"
     t.datetime "confirmation_sent_at"
-    t.string   "confirm_success_url"
-    t.string   "unconfirmed_email"
-    t.string   "name"
-    t.string   "nickname"
-    t.string   "image"
-    t.string   "provider"
-    t.string   "uid",                         default: "", null: false
-    t.text     "tokens"
+    t.string "unconfirmed_email"
+    t.string "name"
+    t.string "nickname"
+    t.string "image"
+    t.string "provider"
+    t.string "uid", default: "", null: false
+    t.text "tokens"
     t.datetime "created_at"
     t.datetime "updated_at"
-    t.integer  "operating_thetan"
-    t.string   "favorite_color"
+    t.integer "operating_thetan"
+    t.string "favorite_color"
+    t.index ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
+    t.index ["email"], name: "index_users_on_email"
+    t.index ["nickname"], name: "index_users_on_nickname", unique: true
+    t.index ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
+    t.index ["uid", "provider"], name: "index_users_on_uid_and_provider", unique: true
   end
 
-  add_index "users", ["confirmation_token"], name: "index_users_on_confirmation_token", unique: true
-  add_index "users", ["email"], name: "index_users_on_email"
-  add_index "users", ["nickname"], name: "index_users_on_nickname", unique: true
-  add_index "users", ["reset_password_token"], name: "index_users_on_reset_password_token", unique: true
-  add_index "users", ["uid", "provider"], name: "index_users_on_uid_and_provider", unique: true
-
 end