fix bugs with token

app/controllers/orbit_backend_controller.rb

@@ -10,7 +10,6 @@ class OrbitBackendController< ApplicationController
   def setup_vars
     @app_title = request.fullpath.split('/')[2]
     @module_app = ModuleApp.first(conditions: {:key => @app_title} )
-    
   end
   
   private

app/models/module_app.rb

@@ -1,6 +1,7 @@
 class ModuleApp
   include Mongoid::Document
   include Mongoid::Timestamps
+  include OrbitCoreLib::ObjectTokenUnility
 
   field :key
 	field :title
@@ -14,7 +15,7 @@ class ModuleApp
   
   field :app_pages ,type: Array
   field :widgets ,type: Array
-  
+    
   has_many :managers,as: :managing_app ,:class_name => "AppManager" #,:dependent => :destroy,:foreign_key => "managing_app_id",:inverse_of => :managing_app
   has_many :sub_managers,as: :sub_managing_app ,:class_name => "AppManager"#, :dependent => :destroy,:foreign_key => "sub_managing_app_id",:inverse_of => :sub_managing_app
   
@@ -77,5 +78,6 @@ class ModuleApp
   def set_key
     self.key = self.title.underscore if self.title
   end
+
   
 end

app/models/object_auth.rb

@@ -1,5 +1,5 @@
 class ObjectAuth  < PrototypeAuth
-
+  include OrbitCoreLib::ObjectTokenUnility
   belongs_to :obj_authable, polymorphic: true
   # > - Something.find_with_auth(query)
   # > - or Something.find(query).auth

app/models/prototype_auth.rb

@@ -4,7 +4,6 @@ class PrototypeAuth
  # after_save :update_block_list,:update_privilage_list
   
   field :title
-  field :token
   field :all ,type: Boolean,default: false
   
   belongs_to :users
@@ -12,12 +11,13 @@ class PrototypeAuth
   has_and_belongs_to_many :blocked_users,  :inverse_of => nil, :class_name => "User"
   has_and_belongs_to_many :privilege_users,  :inverse_of => nil, :class_name => "User"
 
-
   has_and_belongs_to_many :roles
   has_and_belongs_to_many :sub_roles
   
   attr_protected :roles,:sub_roles,:privilege_users,:blocked_users
 
+
+
   def add_role role
     add_operation(:roles,role)
   end
@@ -87,7 +87,6 @@ class PrototypeAuth
     auth_users_before_block_list - self.blocked_users
   end
   
- # protected
   
 
 end

app/views/admin/components/_user_role_management.html.erb

@@ -1,5 +1,7 @@
 <div id="user_role_management">
 	<h1>User Role</h1>
+	All User
+
 	<%= form_tag(submit_url) do %>
 		<%= collection_select(:new,:role, Role.all, :id, :key, :prompt => true) %>
 		<%= submit_tag 'Add Role' %><br/>
@@ -10,7 +12,6 @@
 		<%= collection_select(:new,:blocked_user, User.all, :id, :name, :prompt => true) %>
 		<%= submit_tag 'Add BlockedList' %><br/>
 	<% end %>
-	<ul>Roles </ul>
 	<% unless auth.nil? %>
 		<% auth.roles.each do |role| %>
 			<li> <%= role.key %> Build in:<%= role.built_in ? 'Yes' : 'No' %>

config/environments/development.rb

@@ -24,21 +24,21 @@ PrototypeR4::Application.configure do
   config.action_dispatch.best_standards_support = :builtin  
 
 
-  config.middleware.use ExceptionNotifier,
-    :email_prefix => "[R4_error]",
-    :sender_address => %{"notifier" <redmine@rulingcom.com>},
-    :exception_recipients => %w{chris@rulingcom.com}
-    
-  config.action_mailer.delivery_method = :smtp
-  config.action_mailer.smtp_settings = {
-    :tls => true,
-    :enable_starttls_auto => true,
-    :address => "smtp.gmail.com",
-    :port => '587',
-    :domain => "smtp.gmail.com",
-    :authentication => "plain",
-    :user_name => "redmine@rulingcom.com",
-    :password => "rulingredmine" }
+  # config.middleware.use ExceptionNotifier,
+  #   :email_prefix => "[R4_error]",
+  #   :sender_address => %{"notifier" <redmine@rulingcom.com>},
+  #   :exception_recipients => %w{chris@rulingcom.com}
+  #   
+  # config.action_mailer.delivery_method = :smtp
+  # config.action_mailer.smtp_settings = {
+  #   :tls => true,
+  #   :enable_starttls_auto => true,
+  #   :address => "smtp.gmail.com",
+  #   :port => '587',
+  #   :domain => "smtp.gmail.com",
+  #   :authentication => "plain",
+  #   :user_name => "redmine@rulingcom.com",
+  #   :password => "rulingredmine" }
 
 end
 

config/routes.rb

@@ -14,7 +14,7 @@ PrototypeR4::Application.routes.draw do
     resources :app_auths 
     resources :object_auths  do
       collection do
-        match 'new/:type/:obj_id/:module_app_id',:action => 'new',:via => "get",:as => :init
+        match 'new/:type/:obj_id',:action => 'new',:via => "get",:as => :init
       end
       member do
         match ':id/create_role',:action => 'create_role',:via => "post",:as => :create_role

lib/orbit_core_lib.rb

@@ -31,12 +31,28 @@ module  OrbitCoreLib
     end
     
   end
+  module  ObjectTokenUnility
+    def self.included(base)
+      base.instance_eval("field :s_token")
+      base.instance_eval("after_create :generate_token")
+    end
+    
+    def token
+      return self.s_token
+    end
+    
+    protected
+     def generate_token
+       self.s_token = ActiveSupport::SecureRandom.hex(16)
+       self.save!
+     end
+  end
   
   module PermissionUnility
   private
     def check_permission(type = :use)
       permission_grant =  current_user.admin?? true : false
-      module_app = @module_app.nil?? ModuleApp.find(params[:module_app_id]) : @module_app
+      module_app = @module_app.nil?? find_module_app_by_token(params[:token]) : @module_app
       unless permission_grant
         permission_grant = case type
         when :use
@@ -51,6 +67,8 @@ module  OrbitCoreLib
       end
       permission_grant
     end
-    
+    def find_module_app_by_token(token)
+      ModuleApp.first(conditions: {s_token: token})
+    end
   end
 end

vendor/built_in_modules/announcement/app/views/panel/announcement/back_end/bulletin_categorys/_bulletin_category.html.erb

@@ -7,9 +7,9 @@
 	<td><%= bulletin_category.display %></td>
 	<% if is_manager? %>
 		<td>
-		<%= link_to t('blog.new_auth'), init_admin_object_auths_path("BulletinCategory",bulletin_category,@module_app) %>  <br/ >
+		<%= link_to t('blog.new_auth'), init_admin_object_auths_path("BulletinCategory",bulletin_category,:token => @module_app.token) %>  <br/ >
 		<% bulletin_category.object_auths.each do |obj_auth| %>
-			 <%= link_to obj_auth.title,edit_admin_object_auth_url(obj_auth)  %><br />
+			 <%= link_to obj_auth.title,edit_admin_object_auth_url(obj_auth,:token => @module_app.token)  %><br />
 		<% end %>
 		</td>
 		<td>