check kanjai and frontend access

Karpikau Andrei
1 parent 24017b6a
Showing 4 changed files with 79 additions and 74 deletions
.idea/workspace.xml
Gemfile.lock
app/controllers/kanjai/pages_controller.rb
lib/kanjai/version.rb
--- a/.idea/workspace.xml
View file @076ed7f
+++ b/.idea/workspace.xml
View file @076ed7f
@@ -4,10 +4,8 @@
     <list default="true" id="cbbcb0f9-d203-4967-aa4d-c08a939c7df0" name="Default" comment="">
       <change beforePath="$PROJECT_DIR$/.idea/workspace.xml" beforeDir="false" afterPath="$PROJECT_DIR$/.idea/workspace.xml" afterDir="false" />
       <change beforePath="$PROJECT_DIR$/Gemfile.lock" beforeDir="false" afterPath="$PROJECT_DIR$/Gemfile.lock" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" beforeDir="false" afterPath="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb" beforeDir="false" afterPath="$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/config/initializers/devise.rb" beforeDir="false" afterPath="$PROJECT_DIR$/config/initializers/devise.rb" afterDir="false" />
-      <change beforePath="$PROJECT_DIR$/lib/kanjai/template_generator.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/kanjai/template_generator.rb" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" beforeDir="false" afterPath="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" afterDir="false" />
+      <change beforePath="$PROJECT_DIR$/lib/kanjai/version.rb" beforeDir="false" afterPath="$PROJECT_DIR$/lib/kanjai/version.rb" afterDir="false" />
     </list>
     <ignored path="kanjai.iws" />
     <ignored path=".idea/workspace.xml" />
@@ -27,20 +25,20 @@
   </component>
   <component name="FileEditorManager">
     <leaf SIDE_TABS_SIZE_LIMIT_KEY="300">
-      <file leaf-file-name="_content.html.erb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb">
+      <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="15">
-              <caret line="1" column="121" selection-start-line="1" selection-start-column="121" selection-end-line="1" selection-end-column="121" />
+            <state relative-caret-position="1815">
+              <caret line="121" column="28" selection-start-line="121" selection-start-column="28" selection-end-line="121" selection-end-column="28" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="page_template.rb" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/app/models/kanjai/page_template.rb">
+      <file leaf-file-name="pages_controller.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="1815">
-              <caret line="121" column="28" selection-start-line="121" selection-start-column="28" selection-end-line="121" selection-end-column="28" />
+            <state relative-caret-position="495">
+              <caret line="33" column="34" lean-forward="true" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
             </state>
           </provider>
         </entry>
@@ -83,45 +81,46 @@
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="version.rb" pinned="false" current-in-tab="false">
+      <file leaf-file-name="version.rb" pinned="false" current-in-tab="true">
         <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
           <provider selected="true" editor-type-id="text-editor">
             <state relative-caret-position="15">
-              <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
+              <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="Gemfile" pinned="false" current-in-tab="false">
-        <entry file="file://$PROJECT_DIR$/Gemfile">
-          <provider selected="true" editor-type-id="text-editor" />
-        </entry>
-      </file>
       <file leaf-file-name="Gemfile.lock" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/Gemfile.lock">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="199">
+            <state relative-caret-position="795">
               <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
             </state>
           </provider>
         </entry>
       </file>
-      <file leaf-file-name="devise.rb" pinned="false" current-in-tab="true">
+      <file leaf-file-name="devise.rb" pinned="false" current-in-tab="false">
         <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
           <provider selected="true" editor-type-id="text-editor">
-            <state relative-caret-position="166">
+            <state relative-caret-position="180">
               <caret line="12" column="3" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
             </state>
           </provider>
         </entry>
       </file>
+      <file leaf-file-name="20160707115443_add_show_public_only_to_kanjai_pages.rb" pinned="false" current-in-tab="false">
+        <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
+          <provider selected="true" editor-type-id="text-editor">
+            <state relative-caret-position="30">
+              <caret line="2" column="73" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="73" />
+            </state>
+          </provider>
+        </entry>
+      </file>
     </leaf>
   </component>
   <component name="FindInProjectRecents">
     <findStrings>
-      <find>@@permissions</find>
-      <find>c</find>
-      <find>ce</find>
       <find>che</find>
       <find>check_p</find>
       <find>check_permission</find>
@@ -149,12 +148,15 @@
       <find>def get_marker_type</find>
       <find>sqlite3</find>
       <find>sqli</find>
+      <find>show_public_only</find>
+      <find>UserSession</find>
+      <find>User</find>
     </findStrings>
     <dirStrings>
       <dir>$PROJECT_DIR$/app/controllers</dir>
       <dir>$PROJECT_DIR$/app/assets/javascripts</dir>
-      <dir>$PROJECT_DIR$/app</dir>
       <dir>$PROJECT_DIR$</dir>
+      <dir>$PROJECT_DIR$/app</dir>
     </dirStrings>
   </component>
   <component name="Git.Settings">
@@ -207,13 +209,13 @@
         <option value="$PROJECT_DIR$/kanjai.gemspec" />
         <option value="$PROJECT_DIR$/app/controllers/kanjai/site_controller.rb" />
         <option value="$PROJECT_DIR$/app/assets/javascripts/kanjai/admin/jquery.fileupload.js" />
-        <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
-        <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
         <option value="$PROJECT_DIR$/app/models/kanjai/page_template.rb" />
         <option value="$PROJECT_DIR$/app/views/kanjai/pages/show.html.erb" />
         <option value="$PROJECT_DIR$/lib/kanjai/template_generator.rb" />
         <option value="$PROJECT_DIR$/app/views/kanjai/admin/pages/content_types/_content.html.erb" />
         <option value="$PROJECT_DIR$/config/initializers/devise.rb" />
+        <option value="$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb" />
+        <option value="$PROJECT_DIR$/lib/kanjai/version.rb" />
       </list>
     </option>
   </component>
@@ -237,8 +239,6 @@
       <foldersAlwaysOnTop value="true" />
     </navigator>
     <panes>
-      <pane id="Scope" />
-      <pane id="RailsProjectView" />
       <pane id="ProjectPane">
         <subPane>
           <expand>
@@ -261,29 +261,18 @@
               <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
               <item name="kanjai" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="assets" type="462c0819:PsiDirectoryNode" />
-              <item name="javascripts" type="462c0819:PsiDirectoryNode" />
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
               <item name="kanjai" type="462c0819:PsiDirectoryNode" />
               <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="assets" type="462c0819:PsiDirectoryNode" />
-              <item name="javascripts" type="462c0819:PsiDirectoryNode" />
+              <item name="controllers" type="462c0819:PsiDirectoryNode" />
               <item name="kanjai" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
               <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
               <item name="kanjai" type="462c0819:PsiDirectoryNode" />
-              <item name="app" type="462c0819:PsiDirectoryNode" />
-              <item name="assets" type="462c0819:PsiDirectoryNode" />
-              <item name="javascripts" type="462c0819:PsiDirectoryNode" />
-              <item name="kanjai" type="462c0819:PsiDirectoryNode" />
-              <item name="admin" type="462c0819:PsiDirectoryNode" />
-            </path>
-            <path>
-              <item name="kanjai" type="b2602c69:ProjectViewProjectNode" />
-              <item name="kanjai" type="462c0819:PsiDirectoryNode" />
               <item name="config" type="462c0819:PsiDirectoryNode" />
             </path>
             <path>
@@ -307,6 +296,8 @@
           <select />
         </subPane>
       </pane>
+      <pane id="RailsProjectView" />
+      <pane id="Scope" />
     </panes>
   </component>
   <component name="PropertiesComponent">
@@ -578,15 +569,18 @@
       <workItem from="1527239274712" duration="965000" />
       <workItem from="1527250151106" duration="1359000" />
       <workItem from="1528795289630" duration="58000" />
-      <workItem from="1528797772730" duration="1671000" />
+      <workItem from="1528797772730" duration="2306000" />
+      <workItem from="1528983596909" duration="231000" />
+      <workItem from="1528984727408" duration="942000" />
+      <workItem from="1529067232509" duration="381000" />
     </task>
     <servers />
   </component>
   <component name="TimeTrackingManager">
-    <option name="totallyTimeSpent" value="43091000" />
+    <option name="totallyTimeSpent" value="45280000" />
   </component>
   <component name="ToolWindowManager">
-    <frame x="0" y="23" width="1280" height="730" extended-state="6" />
+    <frame x="0" y="23" width="1280" height="729" extended-state="6" />
     <editor active="true" />
     <layout>
       <window_info anchor="bottom" id="TODO" order="6" />
@@ -633,10 +627,10 @@
     </breakpoint-manager>
   </component>
   <component name="editorHistoryManager">
-    <entry file="file://$PROJECT_DIR$/.ruby-version">
+    <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state>
-          <caret column="5" lean-forward="true" selection-end-column="5" />
+        <state relative-caret-position="30">
+          <caret line="2" column="73" lean-forward="true" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="73" />
         </state>
       </provider>
     </entry>
@@ -871,13 +865,6 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
-      <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="1785">
-          <caret line="119" column="36" selection-start-line="119" selection-start-column="19" selection-end-line="119" selection-end-column="36" />
-        </state>
-      </provider>
-    </entry>
     <entry file="file://$PROJECT_DIR$/config/routes.rb">
       <provider selected="true" editor-type-id="text-editor">
         <state relative-caret-position="855">
@@ -964,27 +951,38 @@
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
+    <entry file="file://$PROJECT_DIR$/Gemfile.lock">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="15">
-          <caret line="1" column="13" selection-start-line="1" selection-start-column="13" selection-end-line="1" selection-end-column="13" />
+        <state relative-caret-position="795">
+          <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Gemfile">
-      <provider selected="true" editor-type-id="text-editor" />
+    <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="180">
+          <caret line="12" column="3" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
+        </state>
+      </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/Gemfile.lock">
+    <entry file="file://$PROJECT_DIR$/db/migrate/20160707115443_add_show_public_only_to_kanjai_pages.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="199">
-          <caret line="53" column="13" selection-start-line="53" selection-start-column="13" selection-end-line="53" selection-end-column="13" />
+        <state relative-caret-position="30">
+          <caret line="2" column="73" selection-start-line="2" selection-start-column="4" selection-end-line="2" selection-end-column="73" />
         </state>
       </provider>
     </entry>
-    <entry file="file://$PROJECT_DIR$/config/initializers/devise.rb">
+    <entry file="file://$PROJECT_DIR$/app/controllers/kanjai/pages_controller.rb">
       <provider selected="true" editor-type-id="text-editor">
-        <state relative-caret-position="166">
-          <caret line="12" column="3" selection-start-line="12" selection-start-column="3" selection-end-line="12" selection-end-column="3" />
+        <state relative-caret-position="495">
+          <caret line="33" column="34" lean-forward="true" selection-start-line="33" selection-start-column="34" selection-end-line="33" selection-end-column="34" />
+        </state>
+      </provider>
+    </entry>
+    <entry file="file://$PROJECT_DIR$/lib/kanjai/version.rb">
+      <provider selected="true" editor-type-id="text-editor">
+        <state relative-caret-position="15">
+          <caret line="1" column="19" selection-start-line="1" selection-start-column="19" selection-end-line="1" selection-end-column="19" />
         </state>
       </provider>
     </entry>
--- a/Gemfile.lock
View file @076ed7f
+++ b/Gemfile.lock
View file @076ed7f
 PATH
   remote: .
   specs:
-    kanjai (0.0.79)
+    kanjai (0.0.80)
       acts_as_list
       acts_as_tree
       aws-sdk (= 2.6.32)
--- a/app/controllers/kanjai/pages_controller.rb
View file @076ed7f
+++ b/app/controllers/kanjai/pages_controller.rb
View file @076ed7f
@@ -10,7 +10,7 @@ module Kanjai
       #expires_in 10.minutes, :public => true
       if @page_data
         if @page_data.page.private_flag == true
-          if !!UserSession
+          if class_exists?('UserSession')
             unless UserSession.current_user
               render :template => 'kanjai/shared/401', status: 401, layout: false and return
             end
@@ -19,7 +19,7 @@ module Kanjai
         #look - exist template or not for page
         if  @page_data.page.page_template
           use_cache = true
-          if !!UserSession
+          if class_exists?('UserSession')
             if UserSession.current_user
               use_cache = false
             end
@@ -27,7 +27,6 @@ module Kanjai
           if current_admin_user || @page_data.page.private_flag == true || use_cache == false
-            p @page_data
             layer = @page_data.page.page_template.get_html_content
             content_for_render = setTemplateContent(@page_data.page.page_template, layer, @page_data)
@@ -81,6 +80,13 @@ module Kanjai
     private
+    def class_exists?(class_name)
+      klass = Module.const_get(class_name)
+      return klass.is_a?(Class)
+    rescue NameError
+      return false
+    end
+
     def setTemplateContent(page_template, layer, page_data)
@@ -152,11 +158,11 @@ module Kanjai
             end
             layer.gsub!(marker, content)
           when '###CSRF_PARAM###'
-            if current_admin_user || (!!UserSession && UserSession.current_user)
+            if current_admin_user || (class_exists?('UserSession') && UserSession.current_user)
               layer.gsub!(marker, Rack::Utils.escape_html(request_forgery_protection_token))
             end
           when '###CSRF_TOKEN###'
-            if current_admin_user || (!!UserSession && UserSession.current_user)
+            if current_admin_user || (class_exists?('UserSession') && UserSession.current_user)
               layer.gsub!(marker, Rack::Utils.escape_html(form_authenticity_token))
             end
           when '###DOMAIN_NAME###'
@@ -198,5 +204,6 @@ module Kanjai
+
   end
 end
--- a/lib/kanjai/version.rb
View file @076ed7f
+++ b/lib/kanjai/version.rb
View file @076ed7f
 module Kanjai
-  VERSION = "0.0.79"
+  VERSION = "0.0.81"
 end