Merge 48e36ec into 8718828

backend/config/routes.rb

@@ -59,7 +59,7 @@
 
     resource :store, controller: :store, only: [:show, :edit, :update]
 
-    devise_for :user, path: :user, class_name: Comable::User.name, module: :devise, controllers: {
+    devise_for :users, path: :user, class_name: Comable::User.name, module: :devise, router_name: :comable, controllers: {
       sessions: 'comable/admin/user_sessions'
     }
 

core/app/controllers/comable/application_controller.rb

@@ -0,0 +1,4 @@
+module Comable
+  class ApplicationController < ActionController::Base
+  end
+end

core/app/helpers/comable/application_helper.rb

@@ -5,7 +5,9 @@ def current_store
     end
 
     def current_comable_user
-      resource = current_admin_user || current_user || Comable::User.new
+      resource = current_admin_user if defined? Comable::Backend
+      resource ||= current_user if defined? Comable::Frontend
+      resource ||= Comable::User.new
       resource.with_cookies(cookies)
     end
 
@@ -65,24 +67,33 @@ def liquid_assigns
 
     private
 
-    def after_sign_in_path_for(_resource)
-      session.delete(:user_return_to) || comable.root_path
+    def comable_root_path
+      case resource_name
+      when :admin_user
+        comable.admin_root_path
+      else
+        defined?(Comable::Frontend) ? comable.root_path : '/'
+      end
     end
 
-    def after_sign_out_path_for(_resource)
-      session.delete(:user_return_to) || comable.root_path
+    def after_sign_in_path_for(_resource_or_scope)
+      session.delete(:user_return_to) || comable_root_path
+    end
+
+    def after_sign_out_path_for(_scope)
+      session.delete(:user_return_to) || comable_root_path
     end
 
     def after_sign_up_path_for(resource)
-      signed_in_root_path(resource) || comable.root_path
+      signed_in_root_path(resource) || comable_root_path
     end
 
     def after_update_path_for(resource)
-      signed_in_root_path(resource) || comable.root_path
+      signed_in_root_path(resource) || comable_root_path
     end
 
     def after_resetting_password_path_for(resource)
-      signed_in_root_path(resource) || comable.root_path
+      signed_in_root_path(resource) || comable_root_path
     end
   end
 end

core/spec/helpers/comable/application_helper_spec.rb

@@ -54,4 +54,31 @@
       expect(subject.current_navigations).to eq(Comable::Navigation.all)
     end
   end
+
+  describe '#comable_root_path' do
+    subject { helper.clone }
+
+    before { def subject.resource_name; end }
+
+    it 'returns the root path for the customer in main_app' do
+      frontend = Comable::Frontend
+      begin
+        Comable.send(:remove_const, :Frontend)
+        allow(subject).to receive(:resource_name).and_return(:user)
+        expect(subject.send(:comable_root_path)).to eq('/')
+      ensure
+        Comable.const_set(:Frontend, frontend)
+      end
+    end
+
+    it 'returns the root path for the customer in frontend' do
+      allow(subject).to receive(:resource_name).and_return(:user)
+      expect(subject.send(:comable_root_path)).to eq(comable.root_path)
+    end
+
+    it 'returns the root path for the admin user in backend' do
+      allow(subject).to receive(:resource_name).and_return(:admin_user)
+      expect(subject.send(:comable_root_path)).to eq(comable.admin_root_path)
+    end
+  end
 end

frontend/config/routes.rb

@@ -23,7 +23,7 @@
 
   resources :pages, only: [:show]
 
-  devise_for :user, path: :member, class_name: Comable::User.name, module: :devise
+  devise_for :users, path: :member, class_name: Comable::User.name, module: :devise, router_name: :comable
 
   resource :user, path: :member do
     member do