From 1d702bd3475998adf9f704eca73f4af7f35b051d Mon Sep 17 00:00:00 2001 From: yasushiito Date: Thu, 9 Jul 2015 17:01:04 +0900 Subject: [PATCH] fix: devise --- Gemfile | 2 +- .../locmare/form/field/tag/select.js.coffee | 2 +- app/assets/javascripts/peta/item.js.coffee | 18 ------------------ app/assets/javascripts/pettanr/cache.js.coffee | 2 +- app/controllers/application_controller.rb | 2 ++ app/controllers/concerns/.keep | 0 app/controllers/user_sessions_controller.rb | 6 +++--- app/models/concerns/.keep | 0 app/models/user.rb | 4 ++-- config/routes.rb | 1 - 10 files changed, 10 insertions(+), 27 deletions(-) create mode 100644 app/controllers/concerns/.keep create mode 100644 app/models/concerns/.keep diff --git a/Gemfile b/Gemfile index 0f08acde..35c12253 100644 --- a/Gemfile +++ b/Gemfile @@ -2,7 +2,7 @@ source 'https://rubygems.org' gem 'rails', '~> 4.1.0' gem 'devise' -gem 'devise_token_auth' +gem 'omniauth' gem 'rest-client' gem 'underscore-rails' # gem 'backbone-rails' diff --git a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee index 93b6175d..ac07a01e 100644 --- a/app/assets/javascripts/locmare/form/field/tag/select.js.coffee +++ b/app/assets/javascripts/locmare/form/field/tag/select.js.coffee @@ -56,7 +56,7 @@ class Locmare.FormModule.FieldModule.TagModule.SelectTag extends Locmare.FormMod else {} controller = Manifest.manifest().controllers[resource_controller_name] - action = @my_controller.actions[resource_action_name] + action = controller.actions[resource_action_name] list = action.find(params) list.open(this, { success: (page_status) -> diff --git a/app/assets/javascripts/peta/item.js.coffee b/app/assets/javascripts/peta/item.js.coffee index b919c374..d2e77c37 100644 --- a/app/assets/javascripts/peta/item.js.coffee +++ b/app/assets/javascripts/peta/item.js.coffee @@ -126,55 +126,37 @@ class Peta.Item extends Backbone.Model @item_name() get_association: (routes, context, options) -> - console.log 'get_association' routes = [routes] if _.isString(routes) - console.log routes route = routes.shift() if _.isEmpty(routes) # fetching terminate association. callback - console.log 'fetching terminate association' cxt = options.context || context @fetch_association(route, cxt, { success: (association_item, options) => - console.log 'success' - console.log association_item - console.log options options.success.call(context, association_item) context: context, options: options }) else # fetching through associations - console.log 'fetching through associations' @fetch_association(route, this, { success: (association_item, options) => - console.log 'success' - console.log association_item - console.log options association_item.get_association(routes, this, options) context: context, options: options }) fetch_association: (name, context, options) => - console.log context - console.log options a = @my_class().my_manifest().associations fetch_options = { success: (association_item) => options.success.call(context, association_item, options.options) } if a.belongs_to[name] - console.log 'belongs_to' - console.log name @get_parent(name, context, fetch_options) else if a.has_many[name] - console.log 'has_many' - console.log name @get_children(name, context, fetch_options) else if a.has_one[name] - console.log 'has_one' - console.log name @get_child(name, context, fetch_options) else console.error('association does not exist in model manifest') diff --git a/app/assets/javascripts/pettanr/cache.js.coffee b/app/assets/javascripts/pettanr/cache.js.coffee index 7dd14af2..b2ebb3f9 100644 --- a/app/assets/javascripts/pettanr/cache.js.coffee +++ b/app/assets/javascripts/pettanr/cache.js.coffee @@ -20,7 +20,7 @@ class Pettanr.Cache cached_item # merge? else @data[item.cache_key()] = item - @refresh(return_items) + # @refresh(return_items) return_items restore: (key) -> diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb index 0c17b70e..14c8e8cd 100644 --- a/app/controllers/application_controller.rb +++ b/app/controllers/application_controller.rb @@ -1,5 +1,6 @@ class ApplicationController < ActionController::Base protect_from_forgery + protect_from_forgery with: :null_session, if: Proc.new {|c| c.request.format == 'application/json'} layout :devise_layout before_action :bf @@ -28,6 +29,7 @@ class ApplicationController < ActionController::Base else nil end + p user author = if user user.author else diff --git a/app/controllers/concerns/.keep b/app/controllers/concerns/.keep new file mode 100644 index 00000000..e69de29b diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb index 52312a81..11f4103e 100644 --- a/app/controllers/user_sessions_controller.rb +++ b/app/controllers/user_sessions_controller.rb @@ -1,11 +1,11 @@ class UserSessionsController < Devise::SessionsController prepend_before_action :require_no_authentication, :only => [:create ] respond_to :json - + skip_before_filter :verify_authenticity_token, only: [:create] + def create if request.xhr? - resource = warden.authenticate!(scope: resource_name, recall: "#{controller_path}#failure") - sign_in(resource_name, resource) + resource = warden.authenticate!(scope: resource_name, recall: "#{controller_path}#xhr_failure") return render :json => current_user.to_json({:include => {:author => {}, :artist => {}} }) else super diff --git a/app/models/concerns/.keep b/app/models/concerns/.keep new file mode 100644 index 00000000..e69de29b diff --git a/app/models/user.rb b/app/models/user.rb index 11d7d12f..f6b0cdfc 100644 --- a/app/models/user.rb +++ b/app/models/user.rb @@ -5,8 +5,8 @@ class User < ActiveRecord::Base # Include default devise modules. Others available are: # :token_authenticatable, :encryptable, :confirmable, :lockable, :timeoutable and :omniauthable devise :database_authenticatable, :registerable, - :recoverable, :rememberable, :trackable, :validatable#, :confirmable - + :recoverable, :rememberable, :trackable, :validatable, + :omniauthable#, :confirmable def create_token self.ensure_authentication_token diff --git a/config/routes.rb b/config/routes.rb index b3c1a9b5..80aff45e 100644 --- a/config/routes.rb +++ b/config/routes.rb @@ -1,5 +1,4 @@ Pettanr::Application.routes.draw do - devise_for :users, controllers: {sessions: 'user_sessions'} devise_for :admins devise_for :demand_users -- 2.11.0