fix: devise

diff --git a/Gemfile b/Gemfile
index 0f08acd..35c1225 100644 (file)
--- 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 93b6175..ac07a01 100644 (file)
--- 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\r
         {}\r
       controller = Manifest.manifest().controllers[resource_controller_name]\r
-      action = @my_controller.actions[resource_action_name]\r
+      action = controller.actions[resource_action_name]\r
       list = action.find(params)\r
       list.open(this, {\r
         success: (page_status) ->\r

diff --git a/app/assets/javascripts/peta/item.js.coffee b/app/assets/javascripts/peta/item.js.coffee
index b919c37..d2e77c3 100644 (file)
--- 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()\r
   \r
   get_association: (routes, context, options) ->\r
-    console.log 'get_association'\r
     routes = [routes] if _.isString(routes)\r
-    console.log routes\r
     route = routes.shift()\r
     if _.isEmpty(routes)\r
       # fetching terminate association. callback\r
-      console.log 'fetching terminate association'\r
       cxt = options.context || context\r
       @fetch_association(route, cxt, {\r
         success: (association_item, options) =>\r
-          console.log 'success'\r
-          console.log association_item\r
-          console.log options\r
           options.success.call(context, association_item)\r
         context: context,\r
         options: options\r
       })\r
     else\r
       # fetching through associations\r
-      console.log 'fetching through associations'\r
       @fetch_association(route, this, {\r
         success: (association_item, options) =>\r
-          console.log 'success'\r
-          console.log association_item\r
-          console.log options\r
           association_item.get_association(routes, this, options)\r
         context: context,\r
         options: options\r
       })\r
   \r
   fetch_association: (name, context, options) =>\r
-    console.log context\r
-    console.log options\r
     a = @my_class().my_manifest().associations\r
     fetch_options = {\r
       success: (association_item) =>\r
         options.success.call(context, association_item, options.options)\r
     }\r
     if a.belongs_to[name]\r
-      console.log 'belongs_to'\r
-      console.log name\r
       @get_parent(name, context, fetch_options)\r
     else if a.has_many[name]\r
-      console.log 'has_many'\r
-      console.log name\r
       @get_children(name, context, fetch_options)\r
     else if a.has_one[name]\r
-      console.log 'has_one'\r
-      console.log name\r
       @get_child(name, context, fetch_options)\r
     else\r
       console.error('association does not exist in model manifest')\r

diff --git a/app/assets/javascripts/pettanr/cache.js.coffee b/app/assets/javascripts/pettanr/cache.js.coffee
index 7dd14af..b2ebb3f 100644 (file)
--- 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?\r
       else\r
         @data[item.cache_key()] = item\r
-      @refresh(return_items)\r
+      # @refresh(return_items)\r
     return_items\r
   \r
   restore: (key) ->\r

diff --git a/app/controllers/application_controller.rb b/app/controllers/application_controller.rb
index 0c17b70..14c8e8c 100644 (file)
--- 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 (file)
index 0000000..e69de29

diff --git a/app/controllers/user_sessions_controller.rb b/app/controllers/user_sessions_controller.rb
index 52312a8..11f4103 100644 (file)
--- 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 (file)
index 0000000..e69de29

diff --git a/app/models/user.rb b/app/models/user.rb
index 11d7d12..f6b0cdf 100644 (file)
--- 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 b3c1a9b..80aff45 100644 (file)
--- 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