@shivaedev/identity 0.26.0 → 0.26.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/CHANGELOG.md +7 -0
- package/dist/accountPreferences.d.ts +13 -13
- package/dist/server/better-auth/sessionAdministration.d.ts +3 -3
- package/dist/server/better-auth/sessionAdministration.d.ts.map +1 -1
- package/dist/server/better-auth/sessionAdministration.js +18 -15
- package/dist/server/better-auth/sessionAdministration.js.map +1 -1
- package/dist/server/better-auth/userDirectoryReads.d.ts +1 -1
- package/dist/server/better-auth/userDirectoryReads.d.ts.map +1 -1
- package/dist/server/better-auth/userDirectoryReads.js +18 -10
- package/dist/server/better-auth/userDirectoryReads.js.map +1 -1
- package/dist/sessions.d.ts +4 -4
- package/dist/sessions.d.ts.map +1 -1
- package/package.json +9 -9
- package/src/server/better-auth/sessionAdministration.ts +19 -18
- package/src/server/better-auth/userDirectoryReads.ts +19 -10
package/CHANGELOG.md
CHANGED
|
@@ -64,11 +64,19 @@ export declare const AccountPreferences: import("@shivaedev/contract/contract.ts
|
|
|
64
64
|
error: Schema.Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof AuthUnavailable, typeof import("@shivaedev/errors/taxonomy.ts").Forbidden, typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>;
|
|
65
65
|
middleware: Effect.Effect<import("#subject.ts").SubjectMiddleware<never, never>, never, import("#subject.ts").SubjectResolver>;
|
|
66
66
|
};
|
|
67
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"identity.accountPreferences.
|
|
67
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"identity.accountPreferences.get", Schema.Void, Schema.Struct<{
|
|
68
68
|
readonly locale: Schema.NonEmptyString;
|
|
69
69
|
readonly timezone: Schema.String;
|
|
70
70
|
readonly units: Schema.Literals<readonly ["metric", "imperial"]>;
|
|
71
|
-
}>, Schema.
|
|
71
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, (import("effect/Context").Reference<<A, E, R>(effect: Effect.Effect<A, E, R>, request: {
|
|
72
|
+
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
73
|
+
readonly payload: unknown;
|
|
74
|
+
}) => Effect.Effect<A, E | import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy | import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied | import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
|
|
75
|
+
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
76
|
+
"~ClientError": never;
|
|
77
|
+
error: Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
78
|
+
requiredForClient: false;
|
|
79
|
+
}) | (import("effect/rpc/RpcMiddleware").ServiceClass<import("@shivaedev/contract/internal/subjectMiddleware.ts").SubjectMiddleware<{
|
|
72
80
|
error: Schema.Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof AuthUnavailable, typeof import("@shivaedev/errors/taxonomy.ts").Forbidden, typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>;
|
|
73
81
|
middleware: Effect.Effect<import("#subject.ts").SubjectMiddleware<never, never>, never, import("#subject.ts").SubjectResolver>;
|
|
74
82
|
}>, `@shivaedev/contract/Subject/${string}`, import("./identity.ts").Identity | import("./identity.ts").SessionUser | import("#subject.ts").Subject, Schema.Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof 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> & {
|
|
@@ -76,19 +84,11 @@ export declare const AccountPreferences: import("@shivaedev/contract/contract.ts
|
|
|
76
84
|
error: Schema.Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof AuthUnavailable, typeof import("@shivaedev/errors/taxonomy.ts").Forbidden, typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>;
|
|
77
85
|
middleware: Effect.Effect<import("#subject.ts").SubjectMiddleware<never, never>, never, import("#subject.ts").SubjectResolver>;
|
|
78
86
|
};
|
|
79
|
-
}, never> | import("effect/rpc/Rpc").Rpc<"identity.accountPreferences.
|
|
87
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"identity.accountPreferences.capture", Schema.Struct<{
|
|
80
88
|
readonly locale: Schema.NonEmptyString;
|
|
81
89
|
readonly timezone: Schema.String;
|
|
82
90
|
readonly units: Schema.Literals<readonly ["metric", "imperial"]>;
|
|
83
|
-
}>, Schema.
|
|
84
|
-
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
85
|
-
readonly payload: unknown;
|
|
86
|
-
}) => Effect.Effect<A, E | import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy | import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied | import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
|
|
87
|
-
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
88
|
-
"~ClientError": never;
|
|
89
|
-
error: Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
90
|
-
requiredForClient: false;
|
|
91
|
-
}) | (import("effect/rpc/RpcMiddleware").ServiceClass<import("@shivaedev/contract/internal/subjectMiddleware.ts").SubjectMiddleware<{
|
|
91
|
+
}>, Schema.Void, Schema.Union<readonly (typeof AuthUnavailable)[]>, import("effect/rpc/RpcMiddleware").ServiceClass<import("@shivaedev/contract/internal/subjectMiddleware.ts").SubjectMiddleware<{
|
|
92
92
|
error: Schema.Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof AuthUnavailable, typeof import("@shivaedev/errors/taxonomy.ts").Forbidden, typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>;
|
|
93
93
|
middleware: Effect.Effect<import("#subject.ts").SubjectMiddleware<never, never>, never, import("#subject.ts").SubjectResolver>;
|
|
94
94
|
}>, `@shivaedev/contract/Subject/${string}`, import("./identity.ts").Identity | import("./identity.ts").SessionUser | import("#subject.ts").Subject, Schema.Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof 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> & {
|
|
@@ -96,7 +96,7 @@ export declare const AccountPreferences: import("@shivaedev/contract/contract.ts
|
|
|
96
96
|
error: Schema.Union<readonly [typeof import("@shivaedev/errors/taxonomy.ts").Unauthorized, typeof AuthUnavailable, typeof import("@shivaedev/errors/taxonomy.ts").Forbidden, typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>;
|
|
97
97
|
middleware: Effect.Effect<import("#subject.ts").SubjectMiddleware<never, never>, never, import("#subject.ts").SubjectResolver>;
|
|
98
98
|
};
|
|
99
|
-
}
|
|
99
|
+
}, never> | import("effect/rpc/Rpc").Rpc<"identity.accountPreferences.set", Schema.Struct<{
|
|
100
100
|
readonly locale: Schema.NonEmptyString;
|
|
101
101
|
readonly timezone: Schema.String;
|
|
102
102
|
readonly units: Schema.Literals<readonly ["metric", "imperial"]>;
|
|
@@ -10,10 +10,10 @@ export declare const listSessions: (input: {
|
|
|
10
10
|
readonly limit: number;
|
|
11
11
|
}) => Effect.Effect<{
|
|
12
12
|
next: Option.Option<{
|
|
13
|
-
id: string;
|
|
14
|
-
lastActivityAt: DateTime.Utc;
|
|
13
|
+
readonly id: string;
|
|
14
|
+
readonly lastActivityAt: DateTime.Utc;
|
|
15
15
|
}>;
|
|
16
|
-
sessions: {
|
|
16
|
+
sessions: readonly {
|
|
17
17
|
readonly expiresAt: DateTime.Utc;
|
|
18
18
|
readonly id: string;
|
|
19
19
|
readonly lastActivityAt: DateTime.Utc;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionAdministration.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/sessionAdministration.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,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"sessionAdministration.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/sessionAdministration.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,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAQ3C,eAAO,MAAM,YAAY;;;;;;;;;;;;;;;;;;;;;;0GAsBvB,CAAC;AAEH,eAAO,MAAM,aAAa,6JAYxB,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { DateTime, Effect, Option, Schema } from "effect";
|
|
|
2
2
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
3
|
import { requirePermission } from "@shivaedev/access/requirePermission.ts";
|
|
4
4
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
5
|
+
import { keysetPage } from "@shivaedev/sql/keysetPage.ts";
|
|
5
6
|
import { SessionUser } from "#identity.ts";
|
|
6
7
|
import { ManageSessions } from "#sessionPermissions.ts";
|
|
7
8
|
import { SignedInSession } from "#sessions.ts";
|
|
@@ -12,21 +13,23 @@ export const listSessions = Effect.fn("Identity.listSessions")(function* (input)
|
|
|
12
13
|
yield* requirePermission(yield* SessionUser, ManageSessions);
|
|
13
14
|
const sql = yield* SqlClient.SqlClient;
|
|
14
15
|
const now = DateTime.toDateUtc(yield* DateTime.now);
|
|
15
|
-
const
|
|
16
|
-
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
16
|
+
const page = yield* keysetPage({
|
|
17
|
+
after: input.cursor,
|
|
18
|
+
cursorFor: ({ id, lastActivityAt }) => ({ id, lastActivityAt }),
|
|
19
|
+
limit: input.limit,
|
|
20
|
+
orderBy: [{ column: sql `s."updatedAt"`, direction: "desc", value: (cursor) => DateTime.formatIso(cursor.lastActivityAt) }],
|
|
21
|
+
read: ({ limit, orderBy, seek }) => SqlSchema.findAll({
|
|
22
|
+
execute: () => sql `select s.id, s."createdAt" as "startedAt", s."updatedAt" as "lastActivityAt", s."expiresAt",
|
|
23
|
+
json_build_object('id', u.id, 'name', u.name, 'email', u.email) as "user"
|
|
24
|
+
from "session" s join "user" u on u.id = s."userId"
|
|
25
|
+
where s."expiresAt" > ${now} and ${seek}
|
|
26
|
+
order by ${orderBy} limit ${limit}`,
|
|
27
|
+
Request: Schema.Void,
|
|
28
|
+
Result: SignedInSession,
|
|
29
|
+
})(undefined),
|
|
30
|
+
tieBreaker: { column: sql `s.id`, direction: "desc", value: (cursor) => cursor.id },
|
|
31
|
+
}).pipe(Effect.mapError(unavailable));
|
|
32
|
+
return { next: page.next, sessions: page.rows };
|
|
30
33
|
});
|
|
31
34
|
export const revokeSession = Effect.fn("Identity.revokeSession")(function* (id) {
|
|
32
35
|
yield* requirePermission(yield* SessionUser, ManageSessions);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionAdministration.js","sourceRoot":"","sources":["../../../src/server/better-auth/sessionAdministration.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;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAC3C,OAAO,EAAE,cAAc,EAAE,MAAM,wBAAwB,CAAC;AACxD,OAAO,EAAyB,eAAe,EAAE,MAAM,cAAc,CAAC;AAEtE,SAAS,WAAW;IACnB,OAAO,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,qCAAqC,EAAE,CAAC,CAAC;AAChF,CAAC;AAED,MAAM,CAAC,MAAM,YAAY,GAAG,MAAM,CAAC,EAAE,CAAC,uBAAuB,CAAC,CAAC,QAAQ,CAAC,EAAE,KAAmC;IAC5G,KAAK,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,CAAC,WAAW,EAAE,cAAc,CAAC,CAAC;IAC7D,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;IACvC,MAAM,GAAG,GAAG,QAAQ,CAAC,SAAS,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,CAAC;IACpD,MAAM,
|
|
1
|
+
{"version":3,"file":"sessionAdministration.js","sourceRoot":"","sources":["../../../src/server/better-auth/sessionAdministration.ts"],"names":[],"mappings":"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"}
|
|
@@ -9,7 +9,7 @@ export declare const userDirectoryReads: <TRole extends string>(access: Pick<Acc
|
|
|
9
9
|
readonly limit: number;
|
|
10
10
|
}) => Effect.Effect<{
|
|
11
11
|
next: Option.Option<string>;
|
|
12
|
-
users: {
|
|
12
|
+
users: readonly {
|
|
13
13
|
readonly createdAt: import("effect/DateTime").Utc;
|
|
14
14
|
readonly email: string;
|
|
15
15
|
readonly id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userDirectoryReads.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectoryReads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"userDirectoryReads.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectoryReads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,EAAE,KAAK,gBAAgB,EAAU,MAAM,wCAAwC,CAAC;AAOvF,eAAO,MAAM,kBAAkB,GAAgC,KAAK,SAAS,MAAM;;;;;;;;;;;;;;iBAqCpE,SAAS,MAAM,EAAE;;;;;8BAM9B,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Effect, Option, Schema } from "effect";
|
|
2
2
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
3
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
import { keysetPage } from "@shivaedev/sql/keysetPage.ts";
|
|
4
5
|
import { tables } from "#server/better-auth/adapters/tables.ts";
|
|
5
6
|
import { AccountName, DirectoryUser, UserListInput } from "#users.ts";
|
|
6
7
|
function unavailable() {
|
|
@@ -9,13 +10,7 @@ function unavailable() {
|
|
|
9
10
|
export const userDirectoryReads = Effect.fnUntraced(function* (access, options) {
|
|
10
11
|
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
11
12
|
const { user } = tables(options);
|
|
12
|
-
const
|
|
13
|
-
execute: ({ cursor, limit }) => sql `select id, ${sql(user.name)} as name, ${sql(user.email)} as email,
|
|
14
|
-
${sql(user.role)} as role, ${sql(user.createdAt)} as "createdAt" from ${sql(user.table)}
|
|
15
|
-
where id > ${cursor ?? ""} order by id limit ${limit + 1}`,
|
|
16
|
-
Request: UserListInput,
|
|
17
|
-
Result: Schema.Struct({ ...DirectoryUser.fields, role: access.Role }),
|
|
18
|
-
});
|
|
13
|
+
const User = Schema.Struct({ ...DirectoryUser.fields, role: access.Role });
|
|
19
14
|
const readRole = SqlSchema.findOneOption({
|
|
20
15
|
execute: (id) => sql `select ${sql(user.role)} as role from ${sql(user.table)} where id = ${id}`,
|
|
21
16
|
Request: Schema.String,
|
|
@@ -28,9 +23,22 @@ export const userDirectoryReads = Effect.fnUntraced(function* (access, options)
|
|
|
28
23
|
});
|
|
29
24
|
return {
|
|
30
25
|
list: Effect.fn("UserDirectory.list")(function* (input) {
|
|
31
|
-
const
|
|
32
|
-
const
|
|
33
|
-
|
|
26
|
+
const request = yield* Schema.decodeUnknownEffect(UserListInput)(input).pipe(Effect.mapError(unavailable));
|
|
27
|
+
const page = yield* keysetPage({
|
|
28
|
+
after: request.cursor ?? "",
|
|
29
|
+
cursorFor: (row) => row.id,
|
|
30
|
+
limit: request.limit,
|
|
31
|
+
orderBy: [],
|
|
32
|
+
read: ({ limit, orderBy, seek }) => SqlSchema.findAll({
|
|
33
|
+
execute: () => sql `select id, ${sql(user.name)} as name, ${sql(user.email)} as email,
|
|
34
|
+
${sql(user.role)} as role, ${sql(user.createdAt)} as "createdAt" from ${sql(user.table)}
|
|
35
|
+
where ${seek} order by ${orderBy} limit ${limit}`,
|
|
36
|
+
Request: Schema.Void,
|
|
37
|
+
Result: User,
|
|
38
|
+
})(undefined),
|
|
39
|
+
tieBreaker: { column: "id", direction: "asc", value: (cursor) => cursor },
|
|
40
|
+
}).pipe(Effect.mapError(unavailable));
|
|
41
|
+
return { next: page.next, users: page.rows };
|
|
34
42
|
}),
|
|
35
43
|
names: (ids) => (ids.length === 0 ? Effect.succeed([]) : readNames(ids).pipe(Effect.mapError(unavailable))),
|
|
36
44
|
role: Effect.fn("UserDirectory.role")(function* (id) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userDirectoryReads.js","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectoryReads.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAyB,MAAM,EAAE,MAAM,wCAAwC,CAAC;AACvF,OAAO,EAAE,WAAW,EAAE,aAAa,EAAE,aAAa,EAAE,MAAM,WAAW,CAAC;AAEtE,SAAS,WAAW;IACnB,OAAO,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,4BAA4B,EAAE,CAAC,CAAC;AACvE,CAAC;AAED,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAC5D,MAAyC,EACzC,OAA0B;IAE1B,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC7D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;IACjC,MAAM,
|
|
1
|
+
{"version":3,"file":"userDirectoryReads.js","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectoryReads.ts"],"names":[],"mappings":"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"}
|
package/dist/sessions.d.ts
CHANGED
|
@@ -108,9 +108,7 @@ export declare const Sessions: import("@shivaedev/contract/contract.ts").Contrac
|
|
|
108
108
|
"~ClientError": never;
|
|
109
109
|
error: Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
110
110
|
requiredForClient: false;
|
|
111
|
-
}), never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.
|
|
112
|
-
id: Schema.String;
|
|
113
|
-
}>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable)[]>, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.list", Schema.Struct<{
|
|
111
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.list", Schema.Struct<{
|
|
114
112
|
readonly cursor: Schema.optionalKey<Schema.Struct<{
|
|
115
113
|
readonly id: Schema.String;
|
|
116
114
|
readonly lastActivityAt: Schema.DateTimeUtcFromString;
|
|
@@ -140,5 +138,7 @@ export declare const Sessions: import("@shivaedev/contract/contract.ts").Contrac
|
|
|
140
138
|
"~ClientError": never;
|
|
141
139
|
error: Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
142
140
|
requiredForClient: false;
|
|
143
|
-
}), never
|
|
141
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.revoke", Schema.Struct<{
|
|
142
|
+
id: Schema.String;
|
|
143
|
+
}>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable)[]>, typeof SessionsPermission, never>, readonly [], undefined>;
|
|
144
144
|
//# sourceMappingURL=sessions.d.ts.map
|
package/dist/sessions.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIxC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAI5D,eAAO,MAAM,eAAe;;;;;;;;;;EAM1B,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAAqF,CAAC;AAChH,eAAO,MAAM,gBAAgB;;;;;;EAG3B,CAAC;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;EAA2G,CAAC;AAEpI,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIxC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAI5D,eAAO,MAAM,eAAe;;;;;;;;;;EAM1B,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAAqF,CAAC;AAChH,eAAO,MAAM,gBAAgB;;;;;;EAG3B,CAAC;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;EAA2G,CAAC;AAEpI,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mKAiBY,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/identity",
|
|
3
|
-
"version": "0.26.
|
|
3
|
+
"version": "0.26.1",
|
|
4
4
|
"description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -49,20 +49,20 @@
|
|
|
49
49
|
"@shivaedev/changes": "0.10.1",
|
|
50
50
|
"@shivaedev/contract": "0.36.1",
|
|
51
51
|
"@shivaedev/errors": "0.9.1",
|
|
52
|
-
"@shivaedev/rate-limit": "0.5.
|
|
52
|
+
"@shivaedev/rate-limit": "0.5.2",
|
|
53
53
|
"@shivaedev/service": "0.7.1",
|
|
54
|
-
"@shivaedev/sql": "0.
|
|
54
|
+
"@shivaedev/sql": "0.40.0"
|
|
55
55
|
},
|
|
56
56
|
"devDependencies": {
|
|
57
57
|
"@better-auth/oauth-provider": "1.7.14",
|
|
58
58
|
"@effect/platform-node": "4.0.7",
|
|
59
59
|
"@effect/sql-pg": "4.0.7",
|
|
60
|
-
"@shivaedev/admin": "0.20.
|
|
61
|
-
"@shivaedev/quality": "0.
|
|
62
|
-
"@shivaedev/server": "0.
|
|
63
|
-
"@shivaedev/test-kits": "0.
|
|
64
|
-
"@shivaedev/test-sql": "0.21.
|
|
65
|
-
"@shivaedev/test-story": "0.39.
|
|
60
|
+
"@shivaedev/admin": "0.20.3",
|
|
61
|
+
"@shivaedev/quality": "0.62.0",
|
|
62
|
+
"@shivaedev/server": "0.25.0",
|
|
63
|
+
"@shivaedev/test-kits": "0.5.0",
|
|
64
|
+
"@shivaedev/test-sql": "0.21.2",
|
|
65
|
+
"@shivaedev/test-story": "0.39.2",
|
|
66
66
|
"@types/node": "24.19.2",
|
|
67
67
|
"better-auth": "1.7.14",
|
|
68
68
|
"effect": "4.0.7",
|
|
@@ -2,6 +2,7 @@ import { DateTime, Effect, Option, Schema } from "effect";
|
|
|
2
2
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
3
|
import { requirePermission } from "@shivaedev/access/requirePermission.ts";
|
|
4
4
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
5
|
+
import { keysetPage } from "@shivaedev/sql/keysetPage.ts";
|
|
5
6
|
import { SessionUser } from "#identity.ts";
|
|
6
7
|
import { ManageSessions } from "#sessionPermissions.ts";
|
|
7
8
|
import { type SessionListInput, SignedInSession } from "#sessions.ts";
|
|
@@ -14,24 +15,24 @@ export const listSessions = Effect.fn("Identity.listSessions")(function* (input:
|
|
|
14
15
|
yield* requirePermission(yield* SessionUser, ManageSessions);
|
|
15
16
|
const sql = yield* SqlClient.SqlClient;
|
|
16
17
|
const now = DateTime.toDateUtc(yield* DateTime.now);
|
|
17
|
-
const
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
|
|
21
|
-
|
|
22
|
-
|
|
23
|
-
|
|
24
|
-
|
|
25
|
-
|
|
26
|
-
|
|
27
|
-
|
|
28
|
-
|
|
29
|
-
|
|
30
|
-
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
);
|
|
34
|
-
return { next, sessions };
|
|
18
|
+
const page = yield* keysetPage({
|
|
19
|
+
after: input.cursor,
|
|
20
|
+
cursorFor: ({ id, lastActivityAt }: typeof SignedInSession.Type) => ({ id, lastActivityAt }),
|
|
21
|
+
limit: input.limit,
|
|
22
|
+
orderBy: [{ column: sql`s."updatedAt"`, direction: "desc", value: (cursor) => DateTime.formatIso(cursor.lastActivityAt) }],
|
|
23
|
+
read: ({ limit, orderBy, seek }) =>
|
|
24
|
+
SqlSchema.findAll({
|
|
25
|
+
execute: () => sql`select s.id, s."createdAt" as "startedAt", s."updatedAt" as "lastActivityAt", s."expiresAt",
|
|
26
|
+
json_build_object('id', u.id, 'name', u.name, 'email', u.email) as "user"
|
|
27
|
+
from "session" s join "user" u on u.id = s."userId"
|
|
28
|
+
where s."expiresAt" > ${now} and ${seek}
|
|
29
|
+
order by ${orderBy} limit ${limit}`,
|
|
30
|
+
Request: Schema.Void,
|
|
31
|
+
Result: SignedInSession,
|
|
32
|
+
})(undefined),
|
|
33
|
+
tieBreaker: { column: sql`s.id`, direction: "desc", value: (cursor) => cursor.id },
|
|
34
|
+
}).pipe(Effect.mapError(unavailable));
|
|
35
|
+
return { next: page.next, sessions: page.rows };
|
|
35
36
|
});
|
|
36
37
|
|
|
37
38
|
export const revokeSession = Effect.fn("Identity.revokeSession")(function* (id: string) {
|
|
@@ -2,6 +2,7 @@ import { Effect, Option, Schema } from "effect";
|
|
|
2
2
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
3
|
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
4
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
5
|
+
import { keysetPage } from "@shivaedev/sql/keysetPage.ts";
|
|
5
6
|
import { type AuthTableOptions, tables } from "#server/better-auth/adapters/tables.ts";
|
|
6
7
|
import { AccountName, DirectoryUser, UserListInput } from "#users.ts";
|
|
7
8
|
|
|
@@ -15,13 +16,7 @@ export const userDirectoryReads = Effect.fnUntraced(function* <TRole extends str
|
|
|
15
16
|
) {
|
|
16
17
|
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
17
18
|
const { user } = tables(options);
|
|
18
|
-
const
|
|
19
|
-
execute: ({ cursor, limit }) => sql`select id, ${sql(user.name)} as name, ${sql(user.email)} as email,
|
|
20
|
-
${sql(user.role)} as role, ${sql(user.createdAt)} as "createdAt" from ${sql(user.table)}
|
|
21
|
-
where id > ${cursor ?? ""} order by id limit ${limit + 1}`,
|
|
22
|
-
Request: UserListInput,
|
|
23
|
-
Result: Schema.Struct({ ...DirectoryUser.fields, role: access.Role }),
|
|
24
|
-
});
|
|
19
|
+
const User = Schema.Struct({ ...DirectoryUser.fields, role: access.Role });
|
|
25
20
|
const readRole = SqlSchema.findOneOption({
|
|
26
21
|
execute: (id) => sql`select ${sql(user.role)} as role from ${sql(user.table)} where id = ${id}`,
|
|
27
22
|
Request: Schema.String,
|
|
@@ -34,9 +29,23 @@ export const userDirectoryReads = Effect.fnUntraced(function* <TRole extends str
|
|
|
34
29
|
});
|
|
35
30
|
return {
|
|
36
31
|
list: Effect.fn("UserDirectory.list")(function* (input: typeof UserListInput.Type) {
|
|
37
|
-
const
|
|
38
|
-
const
|
|
39
|
-
|
|
32
|
+
const request = yield* Schema.decodeUnknownEffect(UserListInput)(input).pipe(Effect.mapError(unavailable));
|
|
33
|
+
const page = yield* keysetPage({
|
|
34
|
+
after: request.cursor ?? "",
|
|
35
|
+
cursorFor: (row: typeof User.Type) => row.id,
|
|
36
|
+
limit: request.limit,
|
|
37
|
+
orderBy: [],
|
|
38
|
+
read: ({ limit, orderBy, seek }) =>
|
|
39
|
+
SqlSchema.findAll({
|
|
40
|
+
execute: () => sql`select id, ${sql(user.name)} as name, ${sql(user.email)} as email,
|
|
41
|
+
${sql(user.role)} as role, ${sql(user.createdAt)} as "createdAt" from ${sql(user.table)}
|
|
42
|
+
where ${seek} order by ${orderBy} limit ${limit}`,
|
|
43
|
+
Request: Schema.Void,
|
|
44
|
+
Result: User,
|
|
45
|
+
})(undefined),
|
|
46
|
+
tieBreaker: { column: "id", direction: "asc", value: (cursor: string) => cursor },
|
|
47
|
+
}).pipe(Effect.mapError(unavailable));
|
|
48
|
+
return { next: page.next, users: page.rows };
|
|
40
49
|
}),
|
|
41
50
|
names: (ids: readonly string[]) => (ids.length === 0 ? Effect.succeed([]) : readNames(ids).pipe(Effect.mapError(unavailable))),
|
|
42
51
|
role: Effect.fn("UserDirectory.role")(function* (id: string) {
|