@shivaedev/identity 0.16.0 → 0.18.0
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 +37 -0
- package/README.md +84 -54
- package/dist/server/SessionPolicy.d.ts +14 -0
- package/dist/server/SessionPolicy.d.ts.map +1 -0
- package/dist/server/SessionPolicy.js +4 -0
- package/dist/server/SessionPolicy.js.map +1 -0
- package/dist/server/adapters/authCall.d.ts +5 -0
- package/dist/server/adapters/authCall.d.ts.map +1 -0
- package/dist/server/adapters/authCall.js +7 -0
- package/dist/server/adapters/authCall.js.map +1 -0
- package/dist/server/adapters/betterAuthSessions.d.ts.map +1 -1
- package/dist/server/adapters/betterAuthSessions.js +4 -6
- package/dist/server/adapters/betterAuthSessions.js.map +1 -1
- package/dist/server/better-auth/PasswordReset.d.ts +7 -0
- package/dist/server/better-auth/PasswordReset.d.ts.map +1 -0
- package/dist/server/better-auth/PasswordReset.js +2 -0
- package/dist/server/better-auth/PasswordReset.js.map +1 -0
- package/dist/server/better-auth/accountRoleSeed.d.ts +2 -1
- package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -1
- package/dist/server/better-auth/accountRoleSeed.js +8 -6
- package/dist/server/better-auth/accountRoleSeed.js.map +1 -1
- package/dist/server/better-auth/adapters/database.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/database.js +18 -3
- package/dist/server/better-auth/adapters/database.js.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.js +2 -1
- package/dist/server/better-auth/adapters/hookRuntime.js.map +1 -1
- package/dist/server/better-auth/adapters/passwordResetOptions.d.ts +6 -0
- package/dist/server/better-auth/adapters/passwordResetOptions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/passwordResetOptions.js +17 -0
- package/dist/server/better-auth/adapters/passwordResetOptions.js.map +1 -0
- package/dist/server/better-auth/adapters/storedRoleOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.js +8 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.js.map +1 -1
- package/dist/server/better-auth/assignRole.d.ts +2 -1
- package/dist/server/better-auth/assignRole.d.ts.map +1 -1
- package/dist/server/better-auth/assignRole.js +7 -5
- package/dist/server/better-auth/assignRole.js.map +1 -1
- package/dist/server/better-auth/columnDrift.d.ts.map +1 -1
- package/dist/server/better-auth/columnDrift.js +4 -3
- package/dist/server/better-auth/columnDrift.js.map +1 -1
- package/dist/server/better-auth/migrationPlan.d.ts.map +1 -1
- package/dist/server/better-auth/migrationPlan.js +7 -5
- package/dist/server/better-auth/migrationPlan.js.map +1 -1
- package/dist/server/better-auth/mount.d.ts +3 -0
- package/dist/server/better-auth/mount.d.ts.map +1 -1
- package/dist/server/better-auth/mount.js +15 -4
- package/dist/server/better-auth/mount.js.map +1 -1
- package/dist/server/better-auth/sessionPermissions.js +1 -1
- package/dist/server/better-auth/signInGate.d.ts.map +1 -1
- package/dist/server/better-auth/signInGate.js +2 -1
- package/dist/server/better-auth/signInGate.js.map +1 -1
- package/dist/server/better-auth/tables.d.ts +19 -0
- package/dist/server/better-auth/tables.d.ts.map +1 -0
- package/dist/server/better-auth/tables.js +24 -0
- package/dist/server/better-auth/tables.js.map +1 -0
- package/dist/server/better-auth/userProfiles.js +1 -1
- package/dist/server/lookupSession.d.ts +5 -4
- package/dist/server/lookupSession.d.ts.map +1 -1
- package/dist/server/lookupSession.js +8 -4
- package/dist/server/lookupSession.js.map +1 -1
- package/dist/server/permissions.d.ts +4 -4
- package/dist/server/permissions.d.ts.map +1 -1
- package/dist/server/permissions.js +11 -8
- package/dist/server/permissions.js.map +1 -1
- package/dist/server/providerAccountsUser.d.ts +16 -0
- package/dist/server/providerAccountsUser.d.ts.map +1 -0
- package/dist/server/providerAccountsUser.js +12 -0
- package/dist/server/providerAccountsUser.js.map +1 -0
- package/dist/server/recheckSession.d.ts +2 -2
- package/dist/server/recheckSession.d.ts.map +1 -1
- package/dist/server/recheckSession.js +5 -3
- package/dist/server/recheckSession.js.map +1 -1
- package/dist/server/revalidateStream.d.ts +3 -2
- package/dist/server/revalidateStream.d.ts.map +1 -1
- package/dist/server/revalidateStream.js +3 -2
- package/dist/server/revalidateStream.js.map +1 -1
- package/dist/server/session.d.ts +9 -21
- package/dist/server/session.d.ts.map +1 -1
- package/dist/server/session.js +30 -28
- package/dist/server/session.js.map +1 -1
- package/dist/server/tracing.d.ts.map +1 -1
- package/dist/server/tracing.js +3 -2
- package/dist/server/tracing.js.map +1 -1
- package/package.json +12 -12
- package/src/server/SessionPolicy.ts +14 -0
- package/src/server/adapters/authCall.ts +8 -0
- package/src/server/adapters/betterAuthSessions.ts +5 -7
- package/src/server/better-auth/PasswordReset.ts +7 -0
- package/src/server/better-auth/accountRoleSeed.ts +8 -5
- package/src/server/better-auth/adapters/database.ts +21 -4
- package/src/server/better-auth/adapters/hookRuntime.ts +2 -1
- package/src/server/better-auth/adapters/passwordResetOptions.ts +25 -0
- package/src/server/better-auth/adapters/storedRoleOptions.ts +8 -1
- package/src/server/better-auth/assignRole.ts +7 -4
- package/src/server/better-auth/columnDrift.ts +4 -3
- package/src/server/better-auth/migrationPlan.ts +7 -5
- package/src/server/better-auth/mount.ts +17 -4
- package/src/server/better-auth/sessionPermissions.ts +1 -1
- package/src/server/better-auth/signInGate.ts +2 -1
- package/src/server/better-auth/tables.ts +28 -0
- package/src/server/better-auth/userProfiles.ts +1 -1
- package/src/server/lookupSession.ts +9 -8
- package/src/server/permissions.ts +29 -21
- package/src/server/providerAccountsUser.ts +16 -0
- package/src/server/recheckSession.ts +5 -4
- package/src/server/revalidateStream.ts +7 -5
- package/src/server/session.ts +88 -85
- package/src/server/tracing.ts +5 -2
|
@@ -1,24 +1,39 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { APIError } from "better-auth/api";
|
|
2
|
+
import { Cause, Effect, Exit, Option, Schema, Scope } from "effect";
|
|
2
3
|
import { SqlClient } from "effect/sql";
|
|
4
|
+
import { authCallSignal } from "#server/adapters/authCall.ts";
|
|
3
5
|
import { betterAuthTransaction } from "./transaction.js";
|
|
4
6
|
const Result = Schema.Struct({ command: Schema.String, rowCount: Schema.Number, rows: Schema.Array(Schema.Unknown) });
|
|
7
|
+
function databaseResult(exit) {
|
|
8
|
+
if (Exit.isSuccess(exit)) {
|
|
9
|
+
return exit.value;
|
|
10
|
+
}
|
|
11
|
+
if (Cause.hasInterruptsOnly(exit.cause)) {
|
|
12
|
+
throw new APIError("REQUEST_TIMEOUT", { code: "REQUEST_CANCELLED", message: "Authentication request was cancelled" });
|
|
13
|
+
}
|
|
14
|
+
throw Cause.squash(exit.cause);
|
|
15
|
+
}
|
|
5
16
|
export const betterAuthDatabase = Effect.fn("Identity.betterAuthDatabase")(function* () {
|
|
6
17
|
const sql = yield* SqlClient.SqlClient;
|
|
7
18
|
const transaction = yield* Effect.serviceOption(sql.transactionService);
|
|
8
19
|
const parent = yield* Scope.Scope;
|
|
9
20
|
const context = yield* Effect.context();
|
|
10
21
|
const run = Effect.runPromiseWith(context);
|
|
22
|
+
const runQuery = Effect.runPromiseExitWith(context);
|
|
11
23
|
const pool = {
|
|
12
24
|
async connect() {
|
|
13
25
|
const scope = await run(Scope.fork(parent));
|
|
14
|
-
const connection = await
|
|
26
|
+
const connection = await runQuery((Option.isSome(transaction) ? Effect.succeed(transaction.value[0]) : sql.reserve).pipe(Scope.provide(scope), Effect.onError((cause) => Scope.close(scope, Exit.failCause(cause)))), { signal: authCallSignal.getStore() }).then(databaseResult);
|
|
15
27
|
const control = Option.isSome(transaction) ? await run(betterAuthTransaction.pipe(Scope.provide(scope))) : undefined;
|
|
16
28
|
function query(text, parameters = []) {
|
|
17
29
|
if (typeof text !== "string") {
|
|
18
30
|
throw new Error("Better Auth database does not support cursors");
|
|
19
31
|
}
|
|
20
32
|
const nested = control?.(text);
|
|
21
|
-
|
|
33
|
+
const signal = text === "begin" || text === "commit" || text === "rollback" ? undefined : authCallSignal.getStore();
|
|
34
|
+
return (nested === undefined
|
|
35
|
+
? runQuery(connection.executeRaw(text, parameters), { signal }).then(databaseResult)
|
|
36
|
+
: nested.then(() => ({ command: text, rowCount: 0, rows: [] }))).then(Schema.decodeUnknownSync(Result));
|
|
22
37
|
}
|
|
23
38
|
return {
|
|
24
39
|
query,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/database.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"database.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/database.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hookRuntime.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/hookRuntime.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,KAAK,EAAW,MAAM,EAAU,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"hookRuntime.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/hookRuntime.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,KAAK,KAAK,EAAW,MAAM,EAAU,MAAM,QAAQ,CAAC;AAE7D,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,sCAAsC,CAAC;AAEhF,eAAO,MAAM,WAAW,GAAgC,CAAC;cAIvC,CAAC,QAAQ,MAAM,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,mBAAmB,EAAE,CAAC,CAAC,UAAU,WAAW,GAAG,SAAS,KAAG,OAAO,CAAC,CAAC,CAAC;iBAiBxG,CAAC,WAAW,CAAC,MAAM,EAAE,WAAW,KAAK,OAAO,CAAC,CAAC,CAAC;YAc5D,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { AsyncLocalStorage } from "node:async_hooks";
|
|
2
2
|
import { APIError } from "better-auth/api";
|
|
3
3
|
import { Context, Effect, Result } from "effect";
|
|
4
|
+
import { authCall } from "#server/adapters/authCall.ts";
|
|
4
5
|
export const hookRuntime = Effect.fnUntraced(function* () {
|
|
5
6
|
const context = yield* Effect.context();
|
|
6
7
|
const requests = new AsyncLocalStorage();
|
|
@@ -26,7 +27,7 @@ export const hookRuntime = Effect.fnUntraced(function* () {
|
|
|
26
27
|
const state = {
|
|
27
28
|
context: Context.merge(context, fiber.context),
|
|
28
29
|
};
|
|
29
|
-
const exit = yield* Effect.exit(
|
|
30
|
+
const exit = yield* Effect.exit(authCall((signal) => requests.run(state, () => request(signal))));
|
|
30
31
|
if (state.cause !== undefined) {
|
|
31
32
|
return yield* Effect.failCause(state.cause);
|
|
32
33
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"hookRuntime.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/hookRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAc,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"hookRuntime.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/hookRuntime.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,iBAAiB,EAAE,MAAM,kBAAkB,CAAC;AACrD,OAAO,EAAE,QAAQ,EAAE,MAAM,iBAAiB,CAAC;AAC3C,OAAO,EAAc,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,QAAQ,EAAE,MAAM,8BAA8B,CAAC;AAGxD,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC;IACrD,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAK,CAAC;IAC3C,MAAM,QAAQ,GAAG,IAAI,iBAAiB,EAAwE,CAAC;IAC/G,OAAO;QACN,OAAO,EAAE,KAAK,EAAK,IAAoD,EAAE,MAA+B,EAAc,EAAE;YACvH,MAAM,OAAO,GAAG,QAAQ,CAAC,QAAQ,EAAE,CAAC;YACpC,SAAS,QAAQ,CAAC,KAAyB;gBAC1C,OAAO,MAAM,CAAC,IAAI,CAAC,GAAG,EAAE;oBACvB,IAAI,OAAO,KAAK,SAAS,EAAE,CAAC;wBAC3B,OAAO,CAAC,KAAK,GAAG,KAAK,CAAC;oBACvB,CAAC;gBACF,CAAC,CAAC,CAAC;YACJ,CAAC;YACD,MAAM,MAAM,GAAG,MAAM,MAAM,CAAC,cAAc,CAAC,OAAO,EAAE,OAAO,IAAI,OAAO,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,EAAE;gBAC5I,MAAM;aACN,CAAC,CAAC;YACH,IAAI,MAAM,CAAC,SAAS,CAAC,MAAM,CAAC,EAAE,CAAC;gBAC9B,MAAM,IAAI,QAAQ,CAAC,WAAW,EAAE,EAAE,IAAI,EAAE,MAAM,CAAC,OAAO,CAAC,IAAI,EAAE,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,OAAO,EAAE,CAAC,CAAC;YACjG,CAAC;YACD,OAAO,MAAM,CAAC,OAAO,CAAC;QACvB,CAAC;QACD,UAAU,EAAE,CAAI,OAA4C,EAAE,EAAE,CAC/D,MAAM,CAAC,SAAS,CAAC,CAAC,KAAK,EAAE,EAAE,CAC1B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,MAAM,KAAK,GAAyE;gBACnF,OAAO,EAAE,OAAO,CAAC,KAAK,CAAC,OAAO,EAAE,KAAK,CAAC,OAAO,CAAC;aAC9C,CAAC;YACF,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CAAC,QAAQ,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,QAAQ,CAAC,GAAG,CAAC,KAAK,EAAE,GAAG,EAAE,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC,CAAC;YAClG,IAAI,KAAK,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;gBAC/B,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,SAAS,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC;YAC7C,CAAC;YACD,OAAO,KAAK,CAAC,CAAC,IAAI,CAAC;QACpB,CAAC,CAAC,CACF;KACF,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -0,0 +1,6 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import type { Effect } from "effect";
|
|
3
|
+
import type { BetterAuthPasswordReset } from "#server/better-auth/PasswordReset.ts";
|
|
4
|
+
import type { hookRuntime } from "./hookRuntime.ts";
|
|
5
|
+
export declare function passwordResetOptions<TOptions extends BetterAuthOptions, R>(options: TOptions, hook: BetterAuthPasswordReset<R> | undefined, runtime: Effect.Success<ReturnType<typeof hookRuntime<R>>>): TOptions;
|
|
6
|
+
//# sourceMappingURL=passwordResetOptions.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"passwordResetOptions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/passwordResetOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AACpF,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAEpD,wBAAgB,oBAAoB,CAAC,QAAQ,SAAS,iBAAiB,EAAE,CAAC,EACzE,OAAO,EAAE,QAAQ,EACjB,IAAI,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,SAAS,EAC5C,OAAO,EAAE,MAAM,CAAC,OAAO,CAAC,UAAU,CAAC,OAAO,WAAW,CAAC,CAAC,CAAC,CAAC,CAAC,GACxD,QAAQ,CAeV"}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
export function passwordResetOptions(options, hook, runtime) {
|
|
2
|
+
if (hook === undefined) {
|
|
3
|
+
return options;
|
|
4
|
+
}
|
|
5
|
+
return {
|
|
6
|
+
...options,
|
|
7
|
+
emailAndPassword: {
|
|
8
|
+
...options.emailAndPassword,
|
|
9
|
+
enabled: options.emailAndPassword?.enabled ?? false,
|
|
10
|
+
onPasswordReset: async (data, request) => {
|
|
11
|
+
await options.emailAndPassword?.onPasswordReset?.(data, request);
|
|
12
|
+
await runtime.runHook(() => hook(data), request?.signal);
|
|
13
|
+
},
|
|
14
|
+
},
|
|
15
|
+
};
|
|
16
|
+
}
|
|
17
|
+
//# sourceMappingURL=passwordResetOptions.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"passwordResetOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/passwordResetOptions.ts"],"names":[],"mappings":"AAKA,MAAM,UAAU,oBAAoB,CACnC,OAAiB,EACjB,IAA4C,EAC5C,OAA0D;IAE1D,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,OAAO;QACN,GAAG,OAAO;QACV,gBAAgB,EAAE;YACjB,GAAG,OAAO,CAAC,gBAAgB;YAC3B,OAAO,EAAE,OAAO,CAAC,gBAAgB,EAAE,OAAO,IAAI,KAAK;YACnD,eAAe,EAAE,KAAK,EAAE,IAAI,EAAE,OAAO,EAAE,EAAE;gBACxC,MAAM,OAAO,CAAC,gBAAgB,EAAE,eAAe,EAAE,CAAC,IAAI,EAAE,OAAO,CAAC,CAAC;gBACjE,MAAM,OAAO,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,OAAO,EAAE,MAAM,CAAC,CAAC;YAC1D,CAAC;SACD;KACD,CAAC;AACH,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storedRoleOptions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/storedRoleOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"storedRoleOptions.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/storedRoleOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,MAAM,WAAW,iBAAiB;IACjC,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;CAC7B;AAED,wBAAgB,iBAAiB,CAAC,QAAQ,SAAS,iBAAiB,EAAE,OAAO,EAAE,QAAQ,EAAE,IAAI,CAAC,EAAE,iBAAiB,GAAG,QAAQ,CAoB3H"}
|
|
@@ -1,3 +1,4 @@
|
|
|
1
|
+
import { tables } from "#server/better-auth/tables.ts";
|
|
1
2
|
export function storedRoleOptions(options, role) {
|
|
2
3
|
if (role === undefined) {
|
|
3
4
|
return options;
|
|
@@ -8,7 +9,13 @@ export function storedRoleOptions(options, role) {
|
|
|
8
9
|
...options.user,
|
|
9
10
|
additionalFields: {
|
|
10
11
|
...options.user?.additionalFields,
|
|
11
|
-
role: {
|
|
12
|
+
role: {
|
|
13
|
+
defaultValue: role.defaultRole,
|
|
14
|
+
fieldName: tables(options).user.role,
|
|
15
|
+
input: false,
|
|
16
|
+
required: true,
|
|
17
|
+
type: "string",
|
|
18
|
+
},
|
|
12
19
|
},
|
|
13
20
|
},
|
|
14
21
|
};
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"storedRoleOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/storedRoleOptions.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"storedRoleOptions.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/storedRoleOptions.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAMvD,MAAM,UAAU,iBAAiB,CAAqC,OAAiB,EAAE,IAAwB;IAChH,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,OAAO;QACN,GAAG,OAAO;QACV,IAAI,EAAE;YACL,GAAG,OAAO,CAAC,IAAI;YACf,gBAAgB,EAAE;gBACjB,GAAG,OAAO,CAAC,IAAI,EAAE,gBAAgB;gBACjC,IAAI,EAAE;oBACL,YAAY,EAAE,IAAI,CAAC,WAAW;oBAC9B,SAAS,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,IAAI,CAAC,IAAI;oBACpC,KAAK,EAAE,KAAK;oBACZ,QAAQ,EAAE,IAAI;oBACd,IAAI,EAAE,QAAQ;iBACd;aACD;SACD;KACD,CAAC;AACH,CAAC"}
|
|
@@ -3,5 +3,6 @@ import { SqlClient } from "effect/sql";
|
|
|
3
3
|
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
4
|
import { LastRoleAssigner } from "@shivaedev/access/roles.ts";
|
|
5
5
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
6
|
-
|
|
6
|
+
import { type AuthTableOptions } from "./tables.ts";
|
|
7
|
+
export declare const assignRole: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">, userId: string, role: NoInfer<TRole>, options?: AuthTableOptions | undefined) => Effect.Effect<boolean, AuthUnavailable | LastRoleAssigner | NotFound, SqlClient.SqlClient>;
|
|
7
8
|
//# sourceMappingURL=assignRole.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assignRole.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAe,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"assignRole.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAEhD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAe,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,EAAE,KAAK,gBAAgB,EAAU,MAAM,aAAa,CAAC;AAM5D,eAAO,MAAM,UAAU,GAA+C,KAAK,SAAS,MAAM,0OAwCxF,CAAC"}
|
|
@@ -4,17 +4,19 @@ import { SqlClient, SqlSchema } from "effect/sql";
|
|
|
4
4
|
import { AssignRoles, LastRoleAssigner } from "@shivaedev/access/roles.ts";
|
|
5
5
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
6
6
|
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
7
|
+
import { tables } from "./tables.js";
|
|
7
8
|
function unavailable() {
|
|
8
9
|
return new AuthUnavailable({ message: "Could not access app users" });
|
|
9
10
|
}
|
|
10
|
-
export const assignRole = Effect.fn("Identity.assignRole")(function* (access, userId, role) {
|
|
11
|
-
const sql = yield* SqlClient.SqlClient;
|
|
11
|
+
export const assignRole = Effect.fn("Identity.assignRole")(function* (access, userId, role, options) {
|
|
12
|
+
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
13
|
+
const { user } = tables(options);
|
|
12
14
|
const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
13
15
|
const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
|
|
14
16
|
return yield* Effect.gen(function* () {
|
|
15
17
|
yield* sql `select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
|
|
16
18
|
const readTarget = SqlSchema.findOneOption({
|
|
17
|
-
execute: (id) => sql `select id, role from
|
|
19
|
+
execute: (id) => sql `select id, ${sql(user.role)} as role from ${sql(user.table)} where id = ${id} for update`,
|
|
18
20
|
Request: Schema.String,
|
|
19
21
|
Result: Schema.Struct({ id: Schema.String, role: Schema.NullOr(Schema.String) }),
|
|
20
22
|
});
|
|
@@ -28,7 +30,7 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* (access, us
|
|
|
28
30
|
const assigners = access.Role.literals.filter((candidate) => access.hasPermission(candidate, AssignRoles));
|
|
29
31
|
if (assigners.some((candidate) => candidate === target.value.role) && !access.hasPermission(role, AssignRoles)) {
|
|
30
32
|
const readHolders = SqlSchema.findAll({
|
|
31
|
-
execute: () => sql `select id from
|
|
33
|
+
execute: () => sql `select id from ${sql(user.table)} where ${sql(user.role)} in ${sql.in(assigners)}`,
|
|
32
34
|
Request: Schema.Void,
|
|
33
35
|
Result: Schema.Struct({ id: Schema.String }),
|
|
34
36
|
});
|
|
@@ -37,7 +39,7 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* (access, us
|
|
|
37
39
|
return yield* Effect.fail(new LastRoleAssigner({ userId }));
|
|
38
40
|
}
|
|
39
41
|
}
|
|
40
|
-
yield* sql `update
|
|
42
|
+
yield* sql `update ${sql(user.table)} set ${sql(user.role)} = ${role}, ${sql(user.updatedAt)} = now() where id = ${userId}`;
|
|
41
43
|
yield* invalidateOnCommit(["admin.users"]);
|
|
42
44
|
return true;
|
|
43
45
|
}).pipe(transact({ onSqlError: unavailable }), Effect.provideService(Reactivity.Reactivity, reactivity));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assignRole.js","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChD,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAElD,OAAO,EAAE,WAAW,EAAE,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAC1E,OAAO,EAAE,kBAAkB,EAAE,QAAQ,EAAE,MAAM,4BAA4B,CAAC;
|
|
1
|
+
{"version":3,"file":"assignRole.js","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columnDrift.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/columnDrift.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"columnDrift.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/columnDrift.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAoC3F,eAAO,MAAM,eAAe,iLA0B1B,CAAC"}
|
|
@@ -2,6 +2,7 @@ import { getSchema } from "better-auth/db";
|
|
|
2
2
|
import { matchType } from "better-auth/db/migration";
|
|
3
3
|
import { Effect, Schema } from "effect";
|
|
4
4
|
import { SqlClient } from "effect/sql";
|
|
5
|
+
import { tables } from "./tables.js";
|
|
5
6
|
const Column = Schema.Struct({
|
|
6
7
|
column: Schema.String,
|
|
7
8
|
default: Schema.NullOr(Schema.String),
|
|
@@ -42,11 +43,11 @@ export const authColumnDrift = Effect.fnUntraced(function* (options, role) {
|
|
|
42
43
|
}
|
|
43
44
|
}
|
|
44
45
|
if (role !== undefined) {
|
|
45
|
-
const
|
|
46
|
-
const column = columns.find((entry) => entry.table === table && entry.column ===
|
|
46
|
+
const { user } = tables(options);
|
|
47
|
+
const column = columns.find((entry) => entry.table === user.table && entry.column === user.role);
|
|
47
48
|
const value = `'${role.defaultRole.replaceAll("'", "''")}'`;
|
|
48
49
|
if (column !== undefined && column.default !== `${value}::text`) {
|
|
49
|
-
missing.push(`column ${table}.role requires DEFAULT ${value}`);
|
|
50
|
+
missing.push(`column ${user.table}.${user.role} requires DEFAULT ${value}`);
|
|
50
51
|
}
|
|
51
52
|
}
|
|
52
53
|
return missing;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"columnDrift.js","sourceRoot":"","sources":["../../../src/server/better-auth/columnDrift.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,SAAS,EAAE,MAAM,gBAAgB,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,0BAA0B,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"columnDrift.js","sourceRoot":"","sources":["../../../src/server/better-auth/columnDrift.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrationPlan.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/migrationPlan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"migrationPlan.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/migrationPlan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,mDAAmD,CAAC;AAG9G,eAAO,MAAM,uBAAuB;4BAGD,OAAO;;;;2FAwBxC,CAAC;AAEH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,UAO3C"}
|
|
@@ -3,6 +3,7 @@ import { Effect } from "effect";
|
|
|
3
3
|
import { SqlClient } from "effect/sql";
|
|
4
4
|
import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
|
|
5
5
|
import { storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
6
|
+
import { tables } from "./tables.js";
|
|
6
7
|
export const betterAuthMigrationPlan = Effect.fn("Identity.betterAuthMigrationPlan")(function* (options, role, safety = { throwOnUnsafe: true }) {
|
|
7
8
|
const database = yield* betterAuthDatabase();
|
|
8
9
|
const plan = yield* Effect.tryPromise(() => getMigrations({ ...storedRoleOptions(options, role), database }, safety));
|
|
@@ -17,12 +18,13 @@ export const betterAuthMigrationPlan = Effect.fn("Identity.betterAuthMigrationPl
|
|
|
17
18
|
let ddl = compiled === ";" ? "" : compiled;
|
|
18
19
|
if (role !== undefined) {
|
|
19
20
|
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
20
|
-
const
|
|
21
|
+
const { user } = tables(options);
|
|
21
22
|
const value = `'${role.defaultRole.replaceAll("'", "''")}'`;
|
|
22
|
-
const identifier = sql `${sql(table)}`.compile()[0];
|
|
23
|
-
|
|
24
|
-
ddl +=
|
|
25
|
-
ddl += `
|
|
23
|
+
const identifier = sql `${sql(user.table)}`.compile()[0];
|
|
24
|
+
const column = sql `${sql(user.role)}`.compile()[0];
|
|
25
|
+
ddl += `\nalter table ${identifier} alter column ${column} set default ${value};\n`;
|
|
26
|
+
ddl += `update ${identifier} set ${column} = ${value} where ${column} is null;\n`;
|
|
27
|
+
ddl += `alter table ${identifier} alter column ${column} set not null;`;
|
|
26
28
|
}
|
|
27
29
|
return { ddl, missing };
|
|
28
30
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrationPlan.js","sourceRoot":"","sources":["../../../src/server/better-auth/migrationPlan.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAA0B,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;
|
|
1
|
+
{"version":3,"file":"migrationPlan.js","sourceRoot":"","sources":["../../../src/server/better-auth/migrationPlan.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,kBAAkB,EAAE,MAAM,0CAA0C,CAAC;AAC9E,OAAO,EAA0B,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAC9G,OAAO,EAAE,MAAM,EAAE,MAAM,aAAa,CAAC;AAErC,MAAM,CAAC,MAAM,uBAAuB,GAAG,MAAM,CAAC,EAAE,CAAC,kCAAkC,CAAC,CAAC,QAAQ,CAAC,EAC7F,OAA4C,EAC5C,IAAwB,EACxB,MAAM,GAAwC,EAAE,aAAa,EAAE,IAAI,EAAE;IAErE,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,kBAAkB,EAAE,CAAC;IAC7C,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,aAAa,CAAC,EAAE,GAAG,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,QAAQ,EAAE,EAAE,MAAM,CAAC,CAAC,CAAC;IACtH,MAAM,OAAO,GAAG;QACf,GAAG,IAAI,CAAC,WAAW,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,SAAS,KAAK,KAAK,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,IAAI,CAAC,GAAG,CAAC;QACpG,GAAG,IAAI,CAAC,SAAS,CAAC,OAAO,CAAC,CAAC,EAAE,KAAK,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,CAAC,GAAG,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,UAAU,KAAK,IAAI,KAAK,EAAE,CAAC,CAAC;QAChH,GAAG,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,EAAE,EAAE,CAAC,SAAS,KAAK,IAAI,IAAI,EAAE,CAAC;QAC3E,GAAG,IAAI,CAAC,cAAc;QACtB,GAAG,IAAI,CAAC,aAAa;KACrB,CAAC;IACF,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,iBAAiB,EAAE,CAAC,CAAC;IAC1E,IAAI,GAAG,GAAG,QAAQ,KAAK,GAAG,CAAC,CAAC,CAAC,EAAE,CAAC,CAAC,CAAC,QAAQ,CAAC;IAC3C,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;QACxB,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,EAAE,CAAC;QAC7D,MAAM,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC,OAAO,CAAC,CAAC;QACjC,MAAM,KAAK,GAAG,IAAI,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,GAAG,EAAE,IAAI,CAAC,GAAG,CAAC;QAC5D,MAAM,UAAU,GAAG,GAAG,CAAA,GAAG,GAAG,CAAC,IAAI,CAAC,KAAK,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QACxD,MAAM,MAAM,GAAG,GAAG,CAAA,GAAG,GAAG,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC,OAAO,EAAE,CAAC,CAAC,CAAC,CAAC;QACnD,GAAG,IAAI,iBAAiB,UAAU,iBAAiB,MAAM,gBAAgB,KAAK,KAAK,CAAC;QACpF,GAAG,IAAI,UAAU,UAAU,QAAQ,MAAM,MAAM,KAAK,UAAU,MAAM,aAAa,CAAC;QAClF,GAAG,IAAI,eAAe,UAAU,iBAAiB,MAAM,gBAAgB,CAAC;IACzE,CAAC;IACD,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC;AACzB,CAAC,CAAC,CAAC;AAEH,MAAM,UAAU,gBAAgB,CAAC,GAAW;IAC3C,IAAI,GAAG,GAAG,kBAAkB,CAAC;IAC7B,OAAO,GAAG,CAAC,QAAQ,CAAC,GAAG,CAAC,EAAE,CAAC;QAC1B,GAAG,GAAG,GAAG,CAAC,OAAO,CAAC,OAAO,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IACD,2FAA2F;IAC3F,OAAO,MAAM,GAAG,YAAY,GAAG,WAAW,GAAG,GAAG,CAAC;AAClD,CAAC"}
|
|
@@ -8,11 +8,13 @@ import { type SignInPolicy } from "#server/better-auth/signInGate.ts";
|
|
|
8
8
|
import type { AccountRoleSeed } from "./accountRoleSeed.ts";
|
|
9
9
|
import type { BetterAuthDatabaseHooks } from "./databaseHooks.ts";
|
|
10
10
|
import type { BetterAuthEmails } from "./emails.ts";
|
|
11
|
+
import type { BetterAuthPasswordReset } from "./PasswordReset.ts";
|
|
11
12
|
export type BetterAuthMountOptions<E = never, R = never> = {
|
|
12
13
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
13
14
|
readonly databaseHooks?: BetterAuthDatabaseHooks<R> | undefined;
|
|
14
15
|
readonly emails?: BetterAuthEmails<R> | undefined;
|
|
15
16
|
readonly hardening?: BetterAuthHardeningOptions;
|
|
17
|
+
readonly onPasswordReset?: BetterAuthPasswordReset<R> | undefined;
|
|
16
18
|
readonly signIn?: SignInPolicy<E, R> | undefined;
|
|
17
19
|
} & ({
|
|
18
20
|
readonly roles?: undefined;
|
|
@@ -22,6 +24,7 @@ export type BetterAuthMountOptions<E = never, R = never> = {
|
|
|
22
24
|
readonly roleSeed?: Effect.Effect<AccountRoleSeed<E>, E, R>;
|
|
23
25
|
}));
|
|
24
26
|
export declare const betterAuthMount: <const TOptions extends BetterAuthOptions, E = never, R = never>(options: TOptions, mount?: BetterAuthMountOptions<E, R> | undefined) => Effect.Effect<{
|
|
27
|
+
admitsUser: (userId: string) => Effect.Effect<boolean, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, never>;
|
|
25
28
|
admittedSessions: {
|
|
26
29
|
<TSession extends import("../session.ts").SessionShape>(getSession: import("../adapters/betterAuthSessions.ts").GetSession<TSession>): import("../session.ts").SessionProvider<TSession>;
|
|
27
30
|
<TSession extends import("../session.ts").SessionShape>(getSession: import("../adapters/betterAuthSessions.ts").GetSession<TSession>, getProviderAccounts: import("../adapters/betterAuthSessions.ts").GetProviderAccounts): import("../session.ts").SessionProvider<import("../adapters/betterAuthSessions.ts").SessionWithProviderAccounts<TSession>>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAc,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAoB,MAAM,QAAQ,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAG5D,OAAO,EAAE,KAAK,0BAA0B,EAAiB,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAc,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAoB,MAAM,QAAQ,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAG5D,OAAO,EAAE,KAAK,0BAA0B,EAAiB,MAAM,2CAA2C,CAAC;AAK3G,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,mDAAmD,CAAC;AAC9G,OAAO,EAAE,KAAK,qBAAqB,EAAsB,MAAM,uCAAuC,CAAC;AAKvG,OAAO,EAAmC,KAAK,YAAY,EAAc,MAAM,mCAAmC,CAAC;AAEnH,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAG5D,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAClE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,aAAa,CAAC;AAEpD,OAAO,KAAK,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAElE,MAAM,MAAM,sBAAsB,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,IAAI;IAC1D,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,aAAa,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAChE,QAAQ,CAAC,MAAM,CAAC,EAAE,gBAAgB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAClD,QAAQ,CAAC,SAAS,CAAC,EAAE,0BAA0B,CAAC;IAChD,QAAQ,CAAC,eAAe,CAAC,EAAE,uBAAuB,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;IAClE,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;CACjD,GAAG,CACD;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,GAC7D,CAAC,iBAAiB,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;CAAE,CAAC,CAChH,CAAC;AAEF,eAAO,MAAM,eAAe,SAA0D,QAAQ,SAAS,iBAAiB,EAAE,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4DA0EpI,CAAC"}
|
|
@@ -4,6 +4,7 @@ import { effectHookOptions } from "#server/better-auth/adapters/effectHookOption
|
|
|
4
4
|
import { emailOptions } from "#server/better-auth/adapters/emailOptions.ts";
|
|
5
5
|
import { withHardening } from "#server/better-auth/adapters/hardening.ts";
|
|
6
6
|
import { hookRuntime } from "#server/better-auth/adapters/hookRuntime.ts";
|
|
7
|
+
import { passwordResetOptions } from "#server/better-auth/adapters/passwordResetOptions.ts";
|
|
7
8
|
import { roleSeedOptions } from "#server/better-auth/adapters/roleSeedOptions.ts";
|
|
8
9
|
import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
|
|
9
10
|
import { storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
@@ -12,11 +13,12 @@ import { PEER_IP_HEADER } from "#server/better-auth/clientIp.ts";
|
|
|
12
13
|
import { memoryRateLimit } from "#server/better-auth/memoryRateLimit.ts";
|
|
13
14
|
import { mountRoutes } from "#server/better-auth/mountRoutes.ts";
|
|
14
15
|
import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
|
|
15
|
-
import { signInGate } from "#server/better-auth/signInGate.ts";
|
|
16
|
+
import { fromStorage, signInGate } from "#server/better-auth/signInGate.ts";
|
|
17
|
+
import { providerFailure } from "#server/providerFailure.ts";
|
|
16
18
|
import { admittedSessions } from "./admittedSessions.js";
|
|
17
19
|
import { closeRoleEndpoints } from "./closeRoleEndpoints.js";
|
|
18
20
|
import { mountedSessions } from "./mountedSessions.js";
|
|
19
|
-
export const betterAuthMount = Effect.fn("
|
|
21
|
+
export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* (options, mount = {}) {
|
|
20
22
|
const secret = options.secret ?? Redacted.value(yield* Config.Redacted("BETTER_AUTH_SECRET"));
|
|
21
23
|
const publicUrl = yield* Config.URL("PUBLIC_URL").pipe(Config.option);
|
|
22
24
|
const origin = Option.map(publicUrl, (url) => url.origin);
|
|
@@ -29,7 +31,8 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (
|
|
|
29
31
|
}
|
|
30
32
|
const gate = yield* signInGate(policy);
|
|
31
33
|
const runtime = yield* hookRuntime();
|
|
32
|
-
const
|
|
34
|
+
const reset = passwordResetOptions(options, mount.onPasswordReset, runtime);
|
|
35
|
+
const hooked = effectHookOptions(yield* emailOptions(reset, mount.emails, runtime), mount.databaseHooks, runtime);
|
|
33
36
|
const configured = mount.roles === undefined ? hooked : storedRoleOptions(closeRoleEndpoints(hooked), mount);
|
|
34
37
|
const gated = yield* signInPolicyOptions(configured, gate, () => auth.$context);
|
|
35
38
|
const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
|
|
@@ -71,9 +74,17 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (
|
|
|
71
74
|
trustedProxy,
|
|
72
75
|
});
|
|
73
76
|
const admit = admittedSessions(gate, () => auth.$context, mount.bearerSessions);
|
|
77
|
+
const admission = yield* signInGate({ ...policy, recheckInterval: 0 });
|
|
78
|
+
const admitsUser = Effect.fn("Identity.admitsUser")(function* (userId) {
|
|
79
|
+
if (!admission.active) {
|
|
80
|
+
return true;
|
|
81
|
+
}
|
|
82
|
+
const storage = yield* fromStorage(() => auth.$context);
|
|
83
|
+
return yield* admission.admitsUser(storage, userId).pipe(Effect.catch(providerFailure));
|
|
84
|
+
});
|
|
74
85
|
const revoke = revokeUnadmitted(gate, () => auth.$context);
|
|
75
86
|
const lookupSession = Reflect.get(auth.api, "getSession");
|
|
76
87
|
const sessions = mountedSessions(lookupSession, admit, mount.roles);
|
|
77
|
-
return { admittedSessions: admit, auth, revokeUnadmitted: revoke, routes: authRoutes, sessions };
|
|
88
|
+
return { admitsUser, admittedSessions: admit, auth, revokeUnadmitted: revoke, routes: authRoutes, sessions };
|
|
78
89
|
});
|
|
79
90
|
//# sourceMappingURL=mount.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,UAAU,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAE1D,OAAO,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AACtF,OAAO,EAAE,YAAY,EAAE,MAAM,8CAA8C,CAAC;AAC5E,OAAO,EAAmC,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC3G,OAAO,EAAE,WAAW,EAAE,MAAM,6CAA6C,CAAC;AAC1E,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,mBAAmB,EAAE,MAAM,qDAAqD,CAAC;AAC1F,OAAO,EAA0B,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAC9G,OAAO,EAA8B,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AACvG,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAyC,UAAU,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,7 +3,7 @@ import { SessionUserSchema } from "#identity.ts";
|
|
|
3
3
|
import { resolveRole } from "#server/resolveRole.ts";
|
|
4
4
|
const Fields = Schema.Record(Schema.String, Schema.Unknown);
|
|
5
5
|
const SessionPayload = Schema.NullOr(Schema.StructWithRest(Schema.Struct({ user: Schema.StructWithRest(SessionUserSchema, [Fields]) }), [Fields]));
|
|
6
|
-
export const sessionPermissions = Effect.fn("
|
|
6
|
+
export const sessionPermissions = Effect.fn("Identity.sessionPermissions")(function* (response, roles) {
|
|
7
7
|
const payload = yield* Schema.decodeUnknownEffect(SessionPayload)(yield* Effect.tryPromise(() => response.json()));
|
|
8
8
|
if (payload === null) {
|
|
9
9
|
return Response.json(null, response);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signInGate.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/signInGate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAQ,MAAM,QAAQ,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGzD,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK;IACjD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,oBAAoB,EAAE,CAAC,GAAG,SAAS,CAAC;IAC/E,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC;IACtD,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,oBAAoB,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;CAC9F;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,OAAO,EAAE;QACjB,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;gBAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;gBAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;KAClJ,CAAC;IACF,QAAQ,CAAC,eAAe,EAAE;QACzB,QAAQ,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/D,QAAQ,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,oBAAoB,EAAE,CAAC,CAAC;QACpF,QAAQ,CAAC,SAAS,EAAE,CACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE;YAAE,QAAQ,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;YAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;SAAE,KAClE,OAAO,CAAC,SAAS;YAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC,CAAC;KACjD,CAAC;CACF;AAED,MAAM,WAAW,UAAU,CAAC,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,SAAS,oBAAoB,EAAE,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IACjH,QAAQ,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,WAAW,GAAG,eAAe,CAAC,CAAC;CAClI;AAID,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,4CAEpD;AAMD,eAAO,MAAM,UAAU,GAAgC,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"signInGate.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/signInGate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAS,KAAK,MAAM,EAAE,QAAQ,EAAE,MAAM,EAAQ,MAAM,QAAQ,CAAC;AACpE,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAGzD,MAAM,WAAW,YAAY,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK;IACjD,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,SAAS,oBAAoB,EAAE,CAAC,GAAG,SAAS,CAAC;IAC/E,QAAQ,CAAC,eAAe,CAAC,EAAE,QAAQ,CAAC,KAAK,GAAG,SAAS,CAAC;IACtD,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,OAAO,EAAE,oBAAoB,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC,GAAG,SAAS,CAAC;CAC9F;AAED,MAAM,WAAW,aAAa;IAC7B,QAAQ,CAAC,OAAO,EAAE;QACjB,QAAQ,CAAC,KAAK,EAAE,CAAC,KAAK,EAAE;YAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;YAAC,QAAQ,CAAC,KAAK,EAAE,KAAK,CAAC;gBAAE,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;gBAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;aAAE,CAAC,CAAA;SAAE,KAAK,OAAO,CAAC,MAAM,CAAC,CAAC;KAClJ,CAAC;IACF,QAAQ,CAAC,eAAe,EAAE;QACzB,QAAQ,CAAC,kBAAkB,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/D,QAAQ,CAAC,YAAY,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,OAAO,CAAC,SAAS,oBAAoB,EAAE,CAAC,CAAC;QACpF,QAAQ,CAAC,SAAS,EAAE,CACnB,KAAK,EAAE,MAAM,EACb,MAAM,EAAE,MAAM,EACd,MAAM,EAAE;YAAE,QAAQ,CAAC,SAAS,EAAE,KAAK,GAAG,MAAM,CAAC;YAAC,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAA;SAAE,KAClE,OAAO,CAAC,SAAS;YAAE,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAA;SAAE,EAAE,CAAC,CAAC;KACjD,CAAC;CACF;AAED,MAAM,WAAW,UAAU,CAAC,CAAC;IAC5B,QAAQ,CAAC,MAAM,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,MAAM,EAAE,CAAC,UAAU,EAAE,SAAS,oBAAoB,EAAE,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,WAAW,CAAC,CAAC;IACjH,QAAQ,CAAC,UAAU,EAAE,CAAC,OAAO,EAAE,aAAa,EAAE,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,GAAG,MAAM,CAAC,WAAW,GAAG,eAAe,CAAC,CAAC;CAClI;AAID,wBAAgB,WAAW,CAAC,CAAC,EAAE,IAAI,EAAE,MAAM,OAAO,CAAC,CAAC,CAAC,4CAEpD;AAMD,eAAO,MAAM,UAAU,GAAgC,CAAC,EAAE,CAAC,uEA4BzD,CAAC"}
|
|
@@ -16,6 +16,7 @@ export const signInGate = Effect.fnUntraced(function* (policy) {
|
|
|
16
16
|
capacity: RULE_CACHE_CAPACITY,
|
|
17
17
|
timeToLive: (exit) => (Exit.isSuccess(exit) ? recheckInterval : Duration.zero),
|
|
18
18
|
});
|
|
19
|
+
const checkRule = Duration.isZero(recheckInterval) ? Cache.refresh : Cache.get;
|
|
19
20
|
const admits = Effect.fnUntraced(function* (candidates) {
|
|
20
21
|
const allowed = accounts === undefined ? undefined : yield* accounts;
|
|
21
22
|
const listed = allowed === undefined ? candidates : candidates.filter((candidate) => allowed.some((entry) => sameAccount(entry, candidate)));
|
|
@@ -23,7 +24,7 @@ export const signInGate = Effect.fnUntraced(function* (policy) {
|
|
|
23
24
|
return listed.length > 0;
|
|
24
25
|
}
|
|
25
26
|
for (const { accountId, providerId } of listed) {
|
|
26
|
-
if (yield*
|
|
27
|
+
if (yield* checkRule(verdicts, { accountId, providerId })) {
|
|
27
28
|
return true;
|
|
28
29
|
}
|
|
29
30
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"signInGate.js","sourceRoot":"","sources":["../../../src/server/better-auth/signInGate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAe,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,QAAQ,CAAC;AAGpE,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AA6B7D,MAAM,mBAAmB,GAAG,MAAM,CAAC;AAEnC,MAAM,UAAU,WAAW,CAAI,IAAsB;IACpD,OAAO,MAAM,CAAC,UAAU,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;AAC5F,CAAC;AAED,SAAS,WAAW,CAAC,IAA0B,EAAE,KAA2B;IAC3E,OAAO,IAAI,CAAC,UAAU,KAAK,KAAK,CAAC,UAAU,IAAI,IAAI,CAAC,SAAS,KAAK,KAAK,CAAC,SAAS,CAAC;AACnF,CAAC;AAED,MAAM,CAAC,MAAM,UAAU,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAQ,MAA0B;IACtF,MAAM,EAAE,QAAQ,EAAE,IAAI,EAAE,GAAG,MAAM,CAAC;IAClC,MAAM,eAAe,GAAG,QAAQ,CAAC,eAAe,CAAC,MAAM,CAAC,eAAe,IAAI,WAAW,CAAC,CAAC;IACxF,MAAM,QAAQ,GACb,IAAI,KAAK,SAAS;QACjB,CAAC,CAAC,SAAS;QACX,CAAC,CAAC,KAAK,CAAC,CAAC,KAAK,CAAC,QAAQ,CAAC,IAAI,EAAE;YAC5B,QAAQ,EAAE,mBAAmB;YAC7B,UAAU,EAAE,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,eAAe,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC;SAC9E,CAAC,CAAC;IACN,MAAM,MAAM,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,UAA2C;QACtF,MAAM,OAAO,GAAG,QAAQ,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,QAAQ,CAAC;QACrE,MAAM,MAAM,GAAG,OAAO,KAAK,SAAS,CAAC,CAAC,CAAC,UAAU,CAAC,CAAC,CAAC,UAAU,CAAC,MAAM,CAAC,CAAC,SAAS,EAAE,EAAE,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,WAAW,CAAC,KAAK,EAAE,SAAS,CAAC,CAAC,CAAC,CAAC;QAC7I,IAAI,QAAQ,KAAK,SAAS,EAAE,CAAC;YAC5B,OAAO,MAAM,CAAC,MAAM,GAAG,CAAC,CAAC;QAC1B,CAAC;QACD,KAAK,MAAM,EAAE,SAAS,EAAE,UAAU,EAAE,IAAI,MAAM,EAAE,CAAC;YAChD,IAAI,KAAK,CAAC,CAAC,
|
|
1
|
+
{"version":3,"file":"signInGate.js","sourceRoot":"","sources":["../../../src/server/better-auth/signInGate.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
export type AuthTableOptions = Pick<BetterAuthOptions, "user" | "account" | "plugins">;
|
|
3
|
+
export declare function tables(options?: AuthTableOptions): {
|
|
4
|
+
account: {
|
|
5
|
+
accountId: string;
|
|
6
|
+
providerId: string;
|
|
7
|
+
table: string;
|
|
8
|
+
userId: string;
|
|
9
|
+
};
|
|
10
|
+
user: {
|
|
11
|
+
createdAt: string;
|
|
12
|
+
email: string;
|
|
13
|
+
name: string;
|
|
14
|
+
role: string;
|
|
15
|
+
table: string;
|
|
16
|
+
updatedAt: string;
|
|
17
|
+
};
|
|
18
|
+
};
|
|
19
|
+
//# sourceMappingURL=tables.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tables.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/tables.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,MAAM,MAAM,gBAAgB,GAAG,IAAI,CAAC,iBAAiB,EAAE,MAAM,GAAG,SAAS,GAAG,SAAS,CAAC,CAAC;AAMvF,wBAAgB,MAAM,CAAC,OAAO,GAAE,gBAAqB;IAGnD,OAAO;QACN,SAAS;QACT,UAAU;QACV,KAAK;QACL,MAAM;;IAEP,IAAI;QACH,SAAS;QACT,KAAK;QACL,IAAI;QACJ,IAAI;QACJ,KAAK;QACL,SAAS;;EAGX"}
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import { getAuthTables } from "better-auth/db";
|
|
2
|
+
function field(table, name) {
|
|
3
|
+
return table?.fields[name]?.fieldName ?? name;
|
|
4
|
+
}
|
|
5
|
+
export function tables(options = {}) {
|
|
6
|
+
const schema = getAuthTables(options);
|
|
7
|
+
return {
|
|
8
|
+
account: {
|
|
9
|
+
accountId: field(schema.account, "accountId"),
|
|
10
|
+
providerId: field(schema.account, "providerId"),
|
|
11
|
+
table: schema.account?.modelName ?? "account",
|
|
12
|
+
userId: field(schema.account, "userId"),
|
|
13
|
+
},
|
|
14
|
+
user: {
|
|
15
|
+
createdAt: field(schema.user, "createdAt"),
|
|
16
|
+
email: field(schema.user, "email"),
|
|
17
|
+
name: field(schema.user, "name"),
|
|
18
|
+
role: field(schema.user, "role"),
|
|
19
|
+
table: schema.user?.modelName ?? "user",
|
|
20
|
+
updatedAt: field(schema.user, "updatedAt"),
|
|
21
|
+
},
|
|
22
|
+
};
|
|
23
|
+
}
|
|
24
|
+
//# sourceMappingURL=tables.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"tables.js","sourceRoot":"","sources":["../../../src/server/better-auth/tables.ts"],"names":[],"mappings":"AACA,OAAO,EAA2B,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAIxE,SAAS,KAAK,CAAC,KAA6C,EAAE,IAAY;IACzE,OAAO,KAAK,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,SAAS,IAAI,IAAI,CAAC;AAC/C,CAAC;AAED,MAAM,UAAU,MAAM,CAAC,OAAO,GAAqB,EAAE;IACpD,MAAM,MAAM,GAAG,aAAa,CAAC,OAAO,CAAC,CAAC;IACtC,OAAO;QACN,OAAO,EAAE;YACR,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,WAAW,CAAC;YAC7C,UAAU,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,YAAY,CAAC;YAC/C,KAAK,EAAE,MAAM,CAAC,OAAO,EAAE,SAAS,IAAI,SAAS;YAC7C,MAAM,EAAE,KAAK,CAAC,MAAM,CAAC,OAAO,EAAE,QAAQ,CAAC;SACvC;QACD,IAAI,EAAE;YACL,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC;YAC1C,KAAK,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,OAAO,CAAC;YAClC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC;YAChC,IAAI,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,MAAM,CAAC;YAChC,KAAK,EAAE,MAAM,CAAC,IAAI,EAAE,SAAS,IAAI,MAAM;YACvC,SAAS,EAAE,KAAK,CAAC,MAAM,CAAC,IAAI,EAAE,WAAW,CAAC;SAC1C;KACD,CAAC;AACH,CAAC"}
|
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
3
|
-
export const userProfiles = Effect.fn("
|
|
3
|
+
export const userProfiles = Effect.fn("Identity.userProfiles")(function* (auth, userIds) {
|
|
4
4
|
const ids = [...new Set(userIds)];
|
|
5
5
|
if (ids.length === 0) {
|
|
6
6
|
return [];
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
2
|
import type { Headers } from "effect/http";
|
|
3
3
|
import { Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
-
import
|
|
5
|
-
|
|
6
|
-
export declare const
|
|
7
|
-
export declare const
|
|
4
|
+
import { SessionPolicy } from "./SessionPolicy.ts";
|
|
5
|
+
import type { SessionShape } from "./session.ts";
|
|
6
|
+
export declare const sessionRequest: (headers: Headers.Headers, rpc: string) => Effect.Effect<import("./origin.ts").OriginRequest, Forbidden, SessionPolicy>;
|
|
7
|
+
export declare const sessionAccess: <TSession extends SessionShape>(session: Option.Option<TSession>) => Effect.Effect<Option.None<TSession> | Option.Some<TSession>, Forbidden, SessionPolicy>;
|
|
8
|
+
export declare const lookupSession: (headers: Headers.Headers) => Effect.Effect<Option.None<SessionShape> | Option.Some<SessionShape>, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | Forbidden, SessionPolicy>;
|
|
8
9
|
//# sourceMappingURL=lookupSession.d.ts.map
|