Merge branch 'master' of bitbucket.org:code2lab/sxrestaurant into adminbsb_ui_changes

app/controllers/api/restaurant/item_sets_controller.rb

@@ -1,5 +1,4 @@
 class Api::Restaurant::ItemSetsController < Api::ApiController
-
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id

app/controllers/api/restaurant/menu_categories_controller.rb

@@ -1,5 +1,4 @@
-class Api::Restaurant::MenuCategoriesController < Api::ApiController
+class Api::Restaurant::MenuCategoriesController < Api::ApiController 
- skip_before_action  :authenticate
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id

app/controllers/api/restaurant/menu_controller.rb

@@ -1,5 +1,4 @@
 class Api::Restaurant::MenuController < Api::ApiController
-  skip_before_action  :authenticate
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id

app/controllers/api/restaurant/menu_item_attributes_controller.rb

@@ -1,5 +1,4 @@
-class Api::Restaurant::MenuItemAttributesController < Api::ApiController
+class Api::Restaurant::MenuItemAttributesController < Api::ApiController	
-	skip_before_action  :authenticate
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id

app/controllers/api/restaurant/menu_item_instances_controller.rb

@@ -1,5 +1,4 @@
-class Api::Restaurant::MenuItemInstancesController < Api::ApiController
+class Api::Restaurant::MenuItemInstancesController < Api::ApiController  
-  skip_before_action  :authenticate
   #Description
   # Pull the default menu details and also other available (active) menus
   # Input Params - order_id

app/controllers/base_origami_controller.rb

@@ -15,19 +15,16 @@ class BaseOrigamiController < ActionController::Base
     redirect_to origami_dashboard_path
   end
 
-  def check_user
+  def check_user   
-    token_status = false
+    if check_mobile     
-    authenticate_with_http_token do |token, options|   
-      if token
-        token_status = true
-        session[:webview] = true
-        session[:session_token] = token
-      end
-    end
-
-    if !token_status
       if current_user.nil?
-        redirect_to root_path
+        return render status: 401, json: {
+          message: "User using other device!"          
+        }.to_json
+      end
+    else 
+      if current_user.nil?
+        redirect_to root_path    
       end
     end
   end
@@ -49,9 +46,13 @@ class BaseOrigamiController < ActionController::Base
   #check webview
   def check_mobile
     status = false
-    puts "check mobile"
+    authenticate_with_http_token do |token, options|   
-    puts session[:session_token]
+      if token
-    puts session[:webview]
+        session[:webview] = true
+        session[:session_token] = token
+      end            
+    end
+    
     if session[:webview] && request.user_agent =~ /android|blackberry|iphone|ipad|ipod|iemobile|mobile|webos/i
       status = true
     end

app/controllers/concerns/token_verification.rb

@@ -9,7 +9,7 @@ module TokenVerification
 
   protected
   # Authenticate the user with token based authentication
-  def authenticate
+  def authenticate    
     authenticate_token || render_unauthorized
   end