From 33ffcfdb9b99328821448dd9548c5d751d2b09e6 Mon Sep 17 00:00:00 2001 From: benji Date: Sat, 21 Mar 2015 17:58:49 +0100 Subject: [PATCH] remove database_authenticatable from user and fix paths --- app/controllers/user_avatar_controller.rb | 2 +- app/models/user.rb | 6 ++---- app/views/layouts/_header.html.erb | 6 +++--- config/initializers/devise.rb | 2 +- config/routes.rb | 1 + ...1161136_remove_encrypted_password_from_users.rb | 5 +++++ db/schema.rb | 3 +-- db/seeds.rb | 14 ++++++-------- 8 files changed, 20 insertions(+), 19 deletions(-) create mode 100644 db/migrate/20150321161136_remove_encrypted_password_from_users.rb diff --git a/app/controllers/user_avatar_controller.rb b/app/controllers/user_avatar_controller.rb index 820bcef..d1dda6a 100644 --- a/app/controllers/user_avatar_controller.rb +++ b/app/controllers/user_avatar_controller.rb @@ -23,7 +23,7 @@ class UserAvatarController < ApplicationController def authenticate_session_user! redirect_to root_path unless session[:id] - @user = User.find_by session[:id] + @user = User.find session[:id] unless @user reset_session redirect_to root_path diff --git a/app/models/user.rb b/app/models/user.rb index 0b0fc17..1135dd2 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -26,7 +26,7 @@ # class User < ActiveRecord::Base - devise :database_authenticatable, :trackable, :omniauthable, :omniauth_providers => [:zeuswpi] + devise :trackable, :omniauthable, :omniauth_providers => [:zeuswpi] has_paper_trail only: [:debt_cents, :admin, :orders_count, :koelkast] @@ -43,12 +43,10 @@ class User < ActiveRecord::Base scope :members, -> { where koelkast: false } def self.from_omniauth(auth) - newuser = where(provider: auth.provider, uid: auth.uid).first_or_create do |user| + where(provider: auth.provider, uid: auth.uid).first_or_create do |user| user.provider = auth.provider user.uid = auth.uid end - newuser.password = Devise.friendly_token[0,20] - newuser end def nickname diff --git a/app/views/layouts/_header.html.erb b/app/views/layouts/_header.html.erb index 9f8abfa..2b042b4 100644 --- a/app/views/layouts/_header.html.erb +++ b/app/views/layouts/_header.html.erb @@ -16,11 +16,11 @@ @@ -62,7 +62,7 @@ <% if user_signed_in? %> <%= button_to "Logout", destroy_user_session_path, class: "btn btn-default form-control", method: :delete %> <% else %> - <%= link_to "Login", new_user_session_path, class: "btn btn-success form-control" %> + <%= link_to "Login", omniauth_authorize_path("user", "zeuswpi"), class: "btn btn-success form-control" %> <% end %> diff --git a/config/initializers/devise.rb b/config/initializers/devise.rb index 51089b3..3a4f493 100644 --- a/config/initializers/devise.rb +++ b/config/initializers/devise.rb @@ -228,7 +228,7 @@ Devise.setup do |config| # config.navigational_formats = ['*/*', :html] # The default HTTP method used to sign out a resource. Default is :delete. - config.sign_out_via = :delete + config.sign_out_via = :get # ==> OmniAuth # Add a new OmniAuth provider. Check the wiki for more information on setting diff --git a/config/routes.rb b/config/routes.rb index d49034a..7c3e7b9 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -16,6 +16,7 @@ Rails.application.routes.draw do authenticated :user, ->(u) { !u.koelkast? } do root to: 'users#show', as: :user_root end + get 'sign_out', :to => 'devise/sessions#destroy', :as => :destroy_user_session end resources :users do diff --git a/db/migrate/20150321161136_remove_encrypted_password_from_users.rb b/db/migrate/20150321161136_remove_encrypted_password_from_users.rb new file mode 100644 index 0000000..ab28100 --- /dev/null +++ b/db/migrate/20150321161136_remove_encrypted_password_from_users.rb @@ -0,0 +1,5 @@ +class RemoveEncryptedPasswordFromUsers < ActiveRecord::Migration + def change + remove_column :users, :encrypted_password, :string + end +end diff --git a/db/schema.rb b/db/schema.rb index 8c26e86..a7231b6 100644 --- a/db/schema.rb +++ b/db/schema.rb @@ -11,7 +11,7 @@ # # It's strongly recommended that you check this file into your version control system. -ActiveRecord::Schema.define(version: 20150320001338) do +ActiveRecord::Schema.define(version: 20150321161136) do create_table "order_items", force: :cascade do |t| t.integer "order_id" @@ -63,7 +63,6 @@ ActiveRecord::Schema.define(version: 20150320001338) do t.boolean "koelkast", default: false t.string "provider" t.string "uid" - t.string "encrypted_password" end add_index "users", ["koelkast"], name: "index_users_on_koelkast" diff --git a/db/seeds.rb b/db/seeds.rb index 339c215..0a86f9e 100644 --- a/db/seeds.rb +++ b/db/seeds.rb @@ -67,16 +67,14 @@ users.each do |attr| provider: attr[:provider], avatar: attr[:avatar], dagschotel: attr[:dagschotel], - password: DEFAULT_PASSWORD, admin: attr[:admin] || false, koelkast: attr[:koelkast] || false ) end -50.times do |i| - User.create( - uid: "testUser#{i}", - avatar: users[0][:avatar], - password: DEFAULT_PASSWORD, - ) -end +# 50.times do |i| + # User.create( + # uid: "testUser#{i}", + # avatar: users[0][:avatar], + # ) +# end