forest_liana 7.0.0.beta.2 → 7.0.0.beta.6

data/spec/services/forest_liana/line_stat_getter_spec.rb

@@ -1,12 +1,21 @@
 module ForestLiana
   describe LineStatGetter do
+    let(:rendering_id) { 13 }
+    let(:user) { { 'id' => '1', 'rendering_id' => rendering_id } }
+    let(:scopes) { { } }
+
+    before(:each) do
+      ForestLiana::ScopeManager.invalidate_scope_cache(rendering_id)
+      allow(ForestLiana::ScopeManager).to receive(:fetch_scopes).and_return(scopes)
+    end
+
     describe 'Check client_timezone function' do
       describe 'with a SQLite database' do
         it 'should return false' do
           expect(LineStatGetter.new(Owner, {
             timezone: "Europe/Paris",
             aggregate: "Count",
-          }).client_timezone).to eq(false)
+          }, user).client_timezone).to eq(false)
         end
       end
 
@@ -16,7 +25,7 @@ module ForestLiana
           expect(LineStatGetter.new(Owner, {
             timezone: "Europe/Paris",
             aggregate: "Count",
-          }).client_timezone).to eq('Europe/Paris')
+          }, user).client_timezone).to eq('Europe/Paris')
         end
       end
     end
@@ -25,7 +34,6 @@ module ForestLiana
       describe 'Using a Count aggregation' do
         describe 'Using a Week time range' do
           it 'should return consistent data based on monday as week_start ' do
-            
             # Week should start on monday
             # 08-05-2021 was a Saturday
             Owner.create(name: 'Michel', hired_at: Date.parse('08-05-2021'));
@@ -38,8 +46,8 @@ module ForestLiana
               aggregate: "Count",
               time_range: "Week",
               group_by_date_field: "hired_at",
-            }).perform
-            
+            }, user).perform
+
             expect(stat.value.find { |item| item[:label] == "W18-2021" }[:values][:value]).to eq(2)
             expect(stat.value.find { |item| item[:label] == "W19-2021" }[:values][:value]).to eq(2)
           end
@@ -47,4 +55,4 @@ module ForestLiana
       end
     end
   end
-end
+end

data/spec/services/forest_liana/permissions_checker_acl_disabled_spec.rb

@@ -75,7 +75,7 @@ module ForestLiana
                 "users" => nil
               },
             },
-            "scope" => nil
+            "segments" => nil
           },
           "no_rights_collection" => {
             "collection" => {
@@ -93,7 +93,7 @@ module ForestLiana
                 "users" => nil
               }
             },
-            "scope" => nil
+            "segments" => nil
           },
         },
         "meta" => {
@@ -146,6 +146,8 @@ module ForestLiana
 
       context 'with permissions coming from 2 different renderings' do
         let(:collection_name) { 'custom' }
+
+        let(:segments_permissions) { nil }
         let(:api_permissions_rendering_1) {
           {
             "data" => {
@@ -160,7 +162,7 @@ module ForestLiana
                   "searchToEdit" => true
                 },
                 "actions" => { },
-                "scope" => nil
+                "segments" => segments_permissions
               },
             },
             "meta" => {
@@ -189,12 +191,11 @@ module ForestLiana
       end
     end
 
-
-    context 'scopes cache' do
+    context 'renderings cache' do
       let(:fake_ressource) { collection_name }
       let(:rendering_id) { 1 }
       let(:collection_name) { 'custom' }
-      let(:scope_permissions) { { rendering_id => { 'custom' => nil } } }
+      let(:segments_permissions) { { rendering_id => { 'custom' => nil } } }
       let(:api_permissions) {
         {
           "data" => {
@@ -209,7 +210,7 @@ module ForestLiana
                 "searchToEdit" => true
               },
               "actions" => { },
-              "scope" => nil
+              "segments" => nil
             },
           },
           "meta" => {
@@ -217,11 +218,11 @@ module ForestLiana
           }
         }
       }
-      let(:api_permissions_scope_only) {
+      let(:api_permissions_rendering_only) {
         {
           "data" => {
             'collections' => { },
-            'renderings' => scope_permissions
+            'renderings' => segments_permissions
           },
           "meta" => {
             "rolesACLActivated" => false
@@ -233,13 +234,13 @@ module ForestLiana
         # clones is called to duplicate the returned value and not use to same (which results in an error
         # as the permissions is edited through the formatter)
         allow(ForestLiana::PermissionsGetter).to receive(:get_permissions_for_rendering).with(rendering_id) { api_permissions.clone }
-        allow(ForestLiana::PermissionsGetter).to receive(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true).and_return(api_permissions_scope_only)
+        allow(ForestLiana::PermissionsGetter).to receive(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true).and_return(api_permissions_rendering_only)
       end
 
       context 'when checking once for authorization' do
         context 'when checking browseEnabled' do
           context 'when expiration value is set to its default' do
-            it 'should not call the API to refresh the scopes cache' do
+            it 'should not call the API to refresh the renderings cache' do
               described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
 
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
@@ -254,7 +255,7 @@ module ForestLiana
               described_class.empty_cache
             end
 
-            it 'should call the API to refresh the scopes cache' do
+            it 'should call the API to refresh the renderings cache' do
               described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
 
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
@@ -263,7 +264,7 @@ module ForestLiana
           end
         end
 
-        # Only browse permission requires scopes
+        # Only browse permission requires segments
         context 'when checking exportEnabled' do
           context 'when expiration value is set in the past' do
             before do
@@ -273,7 +274,7 @@ module ForestLiana
             end
           end
 
-          it 'should NOT call the API to refresh the scopes cache' do
+          it 'should NOT call the API to refresh the renderings cache' do
             described_class.new(fake_ressource, 'exportEnabled', rendering_id, user_id: user_id).is_authorized?
 
             expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
@@ -284,8 +285,8 @@ module ForestLiana
 
       context 'when checking twice for authorization' do
         context 'on the same rendering' do
-          context 'when scopes permission has NOT expired' do
-            it 'should NOT call the API to refresh the scopes permissions' do
+          context 'when renderings permission has NOT expired' do
+            it 'should NOT call the API to refresh the renderings permissions' do
               described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
               described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
 
@@ -294,14 +295,14 @@ module ForestLiana
             end
           end
 
-          context 'when scopes permission has expired' do
+          context 'when renderings permission has expired' do
             before do
               allow(ENV).to receive(:[]).with('FOREST_PERMISSIONS_EXPIRATION_IN_SECONDS').and_return('-1')
               # Needed to enforce ENV stub
               described_class.empty_cache
             end
 
-            it 'should call the API to refresh the scopes permissions' do
+            it 'should call the API to refresh the renderings permissions' do
               described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
               described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
 
@@ -313,7 +314,7 @@ module ForestLiana
 
         context 'on two different renderings' do
           let(:other_rendering_id) { 2 }
-          let(:api_permissions_scope_only) {
+          let(:api_permissions_rendering_only) {
             {
               "data" => {
                 'collections' => { },
@@ -330,10 +331,10 @@ module ForestLiana
 
           before do
             allow(ForestLiana::PermissionsGetter).to receive(:get_permissions_for_rendering).with(other_rendering_id).and_return(api_permissions_copy)
-            allow(ForestLiana::PermissionsGetter).to receive(:get_permissions_for_rendering).with(other_rendering_id, rendering_specific_only: true).and_return(api_permissions_scope_only)
+            allow(ForestLiana::PermissionsGetter).to receive(:get_permissions_for_rendering).with(other_rendering_id, rendering_specific_only: true).and_return(api_permissions_rendering_only)
           end
 
-          it 'should not call the API to refresh the scopes permissions' do
+          it 'should not call the API to refresh the rederings permissions' do
             described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
             described_class.new(fake_ressource, 'browseEnabled', other_rendering_id, user_id: user_id).is_authorized?
 
@@ -350,7 +351,7 @@ module ForestLiana
       # Resource is only used to retrieve the collection name as it's stubbed it does not
       # need to be defined
       let(:fake_ressource) { collection_name }
-      let(:default_rendering_id) { nil }
+      let(:default_rendering_id) { 1 }
       let(:api_permissions) { default_api_permissions }
       let(:collection_name) { 'all_rights_collection' }
 
@@ -380,14 +381,14 @@ module ForestLiana
         describe 'browseEnabled permission' do
           let(:collection_name) { 'custom' }
           subject { described_class.new(fake_ressource, 'browseEnabled', default_rendering_id, user_id: user_id) }
-          let(:scope_permissions) { nil }
+          let(:segments_permissions) { nil }
           let(:default_api_permissions) {
             {
               "data" => {
                 "custom" => {
                   "collection" => collection_permissions,
                   "actions" => { },
-                  "scope" => scope_permissions
+                  "segments" => segments_permissions
                 },
               },
               "meta" => {
@@ -480,6 +481,26 @@ module ForestLiana
               end
             end
 
+            context 'when segments are defined' do
+              let(:segments_permissions) { ['SELECT * FROM products;', 'SELECT * FROM sellers;'] }
+              let(:collection_list_parameters) { { :user_id => "1", :segmentQuery => segmentQuery } }
+
+              context 'when segments are passing validation' do
+                  let(:segmentQuery) { 'SELECT * FROM products;' }
+                  it 'should return true' do
+                    expect(subject.is_authorized?).to be true
+                  end
+              end
+
+              context 'when segments are NOT passing validation' do
+                let(:segmentQuery) { 'SELECT * FROM rockets WHERE name = "Starship";' }
+                it 'should return false' do
+                  expect(subject.is_authorized?).to be false
+                end
+              end
+
+            end
+
             context 'when user has not the required permission' do
               let(:collection_permissions) {
                 {
@@ -497,53 +518,6 @@ module ForestLiana
                 expect(subject.is_authorized?).to be false
               end
             end
-
-            context 'when scopes are defined' do
-              let(:scope_permissions) { { 'dynamicScopesValues' => {}, 'filter' => { 'aggregator' => 'and', 'conditions' => [condition] } }}
-              let(:collection_list_parameters) { { :user_id => "1", :filters => JSON.generate(condition) } }
-
-              context 'when scopes are passing validation' do
-                context 'when scope value is a string' do
-                  let(:condition) { { 'field' => 'field_1', 'operator' => 'equal', 'value' => true } }
-
-                  it 'should return true' do
-                    expect(subject.is_authorized?).to be true
-                  end
-                end
-
-                context 'when scope value is a boolean' do
-                  let(:condition) { { 'field' => 'field_1', 'operator' => 'equal', 'value' => 'true' } }
-
-                  it 'should return true' do
-                    expect(subject.is_authorized?).to be true
-                  end
-                end
-              end
-
-              context 'when scopes are NOT passing validation' do
-                let(:condition) { { 'field' => 'field_1', 'operator' => 'equal', 'value' => true } }
-                let(:other_condition) {
-                  {
-                    aggregator: 'and',
-                    conditions: [
-                      { field: 'name', value: 'john', operator: 'equal' },
-                      { field: 'price', value: '2500', operator: 'equal' }
-                    ]
-                  }
-                }
-                let(:collection_list_parameters) {
-                  {
-                    :user_id => "1",
-                    :filters => JSON.generate(other_condition)
-                  }
-                }
-
-
-                it 'should return false' do
-                  expect(subject.is_authorized?).to be false
-                end
-              end
-            end
           end
         end
 

data/spec/services/forest_liana/permissions_checker_acl_enabled_spec.rb

@@ -50,7 +50,8 @@ module ForestLiana
         })
       ]
     }
-    let(:scope_permissions) { nil }
+    let(:default_rendering_id) { 1 }
+    let(:segments_permissions) { { default_rendering_id => { 'segments' => nil } } }
     let(:default_api_permissions) {
       {
         "data" => {
@@ -116,14 +117,16 @@ module ForestLiana
               }
             },
           },
-          'renderings' => scope_permissions
+          'renderings' => segments_permissions
+        },
+        "stats" => {
+          "queries"=>[],
         },
         "meta" => {
           "rolesACLActivated" => true
         }
       }
     }
-    let(:default_rendering_id) { 1 }
 
     before do
       allow(ForestLiana).to receive(:apimap).and_return(schema)
@@ -174,7 +177,7 @@ module ForestLiana
           end
 
           let(:collection_name) { 'custom' }
-          let(:scope_permissions) { { default_rendering_id => { 'custom' => nil }, 2 => { 'custom' => nil } } }
+          let(:segments_permissions) { { default_rendering_id => { 'custom' => nil }, 2 => { 'custom' => nil } } }
           let(:api_permissions_rendering_1) {
             {
               "data" => {
@@ -191,7 +194,7 @@ module ForestLiana
                     "actions" => { }
                   },
                 },
-                'renderings' => scope_permissions
+                'renderings' => segments_permissions
               },
               "meta" => {
                 "rolesACLActivated" => true
@@ -242,10 +245,10 @@ module ForestLiana
         end
       end
 
-      context 'scopes cache' do
+      context 'renderings cache' do
         let(:rendering_id) { 1 }
         let(:collection_name) { 'custom' }
-        let(:scope_permissions) { { rendering_id => { 'custom' => nil } } }
+        let(:segments_permissions) { { rendering_id => { 'custom' => nil } } }
         let(:api_permissions) {
           {
             "data" => {
@@ -262,18 +265,18 @@ module ForestLiana
                   "actions" => { }
                 },
               },
-              'renderings' => scope_permissions
+              'renderings' => segments_permissions
             },
             "meta" => {
               "rolesACLActivated" => true
             }
           }
         }
-        let(:api_permissions_scope_only) {
+        let(:api_permissions_rendering_only) {
           {
             "data" => {
               'collections' => { },
-              'renderings' => scope_permissions
+              'renderings' => segments_permissions
             },
             "meta" => {
               "rolesACLActivated" => true
@@ -283,13 +286,13 @@ module ForestLiana
 
         before do
           allow(ForestLiana::PermissionsGetter).to receive(:get_permissions_for_rendering).with(rendering_id).and_return(api_permissions)
-          allow(ForestLiana::PermissionsGetter).to receive(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true).and_return(api_permissions_scope_only)
+          allow(ForestLiana::PermissionsGetter).to receive(:get_permissions_for_rendering).with(rendering_id, rendering_specific_only: true).and_return(api_permissions_rendering_only)
         end
 
         context 'when checking once for authorization' do
           context 'when checking browseEnabled' do
             context 'when expiration value is set to its default' do
-              it 'should not call the API to refresh the scopes cache' do
+              it 'should not call the API to refresh the renderings cache' do
                 described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
 
                 expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
@@ -304,7 +307,7 @@ module ForestLiana
                 described_class.empty_cache
               end
 
-              it 'should call the API to refresh the scopes cache' do
+              it 'should call the API to refresh the renderings cache' do
                 described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
 
                 expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
@@ -313,7 +316,7 @@ module ForestLiana
             end
           end
 
-          # Only browse permission requires scopes
+          # Only browse permission requires segments
           context 'when checking exportEnabled' do
             context 'when expiration value is set in the past' do
               before do
@@ -323,7 +326,7 @@ module ForestLiana
               end
             end
 
-            it 'should NOT call the API to refresh the scopes cache' do
+            it 'should NOT call the API to refresh the rendering cache' do
               described_class.new(fake_ressource, 'exportEnabled', rendering_id, user_id: user_id).is_authorized?
 
               expect(ForestLiana::PermissionsGetter).to have_received(:get_permissions_for_rendering).with(rendering_id).once
@@ -334,8 +337,8 @@ module ForestLiana
 
         context 'when checking twice for authorization' do
           context 'on the same rendering' do
-            context 'when scopes permission has NOT expired' do
-              it 'should NOT call the API to refresh the scopes permissions' do
+            context 'when rendering permission has NOT expired' do
+              it 'should NOT call the API to refresh the rendering permissions' do
                 described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
                 described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
 
@@ -344,14 +347,14 @@ module ForestLiana
               end
             end
 
-            context 'when scopes permission has expired' do
+            context 'when renderings permission has expired' do
               before do
                 allow(ENV).to receive(:[]).with('FOREST_PERMISSIONS_EXPIRATION_IN_SECONDS').and_return('-1')
                 # Needed to enforce ENV stub
                 described_class.empty_cache
               end
 
-              it 'should call the API to refresh the scopes permissions' do
+              it 'should call the API to refresh the rendering permissions' do
                 described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
                 described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
 
@@ -363,14 +366,17 @@ module ForestLiana
 
           context 'on two different renderings' do
             let(:other_rendering_id) { 2 }
-            let(:api_permissions_scope_only) {
+            let(:api_permissions_rendering_only) {
               {
                 "data" => {
                   'collections' => { },
                   'renderings' => {
-                    '2' => { 'custom' => nil }
+                    other_rendering_id => { 'custom' => nil }
                   }
                 },
+                "stats" => {
+                  "somestats" => [],
+                },
                 "meta" => {
                   "rolesACLActivated" => true
                 }
@@ -378,10 +384,10 @@ module ForestLiana
             }
 
             before do
-              allow(ForestLiana::PermissionsGetter).to receive(:get_permissions_for_rendering).with(other_rendering_id, rendering_specific_only: true).and_return(api_permissions_scope_only)
+              allow(ForestLiana::PermissionsGetter).to receive(:get_permissions_for_rendering).with(other_rendering_id, rendering_specific_only: true).and_return(api_permissions_rendering_only)
             end
 
-            it 'should call the API to refresh the scopes permissions' do
+            it 'should call the API to refresh the rendering permissions' do
               described_class.new(fake_ressource, 'browseEnabled', rendering_id, user_id: user_id).is_authorized?
               described_class.new(fake_ressource, 'browseEnabled', other_rendering_id, user_id: user_id).is_authorized?
 
@@ -452,58 +458,28 @@ module ForestLiana
               end
             end
 
-            context 'when scopes are defined' do
+            context 'when segments are defined' do
               let(:default_rendering_id) { 1 }
-              let(:scope_permissions) {
+              let(:segments_permissions) {
                 {
                   default_rendering_id => {
                     collection_name => {
-                      'scope' => {
-                        'dynamicScopesValues' => {},
-                        'filter' => { 'aggregator' => 'and', 'conditions' => [condition] }
-                      }
+                      'segments' => ['SELECT * FROM products;', 'SELECT * FROM sellers;']
                     }
                   }
                 }
               }
-              let(:collection_list_parameters) { { :user_id => "1", :filters => JSON.generate(condition) } }
+              let(:collection_list_parameters) { { :user_id => "1", :segmentQuery => segmentQuery } }
 
-              context 'when scopes are passing validation' do
-                context 'when scope value is a string' do
-                  let(:condition) { { 'field' => 'field_1', 'operator' => 'equal', 'value' => true } }
-
-                  it 'should return true' do
-                    expect(subject.is_authorized?).to be true
-                  end
-                end
-
-                context 'when scope value is a boolean' do
-                  let(:condition) { { 'field' => 'field_1', 'operator' => 'equal', 'value' => 'true' } }
-
-                  it 'should return true' do
-                    expect(subject.is_authorized?).to be true
-                  end
+              context 'when segments are passing validation' do
+                let(:segmentQuery) { 'SELECT * FROM products;' }
+                it 'should return true' do
+                  expect(subject.is_authorized?).to be true
                 end
               end
 
-              context 'when scopes are NOT passing validation' do
-                let(:condition) { { 'field' => 'field_1', 'operator' => 'equal', 'value' => true } }
-                let(:other_condition) {
-                  {
-                    aggregator: 'and',
-                    conditions: [
-                      { field: 'name', value: 'john', operator: 'equal' },
-                      { field: 'price', value: '2500', operator: 'equal' }
-                    ]
-                  }
-                }
-                let(:collection_list_parameters) {
-                  {
-                    :user_id => "1",
-                    :filters => JSON.generate(other_condition)
-                  }
-                }
-
+              context 'when segments are NOT passing validation' do
+                let(:segmentQuery) { 'SELECT * FROM rockets WHERE name = "Starship";' }
                 it 'should return false' do
                   expect(subject.is_authorized?).to be false
                 end