Skip to content

Commit 89c78ec

Browse files
authored
fix: access_policy is not applied for JS models (#9865)
1 parent 5246fa0 commit 89c78ec

File tree

2 files changed

+5
-2
lines changed

2 files changed

+5
-2
lines changed

packages/cubejs-schema-compiler/src/compiler/CubeSymbols.ts

Lines changed: 4 additions & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -121,6 +121,8 @@ export interface CubeDefinition {
121121
pre_aggregations?: Record<string, PreAggregationDefinitionRollup | PreAggregationDefinitionOriginalSql>;
122122
joins?: Record<string, JoinDefinition>;
123123
accessPolicy?: any[];
124+
// eslint-disable-next-line camelcase
125+
access_policy?: any[];
124126
folders?: any[];
125127
includes?: any;
126128
excludes?: any;
@@ -346,7 +348,8 @@ export class CubeSymbols {
346348
get accessPolicy() {
347349
if (!accessPolicy) {
348350
const parentAcls = cubeDefinition.extends ? R.clone(super.accessPolicy) : [];
349-
accessPolicy = [...(parentAcls || []), ...(cubeDefinition.accessPolicy || [])];
351+
const localAccessPolicy = cubeDefinition.accessPolicy || cubeDefinition.access_policy;
352+
accessPolicy = [...(parentAcls || []), ...(localAccessPolicy || [])];
350353
}
351354
// Schema validator expects accessPolicy to be not empty if defined
352355
if (accessPolicy.length) {

packages/cubejs-testing/birdbox-fixtures/rbac/model/cubes/orders.js

Lines changed: 1 addition & 1 deletion
Original file line numberDiff line numberDiff line change
@@ -29,7 +29,7 @@ cube('orders', {
2929
},
3030
},
3131

32-
accessPolicy: [
32+
access_policy: [
3333
{
3434
role: '*',
3535
memberLevel: {

0 commit comments

Comments
 (0)