@lightdash/common 2.66.0 → 2.67.1
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/dist/cjs/.tsbuildinfo +1 -1
- package/dist/cjs/authorization/getUserAbilityBuilder.test.js +268 -27
- package/dist/cjs/authorization/getUserAbilityBuilder.test.js.map +1 -1
- package/dist/cjs/authorization/index.d.ts +6 -1
- package/dist/cjs/authorization/index.d.ts.map +1 -1
- package/dist/cjs/authorization/index.js +21 -4
- package/dist/cjs/authorization/index.js.map +1 -1
- package/dist/cjs/authorization/roleToScopeMapping.testUtils.d.ts +98 -98
- package/dist/cjs/authorization/scopeAbilityBuilder.d.ts +5 -0
- package/dist/cjs/authorization/scopeAbilityBuilder.d.ts.map +1 -1
- package/dist/cjs/authorization/scopeAbilityBuilder.js +11 -4
- package/dist/cjs/authorization/scopeAbilityBuilder.js.map +1 -1
- package/dist/esm/.tsbuildinfo +1 -1
- package/dist/esm/authorization/getUserAbilityBuilder.test.js +268 -27
- package/dist/esm/authorization/getUserAbilityBuilder.test.js.map +1 -1
- package/dist/esm/authorization/index.d.ts +6 -1
- package/dist/esm/authorization/index.d.ts.map +1 -1
- package/dist/esm/authorization/index.js +21 -4
- package/dist/esm/authorization/index.js.map +1 -1
- package/dist/esm/authorization/scopeAbilityBuilder.d.ts +5 -0
- package/dist/esm/authorization/scopeAbilityBuilder.d.ts.map +1 -1
- package/dist/esm/authorization/scopeAbilityBuilder.js +11 -4
- package/dist/esm/authorization/scopeAbilityBuilder.js.map +1 -1
- package/dist/types/.tsbuildinfo +1 -1
- package/dist/types/authorization/getUserAbilityBuilder.test.js +268 -27
- package/dist/types/authorization/getUserAbilityBuilder.test.js.map +1 -1
- package/dist/types/authorization/index.d.ts +6 -1
- package/dist/types/authorization/index.d.ts.map +1 -1
- package/dist/types/authorization/index.js +21 -4
- package/dist/types/authorization/index.js.map +1 -1
- package/dist/types/authorization/scopeAbilityBuilder.d.ts +5 -0
- package/dist/types/authorization/scopeAbilityBuilder.d.ts.map +1 -1
- package/dist/types/authorization/scopeAbilityBuilder.js +11 -4
- package/dist/types/authorization/scopeAbilityBuilder.js.map +1 -1
- package/package.json +1 -1
|
@@ -23,6 +23,11 @@ type BuilderOptions = {
|
|
|
23
23
|
allowedOrgRoles: string[];
|
|
24
24
|
};
|
|
25
25
|
};
|
|
26
|
+
/**
|
|
27
|
+
* Whether an omitted `manage:PersonalAccessToken` still inherits from config.
|
|
28
|
+
* False for every set when the org opted into authoritative PAT scopes, true otherwise.
|
|
29
|
+
*/
|
|
30
|
+
applyPatConfigFallback?: boolean;
|
|
26
31
|
} & OptionalIdContext;
|
|
27
32
|
/**
|
|
28
33
|
* Apply CASL abilities from scopes to a builder. Returns the list of scope
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scopeAbilityBuilder.d.ts","sourceRoot":"","sources":["../../../src/authorization/scopeAbilityBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIrD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;
|
|
1
|
+
{"version":3,"file":"scopeAbilityBuilder.d.ts","sourceRoot":"","sources":["../../../src/authorization/scopeAbilityBuilder.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,cAAc,EAAE,MAAM,eAAe,CAAC;AACpD,OAAO,EAAE,KAAK,WAAW,EAAE,MAAM,mBAAmB,CAAC;AAIrD,OAAO,EAAE,KAAK,aAAa,EAAE,MAAM,SAAS,CAAC;AAmE7C,KAAK,iBAAiB,GAChB;IACI,gBAAgB,EAAE,MAAM,CAAC;IACzB,WAAW,CAAC,EAAE,KAAK,CAAC;IACpB,WAAW,CAAC,EAAE,KAAK,CAAC;IACpB,wBAAwB,CAAC,EAAE,KAAK,CAAC;CACpC,GACD;IACI,WAAW,EAAE,MAAM,CAAC;IACpB,gBAAgB,CAAC,EAAE,KAAK,CAAC;IACzB,WAAW,CAAC,EAAE,WAAW,CAAC;IAC1B,wBAAwB,CAAC,EAAE,MAAM,GAAG,IAAI,CAAC;CAC5C,CAAC;AAER,KAAK,cAAc,GAAG;IAClB,QAAQ,EAAE,MAAM,CAAC;IACjB,MAAM,EAAE,MAAM,EAAE,CAAC;IACjB,YAAY,EAAE,OAAO,GAAG,SAAS,CAAC;IAClC,gBAAgB,CAAC,EAAE,MAAM,CAAC;IAC1B,iBAAiB,CAAC,EAAE;QAChB,GAAG,EAAE;YACD,OAAO,EAAE,OAAO,CAAC;YACjB,eAAe,EAAE,MAAM,EAAE,CAAC;SAC7B,CAAC;KACL,CAAC;IACF;;;OAGG;IACH,sBAAsB,CAAC,EAAE,OAAO,CAAC;CACpC,GAAG,iBAAiB,CAAC;AAEtB;;;;;;GAMG;AACH,eAAO,MAAM,sBAAsB,YACtB,cAAc,WACd,cAAc,CAAC,aAAa,CAAC,KACvC,MAAM,EAgBR,CAAC"}
|
|
@@ -3,6 +3,10 @@ Object.defineProperty(exports, "__esModule", { value: true });
|
|
|
3
3
|
exports.buildAbilityFromScopes = void 0;
|
|
4
4
|
const parseScopes_1 = require("./parseScopes");
|
|
5
5
|
const scopes_1 = require("./scopes");
|
|
6
|
+
/**
|
|
7
|
+
* Compatibility grant so a scope set doesn't strip already-granted PAT access.
|
|
8
|
+
* Skipped for every set while the org's PAT opt-in is authoritative, applied otherwise.
|
|
9
|
+
*/
|
|
6
10
|
const handlePatConfigApplication = (context, builder) => {
|
|
7
11
|
const { pat } = context?.permissionsConfig || {};
|
|
8
12
|
const hasPatRule = builder.rules.find((rule) => rule.action === 'manage' && rule.subject === 'PersonalAccessToken');
|
|
@@ -19,7 +23,7 @@ const handlePatConfigApplication = (context, builder) => {
|
|
|
19
23
|
* @param context - Context containing organization, project, user, and space access information
|
|
20
24
|
* @param builder - CASL ability builder to add permissions to
|
|
21
25
|
*/
|
|
22
|
-
const applyScopeAbilities = (context, builder) => {
|
|
26
|
+
const applyScopeAbilities = (context, builder, applyPatConfigFallback) => {
|
|
23
27
|
const scopeMap = (0, scopes_1.getAllScopeMap)({ isEnterprise: context.isEnterprise });
|
|
24
28
|
context.scopes.forEach((scopeName) => {
|
|
25
29
|
const scope = scopeMap[scopeName];
|
|
@@ -42,7 +46,9 @@ const applyScopeAbilities = (context, builder) => {
|
|
|
42
46
|
});
|
|
43
47
|
}
|
|
44
48
|
});
|
|
45
|
-
|
|
49
|
+
if (applyPatConfigFallback) {
|
|
50
|
+
handlePatConfigApplication(context, builder);
|
|
51
|
+
}
|
|
46
52
|
};
|
|
47
53
|
/**
|
|
48
54
|
* Apply CASL abilities from scopes to a builder. Returns the list of scope
|
|
@@ -52,17 +58,18 @@ const applyScopeAbilities = (context, builder) => {
|
|
|
52
58
|
* backend Winston logger).
|
|
53
59
|
*/
|
|
54
60
|
const buildAbilityFromScopes = (context, builder) => {
|
|
61
|
+
const { applyPatConfigFallback = true, ...scopeContext } = context;
|
|
55
62
|
const isEnterprise = context.isEnterprise ?? false;
|
|
56
63
|
const { valid, invalid } = (0, parseScopes_1.parseScopes)({
|
|
57
64
|
scopes: context.scopes,
|
|
58
65
|
isEnterprise,
|
|
59
66
|
});
|
|
60
67
|
const parsedContext = {
|
|
61
|
-
...
|
|
68
|
+
...scopeContext,
|
|
62
69
|
scopes: valid,
|
|
63
70
|
isEnterprise,
|
|
64
71
|
};
|
|
65
|
-
applyScopeAbilities(parsedContext, builder);
|
|
72
|
+
applyScopeAbilities(parsedContext, builder, applyPatConfigFallback);
|
|
66
73
|
return invalid;
|
|
67
74
|
};
|
|
68
75
|
exports.buildAbilityFromScopes = buildAbilityFromScopes;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"scopeAbilityBuilder.js","sourceRoot":"","sources":["../../../src/authorization/scopeAbilityBuilder.ts"],"names":[],"mappings":";;;AAGA,+CAAwD;AACxD,qCAA0C;AAG1C,MAAM,0BAA0B,GAAG,CAC/B,OAAqB,EACrB,OAAsC,EACxC,EAAE;IACA,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,iBAAiB,IAAI,EAAE,CAAC;IACjD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CACjC,CAAC,IAAI,EAAE,EAAE,CACL,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,OAAO,KAAK,qBAAqB,CACzE,CAAC;IAEF,IACI,CAAC,UAAU;QACX,GAAG,EAAE,OAAO;QACZ,OAAO,CAAC,gBAAgB;QACxB,GAAG,EAAE,eAAe,EAAE,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAC1D,CAAC;QACC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;IACjD,CAAC;AACL,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,mBAAmB,GAAG,CACxB,OAAqB,EACrB,OAAsC,
|
|
1
|
+
{"version":3,"file":"scopeAbilityBuilder.js","sourceRoot":"","sources":["../../../src/authorization/scopeAbilityBuilder.ts"],"names":[],"mappings":";;;AAGA,+CAAwD;AACxD,qCAA0C;AAG1C;;;GAGG;AACH,MAAM,0BAA0B,GAAG,CAC/B,OAAqB,EACrB,OAAsC,EACxC,EAAE;IACA,MAAM,EAAE,GAAG,EAAE,GAAG,OAAO,EAAE,iBAAiB,IAAI,EAAE,CAAC;IACjD,MAAM,UAAU,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CACjC,CAAC,IAAI,EAAE,EAAE,CACL,IAAI,CAAC,MAAM,KAAK,QAAQ,IAAI,IAAI,CAAC,OAAO,KAAK,qBAAqB,CACzE,CAAC;IAEF,IACI,CAAC,UAAU;QACX,GAAG,EAAE,OAAO;QACZ,OAAO,CAAC,gBAAgB;QACxB,GAAG,EAAE,eAAe,EAAE,QAAQ,CAAC,OAAO,CAAC,gBAAgB,CAAC,EAC1D,CAAC;QACC,OAAO,CAAC,GAAG,CAAC,QAAQ,EAAE,qBAAqB,CAAC,CAAC;IACjD,CAAC;AACL,CAAC,CAAC;AAEF;;;;;GAKG;AACH,MAAM,mBAAmB,GAAG,CACxB,OAAqB,EACrB,OAAsC,EACtC,sBAA+B,EAC3B,EAAE;IACN,MAAM,QAAQ,GAAG,IAAA,uBAAc,EAAC,EAAE,YAAY,EAAE,OAAO,CAAC,YAAY,EAAE,CAAC,CAAC;IAExE,OAAO,CAAC,MAAM,CAAC,OAAO,CAAC,CAAC,SAAS,EAAE,EAAE;QACjC,MAAM,KAAK,GAAG,QAAQ,CAAC,SAAS,CAAC,CAAC;QAElC,IAAI,CAAC,KAAK;YAAE,OAAO;QAEnB,MAAM,CAAC,MAAM,EAAE,OAAO,CAAC,GAAG,IAAA,wBAAU,EAAC,SAAS,CAAC,CAAC;QAChD,MAAM,cAAc,GAAG,KAAK,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;QAEpD,0DAA0D;QAC1D,oEAAoE;QACpE,4CAA4C;QAC5C,IAAI,cAAc,KAAK,IAAI;YAAE,OAAO;QAEpC,4CAA4C;QAC5C,IAAI,cAAc,CAAC,MAAM,KAAK,CAAC,EAAE,CAAC;YAC9B,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,CAAC,CAAC;QACjC,CAAC;aAAM,CAAC;YACJ,cAAc,CAAC,OAAO,CAAC,CAAC,UAAU,EAAE,EAAE;gBAClC,OAAO,CAAC,GAAG,CAAC,MAAM,EAAE,OAAO,EAAE,UAAU,CAAC,CAAC;YAC7C,CAAC,CAAC,CAAC;QACP,CAAC;IACL,CAAC,CAAC,CAAC;IAEH,IAAI,sBAAsB,EAAE,CAAC;QACzB,0BAA0B,CAAC,OAAO,EAAE,OAAO,CAAC,CAAC;IACjD,CAAC;AACL,CAAC,CAAC;AAkCF;;;;;;GAMG;AACI,MAAM,sBAAsB,GAAG,CAClC,OAAuB,EACvB,OAAsC,EAC9B,EAAE;IACV,MAAM,EAAE,sBAAsB,GAAG,IAAI,EAAE,GAAG,YAAY,EAAE,GAAG,OAAO,CAAC;IACnE,MAAM,YAAY,GAAG,OAAO,CAAC,YAAY,IAAI,KAAK,CAAC;IACnD,MAAM,EAAE,KAAK,EAAE,OAAO,EAAE,GAAG,IAAA,yBAAW,EAAC;QACnC,MAAM,EAAE,OAAO,CAAC,MAAM;QACtB,YAAY;KACf,CAAC,CAAC;IACH,MAAM,aAAa,GAAG;QAClB,GAAG,YAAY;QACf,MAAM,EAAE,KAAK;QACb,YAAY;KACf,CAAC;IAEF,mBAAmB,CAAC,aAAa,EAAE,OAAO,EAAE,sBAAsB,CAAC,CAAC;IAEpE,OAAO,OAAO,CAAC;AACnB,CAAC,CAAC;AAnBW,QAAA,sBAAsB,GAAtB,sBAAsB,CAmBjC"}
|