New authorization

app/controllers/admin/authorizations_controller.rb

@@ -1,13 +1,13 @@
 class Admin::AuthorizationsController < OrbitBackendController
 
-  before_filter :admin_or_manager
+  prepend_before_filter :admin_or_manager
    
   def index
-    @module_apps ||= ModuleApp.where(is_authorizable: true).order_by([:title, :asc])
+    @module_apps ||= ModuleApp.any_of({is_authorizable: true}, {is_approvable: true}).order_by([:title, :asc])
     if @module_apps && @module_apps.include?(@module_app)
       if @type
         case @type
-        when 'category', 'approval'
+        when 'category_authorization', 'category_approval'
           if @module_app.has_category
             @objects = @module_app.categories
           else
@@ -18,12 +18,12 @@ class Admin::AuthorizationsController < OrbitBackendController
         end
         unless @objects.blank?
           @object ||= @objects.first
-          @users = @object.get_object_auth_by_title("#{@type}_#{@module_app.key}").auth_users
+          @users = @object.get_authorization_by_title("#{@type}_#{@module_app.key}").authorized_users rescue nil
         else
           @error = t(:no_data)
         end
       else
-        @users = @module_app.managing_users
+        @users = @module_app.managers
       end
     elsif @module_apps
       @module_app = @module_apps.first
@@ -33,35 +33,42 @@ class Admin::AuthorizationsController < OrbitBackendController
     end
   end
 
-  def add(users)
-    unless users.blank?
-      if @type
-        if @object
-          object_auth = @object.get_object_auth_by_title("#{@type}_#{@module_app.key}")
-          add_users_to_object_auth(object_auth, users)
-        else
-          @error = t(:no_data)
-        end
-      else
-        add_managers(users) unless users.blank?
-      end
+  def add_roles
+    roles = Role.find(params[:role_ids]) rescue []
+    users = []
+    roles.each do |role|
+      users += role.users.all.entries
     end
-    @users = users 
-    render 'admin/authorizations/insert_users'
+    unless roles.blank?
+      authorization = get_or_create_authorization
+      add_roles_to_auth(authorization, roles) unless @error
+    end
+    @users = authorization.authorized_users
+    render 'admin/authorizations/reload_users'
+  end
+
+  def add_sub_roles
+    sub_roles = SubRole.find(params[:sub_role_ids]) rescue []
+    users = []
+    sub_roles.each do |sub_role|
+      users += sub_role.users.all.entries
+    end
+    unless sub_roles.blank?
+      authorization = get_or_create_authorization
+      add_sub_roles_to_auth(authorization, sub_roles) unless @error
+    end
+    @users = authorization.authorized_users
+    render 'admin/authorizations/reload_users'
   end
 
   def add_users
     users = User.find(params[:user_ids]) rescue []
-    add(users)
-  end
-
-  def add_roles
-    roles = Role.find(params[:role_ids]) rescue []
-    users = roles.inject([]) do |users, role|
-      users += role.users.all.entries
-      users
+    unless users.blank?
+      authorization = get_or_create_authorization
+      add_users_to_auth(authorization, users) unless @error
     end
-    add(users)
+    @users = authorization.authorized_users
+    render 'admin/authorizations/reload_users'
   end
 
   def modal_select
@@ -70,63 +77,111 @@ class Admin::AuthorizationsController < OrbitBackendController
     if @type
       @object_id = @object.id if @object
       @sorted_users = roles.inject({}) do |users, role|
-        users[role] = role.users.where(admin: false).not_guest_user - existing_users - @module_app.managing_users
+        users[role] = role.users.where(admin: false) - existing_users - @module_app.managers
         users
       end
     else
       @sorted_users = roles.inject({}) do |users, role|
-        users[role] = role.users.where(admin: false).not_guest_user - existing_users
+        users[role] = role.users.where(admin: false) - existing_users
         users
       end
     end
   end
 
+  def remove_roles
+    roles = Role.find(params[:role_ids]) rescue []
+    unless roles.blank?
+      authorization = get_or_create_authorization
+      remove_roles_form_auth(authorization, roles)
+    end
+    @users = authorization.authorized_users
+    render 'admin/authorizations/reload_users'
+  end
+
+  def remove_sub_roles
+    sub_roles = SubRole.find(params[:sub_role_ids]) rescue []
+    unless sub_roles.blank?
+      authorization = get_or_create_authorization
+      remove_sub_roles_from_auth(authorization, sub_roles)
+    end
+    @users = authorization.authorized_users
+    render 'admin/authorizations/reload_users'
+  end
+
   def remove_users
     @users = User.find(params[:ids]) rescue []
     unless @users.blank?
-      if @type
-        if @object
-          object_auth = @object.get_object_auth_by_title("#{@type}_#{@module_app.key}")
-          remove_users_form_object_auth(object_auth, @users)
-        else
-          @error = t(:no_data)
-        end
-      else
-        remove_managers(@users)
-      end
+      authorization = get_or_create_authorization
+      remove_users_from_auth(authorization, @users)
     end
-    render 'admin/authorizations/remove_users'
+    @users = authorization.authorized_users
+    render 'admin/authorizations/reload_users'
   end
   
   protected
 
-  def add_managers(users)
-    users.each do |user|
-      @module_app.assign_manager(user, current_user)
+  def add_managers_to_auth(users)
+    @module_app.add_managers(users)
+  end
+
+  def add_roles_to_auth(authorization, roles)
+    authorization.add_roles(roles)
+  end
+
+  def add_sub_roles_to_auth(authorization, sub_roles)
+    authorization.add_sub_roles(sub_roles)
+  end
+
+  def add_users_to_auth(authorization, users)
+    authorization.add_users(users)
+  end
+
+  def get_or_create_authorization
+    case @type
+    when 'category_approval'
+      if @object
+        @object.auth_approval || @object.create_auth_approval(module_app_id: @module_app.id, title: "#{@type}_#{@module_app.key}")
+      else
+        @error = t(:no_data)
+      end
+    when 'category_authorization'
+      if @object
+        @object.auth_sub_manager || @object.create_auth_sub_manager(module_app_id: @module_app.id, title: "#{@type}_#{@module_app.key}")
+      else
+        @error = t(:no_data)
+      end
+    when nil
+      @module_app.auth_manager || @module_app.create_auth_manager(module_app_id: @module_app.id, title: "#{@type}_#{@module_app.key}")
+    else
+      auth = @object.get_authorization_by_title("#{@type}_#{@module_app.key}")
+      unless auth
+        auth = @object.create_auth_approval(module_app_id: @module_app.id, title: "#{@type}_#{@module_app.key}") if @type.include?('approval')
+        auth = @object.create_auth_sub_manager(module_app_id: @module_app.id, title: "#{@type}_#{@module_app.key}") if @type.include?('authorization')
+      end
+      auth
     end
   end
 
-  def add_users_to_object_auth(object_auth, users)
-    users.each do |user|
-      object_auth.add_user_to_privilege_list(user)
-    end
+  def remove_managers_from_auth(users)
+    @module_app.remove_manager(users)
   end
 
-  def remove_managers(users)
-    users.each do |user|
-      @module_app.remove_manager(user)
-    end
+  def remove_roles_form_auth(authorization, roles)
+    authorization.remove_roles(roles)
   end
 
-  def remove_users_form_object_auth(object_auth, users)
-    users.each do |user|
-      object_auth.remove_user_from_privilege_list(user)
-    end
+  def remove_sub_roles_from_auth(authorization, sub_roles)
+    authorization.remove_sub_roles(sub_roles)
+  end
+
+  def remove_users_from_auth(authorization, users)
+    authorization.remove_users(users)
   end
 
   private
 
   def admin_or_manager
+    @override_can_use = true
     setup_vars   
     authenticate_user!
     user_is_manager?
@@ -136,7 +191,7 @@ class Admin::AuthorizationsController < OrbitBackendController
     @module_app = ModuleApp.first(conditions: {:key => params[:module]} ) if params[:module]
     @type = params[:type].underscore if params[:type]
     if @type
-      @klass = @type.classify.constantize rescue nil
+      @klass = @type.gsub('_authorization', '').gsub('_approval', '').classify.constantize rescue nil
       @object = @klass.find(params[:id]) rescue nil
     end
   end

app/controllers/admin/dashboards_controller.rb

@@ -4,6 +4,8 @@ class Admin::DashboardsController < OrbitBackendController
   #before_filter :authenticate_user!, :except => [:index]
 #  before_filter :is_admin?
 
+  prepend_before_filter :set_public
+
   layout "basic_back_end"
   
   def index

app/controllers/admin/users_new_interface_controller.rb

@@ -2,18 +2,9 @@ class Admin::UsersNewInterfaceController <  OrbitMemberController
 
   helper MemberHelper
   
-  # before_filter :authenticate_user!
-  # before_filter :set_attribute, :only => [:index, :show, :new, :edit]
-  
-  before_filter :force_order_for_visitor,:only=>[:index,:show]
-  before_filter :force_order_for_user,:except => [:index,:show]
   before_filter :set_attribute,:except => [:index,:show]
+  prepend_filter :set_public, :only => [:index, :show]
 
-  def setup_vars
-    # @app_title ||= controller_path.split('/')[1].singularize
-    # @module_app ||= ModuleApp.first(conditions: {:key => @app_title} )
-    # raise ModuleAppError, 'Can not find ModuleApp' if @module_app.nil?
-  end
 
   def index
     get_tags

app/controllers/orbit_backend_controller.rb

@@ -1,7 +1,6 @@
 class OrbitBackendController < ApplicationController
   include OrbitCategory::Categorizing
-  include OrbitCoreLib::AppBackendUtility
-  include OrbitCoreLib::PermissionUtility
+  include OrbitCoreLib::Authorization
   include OrbitTag::Tagging
   include AdminHelper
   include ApplicationHelper
@@ -10,12 +9,6 @@ class OrbitBackendController < ApplicationController
   
   layout "back_end"
 
-  def setup_vars
-    @app_title ||= controller_path.split('/')[1].singularize
-    @module_app ||= ModuleApp.first(conditions: {:key => @app_title} )
-    raise ModuleAppError, 'Can not find ModuleApp' if @module_app.nil?
-  end
-
   def get_statuses
     status = []
     status << 'is_top'
@@ -28,27 +21,4 @@ class OrbitBackendController < ApplicationController
     end
     status
   end
-
-  private
-
-  def force_order_for_visitor
-    check_backend_openness
-    setup_vars
-    set_current_user
-  end
-
-
-  def force_order_for_user
-    setup_vars
-    set_current_user
-    authenticate_user!
-    check_user_can_use
-  end
-
-  def check_user_can_use
-    unless check_permission
-      #redirect_to polymorphic_path(['panel',@app_title,'back_end','public'])
-      redirect_to root_url
-    end
-  end
 end

app/controllers/orbit_member_controller.rb

@@ -1,7 +1,6 @@
 class OrbitMemberController < ApplicationController
   include OrbitCategory::Categorizing
-  include OrbitCoreLib::AppBackendUtility
-  include OrbitCoreLib::PermissionUtility
+  include OrbitCoreLib::Authorization
   include OrbitTag::Tagging
   include AdminHelper
   include ApplicationHelper
@@ -10,12 +9,6 @@ class OrbitMemberController < ApplicationController
   
   layout "member"
 
-  def setup_vars
-    @app_title ||= controller_path.split('/')[1].singularize
-    @module_app ||= ModuleApp.first(conditions: {:key => @app_title} )
-    raise ModuleAppError, 'Can not find ModuleApp' if @module_app.nil?
-  end
-
   def get_statuses
     status = []
     status << 'is_top'
@@ -28,27 +21,4 @@ class OrbitMemberController < ApplicationController
     end
     status
   end
-
-  private
-
-  def force_order_for_visitor
-    check_backend_openness
-    setup_vars
-    set_current_user
-  end
-
-
-  def force_order_for_user
-    setup_vars
-    set_current_user
-    authenticate_user!
-    check_user_can_use
-  end
-
-  def check_user_can_use
-    unless check_permission
-      #redirect_to polymorphic_path(['panel',@app_title,'back_end','public'])
-      redirect_to root_url
-    end
-  end
 end