@shivaedev/admin 0.9.0 → 0.10.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/README.md +3 -3
- package/dist/jobs/page.d.ts +56 -27
- package/dist/jobs/page.d.ts.map +1 -1
- package/dist/jobs/retryPage.d.ts +49 -17
- package/dist/jobs/retryPage.d.ts.map +1 -1
- package/dist/jobs/retryPage.js +2 -1
- package/dist/jobs/retryPage.js.map +1 -1
- package/dist/jobs/schemas.d.ts +18 -4
- package/dist/jobs/schemas.d.ts.map +1 -1
- package/dist/jobs/schemas.js +5 -3
- package/dist/jobs/schemas.js.map +1 -1
- package/dist/permissions.d.ts +16 -2
- package/dist/permissions.d.ts.map +1 -1
- package/dist/permissions.js +1 -0
- package/dist/permissions.js.map +1 -1
- package/dist/server/jobsHandlers.d.ts +28 -9
- package/dist/server/jobsHandlers.d.ts.map +1 -1
- package/dist/server/jobsHandlers.js +23 -6
- package/dist/server/jobsHandlers.js.map +1 -1
- package/dist/server/jobsHandlersWithRetry.d.ts +2 -1
- package/dist/server/jobsHandlersWithRetry.d.ts.map +1 -1
- package/dist/server/jobsHandlersWithRetry.js +4 -0
- package/dist/server/jobsHandlersWithRetry.js.map +1 -1
- package/dist/server/users.d.ts +9 -34
- package/dist/server/users.d.ts.map +1 -1
- package/dist/server/users.js +24 -27
- package/dist/server/users.js.map +1 -1
- package/dist/server/usersHandlers.d.ts +2 -2
- package/dist/server/usersHandlers.d.ts.map +1 -1
- package/dist/server/usersHandlers.js.map +1 -1
- package/dist/users/page.d.ts +10 -10
- package/dist/users/page.d.ts.map +1 -1
- package/dist/users/page.js.map +1 -1
- package/dist/users/roles.d.ts +2 -2
- package/dist/users/roles.js +1 -1
- package/dist/users/roles.js.map +1 -1
- package/package.json +12 -12
- package/src/jobs/retryPage.ts +2 -1
- package/src/jobs/schemas.ts +5 -3
- package/src/permissions.ts +1 -0
- package/src/server/jobsHandlers.ts +26 -9
- package/src/server/jobsHandlersWithRetry.ts +4 -0
- package/src/server/users.ts +27 -30
- package/src/server/usersHandlers.ts +2 -2
- package/src/users/page.ts +2 -2
- package/src/users/roles.ts +1 -1
package/dist/permissions.d.ts
CHANGED
|
@@ -22,13 +22,27 @@ export declare const ReadJobs: {
|
|
|
22
22
|
readonly name: "jobs.read";
|
|
23
23
|
readonly strength: "own";
|
|
24
24
|
};
|
|
25
|
+
export declare const RetryJobs: {
|
|
26
|
+
readonly any: {
|
|
27
|
+
readonly name: "jobs.retry";
|
|
28
|
+
readonly strength: "any";
|
|
29
|
+
};
|
|
30
|
+
readonly name: "jobs.retry";
|
|
31
|
+
readonly strength: "own";
|
|
32
|
+
};
|
|
25
33
|
declare const UsersPermission_base: import("effect/rpc/RpcMiddleware").ServiceClass<UsersPermission, "@shivaedev/admin/UsersPermission", import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser, import("effect/Schema").Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, typeof import("@shivaedev/errors/taxonomy.ts").Forbidden, typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, never, never, false> & {
|
|
26
|
-
permission:
|
|
34
|
+
permission: {
|
|
35
|
+
readonly name: string;
|
|
36
|
+
readonly strength: "any" | "own";
|
|
37
|
+
};
|
|
27
38
|
};
|
|
28
39
|
export declare class UsersPermission extends UsersPermission_base {
|
|
29
40
|
}
|
|
30
41
|
declare const JobsPermission_base: import("effect/rpc/RpcMiddleware").ServiceClass<JobsPermission, "@shivaedev/admin/JobsPermission", import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser, import("effect/Schema").Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, typeof import("@shivaedev/errors/taxonomy.ts").Forbidden, typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, never, never, false> & {
|
|
31
|
-
permission:
|
|
42
|
+
permission: {
|
|
43
|
+
readonly name: string;
|
|
44
|
+
readonly strength: "any" | "own";
|
|
45
|
+
};
|
|
32
46
|
};
|
|
33
47
|
export declare class JobsPermission extends JobsPermission_base {
|
|
34
48
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS;;;;;;;CAA2B,CAAC;AAClD,eAAO,MAAM,WAAW;;;;;;;CAA6B,CAAC;AACtD,eAAO,MAAM,QAAQ;;;;;;;CAA0B,CAAC
|
|
1
|
+
{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"AAGA,eAAO,MAAM,SAAS;;;;;;;CAA2B,CAAC;AAClD,eAAO,MAAM,WAAW;;;;;;;CAA6B,CAAC;AACtD,eAAO,MAAM,QAAQ;;;;;;;CAA0B,CAAC;AAChD,eAAO,MAAM,SAAS;;;;;;;CAA2B,CAAC;;;;;;;AAClD,qBAAa,eAAgB,SAAQ,oBAAsF;CAAG;;;;;;;AAC9H,qBAAa,cAAe,SAAQ,mBAAmF;CAAG"}
|
package/dist/permissions.js
CHANGED
|
@@ -3,6 +3,7 @@ import { permissionMiddleware } from "@shivaedev/identity/permission.ts";
|
|
|
3
3
|
export const ReadUsers = permission("users.read");
|
|
4
4
|
export const AssignRoles = permission("roles.assign");
|
|
5
5
|
export const ReadJobs = permission("jobs.read");
|
|
6
|
+
export const RetryJobs = permission("jobs.retry");
|
|
6
7
|
export class UsersPermission extends permissionMiddleware()("@shivaedev/admin/UsersPermission", ReadUsers) {
|
|
7
8
|
}
|
|
8
9
|
export class JobsPermission extends permissionMiddleware()("@shivaedev/admin/JobsPermission", ReadJobs) {
|
package/dist/permissions.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;AACtD,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;AAChD,MAAM,OAAO,eAAgB,SAAQ,oBAAoB,EAAmB,CAAC,kCAAkC,EAAE,SAAS,CAAC;CAAG;AAC9H,MAAM,OAAO,cAAe,SAAQ,oBAAoB,EAAkB,CAAC,iCAAiC,EAAE,QAAQ,CAAC;CAAG"}
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../src/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAC7D,OAAO,EAAE,oBAAoB,EAAE,MAAM,mCAAmC,CAAC;AAEzE,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;AAClD,MAAM,CAAC,MAAM,WAAW,GAAG,UAAU,CAAC,cAAc,CAAC,CAAC;AACtD,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,WAAW,CAAC,CAAC;AAChD,MAAM,CAAC,MAAM,SAAS,GAAG,UAAU,CAAC,YAAY,CAAC,CAAC;AAClD,MAAM,OAAO,eAAgB,SAAQ,oBAAoB,EAAmB,CAAC,kCAAkC,EAAE,SAAS,CAAC;CAAG;AAC9H,MAAM,OAAO,cAAe,SAAQ,oBAAoB,EAAkB,CAAC,iCAAiC,EAAE,QAAQ,CAAC;CAAG"}
|
|
@@ -1,26 +1,27 @@
|
|
|
1
|
-
import { type Context, DateTime, Effect, Option } from "effect";
|
|
1
|
+
import { type Context, DateTime, Effect, Option, Schema } from "effect";
|
|
2
|
+
import { BadRequest } from "@shivaedev/errors/taxonomy.ts";
|
|
2
3
|
import type { PgBossError, PgBossPayloadError } from "@shivaedev/jobs/server/error.ts";
|
|
3
4
|
import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
|
|
4
5
|
import { type JobsEntry, type JobsPayload } from "#jobs/entry.ts";
|
|
5
6
|
import type { jobsPage } from "#jobs/page.ts";
|
|
6
7
|
import { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
|
|
7
|
-
export declare function jobsFailures<A, R>(effect: Effect.Effect<A, PgBossError | PgBossPayloadError, R>): Effect.Effect<A, JobsPayloadInvalid | JobsUnavailable, R>;
|
|
8
|
+
export declare function jobsFailures<A, R>(effect: Effect.Effect<A, PgBossError | PgBossPayloadError | Schema.SchemaError, R>): Effect.Effect<A, BadRequest | JobsPayloadInvalid | JobsUnavailable, R>;
|
|
8
9
|
export declare function jobsReadHandlers<const TQueues extends readonly JobsEntry[], TService>(page: {
|
|
9
10
|
readonly queues: TQueues;
|
|
10
11
|
}, service: Context.Service<TService, PgBossService>): {
|
|
11
12
|
"admin.jobs.counts": ({ queue }: {
|
|
12
13
|
readonly queue: string;
|
|
13
|
-
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").QueueCounts, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService>;
|
|
14
|
+
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").QueueCounts, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService>;
|
|
14
15
|
"admin.jobs.deadLettered": ({ queue, ...options }: {
|
|
15
16
|
readonly queue: string;
|
|
16
17
|
readonly limit: number;
|
|
17
18
|
readonly cursor?: string;
|
|
18
|
-
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").DeadLetteredJob<JobsPayload<TQueues[number]>["Type"]>>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | JobsPayload<TQueues[number]>["DecodingServices"]>;
|
|
19
|
+
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").DeadLetteredJob<JobsPayload<TQueues[number]>["Type"]>>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | JobsPayload<TQueues[number]>["DecodingServices"]>;
|
|
19
20
|
"admin.jobs.failed": ({ queue, ...options }: {
|
|
20
21
|
readonly queue: string;
|
|
21
22
|
readonly limit: number;
|
|
22
23
|
readonly cursor?: string;
|
|
23
|
-
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").ListedJob<JobsPayload<TQueues[number]>["Type"]>>, JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | JobsPayload<TQueues[number]>["DecodingServices"]>;
|
|
24
|
+
}) => Effect.Effect<import("@shivaedev/jobs/server/health.ts").JobPage<import("@shivaedev/jobs/server/health.ts").ListedJob<JobsPayload<TQueues[number]>["Type"]>>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | JobsPayload<TQueues[number]>["DecodingServices"]>;
|
|
24
25
|
"admin.jobs.health": () => Effect.Effect<{
|
|
25
26
|
activeTotal: number;
|
|
26
27
|
deadLetteredTotal: number;
|
|
@@ -28,23 +29,41 @@ export declare function jobsReadHandlers<const TQueues extends readonly JobsEntr
|
|
|
28
29
|
jobs: import("@shivaedev/jobs/server/health.ts").QueueHealth[];
|
|
29
30
|
queuedTotal: number;
|
|
30
31
|
readyTotal: number;
|
|
31
|
-
}, JobsPayloadInvalid | JobsUnavailable, TService>;
|
|
32
|
+
}, BadRequest | JobsPayloadInvalid | JobsUnavailable, TService>;
|
|
32
33
|
"admin.jobs.job": ({ id, queue }: {
|
|
33
34
|
readonly id: string;
|
|
34
35
|
readonly queue: string;
|
|
35
|
-
}) => Effect.Effect<Option.
|
|
36
|
+
}) => Effect.Effect<Option.None<{
|
|
36
37
|
attempt: number;
|
|
37
38
|
completedOn: Option.Option<DateTime.Utc>;
|
|
38
39
|
createdOn: DateTime.Utc;
|
|
39
40
|
data: JobsPayload<TQueues[number]>["Type"];
|
|
40
41
|
id: string;
|
|
41
|
-
output:
|
|
42
|
+
output: {
|
|
43
|
+
readonly _tag: string;
|
|
44
|
+
readonly message: string;
|
|
45
|
+
} | null;
|
|
42
46
|
queue: string;
|
|
43
47
|
retryCount: number;
|
|
44
48
|
retryLimit: number;
|
|
45
49
|
startedOn: Option.Option<DateTime.Utc>;
|
|
46
50
|
state: "active" | "cancelled" | "completed" | "created" | "failed" | "retry";
|
|
47
|
-
}
|
|
51
|
+
}> | Option.Some<{
|
|
52
|
+
attempt: number;
|
|
53
|
+
completedOn: Option.Option<DateTime.Utc>;
|
|
54
|
+
createdOn: DateTime.Utc;
|
|
55
|
+
data: JobsPayload<TQueues[number]>["Type"];
|
|
56
|
+
id: string;
|
|
57
|
+
output: {
|
|
58
|
+
readonly _tag: string;
|
|
59
|
+
readonly message: string;
|
|
60
|
+
} | null;
|
|
61
|
+
queue: string;
|
|
62
|
+
retryCount: number;
|
|
63
|
+
retryLimit: number;
|
|
64
|
+
startedOn: Option.Option<DateTime.Utc>;
|
|
65
|
+
state: "active" | "cancelled" | "completed" | "created" | "failed" | "retry";
|
|
66
|
+
}>, BadRequest | JobsPayloadInvalid | JobsQueueUnregistered | JobsUnavailable, TService | JobsPayload<TQueues[number]>["DecodingServices"]>;
|
|
48
67
|
};
|
|
49
68
|
export declare function jobsHandlers<const TQueues extends readonly JobsEntry[], TService>(page: ReturnType<typeof jobsPage<TQueues>>, service: Context.Service<TService, PgBossService>): import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"admin.jobs.counts"> | import("effect/rpc/Rpc").Handler<"admin.jobs.deadLettered"> | import("effect/rpc/Rpc").Handler<"admin.jobs.failed"> | import("effect/rpc/Rpc").Handler<"admin.jobs.health"> | import("effect/rpc/Rpc").Handler<"admin.jobs.job">, never, Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope>>;
|
|
50
69
|
//# sourceMappingURL=jobsHandlers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobsHandlers.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"jobsHandlers.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxE,OAAO,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAE3D,OAAO,KAAK,EAAE,WAAW,EAAE,kBAAkB,EAAE,MAAM,iCAAiC,CAAC;AACvF,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAa,MAAM,gBAAgB,CAAC;AAC7E,OAAO,KAAK,EAAE,QAAQ,EAAE,MAAM,eAAe,CAAC;AAC9C,OAAO,EAAE,kBAAkB,EAAE,qBAAqB,EAAE,eAAe,EAAE,MAAM,kBAAkB,CAAC;AAE9F,wBAAgB,YAAY,CAAC,CAAC,EAAE,CAAC,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,WAAW,GAAG,kBAAkB,GAAG,MAAM,CAAC,WAAW,EAAE,CAAC,CAAC,0EAapH;AAED,wBAAgB,gBAAgB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EACpF,IAAI,EAAE;IAAE,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAA;CAAE,EAClC,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC;IAQhD,mBAAmB,cAAc;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;IAM3D,yBAAyB,0BAA0B;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAM/H,mBAAmB,0BAA0B;QAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAA;KAAE;IAMzH,mBAAmB;;;;;;;;IAcnB,gBAAgB,kBAAkB;QAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;KAAE;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EA2BlF;AAED,wBAAgB,YAAY,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EAChF,IAAI,EAAE,UAAU,CAAC,OAAO,QAAQ,CAAC,OAAO,CAAC,CAAC,EAC1C,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,61BAGjD"}
|
|
@@ -1,8 +1,19 @@
|
|
|
1
|
-
import { DateTime, Effect, Option } from "effect";
|
|
1
|
+
import { DateTime, Effect, Option, Schema } from "effect";
|
|
2
|
+
import { BadRequest } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import { JobFailure } from "@shivaedev/jobs/JobFailure.ts";
|
|
2
4
|
import { jobsQueue } from "#jobs/entry.ts";
|
|
3
5
|
import { JobsPayloadInvalid, JobsQueueUnregistered, JobsUnavailable } from "#jobs/schemas.ts";
|
|
4
6
|
export function jobsFailures(effect) {
|
|
5
|
-
return effect.pipe(Effect.mapError((error) =>
|
|
7
|
+
return effect.pipe(Effect.mapError((error) => {
|
|
8
|
+
switch (error._tag) {
|
|
9
|
+
case "SchemaError":
|
|
10
|
+
return new BadRequest({ message: "Invalid job page options" });
|
|
11
|
+
case "PgBossPayloadError":
|
|
12
|
+
return new JobsPayloadInvalid({ queue: error.queue });
|
|
13
|
+
case "PgBossError":
|
|
14
|
+
return new JobsUnavailable({ operation: error.operation });
|
|
15
|
+
}
|
|
16
|
+
}));
|
|
6
17
|
}
|
|
7
18
|
export function jobsReadHandlers(page, service) {
|
|
8
19
|
function registered(name) {
|
|
@@ -28,7 +39,7 @@ export function jobsReadHandlers(page, service) {
|
|
|
28
39
|
}),
|
|
29
40
|
"admin.jobs.health": () => Effect.gen(function* () {
|
|
30
41
|
const jobs = yield* service;
|
|
31
|
-
const health = yield* jobsFailures(jobs.health);
|
|
42
|
+
const health = yield* jobsFailures(jobs.health());
|
|
32
43
|
const visible = health.jobs.filter((queue) => page.queues.some((candidate) => candidate.name === queue.name));
|
|
33
44
|
return {
|
|
34
45
|
activeTotal: visible.reduce((sum, queue) => sum + queue.activeCount, 0),
|
|
@@ -42,19 +53,25 @@ export function jobsReadHandlers(page, service) {
|
|
|
42
53
|
"admin.jobs.job": ({ id, queue }) => Effect.gen(function* () {
|
|
43
54
|
const definition = yield* registered(queue);
|
|
44
55
|
const jobs = yield* service;
|
|
45
|
-
|
|
56
|
+
const result = yield* jobsFailures(jobs.getJob(definition, id));
|
|
57
|
+
if (Option.isNone(result)) {
|
|
58
|
+
return Option.none();
|
|
59
|
+
}
|
|
60
|
+
const job = result.value;
|
|
61
|
+
const output = yield* Schema.decodeUnknownEffect(Schema.NullOr(JobFailure))(job.output).pipe(Effect.mapError(() => new JobsPayloadInvalid({ queue })));
|
|
62
|
+
return Option.some({
|
|
46
63
|
attempt: job.startedOn === null ? 0 : job.retryCount + 1,
|
|
47
64
|
completedOn: Option.map(Option.fromNullishOr(job.completedOn), DateTime.makeUnsafe),
|
|
48
65
|
createdOn: DateTime.makeUnsafe(job.createdOn),
|
|
49
66
|
data: job.data,
|
|
50
67
|
id: job.id,
|
|
51
|
-
output
|
|
68
|
+
output,
|
|
52
69
|
queue: job.name,
|
|
53
70
|
retryCount: job.retryCount,
|
|
54
71
|
retryLimit: job.retryLimit,
|
|
55
72
|
startedOn: Option.map(Option.fromNullishOr(job.startedOn), DateTime.makeUnsafe),
|
|
56
73
|
state: job.state,
|
|
57
|
-
})
|
|
74
|
+
});
|
|
58
75
|
}),
|
|
59
76
|
};
|
|
60
77
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobsHandlers.js","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"jobsHandlers.js","sourceRoot":"","sources":["../../src/server/jobsHandlers.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { type Context } from "effect";
|
|
2
|
+
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
2
3
|
import type { PgBossService } from "@shivaedev/jobs/server/service.ts";
|
|
3
4
|
import { type JobsEntry, type JobsPayload } from "#jobs/entry.ts";
|
|
4
5
|
import { type jobsPageWithRetry } from "#jobs/retryPage.ts";
|
|
5
|
-
export declare function jobsHandlersWithRetry<const TQueues extends readonly JobsEntry[], TService>(page: ReturnType<typeof jobsPageWithRetry<TQueues>>, service: Context.Service<TService, PgBossService>): import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"admin.jobs.counts"> | import("effect/rpc/Rpc").Handler<"admin.jobs.deadLettered"> | import("effect/rpc/Rpc").Handler<"admin.jobs.failed"> | import("effect/rpc/Rpc").Handler<"admin.jobs.health"> | import("effect/rpc/Rpc").Handler<"admin.jobs.job"> | import("effect/rpc/Rpc").Handler<"admin.jobs.retry">, never, Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | import("@shivaedev/identity/identity.ts").SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity |
|
|
6
|
+
export declare function jobsHandlersWithRetry<const TQueues extends readonly JobsEntry[], TService>(page: ReturnType<typeof jobsPageWithRetry<TQueues>>, service: Context.Service<TService, PgBossService>): import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"admin.jobs.counts"> | import("effect/rpc/Rpc").Handler<"admin.jobs.deadLettered"> | import("effect/rpc/Rpc").Handler<"admin.jobs.failed"> | import("effect/rpc/Rpc").Handler<"admin.jobs.health"> | import("effect/rpc/Rpc").Handler<"admin.jobs.job"> | import("effect/rpc/Rpc").Handler<"admin.jobs.retry">, never, Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<TService, import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope> | Exclude<Exclude<JobsPayload<TQueues[number]>["DecodingServices"], import("@shivaedev/identity/identity.ts").Identity | SessionUser>, import("effect/Scope").Scope>>;
|
|
6
7
|
//# sourceMappingURL=jobsHandlersWithRetry.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobsHandlersWithRetry.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAkB,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"jobsHandlersWithRetry.d.ts","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAkB,MAAM,QAAQ,CAAC;AAEtD,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AACvE,OAAO,EAAE,KAAK,SAAS,EAAE,KAAK,WAAW,EAAa,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAiB,KAAK,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAK3E,wBAAgB,qBAAqB,CAAC,KAAK,CAAC,OAAO,SAAS,SAAS,SAAS,EAAE,EAAE,QAAQ,EACzF,IAAI,EAAE,UAAU,CAAC,OAAO,iBAAiB,CAAC,OAAO,CAAC,CAAC,EACnD,OAAO,EAAE,OAAO,CAAC,OAAO,CAAC,QAAQ,EAAE,aAAa,CAAC,wjCAqBjD"}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
|
+
import { requirePermission } from "@shivaedev/access/requirePermission.ts";
|
|
3
|
+
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
2
4
|
import { jobsQueue } from "#jobs/entry.ts";
|
|
3
5
|
import { JobsNotFailed } from "#jobs/retryPage.ts";
|
|
4
6
|
import { JobsQueueUnregistered } from "#jobs/schemas.ts";
|
|
7
|
+
import { RetryJobs } from "#permissions.ts";
|
|
5
8
|
import { jobsFailures, jobsReadHandlers } from "./jobsHandlers.js";
|
|
6
9
|
export function jobsHandlersWithRetry(page, service) {
|
|
7
10
|
return page.contract.application.toLayer({
|
|
8
11
|
...jobsReadHandlers(page, service),
|
|
9
12
|
"admin.jobs.retry": ({ queue, id }) => Effect.gen(function* () {
|
|
13
|
+
yield* requirePermission(yield* SessionUser, RetryJobs);
|
|
10
14
|
const entries = page.queues;
|
|
11
15
|
const entry = entries.find((candidate) => candidate.name === queue);
|
|
12
16
|
if (entry === undefined) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"jobsHandlersWithRetry.js","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"jobsHandlersWithRetry.js","sourceRoot":"","sources":["../../src/server/jobsHandlersWithRetry.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACtD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAE9D,OAAO,EAAoC,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC7E,OAAO,EAAE,aAAa,EAA0B,MAAM,oBAAoB,CAAC;AAC3E,OAAO,EAAE,qBAAqB,EAAE,MAAM,kBAAkB,CAAC;AACzD,OAAO,EAAE,SAAS,EAAE,MAAM,iBAAiB,CAAC;AAC5C,OAAO,EAAE,YAAY,EAAE,gBAAgB,EAAE,MAAM,mBAAmB,CAAC;AAEnE,MAAM,UAAU,qBAAqB,CACpC,IAAmD,EACnD,OAAiD;IAEjD,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;QACxC,GAAG,gBAAgB,CAAC,IAAI,EAAE,OAAO,CAAC;QAClC,kBAAkB,EAAE,CAAC,EAAE,KAAK,EAAE,EAAE,EAAE,EAAE,EAAE,CACrC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,KAAK,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,SAAS,CAAC,CAAC;YACxD,MAAM,OAAO,GAA+B,IAAI,CAAC,MAAM,CAAC;YACxD,MAAM,KAAK,GAAG,OAAO,CAAC,IAAI,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,SAAS,CAAC,IAAI,KAAK,KAAK,CAAC,CAAC;YACpE,IAAI,KAAK,KAAK,SAAS,EAAE,CAAC;gBACzB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,qBAAqB,CAAC,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YACjE,CAAC;YACD,MAAM,UAAU,GAAG,SAAS,CAAC,KAAK,CAAC,CAAC;YACpC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,OAAO,CAAC;YAC5B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,MAAM,CAAuC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;YACnG,IAAI,MAAM,CAAC,MAAM,CAAC,GAAG,CAAC,IAAI,GAAG,CAAC,KAAK,CAAC,KAAK,KAAK,QAAQ,EAAE,CAAC;gBACxD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,IAAI,aAAa,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,CAAC;YAC7D,CAAC;YACD,KAAK,CAAC,CAAC,YAAY,CAAC,IAAI,CAAC,KAAK,CAAC,UAAU,EAAE,EAAE,CAAC,CAAC,CAAC;QACjD,CAAC,CAAC;KACH,CAAC,CAAC;AACJ,CAAC"}
|
package/dist/server/users.d.ts
CHANGED
|
@@ -1,46 +1,21 @@
|
|
|
1
|
-
import { DateTime, Effect, Option
|
|
1
|
+
import { DateTime, Effect, Option } from "effect";
|
|
2
2
|
import { SqlClient } from "effect/sql";
|
|
3
|
+
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
3
4
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
4
5
|
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
5
6
|
import { type ChangeRoleInput, LastRoleAssigner } from "#users/roles.ts";
|
|
6
|
-
export declare const listUsers: <TRole extends string>(access: Pick<{
|
|
7
|
-
canAccess: (user: import("@shivaedev/access/roleSet.ts").User<TRole> | null | undefined, permission: import("@shivaedev/access/permission.ts").OwnPermission, ownerId: string) => boolean;
|
|
8
|
-
hasPermission: (name: TRole, permission: import("@shivaedev/access/permission.ts").Permission) => boolean;
|
|
9
|
-
Role: Schema.Literals<TRole[]>;
|
|
10
|
-
requireAccess: (user: import("@shivaedev/access/roleSet.ts").User<TRole> | null | undefined, permission: import("@shivaedev/access/permission.ts").OwnPermission, ownerId: string) => Effect.Effect<void, import("@shivaedev/errors/taxonomy.ts").Forbidden | import("@shivaedev/errors/taxonomy.ts").Unauthorized>;
|
|
11
|
-
requirePermission: (user: import("@shivaedev/access/roleSet.ts").User<TRole> | null | undefined, permission: import("@shivaedev/access/permission.ts").Permission) => Effect.Effect<void, import("@shivaedev/errors/taxonomy.ts").Forbidden | import("@shivaedev/errors/taxonomy.ts").Unauthorized>;
|
|
12
|
-
resolve: (stored: unknown) => Effect.Effect<{
|
|
13
|
-
permissions: {
|
|
14
|
-
name: string;
|
|
15
|
-
strength: "any" | "own";
|
|
16
|
-
}[];
|
|
17
|
-
role: TRole;
|
|
18
|
-
}, Schema.SchemaError, never>;
|
|
19
|
-
}, "Role">, input: {
|
|
7
|
+
export declare const listUsers: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role">, input: {
|
|
20
8
|
readonly cursor?: string;
|
|
21
9
|
readonly limit: number;
|
|
22
10
|
}) => Effect.Effect<{
|
|
23
11
|
next: Option.Option<string>;
|
|
24
12
|
users: {
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
role: TRole;
|
|
13
|
+
readonly createdAt: DateTime.Utc;
|
|
14
|
+
readonly email: string;
|
|
15
|
+
readonly id: string;
|
|
16
|
+
readonly name: string;
|
|
17
|
+
readonly role: TRole;
|
|
30
18
|
}[];
|
|
31
19
|
}, AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden, SessionUser | SqlClient.SqlClient>;
|
|
32
|
-
export declare const changeUserRole: <TRole extends string>(access: Pick<
|
|
33
|
-
canAccess: (user: import("@shivaedev/access/roleSet.ts").User<TRole> | null | undefined, permission: import("@shivaedev/access/permission.ts").OwnPermission, ownerId: string) => boolean;
|
|
34
|
-
hasPermission: (name: TRole, permission: import("@shivaedev/access/permission.ts").Permission) => boolean;
|
|
35
|
-
Role: Schema.Literals<TRole[]>;
|
|
36
|
-
requireAccess: (user: import("@shivaedev/access/roleSet.ts").User<TRole> | null | undefined, permission: import("@shivaedev/access/permission.ts").OwnPermission, ownerId: string) => Effect.Effect<void, import("@shivaedev/errors/taxonomy.ts").Forbidden | import("@shivaedev/errors/taxonomy.ts").Unauthorized>;
|
|
37
|
-
requirePermission: (user: import("@shivaedev/access/roleSet.ts").User<TRole> | null | undefined, permission: import("@shivaedev/access/permission.ts").Permission) => Effect.Effect<void, import("@shivaedev/errors/taxonomy.ts").Forbidden | import("@shivaedev/errors/taxonomy.ts").Unauthorized>;
|
|
38
|
-
resolve: (stored: unknown) => Effect.Effect<{
|
|
39
|
-
permissions: {
|
|
40
|
-
name: string;
|
|
41
|
-
strength: "any" | "own";
|
|
42
|
-
}[];
|
|
43
|
-
role: TRole;
|
|
44
|
-
}, Schema.SchemaError, never>;
|
|
45
|
-
}, "Role" | "hasPermission">, input: ChangeRoleInput<TRole>) => Effect.Effect<void, AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden | LastRoleAssigner | NotFound, import("effect/reactivity/Reactivity").Reactivity | SessionUser | SqlClient.SqlClient>;
|
|
20
|
+
export declare const changeUserRole: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">, input: ChangeRoleInput<TRole>) => Effect.Effect<void, AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden | LastRoleAssigner | NotFound, import("effect/reactivity/Reactivity").Reactivity | SessionUser | SqlClient.SqlClient>;
|
|
46
21
|
//# sourceMappingURL=users.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/server/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,
|
|
1
|
+
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../../src/server/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAElD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAG9D,OAAO,EAAW,KAAK,eAAe,EAAE,gBAAgB,EAAsB,MAAM,iBAAiB,CAAC;AAMtG,eAAO,MAAM,SAAS,GAA2C,KAAK,SAAS,MAAM;;;;;;;;;;;;0GAenF,CAAC;AAEH,eAAO,MAAM,cAAc,GAAgD,KAAK,SAAS,MAAM,8SAyC7F,CAAC"}
|
package/dist/server/users.js
CHANGED
|
@@ -1,61 +1,58 @@
|
|
|
1
1
|
import { DateTime, Effect, Option, Schema } from "effect";
|
|
2
2
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
+
import { requirePermission } from "@shivaedev/access/requirePermission.ts";
|
|
3
4
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
4
5
|
import { SessionUser } from "@shivaedev/identity/identity.ts";
|
|
5
|
-
import { requirePermission } from "@shivaedev/identity/permission.ts";
|
|
6
6
|
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
7
7
|
import { AssignRoles, ReadUsers } from "#permissions.ts";
|
|
8
|
-
import { LastRoleAssigner } from "#users/roles.ts";
|
|
9
|
-
const StoredUser = Schema.Struct({
|
|
10
|
-
createdAt: Schema.Date,
|
|
11
|
-
email: Schema.String,
|
|
12
|
-
id: Schema.String,
|
|
13
|
-
name: Schema.String,
|
|
14
|
-
role: Schema.String,
|
|
15
|
-
});
|
|
8
|
+
import { AppUser, LastRoleAssigner } from "#users/roles.ts";
|
|
16
9
|
function unavailable() {
|
|
17
10
|
return new AuthUnavailable({ message: "Could not access app users" });
|
|
18
11
|
}
|
|
19
|
-
export const listUsers = Effect.fn("
|
|
20
|
-
yield* requirePermission(ReadUsers);
|
|
12
|
+
export const listUsers = Effect.fn("Admin.listUsers")(function* (access, input) {
|
|
13
|
+
yield* requirePermission(yield* SessionUser, ReadUsers);
|
|
21
14
|
const sql = yield* SqlClient.SqlClient;
|
|
22
15
|
const read = SqlSchema.findAll({
|
|
23
16
|
execute: () => sql `select id, name, email, role, "createdAt" from "user"
|
|
24
17
|
where id > ${input.cursor ?? ""} order by id limit ${input.limit + 1}`,
|
|
25
18
|
Request: Schema.Void,
|
|
26
|
-
Result: Schema.Struct({ ...
|
|
19
|
+
Result: Schema.Struct({ ...AppUser.fields, role: access.Role }),
|
|
27
20
|
});
|
|
28
21
|
const rows = yield* read(undefined).pipe(Effect.mapError(unavailable));
|
|
29
|
-
const users = rows.slice(0, input.limit)
|
|
30
|
-
...user,
|
|
31
|
-
createdAt: DateTime.makeUnsafe(createdAt),
|
|
32
|
-
role,
|
|
33
|
-
}));
|
|
22
|
+
const users = rows.slice(0, input.limit);
|
|
34
23
|
return { next: rows.length > input.limit ? Option.fromUndefinedOr(users.at(-1)?.id) : Option.none(), users };
|
|
35
24
|
});
|
|
36
|
-
export const changeUserRole = Effect.fn("
|
|
25
|
+
export const changeUserRole = Effect.fn("Admin.changeUserRole")(function* (access, input) {
|
|
37
26
|
const actor = yield* SessionUser;
|
|
38
|
-
yield* requirePermission(AssignRoles);
|
|
27
|
+
yield* requirePermission(actor, AssignRoles);
|
|
39
28
|
const sql = yield* SqlClient.SqlClient;
|
|
40
29
|
const changed = yield* Effect.gen(function* () {
|
|
41
30
|
yield* sql `select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
|
|
42
|
-
const
|
|
43
|
-
|
|
44
|
-
|
|
31
|
+
const readTarget = SqlSchema.findOneOption({
|
|
32
|
+
execute: (id) => sql `select id, role from "user" where id = ${id} for update`,
|
|
33
|
+
Request: AppUser.fields.id,
|
|
34
|
+
Result: Schema.Struct({ id: AppUser.fields.id, role: Schema.NullOr(AppUser.fields.role) }),
|
|
35
|
+
});
|
|
36
|
+
const target = yield* readTarget(input.userId).pipe(Effect.mapError(unavailable));
|
|
37
|
+
if (Option.isNone(target)) {
|
|
45
38
|
return yield* Effect.fail(new NotFound({ message: "User not found" }));
|
|
46
39
|
}
|
|
47
|
-
|
|
48
|
-
if (target.role === next) {
|
|
40
|
+
if (target.value.role === input.role) {
|
|
49
41
|
return false;
|
|
50
42
|
}
|
|
51
43
|
const assigners = access.Role.literals.filter((role) => access.hasPermission(role, AssignRoles));
|
|
52
|
-
if (assigners.some((role) => role === target.role) && !access.hasPermission(
|
|
53
|
-
const
|
|
44
|
+
if (assigners.some((role) => role === target.value.role) && !access.hasPermission(input.role, AssignRoles)) {
|
|
45
|
+
const readHolders = SqlSchema.findAll({
|
|
46
|
+
execute: () => sql `select id from "user" where role in ${sql.in(assigners)}`,
|
|
47
|
+
Request: Schema.Void,
|
|
48
|
+
Result: Schema.Struct({ id: AppUser.fields.id }),
|
|
49
|
+
});
|
|
50
|
+
const holders = yield* readHolders(undefined).pipe(Effect.mapError(unavailable));
|
|
54
51
|
if (holders.length === 1) {
|
|
55
52
|
return yield* Effect.fail(new LastRoleAssigner({ userId: input.userId }));
|
|
56
53
|
}
|
|
57
54
|
}
|
|
58
|
-
yield* sql `update "user" set role = ${
|
|
55
|
+
yield* sql `update "user" set role = ${input.role}, "updatedAt" = now() where id = ${input.userId}`;
|
|
59
56
|
yield* invalidateOnCommit(["admin.users"]);
|
|
60
57
|
return true;
|
|
61
58
|
}).pipe(transact({ onSqlError: unavailable }));
|
package/dist/server/users.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../src/server/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../../src/server/users.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import type {
|
|
1
|
+
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
2
2
|
import type { usersPage } from "#users/page.ts";
|
|
3
|
-
export declare function usersHandlers<const TRole extends string>(page: ReturnType<typeof usersPage<TRole>>, access: Pick<
|
|
3
|
+
export declare function usersHandlers<const TRole extends string>(page: ReturnType<typeof usersPage<TRole>>, access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">): import("effect/Layer").Layer<import("effect/rpc/Rpc").Handler<"admin.users.changeRole"> | import("effect/rpc/Rpc").Handler<"admin.users.list">, never, import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient>;
|
|
4
4
|
//# sourceMappingURL=usersHandlers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usersHandlers.d.ts","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"usersHandlers.d.ts","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AACA,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAKjE,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAEhD,wBAAgB,aAAa,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,EACvD,IAAI,EAAE,UAAU,CAAC,OAAO,SAAS,CAAC,KAAK,CAAC,CAAC,EACzC,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC,wPAU3D"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"usersHandlers.js","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7D,MAAM,UAAU,aAAa,CAC5B,IAAyC,EACzC,
|
|
1
|
+
{"version":3,"file":"usersHandlers.js","sourceRoot":"","sources":["../../src/server/usersHandlers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,WAAW,EAAE,MAAM,iBAAiB,CAAC;AAC9C,OAAO,EAAE,cAAc,EAAE,SAAS,EAAE,MAAM,kBAAkB,CAAC;AAG7D,MAAM,UAAU,aAAa,CAC5B,IAAyC,EACzC,MAA2D;IAE3D,OAAO,IAAI,CAAC,QAAQ,CAAC,WAAW,CAAC,OAAO,CAAC;QACxC,wBAAwB,EAAE,CAAC,KAAK,EAAE,EAAE,CAAC,cAAc,CAAC,MAAM,EAAE,KAAK,CAAC;QAClE,kBAAkB,EAAE,CAAC,KAAK,EAAE,EAAE,CAC7B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC;YAChC,OAAO,EAAE,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,MAAM,EAAE,KAAK,CAAC,CAAC,EAAE,cAAc,EAAE,aAAa,CAAC,IAAI,EAAE,WAAW,CAAC,EAAE,CAAC;QACnG,CAAC,CAAC;KACH,CAAC,CAAC;AACJ,CAAC"}
|
package/dist/users/page.d.ts
CHANGED
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
|
-
import type {
|
|
2
|
+
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
3
3
|
import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
4
4
|
import { UsersPermission } from "#permissions.ts";
|
|
5
5
|
import { LastRoleAssigner } from "#users/roles.ts";
|
|
6
6
|
export declare const UsersList: Schema.Struct<{
|
|
7
7
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
8
8
|
readonly users: Schema.$Array<Schema.Struct<{
|
|
9
|
-
readonly createdAt: Schema.
|
|
9
|
+
readonly createdAt: Schema.DateTimeUtcFromDate;
|
|
10
10
|
readonly email: Schema.String;
|
|
11
11
|
readonly id: Schema.String;
|
|
12
12
|
readonly name: Schema.String;
|
|
@@ -14,7 +14,7 @@ export declare const UsersList: Schema.Struct<{
|
|
|
14
14
|
}>>;
|
|
15
15
|
readonly canChangeRoles: Schema.Boolean;
|
|
16
16
|
}>;
|
|
17
|
-
export declare function usersPage<const TRole extends string>(access: Pick<
|
|
17
|
+
export declare function usersPage<const TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role">): import("#page.ts").AdminPage & {
|
|
18
18
|
readonly id: "users";
|
|
19
19
|
readonly contract: import("@shivaedev/contract/contract.ts").Contract<"admin.users", readonly [NoInfer<import("@shivaedev/contract/operation.ts").Query<"list", Schema.Struct<{
|
|
20
20
|
readonly cursor: Schema.optionalKey<Schema.String>;
|
|
@@ -22,7 +22,7 @@ export declare function usersPage<const TRole extends string>(access: Pick<Retur
|
|
|
22
22
|
}>, Schema.Struct<{
|
|
23
23
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
24
24
|
readonly users: Schema.$Array<Schema.Struct<{
|
|
25
|
-
readonly createdAt: Schema.
|
|
25
|
+
readonly createdAt: Schema.DateTimeUtcFromDate;
|
|
26
26
|
readonly email: Schema.String;
|
|
27
27
|
readonly id: Schema.String;
|
|
28
28
|
readonly name: Schema.String;
|
|
@@ -66,22 +66,22 @@ export declare function usersPage<const TRole extends string>(access: Pick<Retur
|
|
|
66
66
|
readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
|
|
67
67
|
}>, Schema.Struct<{
|
|
68
68
|
readonly _tag: Schema.Literal<"Resync">;
|
|
69
|
-
}>]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>>, Schema.Never, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.
|
|
70
|
-
role: Schema.Literals<TRole[]>;
|
|
71
|
-
userId: Schema.String;
|
|
72
|
-
}>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastRoleAssigner)[]>, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
|
|
69
|
+
}>]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>>, Schema.Never, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.list", Schema.Struct<{
|
|
73
70
|
readonly cursor: Schema.optionalKey<Schema.String>;
|
|
74
71
|
readonly limit: Schema.Number;
|
|
75
72
|
}>, Schema.Struct<{
|
|
76
73
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
77
74
|
readonly users: Schema.$Array<Schema.Struct<{
|
|
78
|
-
readonly createdAt: Schema.
|
|
75
|
+
readonly createdAt: Schema.DateTimeUtcFromDate;
|
|
79
76
|
readonly email: Schema.String;
|
|
80
77
|
readonly id: Schema.String;
|
|
81
78
|
readonly name: Schema.String;
|
|
82
79
|
readonly role: Schema.String;
|
|
83
80
|
}>>;
|
|
84
81
|
readonly canChangeRoles: Schema.Boolean;
|
|
85
|
-
}>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof UsersPermission, never
|
|
82
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof UsersPermission, never> | import("effect/rpc/Rpc").Rpc<"admin.users.changeRole", Schema.Struct<{
|
|
83
|
+
role: Schema.Literals<TRole[]>;
|
|
84
|
+
userId: Schema.String;
|
|
85
|
+
}>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable | typeof LastRoleAssigner)[]>, typeof UsersPermission, never>, readonly [], undefined>;
|
|
86
86
|
};
|
|
87
87
|
//# sourceMappingURL=page.d.ts.map
|
package/dist/users/page.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"page.d.ts","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAIjE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAIrF,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAA2B,MAAM,iBAAiB,CAAC;AAI5E,eAAO,MAAM,SAAS;;;;;;;;;;EAAwE,CAAC;AAC/F,wBAAgB,SAAS,CAAC,KAAK,CAAC,KAAK,SAAS,MAAM,EAAE,MAAM,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;EAwB9F"}
|
package/dist/users/page.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE5E,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AAC/F,MAAM,UAAU,SAAS,CAA6B,
|
|
1
|
+
{"version":3,"file":"page.js","sourceRoot":"","sources":["../../src/users/page.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AACxD,OAAO,EAAE,QAAQ,EAAE,MAAM,iCAAiC,CAAC;AAC3D,OAAO,EAAE,OAAO,EAAE,KAAK,EAAE,MAAM,kCAAkC,CAAC;AAClE,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,WAAW,EAAE,MAAM,iCAAiC,CAAC;AAC9D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,SAAS,EAAE,MAAM,UAAU,CAAC;AACrC,OAAO,EAAE,eAAe,EAAE,MAAM,iBAAiB,CAAC;AAClD,OAAO,EAAE,gBAAgB,EAAE,QAAQ,EAAE,aAAa,EAAE,MAAM,iBAAiB,CAAC;AAE5E,MAAM,KAAK,GAAG,UAAU,CAAC,aAAa,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAEvD,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,GAAG,QAAQ,CAAC,MAAM,EAAE,cAAc,EAAE,MAAM,CAAC,OAAO,EAAE,CAAC,CAAC;AAC/F,MAAM,UAAU,SAAS,CAA6B,MAAyC;IAC9F,OAAO,SAAS,CAAC;QAChB,QAAQ,EAAE,QAAQ,CAAC,aAAa,EAAE;YACjC,QAAQ,EAAE;gBACT,OAAO,CAAC,YAAY,EAAE;oBACrB,WAAW,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBAC/B,OAAO,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,IAAI,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE;oBACrD,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE,gBAAgB,EAAE,QAAQ,EAAE;iBACtE,CAAC;aACF;YACD,OAAO,EAAE;gBACR,KAAK,CAAC,MAAM,EAAE;oBACb,OAAO,EAAE,aAAa,CAAC,MAAM;oBAC7B,UAAU,EAAE,GAAG,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,WAAW,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,aAAa,CAAC,IAAI,EAAE,eAAe,CAAC,UAAU,CAAC,CAAC;oBACpG,KAAK,EAAE,GAAG,EAAE,CAAC,CAAC,KAAK,CAAC,IAAI,CAAC;oBACzB,UAAU,EAAE,EAAE,eAAe,EAAE,SAAS,EAAE;oBAC1C,OAAO,EAAE,SAAS;iBAClB,CAAC;aACF;SACD,CAAC;QACF,EAAE,EAAE,OAAO;QACX,UAAU,EAAE,eAAe;QAC3B,KAAK,EAAE,EAAE,IAAI,EAAE,cAAc,EAAE,KAAK,EAAE,OAAO,EAAE;KAC/C,CAAC,CAAC;AACJ,CAAC"}
|
package/dist/users/roles.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Schema } from "effect";
|
|
2
2
|
export declare const AppUser: Schema.Struct<{
|
|
3
|
-
readonly createdAt: Schema.
|
|
3
|
+
readonly createdAt: Schema.DateTimeUtcFromDate;
|
|
4
4
|
readonly email: Schema.String;
|
|
5
5
|
readonly id: Schema.String;
|
|
6
6
|
readonly name: Schema.String;
|
|
@@ -13,7 +13,7 @@ export declare const UserListInput: Schema.Struct<{
|
|
|
13
13
|
export declare const UserList: Schema.Struct<{
|
|
14
14
|
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
15
15
|
readonly users: Schema.$Array<Schema.Struct<{
|
|
16
|
-
readonly createdAt: Schema.
|
|
16
|
+
readonly createdAt: Schema.DateTimeUtcFromDate;
|
|
17
17
|
readonly email: Schema.String;
|
|
18
18
|
readonly id: Schema.String;
|
|
19
19
|
readonly name: Schema.String;
|
package/dist/users/roles.js
CHANGED
package/dist/users/roles.js.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC,
|
|
1
|
+
{"version":3,"file":"roles.js","sourceRoot":"","sources":["../../src/users/roles.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,CAAC,MAAM,OAAO,GAAG,MAAM,CAAC,MAAM,CAAC;IACpC,SAAS,EAAE,MAAM,CAAC,mBAAmB;IACrC,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM;CACnB,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1F,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC;AAKtH,MAAM,OAAO,gBAAiB,SAAQ,MAAM,CAAC,WAAW,EAAoB,CAAC,kBAAkB,EAAE,EAAE,MAAM,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;CAAG"}
|