@cravery/core 0.0.12 → 0.0.13

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 (6) hide show
  1. package/dist/lib/api.d.ts +4 -2
  2. package/dist/lib/api.d.ts.map +1 -1
  3. package/dist/lib/api.js +17 -7
  4. package/dist/lib/api.js.map +1 -1
  5. package/package.json +1 -1
  6. package/src/lib/api.ts +23 -10
package/dist/lib/api.d.ts CHANGED
@@ -5,12 +5,14 @@ declare class CallableBuilder<T> {
5
5
  private requiresAuth;
6
6
  private requiresAdmin;
7
7
  private requiresModerator;
8
+ private requiresTranslator;
8
9
  private options;
9
10
  constructor(schema: z.ZodSchema<T>);
10
- withOptions(options: CallableOptions): this;
11
- requireUser(): this;
12
11
  requireAdmin(): this;
12
+ requireUser(): this;
13
13
  requireModerator(): this;
14
+ requireTranslator(): this;
15
+ withOptions(options: CallableOptions): this;
14
16
  handle<R>(handler: (data: T, request: CallableRequest) => Promise<R>): import("firebase-functions/v2/https").CallableFunction<any, Promise<R>, unknown>;
15
17
  }
16
18
  export declare const callable: <T>(schema: z.ZodSchema<T>) => CallableBuilder<T>;
package/dist/lib/api.d.ts.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/lib/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EACf,eAAe,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAqB3B,cAAM,eAAe,CAAC,CAAC;IAMT,OAAO,CAAC,MAAM;IAL1B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,OAAO,CAAoC;gBAE/B,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAE1C,WAAW,CAAC,OAAO,EAAE,eAAe;IAKpC,WAAW;IAKX,YAAY;IAMZ,gBAAgB;IAMhB,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,eAAe,KAAK,OAAO,CAAC,CAAC,CAAC;CA6BrE;AAED,eAAO,MAAM,QAAQ,GAAI,CAAC,EAAE,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,uBACrB,CAAC"}
1
+ {"version":3,"file":"api.d.ts","sourceRoot":"","sources":["../../src/lib/api.ts"],"names":[],"mappings":"AAAA,OAAO,EAGL,eAAe,EACf,eAAe,EAChB,MAAM,6BAA6B,CAAC;AACrC,OAAO,EAAE,CAAC,EAAE,MAAM,QAAQ,CAAC;AAqB3B,cAAM,eAAe,CAAC,CAAC;IAOT,OAAO,CAAC,MAAM;IAN1B,OAAO,CAAC,YAAY,CAAS;IAC7B,OAAO,CAAC,aAAa,CAAS;IAC9B,OAAO,CAAC,iBAAiB,CAAS;IAClC,OAAO,CAAC,kBAAkB,CAAS;IACnC,OAAO,CAAC,OAAO,CAAoC;gBAE/B,MAAM,EAAE,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC;IAE1C,YAAY;IAMZ,WAAW;IAKX,gBAAgB;IAMhB,iBAAiB;IAMjB,WAAW,CAAC,OAAO,EAAE,eAAe;IAKpC,MAAM,CAAC,CAAC,EAAE,OAAO,EAAE,CAAC,IAAI,EAAE,CAAC,EAAE,OAAO,EAAE,eAAe,KAAK,OAAO,CAAC,CAAC,CAAC;CAmCrE;AAED,eAAO,MAAM,QAAQ,GAAI,CAAC,EAAE,QAAQ,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,uBACrB,CAAC"}
package/dist/lib/api.js CHANGED
@@ -20,24 +20,30 @@ class CallableBuilder {
20
20
  this.requiresAuth = false;
21
21
  this.requiresAdmin = false;
22
22
  this.requiresModerator = false;
23
+ this.requiresTranslator = false;
23
24
  this.options = DEFAULT_OPTIONS;
24
25
  }
25
- withOptions(options) {
26
- this.options = Object.assign(Object.assign({}, DEFAULT_OPTIONS), options);
26
+ requireAdmin() {
27
+ this.requiresAuth = true;
28
+ this.requiresAdmin = true;
27
29
  return this;
28
30
  }
29
31
  requireUser() {
30
32
  this.requiresAuth = true;
31
33
  return this;
32
34
  }
33
- requireAdmin() {
35
+ requireModerator() {
34
36
  this.requiresAuth = true;
35
- this.requiresAdmin = true;
37
+ this.requiresModerator = true;
36
38
  return this;
37
39
  }
38
- requireModerator() {
40
+ requireTranslator() {
39
41
  this.requiresAuth = true;
40
- this.requiresModerator = true;
42
+ this.requiresTranslator = true;
43
+ return this;
44
+ }
45
+ withOptions(options) {
46
+ this.options = Object.assign(Object.assign({}, DEFAULT_OPTIONS), options);
41
47
  return this;
42
48
  }
43
49
  handle(handler) {
@@ -50,9 +56,13 @@ class CallableBuilder {
50
56
  if (this.requiresAdmin && !(await (0, iam_1.isAdmin)(uid))) {
51
57
  throw new https_1.HttpsError("permission-denied", "Admin access required");
52
58
  }
53
- if (this.requiresModerator && !(await (0, iam_1.isModerator)(uid))) {
59
+ else if (this.requiresModerator && !(await (0, iam_1.isModeratorOrAbove)(uid))) {
54
60
  throw new https_1.HttpsError("permission-denied", "Moderator access required");
55
61
  }
62
+ else if (this.requiresTranslator &&
63
+ !(await (0, iam_1.isTranslatorOrAbove)(uid))) {
64
+ throw new https_1.HttpsError("permission-denied", "Translator access required");
65
+ }
56
66
  }
57
67
  try {
58
68
  const data = this.schema.parse(request.data);
package/dist/lib/api.js.map CHANGED
@@ -1 +1 @@
1
- {"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/lib/api.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"api.js","sourceRoot":"","sources":["../../src/lib/api.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@cravery/core",
3
- "version": "0.0.12",
3
+ "version": "0.0.13",
4
4
  "description": "Clean architecture foundation for Cravery",
5
5
  "main": "dist/index.js",
6
6
  "types": "dist/index.d.ts",
package/src/lib/api.ts CHANGED
@@ -5,7 +5,7 @@ import {
5
5
  CallableOptions,
6
6
  } from "firebase-functions/v2/https";
7
7
  import { z } from "genkit";
8
- import { isAdmin, isModerator } from "./iam";
8
+ import { isAdmin, isModeratorOrAbove, isTranslatorOrAbove } from "./iam";
9
9
 
10
10
  const DEFAULT_OPTIONS: CallableOptions = { cors: true, enforceAppCheck: true };
11
11
 
@@ -29,12 +29,14 @@ class CallableBuilder<T> {
29
29
  private requiresAuth = false;
30
30
  private requiresAdmin = false;
31
31
  private requiresModerator = false;
32
+ private requiresTranslator = false;
32
33
  private options: CallableOptions = DEFAULT_OPTIONS;
33
34
 
34
35
  constructor(private schema: z.ZodSchema<T>) {}
35
36
 
36
- withOptions(options: CallableOptions) {
37
- this.options = { ...DEFAULT_OPTIONS, ...options };
37
+ requireAdmin() {
38
+ this.requiresAuth = true;
39
+ this.requiresAdmin = true;
38
40
  return this;
39
41
  }
40
42
 
@@ -43,15 +45,20 @@ class CallableBuilder<T> {
43
45
  return this;
44
46
  }
45
47
 
46
- requireAdmin() {
48
+ requireModerator() {
47
49
  this.requiresAuth = true;
48
- this.requiresAdmin = true;
50
+ this.requiresModerator = true;
49
51
  return this;
50
52
  }
51
53
 
52
- requireModerator() {
54
+ requireTranslator() {
53
55
  this.requiresAuth = true;
54
- this.requiresModerator = true;
56
+ this.requiresTranslator = true;
57
+ return this;
58
+ }
59
+
60
+ withOptions(options: CallableOptions) {
61
+ this.options = { ...DEFAULT_OPTIONS, ...options };
55
62
  return this;
56
63
  }
57
64
 
@@ -66,13 +73,19 @@ class CallableBuilder<T> {
66
73
 
67
74
  if (this.requiresAdmin && !(await isAdmin(uid))) {
68
75
  throw new HttpsError("permission-denied", "Admin access required");
69
- }
70
-
71
- if (this.requiresModerator && !(await isModerator(uid))) {
76
+ } else if (this.requiresModerator && !(await isModeratorOrAbove(uid))) {
72
77
  throw new HttpsError(
73
78
  "permission-denied",
74
79
  "Moderator access required",
75
80
  );
81
+ } else if (
82
+ this.requiresTranslator &&
83
+ !(await isTranslatorOrAbove(uid))
84
+ ) {
85
+ throw new HttpsError(
86
+ "permission-denied",
87
+ "Translator access required",
88
+ );
76
89
  }
77
90
  }
78
91