@balena/pinejs 19.1.0-build-compile-auth-f615d178643e42fe5cd03afca19cef8d2867887d-2 → 19.1.0-build-compile-auth-dc02184d5b6c707f41953d4711369bda31db2955-2

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.
Files changed (7) hide show
  1. package/.versionbot/CHANGELOG.yml +2 -2
  2. package/CHANGELOG.md +1 -1
  3. package/out/sbvr-api/compile-auth.d.ts +1 -7
  4. package/out/sbvr-api/compile-auth.js +19 -7
  5. package/out/sbvr-api/compile-auth.js.map +1 -1
  6. package/package.json +3 -3
  7. package/src/sbvr-api/compile-auth.ts +25 -17
package/.versionbot/CHANGELOG.yml CHANGED
@@ -1,6 +1,6 @@
1
1
  - commits:
2
2
  - subject: Add getAuthCompiler for building permissions
3
- hash: f615d178643e42fe5cd03afca19cef8d2867887d
3
+ hash: dc02184d5b6c707f41953d4711369bda31db2955
4
4
  body: ""
5
5
  footer:
6
6
  Change-type: minor
@@ -9,7 +9,7 @@
9
9
  nested: []
10
10
  version: 19.1.0
11
11
  title: ""
12
- date: 2024-09-30T23:35:37.818Z
12
+ date: 2024-10-02T13:24:09.330Z
13
13
  - commits:
14
14
  - subject: Update dependency grunt-webpack to v7
15
15
  hash: 178c06f03da15786e2447190ed7b2df36d5eb0d2
package/CHANGELOG.md CHANGED
@@ -5,7 +5,7 @@ automatically by Versionist. DO NOT EDIT THIS FILE MANUALLY!
5
5
  This project adheres to [Semantic Versioning](http://semver.org/).
6
6
 
7
7
  # v19.1.0
8
- ## (2024-09-30)
8
+ ## (2024-10-02)
9
9
 
10
10
  * Add getAuthCompiler for building permissions [Otavio Jacobi]
11
11
 
package/out/sbvr-api/compile-auth.d.ts CHANGED
@@ -3,11 +3,5 @@ export declare const getAuthCompiler: <M extends { [key in keyof M]: Resource; }
3
3
  pinejsClient: PinejsClientCore<M>;
4
4
  modelName: string;
5
5
  }) => {
6
- compileAuth: <TResource extends string & keyof M>({ resource, access, options, }: {
7
- resource: TResource;
8
- access: string;
9
- options?: {
10
- $filter: Filter<M[TResource]["Read"]>;
11
- };
12
- }) => string;
6
+ compileAuth: <TResource extends string & keyof M>(resource: TResource, access: string, $filter?: Filter<M[TResource]["Read"]>) => string;
13
7
  };
package/out/sbvr-api/compile-auth.js CHANGED
@@ -1,10 +1,17 @@
1
1
  "use strict";
2
2
  Object.defineProperty(exports, "__esModule", { value: true });
3
3
  exports.getAuthCompiler = void 0;
4
- const asPermission = (compiledFilter) => {
5
- return compiledFilter
6
- .split('$filter=')[1]
7
- .replace(/Auth\.canAccess\(\)/g, 'canAccess()');
4
+ const asPermission = (url) => {
5
+ const queryParamsIndex = url.indexOf('?');
6
+ if (queryParamsIndex === -1) {
7
+ throw new Error(`Failed to compile permissions for url: ${url}`);
8
+ }
9
+ const queryParams = new URLSearchParams(url.slice(queryParamsIndex + 1));
10
+ const compiledFilter = queryParams.get('$filter');
11
+ if (compiledFilter == null) {
12
+ throw new Error(`Failed to find $filter permissions for url: ${url}`);
13
+ }
14
+ return compiledFilter.replace(/Auth\.canAccess\(\)/g, 'canAccess()');
8
15
  };
9
16
  const getAuthCompiler = ({ pinejsClient, modelName, }) => {
10
17
  if (pinejsClient == null) {
@@ -14,15 +21,20 @@ const getAuthCompiler = ({ pinejsClient, modelName, }) => {
14
21
  throw new Error('The modelName must be specified.');
15
22
  }
16
23
  return {
17
- compileAuth: ({ resource, access, options, }) => {
24
+ compileAuth: (resource, access, $filter) => {
18
25
  if (resource == null) {
19
26
  throw new Error('The resource must be specified.');
20
27
  }
21
28
  if (typeof access !== 'string') {
22
29
  throw new Error(`The access property must be a string.`);
23
30
  }
24
- const filter = options != null
25
- ? `?${asPermission(decodeURIComponent(pinejsClient.compile({ resource, options })))}`
31
+ const filter = $filter != null
32
+ ? `?${asPermission(pinejsClient.compile({
33
+ resource,
34
+ options: {
35
+ $filter,
36
+ },
37
+ }))}`
26
38
  : '';
27
39
  return `${modelName}.${resource}.${access}${filter}`;
28
40
  },
package/out/sbvr-api/compile-auth.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"compile-auth.js","sourceRoot":"","sources":["../../src/sbvr-api/compile-auth.ts"],"names":[],"mappings":";;;AAEA,MAAM,YAAY,GAAG,CAAC,cAAsB,EAAU,EAAE;IACvD,OAAO,cAAc;SACnB,KAAK,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC;SACpB,OAAO,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC;AAClD,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,CAA2C,EACzE,YAAY,EACZ,SAAS,GAIT,EAAE,EAAE;IACJ,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACrD,CAAC;IAED,OAAO;QACN,WAAW,EAAE,CAAqC,EACjD,QAAQ,EACR,MAAM,EACN,OAAO,GAOP,EAAU,EAAE;YACZ,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;YACpD,CAAC;YAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;YAC1D,CAAC;YAED,MAAM,MAAM,GACX,OAAO,IAAI,IAAI;gBACd,CAAC,CAAC,IAAI,YAAY,CAAC,kBAAkB,CAAC,YAAY,CAAC,OAAO,CAAC,EAAE,QAAQ,EAAE,OAAO,EAAE,CAAC,CAAC,CAAC,EAAE;gBACrF,CAAC,CAAC,EAAE,CAAC;YACP,OAAO,GAAG,SAAS,IAAI,QAAQ,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC;QACtD,CAAC;KACD,CAAC;AACH,CAAC,CAAC;AA1CW,QAAA,eAAe,mBA0C1B"}
1
+ {"version":3,"file":"compile-auth.js","sourceRoot":"","sources":["../../src/sbvr-api/compile-auth.ts"],"names":[],"mappings":";;;AAEA,MAAM,YAAY,GAAG,CAAC,GAAW,EAAU,EAAE;IAC5C,MAAM,gBAAgB,GAAG,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1C,IAAI,gBAAgB,KAAK,CAAC,CAAC,EAAE,CAAC;QAC7B,MAAM,IAAI,KAAK,CAAC,0CAA0C,GAAG,EAAE,CAAC,CAAC;IAClE,CAAC;IACD,MAAM,WAAW,GAAG,IAAI,eAAe,CAAC,GAAG,CAAC,KAAK,CAAC,gBAAgB,GAAG,CAAC,CAAC,CAAC,CAAC;IACzE,MAAM,cAAc,GAAG,WAAW,CAAC,GAAG,CAAC,SAAS,CAAC,CAAC;IAClD,IAAI,cAAc,IAAI,IAAI,EAAE,CAAC;QAC5B,MAAM,IAAI,KAAK,CAAC,+CAA+C,GAAG,EAAE,CAAC,CAAC;IACvE,CAAC;IACD,OAAO,cAAc,CAAC,OAAO,CAAC,sBAAsB,EAAE,aAAa,CAAC,CAAC;AACtE,CAAC,CAAC;AAEK,MAAM,eAAe,GAAG,CAA2C,EACzE,YAAY,EACZ,SAAS,GAIT,EAAE,EAAE;IACJ,IAAI,YAAY,IAAI,IAAI,EAAE,CAAC;QAC1B,MAAM,IAAI,KAAK,CAAC,qCAAqC,CAAC,CAAC;IACxD,CAAC;IAED,IAAI,SAAS,IAAI,IAAI,EAAE,CAAC;QACvB,MAAM,IAAI,KAAK,CAAC,kCAAkC,CAAC,CAAC;IACrD,CAAC;IAED,OAAO;QACN,WAAW,EAAE,CACZ,QAAmB,EACnB,MAAc,EACd,OAAsC,EAC7B,EAAE;YACX,IAAI,QAAQ,IAAI,IAAI,EAAE,CAAC;gBACtB,MAAM,IAAI,KAAK,CAAC,iCAAiC,CAAC,CAAC;YACpD,CAAC;YAED,IAAI,OAAO,MAAM,KAAK,QAAQ,EAAE,CAAC;gBAChC,MAAM,IAAI,KAAK,CAAC,uCAAuC,CAAC,CAAC;YAC1D,CAAC;YAED,MAAM,MAAM,GACX,OAAO,IAAI,IAAI;gBACd,CAAC,CAAC,IAAI,YAAY,CAChB,YAAY,CAAC,OAAO,CAAC;oBACpB,QAAQ;oBACR,OAAO,EAAE;wBACR,OAAO;qBACP;iBACD,CAAC,CACF,EAAE;gBACJ,CAAC,CAAC,EAAE,CAAC;YACP,OAAO,GAAG,SAAS,IAAI,QAAQ,IAAI,MAAM,GAAG,MAAM,EAAE,CAAC;QACtD,CAAC;KACD,CAAC;AACH,CAAC,CAAC;AA3CW,QAAA,eAAe,mBA2C1B"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@balena/pinejs",
3
- "version": "19.1.0-build-compile-auth-f615d178643e42fe5cd03afca19cef8d2867887d-2",
3
+ "version": "19.1.0-build-compile-auth-dc02184d5b6c707f41953d4711369bda31db2955-2",
4
4
  "main": "out/server-glue/module",
5
5
  "type": "commonjs",
6
6
  "repository": "git@github.com:balena-io/pinejs.git",
@@ -62,7 +62,7 @@
62
62
  "express-session": "^1.18.0",
63
63
  "lodash": "^4.17.21",
64
64
  "memoizee": "^0.4.17",
65
- "pinejs-client-core": "8.1.0-build-add-support-to-odata-fns-00fa6b67e2a144706b67db0b0c29b87a01552f27-1",
65
+ "pinejs-client-core": "8.1.0-build-add-support-to-odata-fns-befd5b25dc3c8f2d663c138255c68e4108abf8c9-1",
66
66
  "randomstring": "^1.3.0",
67
67
  "typed-error": "^3.2.2"
68
68
  },
@@ -147,6 +147,6 @@
147
147
  "recursive": true
148
148
  },
149
149
  "versionist": {
150
- "publishedAt": "2024-09-30T23:35:38.566Z"
150
+ "publishedAt": "2024-10-02T13:24:10.089Z"
151
151
  }
152
152
  }
package/src/sbvr-api/compile-auth.ts CHANGED
@@ -1,9 +1,16 @@
1
1
  import type { Filter, PinejsClientCore, Resource } from 'pinejs-client-core';
2
2
 
3
- const asPermission = (compiledFilter: string): string => {
4
- return compiledFilter
5
- .split('$filter=')[1]
6
- .replace(/Auth\.canAccess\(\)/g, 'canAccess()');
3
+ const asPermission = (url: string): string => {
4
+ const queryParamsIndex = url.indexOf('?');
5
+ if (queryParamsIndex === -1) {
6
+ throw new Error(`Failed to compile permissions for url: ${url}`);
7
+ }
8
+ const queryParams = new URLSearchParams(url.slice(queryParamsIndex + 1));
9
+ const compiledFilter = queryParams.get('$filter');
10
+ if (compiledFilter == null) {
11
+ throw new Error(`Failed to find $filter permissions for url: ${url}`);
12
+ }
13
+ return compiledFilter.replace(/Auth\.canAccess\(\)/g, 'canAccess()');
7
14
  };
8
15
 
9
16
  export const getAuthCompiler = <M extends { [key in keyof M]: Resource }>({
@@ -22,17 +29,11 @@ export const getAuthCompiler = <M extends { [key in keyof M]: Resource }>({
22
29
  }
23
30
 
24
31
  return {
25
- compileAuth: <TResource extends string & keyof M>({
26
- resource,
27
- access,
28
- options,
29
- }: {
30
- resource: TResource;
31
- access: string;
32
- options?: {
33
- $filter: Filter<M[TResource]['Read']>;
34
- };
35
- }): string => {
32
+ compileAuth: <TResource extends string & keyof M>(
33
+ resource: TResource,
34
+ access: string,
35
+ $filter?: Filter<M[TResource]['Read']>,
36
+ ): string => {
36
37
  if (resource == null) {
37
38
  throw new Error('The resource must be specified.');
38
39
  }
@@ -42,8 +43,15 @@ export const getAuthCompiler = <M extends { [key in keyof M]: Resource }>({
42
43
  }
43
44
 
44
45
  const filter =
45
- options != null
46
- ? `?${asPermission(decodeURIComponent(pinejsClient.compile({ resource, options })))}`
46
+ $filter != null
47
+ ? `?${asPermission(
48
+ pinejsClient.compile({
49
+ resource,
50
+ options: {
51
+ $filter,
52
+ },
53
+ }),
54
+ )}`
47
55
  : '';
48
56
  return `${modelName}.${resource}.${access}${filter}`;
49
57
  },