@shivaedev/identity 0.37.0 → 0.38.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 +27 -0
- package/README.md +150 -139
- package/dist/server/UserProvisioning.d.ts +3 -1
- package/dist/server/UserProvisioning.d.ts.map +1 -1
- package/dist/server/UserProvisioning.js.map +1 -1
- package/dist/server/better-auth/AdminPasswordLength.d.ts +10 -0
- package/dist/server/better-auth/AdminPasswordLength.d.ts.map +1 -0
- package/dist/server/better-auth/AdminPasswordLength.js +10 -0
- package/dist/server/better-auth/AdminPasswordLength.js.map +1 -0
- package/dist/server/better-auth/SeedOptions.d.ts +0 -5
- package/dist/server/better-auth/SeedOptions.d.ts.map +1 -1
- package/dist/server/better-auth/UnverifiedAdminEmail.d.ts +9 -0
- package/dist/server/better-auth/UnverifiedAdminEmail.d.ts.map +1 -0
- package/dist/server/better-auth/UnverifiedAdminEmail.js +9 -0
- package/dist/server/better-auth/UnverifiedAdminEmail.js.map +1 -0
- package/dist/server/better-auth/adapters/accountRoleSeed.d.ts +2 -3
- package/dist/server/better-auth/adapters/accountRoleSeed.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/accountRoleSeed.js +3 -3
- package/dist/server/better-auth/adapters/accountRoleSeed.js.map +1 -1
- package/dist/server/better-auth/adapters/userProvisioning.js +2 -2
- package/dist/server/better-auth/adapters/userProvisioning.js.map +1 -1
- package/dist/server/better-auth/assertSchema.d.ts +2 -3
- package/dist/server/better-auth/assertSchema.d.ts.map +1 -1
- package/dist/server/better-auth/assertSchema.js +4 -1
- package/dist/server/better-auth/assertSchema.js.map +1 -1
- package/dist/server/better-auth/assignRole.d.ts +2 -3
- package/dist/server/better-auth/assignRole.d.ts.map +1 -1
- package/dist/server/better-auth/assignRole.js +3 -2
- package/dist/server/better-auth/assignRole.js.map +1 -1
- package/dist/server/better-auth/define.d.ts +36 -0
- package/dist/server/better-auth/define.d.ts.map +1 -0
- package/dist/server/better-auth/define.js +7 -0
- package/dist/server/better-auth/define.js.map +1 -0
- package/dist/server/better-auth/defineSeed.d.ts +2 -1
- package/dist/server/better-auth/defineSeed.d.ts.map +1 -1
- package/dist/server/better-auth/defineSeed.js +3 -9
- package/dist/server/better-auth/defineSeed.js.map +1 -1
- package/dist/server/better-auth/migrate.d.ts +2 -3
- package/dist/server/better-auth/migrate.d.ts.map +1 -1
- package/dist/server/better-auth/migrate.js +3 -2
- package/dist/server/better-auth/migrate.js.map +1 -1
- package/dist/server/better-auth/migrations/generate.d.ts +2 -3
- package/dist/server/better-auth/migrations/generate.d.ts.map +1 -1
- package/dist/server/better-auth/migrations/generate.js +3 -2
- package/dist/server/better-auth/migrations/generate.js.map +1 -1
- package/dist/server/better-auth/mount.d.ts +14 -16
- package/dist/server/better-auth/mount.d.ts.map +1 -1
- package/dist/server/better-auth/mount.js +11 -8
- package/dist/server/better-auth/mount.js.map +1 -1
- package/dist/server/better-auth/mountedUserProvisioning.d.ts +4 -0
- package/dist/server/better-auth/mountedUserProvisioning.d.ts.map +1 -0
- package/dist/server/better-auth/mountedUserProvisioning.js +8 -0
- package/dist/server/better-auth/mountedUserProvisioning.js.map +1 -0
- package/dist/server/better-auth/provisionAdmin.d.ts +10 -0
- package/dist/server/better-auth/provisionAdmin.d.ts.map +1 -0
- package/dist/server/better-auth/provisionAdmin.js +28 -0
- package/dist/server/better-auth/provisionAdmin.js.map +1 -0
- package/dist/server/better-auth/seedUsers.d.ts +2 -1
- package/dist/server/better-auth/seedUsers.d.ts.map +1 -1
- package/dist/server/better-auth/seedUsers.js +5 -5
- package/dist/server/better-auth/seedUsers.js.map +1 -1
- package/dist/server/better-auth/testDatabase.d.ts +1 -1
- package/dist/server/better-auth/userDirectory.d.ts +2 -3
- package/dist/server/better-auth/userDirectory.d.ts.map +1 -1
- package/dist/server/better-auth/userDirectory.js +3 -3
- package/dist/server/better-auth/userDirectory.js.map +1 -1
- package/package.json +8 -8
- package/src/server/UserProvisioning.ts +3 -1
- package/src/server/better-auth/AdminPasswordLength.ts +10 -0
- package/src/server/better-auth/SeedOptions.ts +0 -5
- package/src/server/better-auth/UnverifiedAdminEmail.ts +9 -0
- package/src/server/better-auth/adapters/accountRoleSeed.ts +5 -6
- package/src/server/better-auth/adapters/userProvisioning.ts +2 -2
- package/src/server/better-auth/assertSchema.ts +5 -6
- package/src/server/better-auth/assignRole.ts +5 -5
- package/src/server/better-auth/define.ts +37 -0
- package/src/server/better-auth/defineSeed.ts +4 -12
- package/src/server/better-auth/migrate.ts +3 -7
- package/src/server/better-auth/migrations/generate.ts +3 -7
- package/src/server/better-auth/mount.ts +23 -18
- package/src/server/better-auth/mountedUserProvisioning.ts +14 -0
- package/src/server/better-auth/provisionAdmin.ts +32 -0
- package/src/server/better-auth/seedUsers.ts +10 -6
- package/src/server/better-auth/userDirectory.ts +5 -9
|
@@ -7,7 +7,9 @@ export interface PasswordUser {
|
|
|
7
7
|
readonly password: Redacted.Redacted<string>;
|
|
8
8
|
}
|
|
9
9
|
declare const UserProvisioning_base: Context.ServiceClass<UserProvisioning, "@shivaedev/identity/UserProvisioning", {
|
|
10
|
-
readonly findOrCreateUser: (user: PasswordUser) => Effect.Effect<Pick<SessionUserValue, "id" | "email" | "name"
|
|
10
|
+
readonly findOrCreateUser: (user: PasswordUser) => Effect.Effect<Pick<SessionUserValue, "id" | "email" | "name"> & {
|
|
11
|
+
readonly emailVerified: boolean;
|
|
12
|
+
}, AuthUnavailable>;
|
|
11
13
|
}>;
|
|
12
14
|
export declare class UserProvisioning extends UserProvisioning_base {
|
|
13
15
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserProvisioning.d.ts","sourceRoot":"","sources":["../../src/server/UserProvisioning.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC7C;;+BAK4B,
|
|
1
|
+
{"version":3,"file":"UserProvisioning.d.ts","sourceRoot":"","sources":["../../src/server/UserProvisioning.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,KAAK,MAAM,EAAE,KAAK,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,cAAc,CAAC;AAErD,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,KAAK,EAAE,MAAM,CAAC;IACvB,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAC;IACtB,QAAQ,CAAC,QAAQ,EAAE,QAAQ,CAAC,QAAQ,CAAC,MAAM,CAAC,CAAC;CAC7C;;+BAK4B,CAC1B,IAAI,EAAE,YAAY,KACd,MAAM,CAAC,MAAM,CAAC,IAAI,CAAC,gBAAgB,EAAE,IAAI,GAAG,OAAO,GAAG,MAAM,CAAC,GAAG;QAAE,QAAQ,CAAC,aAAa,EAAE,OAAO,CAAA;KAAE,EAAE,eAAe,CAAC;;AAL5H,qBAAa,gBAAiB,SAAQ,qBAOK;CAAG"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"UserProvisioning.js","sourceRoot":"","sources":["../../src/server/UserProvisioning.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA8B,MAAM,QAAQ,CAAC;AAU7D,MAAM,OAAO,gBAAiB,SAAQ,OAAO,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"UserProvisioning.js","sourceRoot":"","sources":["../../src/server/UserProvisioning.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAA8B,MAAM,QAAQ,CAAC;AAU7D,MAAM,OAAO,gBAAiB,SAAQ,OAAO,CAAC,OAAO,EAOlD,CAAC,sCAAsC,CAAC;CAAG"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
declare const AdminPasswordLength_base: Schema.Class<AdminPasswordLength, Schema.TaggedStruct<"AdminPasswordLength", {
|
|
3
|
+
readonly maximum: Schema.Number;
|
|
4
|
+
readonly minimum: Schema.Number;
|
|
5
|
+
}>, import("effect/Cause").YieldableError>;
|
|
6
|
+
export declare class AdminPasswordLength extends AdminPasswordLength_base {
|
|
7
|
+
get message(): string;
|
|
8
|
+
}
|
|
9
|
+
export {};
|
|
10
|
+
//# sourceMappingURL=AdminPasswordLength.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AdminPasswordLength.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/AdminPasswordLength.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;;;;;AAEhC,qBAAa,mBAAoB,SAAQ,wBAGvC;IACD,IAAa,OAAO,WAEnB;CACD"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
export class AdminPasswordLength extends Schema.TaggedError()("AdminPasswordLength", {
|
|
3
|
+
maximum: Schema.Number,
|
|
4
|
+
minimum: Schema.Number,
|
|
5
|
+
}) {
|
|
6
|
+
get message() {
|
|
7
|
+
return `ADMIN_PASSWORD must be ${this.minimum} to ${this.maximum} characters long`;
|
|
8
|
+
}
|
|
9
|
+
}
|
|
10
|
+
//# sourceMappingURL=AdminPasswordLength.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"AdminPasswordLength.js","sourceRoot":"","sources":["../../../src/server/better-auth/AdminPasswordLength.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,OAAO,mBAAoB,SAAQ,MAAM,CAAC,WAAW,EAAuB,CAAC,qBAAqB,EAAE;IACzG,OAAO,EAAE,MAAM,CAAC,MAAM;IACtB,OAAO,EAAE,MAAM,CAAC,MAAM;CACtB,CAAC;IACD,IAAa,OAAO;QACnB,OAAO,0BAA0B,IAAI,CAAC,OAAO,OAAO,IAAI,CAAC,OAAO,kBAAkB,CAAC;IACpF,CAAC;CACD"}
|
|
@@ -1,11 +1,6 @@
|
|
|
1
|
-
import type { BetterAuthOptions } from "better-auth";
|
|
2
1
|
import type { Effect } from "effect";
|
|
3
|
-
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
2
|
import type { PasswordUser } from "#server/UserProvisioning.ts";
|
|
5
3
|
export interface SeedOptions<TRole extends string, E, R> {
|
|
6
|
-
readonly auth?: Omit<BetterAuthOptions, "database">;
|
|
7
|
-
readonly defaultRole: NoInfer<TRole>;
|
|
8
|
-
readonly roles: AccessPolicy<TRole>;
|
|
9
4
|
readonly run: Effect.Effect<unknown, E, R>;
|
|
10
5
|
readonly users: readonly (PasswordUser & {
|
|
11
6
|
readonly role: NoInfer<TRole>;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"SeedOptions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/SeedOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"SeedOptions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/SeedOptions.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrC,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,6BAA6B,CAAC;AAEhE,MAAM,WAAW,WAAW,CAAC,KAAK,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC;IACtD,QAAQ,CAAC,GAAG,EAAE,MAAM,CAAC,MAAM,CAAC,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC,CAAC;IAC3C,QAAQ,CAAC,KAAK,EAAE,SAAS,CAAC,YAAY,GAAG;QAAE,QAAQ,CAAC,IAAI,EAAE,OAAO,CAAC,KAAK,CAAC,CAAA;KAAE,CAAC,EAAE,CAAC;CAC9E"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
declare const UnverifiedAdminEmail_base: Schema.Class<UnverifiedAdminEmail, Schema.TaggedStruct<"UnverifiedAdminEmail", {
|
|
3
|
+
readonly email: Schema.String;
|
|
4
|
+
}>, import("effect/Cause").YieldableError>;
|
|
5
|
+
export declare class UnverifiedAdminEmail extends UnverifiedAdminEmail_base {
|
|
6
|
+
get message(): string;
|
|
7
|
+
}
|
|
8
|
+
export {};
|
|
9
|
+
//# sourceMappingURL=UnverifiedAdminEmail.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UnverifiedAdminEmail.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/UnverifiedAdminEmail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;;;;AAEhC,qBAAa,oBAAqB,SAAQ,yBAExC;IACD,IAAa,OAAO,WAEnB;CACD"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
export class UnverifiedAdminEmail extends Schema.TaggedError()("UnverifiedAdminEmail", {
|
|
3
|
+
email: Schema.String,
|
|
4
|
+
}) {
|
|
5
|
+
get message() {
|
|
6
|
+
return `ADMIN_EMAIL ${this.email} belongs to an account whose address is not verified; verify it or choose another address`;
|
|
7
|
+
}
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=UnverifiedAdminEmail.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"UnverifiedAdminEmail.js","sourceRoot":"","sources":["../../../src/server/better-auth/UnverifiedAdminEmail.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,MAAM,OAAO,oBAAqB,SAAQ,MAAM,CAAC,WAAW,EAAwB,CAAC,sBAAsB,EAAE;IAC5G,KAAK,EAAE,MAAM,CAAC,MAAM;CACpB,CAAC;IACD,IAAa,OAAO;QACnB,OAAO,eAAe,IAAI,CAAC,KAAK,2FAA2F,CAAC;IAC7H,CAAC;CACD"}
|
|
@@ -1,13 +1,12 @@
|
|
|
1
1
|
import { type Config, Effect } from "effect";
|
|
2
2
|
import { SqlClient } from "effect/sql";
|
|
3
|
-
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
3
|
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
5
4
|
import type { ProviderAccountValue } from "#identity.ts";
|
|
6
|
-
import {
|
|
5
|
+
import type { RoleTables } from "#server/better-auth/define.ts";
|
|
7
6
|
export interface AccountRoleSeed<E> {
|
|
8
7
|
readonly onSignIn: (userId: string) => Effect.Effect<void, E>;
|
|
9
8
|
}
|
|
10
|
-
export declare const accountRoleSeed: <TRole extends string>(
|
|
9
|
+
export declare const accountRoleSeed: <TRole extends string>(auth: RoleTables<TRole>, role: NoInfer<TRole>, accounts: Config.Config<readonly ProviderAccountValue[]>) => Effect.Effect<{
|
|
11
10
|
onSignIn: (userId: string) => Effect.Effect<void, AuthUnavailable | import("../../../roles.ts").LastRoleAssigner | import("@shivaedev/errors/taxonomy.ts").NotFound, never>;
|
|
12
11
|
}, AuthUnavailable | Config.ConfigError | import("../../../roles.ts").LastRoleAssigner | import("@shivaedev/errors/taxonomy.ts").NotFound, SqlClient.SqlClient>;
|
|
13
12
|
//# sourceMappingURL=accountRoleSeed.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountRoleSeed.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/accountRoleSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,
|
|
1
|
+
{"version":3,"file":"accountRoleSeed.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/accountRoleSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,MAAM,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,KAAK,EAAE,oBAAoB,EAAE,MAAM,cAAc,CAAC;AAEzD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAGhE,MAAM,WAAW,eAAe,CAAC,CAAC;IACjC,QAAQ,CAAC,QAAQ,EAAE,CAAC,MAAM,EAAE,MAAM,KAAK,MAAM,CAAC,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;CAC9D;AAED,eAAO,MAAM,eAAe,GAAoD,KAAK,SAAS,MAAM;uBA4BvE,MAAM;+JACjC,CAAC"}
|
|
@@ -3,11 +3,11 @@ import { SqlClient, SqlSchema } from "effect/sql";
|
|
|
3
3
|
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
4
4
|
import { assignRole } from "#server/better-auth/assignRole.ts";
|
|
5
5
|
import { tables } from "#server/better-auth/tables.ts";
|
|
6
|
-
export const accountRoleSeed = Effect.fn("Identity.accountRoleSeed")(function* (
|
|
6
|
+
export const accountRoleSeed = Effect.fn("Identity.accountRoleSeed")(function* (auth, role, accounts) {
|
|
7
7
|
const listed = yield* accounts;
|
|
8
8
|
const context = yield* Effect.context();
|
|
9
9
|
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
10
|
-
const { account: accountTable } = tables(options);
|
|
10
|
+
const { account: accountTable } = tables(auth.options);
|
|
11
11
|
const findUsers = SqlSchema.findAll({
|
|
12
12
|
execute: ({ accountId, providerId, userId }) => sql `
|
|
13
13
|
select distinct ${sql(accountTable.userId)} as id from ${sql(accountTable.table)}
|
|
@@ -20,7 +20,7 @@ export const accountRoleSeed = Effect.fn("Identity.accountRoleSeed")(function* (
|
|
|
20
20
|
for (const account of listed) {
|
|
21
21
|
const users = yield* findUsers({ ...account, userId }).pipe(Effect.mapError(() => new AuthUnavailable({ message: "Could not access provider accounts" })));
|
|
22
22
|
for (const user of users) {
|
|
23
|
-
yield* assignRole(
|
|
23
|
+
yield* assignRole(auth, user.id, role);
|
|
24
24
|
}
|
|
25
25
|
}
|
|
26
26
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"accountRoleSeed.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/accountRoleSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"accountRoleSeed.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/accountRoleSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAe,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACrD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE/D,OAAO,EAAE,MAAM,EAAE,MAAM,+BAA+B,CAAC;AAMvD,MAAM,CAAC,MAAM,eAAe,GAAG,MAAM,CAAC,EAAE,CAAC,0BAA0B,CAAC,CAAC,QAAQ,CAAC,EAC7E,IAAuB,EACvB,IAAoB,EACpB,QAAwD;IAExD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC;IAC/B,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,EAAuB,CAAC;IAC7D,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC7D,MAAM,EAAE,OAAO,EAAE,YAAY,EAAE,GAAG,MAAM,CAAC,IAAI,CAAC,OAAO,CAAC,CAAC;IACvD,MAAM,SAAS,GAAG,SAAS,CAAC,OAAO,CAAC;QACnC,OAAO,EAAE,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,GAAG,CAAA;qBAChC,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,eAAe,GAAG,CAAC,YAAY,CAAC,KAAK,CAAC;WACxE,GAAG,CAAC,YAAY,CAAC,UAAU,CAAC,MAAM,UAAU,QAAQ,GAAG,CAAC,YAAY,CAAC,SAAS,CAAC,MAAM,SAAS;KACpG,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA,OAAO,GAAG,CAAC,YAAY,CAAC,MAAM,CAAC,MAAM,MAAM,EAAE,EAAE;QAC9F,OAAO,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,MAAM,EAAE,UAAU,EAAE,MAAM,CAAC,MAAM,EAAE,MAAM,EAAE,MAAM,CAAC,QAAQ,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,CAAC;QACvH,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC;KAC5C,CAAC,CAAC;IACH,MAAM,KAAK,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAe;QACzD,KAAK,MAAM,OAAO,IAAI,MAAM,EAAE,CAAC;YAC9B,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,EAAE,GAAG,OAAO,EAAE,MAAM,EAAE,CAAC,CAAC,IAAI,CAC1D,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,oCAAoC,EAAE,CAAC,CAAC,CAC7F,CAAC;YACF,KAAK,MAAM,IAAI,IAAI,KAAK,EAAE,CAAC;gBAC1B,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;YACxC,CAAC;QACF,CAAC;IACF,CAAC,CAAC,CAAC;IACH,KAAK,CAAC,CAAC,KAAK,EAAE,CAAC;IACf,OAAO,EAAE,QAAQ,EAAE,CAAC,MAAc,EAAE,EAAE,CAAC,KAAK,CAAC,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,OAAO,CAAC,CAAC,EAAE,CAAC;AAC7F,CAAC,CAAC,CAAC"}
|
|
@@ -9,12 +9,12 @@ export function betterAuthUserProvisioning(auth) {
|
|
|
9
9
|
const normalized = email.toLowerCase();
|
|
10
10
|
const existing = await context.internalAdapter.findUserByEmail(normalized);
|
|
11
11
|
if (existing !== null) {
|
|
12
|
-
return { email: existing.user.email, id: existing.user.id, name: existing.user.name };
|
|
12
|
+
return { email: existing.user.email, emailVerified: existing.user.emailVerified, id: existing.user.id, name: existing.user.name };
|
|
13
13
|
}
|
|
14
14
|
const hash = await context.password.hash(Redacted.value(password));
|
|
15
15
|
const user = await context.internalAdapter.createUser({ email: normalized, emailVerified: true, name }, { method: "seed" });
|
|
16
16
|
await context.internalAdapter.createAccount({ accountId: user.id, password: hash, providerId: "credential", userId: user.id });
|
|
17
|
-
return { email: user.email, id: user.id, name: user.name };
|
|
17
|
+
return { email: user.email, emailVerified: true, id: user.id, name: user.name };
|
|
18
18
|
}).pipe(Effect.catch((error) => providerFailure(error.cause)));
|
|
19
19
|
}),
|
|
20
20
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userProvisioning.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/userProvisioning.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAqB,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAElF,MAAM,UAAU,0BAA0B,CAAC,IAE1C;IACA,OAAO,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE;QACtC,gBAAgB,EAAE,MAAM,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAgB;YAC1G,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE;gBAC1C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;gBACpC,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;gBACvC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;gBAC3E,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;oBACvB,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;
|
|
1
|
+
{"version":3,"file":"userProvisioning.js","sourceRoot":"","sources":["../../../../src/server/better-auth/adapters/userProvisioning.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AACjD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAqB,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAElF,MAAM,UAAU,0BAA0B,CAAC,IAE1C;IACA,OAAO,KAAK,CAAC,OAAO,CAAC,gBAAgB,EAAE;QACtC,gBAAgB,EAAE,MAAM,CAAC,EAAE,CAAC,2BAA2B,CAAC,CAAC,QAAQ,CAAC,EAAE,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAgB;YAC1G,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,KAAK,IAAI,EAAE;gBAC1C,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;gBACpC,MAAM,UAAU,GAAG,KAAK,CAAC,WAAW,EAAE,CAAC;gBACvC,MAAM,QAAQ,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,eAAe,CAAC,UAAU,CAAC,CAAC;gBAC3E,IAAI,QAAQ,KAAK,IAAI,EAAE,CAAC;oBACvB,OAAO,EAAE,KAAK,EAAE,QAAQ,CAAC,IAAI,CAAC,KAAK,EAAE,aAAa,EAAE,QAAQ,CAAC,IAAI,CAAC,aAAa,EAAE,EAAE,EAAE,QAAQ,CAAC,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,CAAC;gBACnI,CAAC;gBACD,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,QAAQ,CAAC,IAAI,CAAC,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,CAAC;gBACnE,MAAM,IAAI,GAAG,MAAM,OAAO,CAAC,eAAe,CAAC,UAAU,CAAC,EAAE,KAAK,EAAE,UAAU,EAAE,aAAa,EAAE,IAAI,EAAE,IAAI,EAAE,EAAE,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC;gBAC5H,MAAM,OAAO,CAAC,eAAe,CAAC,aAAa,CAAC,EAAE,SAAS,EAAE,IAAI,CAAC,EAAE,EAAE,QAAQ,EAAE,IAAI,EAAE,UAAU,EAAE,YAAY,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC;gBAC/H,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,aAAa,EAAE,IAAI,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;YACjF,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,eAAe,CAAC,KAAK,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC;QAChE,CAAC,CAAC;KACF,CAAC,CAAC;AACJ,CAAC"}
|
|
@@ -1,12 +1,11 @@
|
|
|
1
|
-
import type { BetterAuthOptions } from "better-auth";
|
|
2
1
|
import { Effect, Schema } from "effect";
|
|
3
|
-
import { type
|
|
2
|
+
import { type AuthSchemaDeclaration } from "#server/better-auth/define.ts";
|
|
4
3
|
declare const BetterAuthSchemaDrift_base: Schema.Class<BetterAuthSchemaDrift, Schema.TaggedStruct<"BetterAuthSchemaDrift", {
|
|
5
4
|
readonly missing: Schema.$Array<Schema.String>;
|
|
6
5
|
}>, import("effect/Cause").YieldableError>;
|
|
7
6
|
export declare class BetterAuthSchemaDrift extends BetterAuthSchemaDrift_base {
|
|
8
7
|
get message(): string;
|
|
9
8
|
}
|
|
10
|
-
export declare const assertBetterAuthSchema: (
|
|
9
|
+
export declare const assertBetterAuthSchema: (auth: AuthSchemaDeclaration) => Effect.Effect<undefined, BetterAuthSchemaDrift | Schema.SchemaError | import("effect/sql/SqlError").SqlError | import("effect/Cause").UnknownError, import("effect/Scope").Scope | import("effect/sql/SqlClient").SqlClient>;
|
|
11
10
|
export {};
|
|
12
11
|
//# sourceMappingURL=assertSchema.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertSchema.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/assertSchema.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"assertSchema.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/assertSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGxC,OAAO,EAAE,KAAK,qBAAqB,EAAc,MAAM,+BAA+B,CAAC;;;;AAGvF,qBAAa,qBAAsB,SAAQ,0BAEzC;IACD,IAAa,OAAO,WAEnB;CACD;AAED,eAAO,MAAM,sBAAsB,+PAQjC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Effect, Schema } from "effect";
|
|
2
2
|
import { betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
3
3
|
import { authColumnDrift } from "#server/better-auth/columnDrift.ts";
|
|
4
|
+
import { storedRole } from "#server/better-auth/define.ts";
|
|
4
5
|
import { storedRoleOptions } from "#server/better-auth/storedRoleOptions.ts";
|
|
5
6
|
export class BetterAuthSchemaDrift extends Schema.TaggedError()("BetterAuthSchemaDrift", {
|
|
6
7
|
missing: Schema.Array(Schema.String),
|
|
@@ -9,7 +10,9 @@ export class BetterAuthSchemaDrift extends Schema.TaggedError()("BetterAuthSchem
|
|
|
9
10
|
return `Auth schema needs a new migration:\n${this.missing.join("\n")}`;
|
|
10
11
|
}
|
|
11
12
|
}
|
|
12
|
-
export const assertBetterAuthSchema = Effect.fn("Identity.assertBetterAuthSchema")(function* (
|
|
13
|
+
export const assertBetterAuthSchema = Effect.fn("Identity.assertBetterAuthSchema")(function* (auth) {
|
|
14
|
+
const { options } = auth;
|
|
15
|
+
const role = storedRole(auth);
|
|
13
16
|
const { missing } = yield* betterAuthMigrationPlan(options, role, { throwOnUnsafe: false });
|
|
14
17
|
missing.push(...(yield* authColumnDrift(storedRoleOptions(options, role), role)));
|
|
15
18
|
if (missing.length > 0) {
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"assertSchema.js","sourceRoot":"","sources":["../../../src/server/better-auth/assertSchema.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"assertSchema.js","sourceRoot":"","sources":["../../../src/server/better-auth/assertSchema.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AACxF,OAAO,EAAE,eAAe,EAAE,MAAM,oCAAoC,CAAC;AACrE,OAAO,EAA8B,UAAU,EAAE,MAAM,+BAA+B,CAAC;AACvF,OAAO,EAAE,iBAAiB,EAAE,MAAM,0CAA0C,CAAC;AAE7E,MAAM,OAAO,qBAAsB,SAAQ,MAAM,CAAC,WAAW,EAAyB,CAAC,uBAAuB,EAAE;IAC/G,OAAO,EAAE,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,MAAM,CAAC;CACpC,CAAC;IACD,IAAa,OAAO;QACnB,OAAO,uCAAuC,IAAI,CAAC,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,EAAE,CAAC;IACzE,CAAC;CACD;AAED,MAAM,CAAC,MAAM,sBAAsB,GAAG,MAAM,CAAC,EAAE,CAAC,iCAAiC,CAAC,CAAC,QAAQ,CAAC,EAAE,IAA2B;IACxH,MAAM,EAAE,OAAO,EAAE,GAAG,IAAI,CAAC;IACzB,MAAM,IAAI,GAAG,UAAU,CAAC,IAAI,CAAC,CAAC;IAC9B,MAAM,EAAE,OAAO,EAAE,GAAG,KAAK,CAAC,CAAC,uBAAuB,CAAC,OAAO,EAAE,IAAI,EAAE,EAAE,aAAa,EAAE,KAAK,EAAE,CAAC,CAAC;IAC5F,OAAO,CAAC,IAAI,CAAC,GAAG,CAAC,KAAK,CAAC,CAAC,eAAe,CAAC,iBAAiB,CAAC,OAAO,EAAE,IAAI,CAAC,EAAE,IAAI,CAAC,CAAC,CAAC,CAAC;IAClF,IAAI,OAAO,CAAC,MAAM,GAAG,CAAC,EAAE,CAAC;QACxB,OAAO,KAAK,CAAC,CAAC,IAAI,qBAAqB,CAAC,EAAE,OAAO,EAAE,CAAC,CAAC;IACtD,CAAC;AACF,CAAC,CAAC,CAAC"}
|
|
@@ -1,8 +1,7 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import { SqlClient } from "effect/sql";
|
|
3
|
-
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
3
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
5
4
|
import { LastRoleAssigner } from "#roles.ts";
|
|
6
|
-
import {
|
|
7
|
-
export declare const assignRole: <TRole extends string>(
|
|
5
|
+
import type { RoleTables } from "#server/better-auth/define.ts";
|
|
6
|
+
export declare const assignRole: <TRole extends string>(auth: RoleTables<TRole>, userId: string, role: NoInfer<TRole>) => Effect.Effect<boolean, AuthUnavailable | LastRoleAssigner | NotFound, SqlClient.SqlClient>;
|
|
8
7
|
//# 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;
|
|
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;AAElD,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAE1E,OAAO,EAAe,gBAAgB,EAAE,MAAM,WAAW,CAAC;AAC1D,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAQhE,eAAO,MAAM,UAAU,GAA+C,KAAK,SAAS,MAAM,8JAwCxF,CAAC"}
|
|
@@ -10,9 +10,10 @@ import { roleKeys, userKeys } from "#users.ts";
|
|
|
10
10
|
function unavailable() {
|
|
11
11
|
return new AuthUnavailable({ message: "Could not access app users" });
|
|
12
12
|
}
|
|
13
|
-
export const assignRole = Effect.fn("Identity.assignRole")(function* (
|
|
13
|
+
export const assignRole = Effect.fn("Identity.assignRole")(function* (auth, userId, role) {
|
|
14
|
+
const access = auth.roles;
|
|
14
15
|
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
15
|
-
const { user } = tables(options);
|
|
16
|
+
const { user } = tables(auth.options);
|
|
16
17
|
const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
17
18
|
const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
|
|
18
19
|
return yield* Effect.gen(function* () {
|
|
@@ -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;
|
|
1
|
+
{"version":3,"file":"assignRole.js","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,36 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import type { AccessPolicy, RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
|
+
export type AuthDeclaration<TOptions extends BetterAuthOptions = BetterAuthOptions> = {
|
|
4
|
+
readonly options: TOptions;
|
|
5
|
+
} & ({
|
|
6
|
+
readonly defaultRole?: undefined;
|
|
7
|
+
readonly roles?: undefined;
|
|
8
|
+
} | {
|
|
9
|
+
readonly defaultRole: string;
|
|
10
|
+
readonly roles: RoleSet;
|
|
11
|
+
});
|
|
12
|
+
export interface RoleAuthDeclaration<TRole extends string, TOptions extends BetterAuthOptions = BetterAuthOptions> {
|
|
13
|
+
readonly defaultRole: TRole;
|
|
14
|
+
readonly options: TOptions;
|
|
15
|
+
readonly roles: AccessPolicy<TRole>;
|
|
16
|
+
}
|
|
17
|
+
export interface AuthSchemaDeclaration {
|
|
18
|
+
readonly defaultRole?: string | undefined;
|
|
19
|
+
readonly options: Omit<BetterAuthOptions, "database">;
|
|
20
|
+
}
|
|
21
|
+
export declare function storedRole(auth: AuthSchemaDeclaration): {
|
|
22
|
+
defaultRole: string;
|
|
23
|
+
} | undefined;
|
|
24
|
+
export interface RoleTables<TRole extends string> {
|
|
25
|
+
readonly options?: BetterAuthOptions | undefined;
|
|
26
|
+
readonly roles: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">;
|
|
27
|
+
}
|
|
28
|
+
export declare function defineAuth<const TOptions extends BetterAuthOptions, TRole extends string>(declaration: {
|
|
29
|
+
readonly defaultRole: NoInfer<TRole>;
|
|
30
|
+
readonly options: TOptions;
|
|
31
|
+
readonly roles: AccessPolicy<TRole>;
|
|
32
|
+
}): RoleAuthDeclaration<TRole, TOptions>;
|
|
33
|
+
export declare function defineAuth<const TOptions extends BetterAuthOptions>(declaration: {
|
|
34
|
+
readonly options: TOptions;
|
|
35
|
+
}): AuthDeclaration<TOptions>;
|
|
36
|
+
//# sourceMappingURL=define.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/define.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,KAAK,EAAE,YAAY,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAE1E,MAAM,MAAM,eAAe,CAAC,QAAQ,SAAS,iBAAiB,GAAG,iBAAiB,IAAI;IAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,GAAG,CACpH;IAAE,QAAQ,CAAC,WAAW,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAA;CAAE,GAChE;IAAE,QAAQ,CAAC,WAAW,EAAE,MAAM,CAAC;IAAC,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAA;CAAE,CAC3D,CAAC;AAEF,MAAM,WAAW,mBAAmB,CAAC,KAAK,SAAS,MAAM,EAAE,QAAQ,SAAS,iBAAiB,GAAG,iBAAiB;IAChH,QAAQ,CAAC,WAAW,EAAE,KAAK,CAAC;IAC5B,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;CACpC;AAED,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,WAAW,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IAC1C,QAAQ,CAAC,OAAO,EAAE,IAAI,CAAC,iBAAiB,EAAE,UAAU,CAAC,CAAC;CACtD;AAED,wBAAgB,UAAU,CAAC,IAAI,EAAE,qBAAqB;;cAErD;AAED,MAAM,WAAW,UAAU,CAAC,KAAK,SAAS,MAAM;IAC/C,QAAQ,CAAC,OAAO,CAAC,EAAE,iBAAiB,GAAG,SAAS,CAAC;IACjD,QAAQ,CAAC,KAAK,EAAE,IAAI,CAAC,YAAY,CAAC,KAAK,CAAC,EAAE,MAAM,GAAG,eAAe,CAAC,CAAC;CACpE;AAED,wBAAgB,UAAU,CAAC,KAAK,CAAC,QAAQ,SAAS,iBAAiB,EAAE,KAAK,SAAS,MAAM,EAAE,WAAW,EAAE;IACvG,QAAQ,CAAC,WAAW,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC;IACrC,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAC;IAC3B,QAAQ,CAAC,KAAK,EAAE,YAAY,CAAC,KAAK,CAAC,CAAC;CACpC,GAAG,mBAAmB,CAAC,KAAK,EAAE,QAAQ,CAAC,CAAC;AACzC,wBAAgB,UAAU,CAAC,KAAK,CAAC,QAAQ,SAAS,iBAAiB,EAAE,WAAW,EAAE;IAAE,QAAQ,CAAC,OAAO,EAAE,QAAQ,CAAA;CAAE,GAAG,eAAe,CAAC,QAAQ,CAAC,CAAC"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"define.js","sourceRoot":"","sources":["../../../src/server/better-auth/define.ts"],"names":[],"mappings":"AAmBA,MAAM,UAAU,UAAU,CAAC,IAA2B;IACrD,OAAO,IAAI,CAAC,WAAW,KAAK,SAAS,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC,CAAC,EAAE,WAAW,EAAE,IAAI,CAAC,WAAW,EAAE,CAAC;AACvF,CAAC;AAaD,MAAM,UAAU,UAAU,CAAC,WAA4B;IACtD,OAAO,WAAW,CAAC;AACpB,CAAC"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Config, Effect } from "effect";
|
|
2
|
+
import type { RoleAuthDeclaration } from "#server/better-auth/define.ts";
|
|
2
3
|
import type { SeedOptions } from "#server/better-auth/SeedOptions.ts";
|
|
3
|
-
export declare function defineSeed<TRole extends string, E, R>(
|
|
4
|
+
export declare function defineSeed<TRole extends string, E, R>(auth: RoleAuthDeclaration<TRole>, seed: SeedOptions<TRole, E, R>): Effect.Effect<void, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | Config.ConfigError | import("../../roles.ts").LastRoleAssigner | import("#server/better-auth/assertSeedDatabase.ts").NonLocalSeedDatabase | import("@shivaedev/errors/taxonomy.ts").NotFound | import("effect/Schema").SchemaError | import("effect/sql/SqlError").SqlError | import("./UndeclaredDefaultRole.ts").UndeclaredDefaultRole | import("@shivaedev/sql/repositoryCollection.ts").RepositoryBuildError, Exclude<Exclude<Exclude<Exclude<Exclude<Exclude<R, import("../../identity.ts").Identity>, import("../../identity.ts").SessionUser>, never>, import("../UserProvisioning.ts").UserProvisioning>, import("@effect/sql-pg/PgClient").PgClient | import("@effect/sql-pg/PgPool").PgPool | import("effect/reactivity/Reactivity").Reactivity | import("effect/sql/SqlClient").SqlClient>, import("effect/Scope").Scope>>;
|
|
4
5
|
//# sourceMappingURL=defineSeed.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defineSeed.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/defineSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"defineSeed.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/defineSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGxC,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AAGtE,wBAAgB,UAAU,CAAC,KAAK,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,EAAE,IAAI,EAAE,mBAAmB,CAAC,KAAK,CAAC,EAAE,IAAI,EAAE,WAAW,CAAC,KAAK,EAAE,CAAC,EAAE,CAAC,CAAC,23BAMtH"}
|
|
@@ -1,19 +1,13 @@
|
|
|
1
1
|
import { Config, Effect } from "effect";
|
|
2
|
-
import { memoryStore } from "@shivaedev/rate-limit/memoryStore.ts";
|
|
3
2
|
import { postgresLayer } from "@shivaedev/sql/postgresLayer.ts";
|
|
4
|
-
import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
|
|
5
|
-
import { betterAuthUserProvisioning } from "#server/better-auth/adapters/userProvisioning.ts";
|
|
6
3
|
import { assertSeedDatabase } from "#server/better-auth/assertSeedDatabase.ts";
|
|
7
|
-
import {
|
|
4
|
+
import { mountedUserProvisioning } from "#server/better-auth/mountedUserProvisioning.ts";
|
|
8
5
|
import { seedUsers } from "#server/better-auth/seedUsers.ts";
|
|
9
|
-
export function defineSeed(
|
|
6
|
+
export function defineSeed(auth, seed) {
|
|
10
7
|
return Effect.gen(function* () {
|
|
11
8
|
const url = yield* Config.Redacted("DATABASE_URL");
|
|
12
9
|
yield* assertSeedDatabase(url);
|
|
13
|
-
return yield* Effect.
|
|
14
|
-
const { auth } = yield* betterAuthMount({ emailAndPassword: { enabled: true }, ...options.auth, database: yield* betterAuthDatabase() }, { defaultRole: options.defaultRole, roles: options.roles }).pipe(Effect.provide(memoryStore));
|
|
15
|
-
return yield* seedUsers(options).pipe(Effect.provide(betterAuthUserProvisioning(auth)));
|
|
16
|
-
}).pipe(Effect.provide(postgresLayer(url)));
|
|
10
|
+
return yield* seedUsers(auth, seed).pipe(Effect.provide(mountedUserProvisioning(auth)), Effect.provide(postgresLayer(url)));
|
|
17
11
|
}).pipe(Effect.scoped);
|
|
18
12
|
}
|
|
19
13
|
//# sourceMappingURL=defineSeed.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"defineSeed.js","sourceRoot":"","sources":["../../../src/server/better-auth/defineSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"defineSeed.js","sourceRoot":"","sources":["../../../src/server/better-auth/defineSeed.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAE/E,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AAEzF,OAAO,EAAE,SAAS,EAAE,MAAM,kCAAkC,CAAC;AAE7D,MAAM,UAAU,UAAU,CAA6B,IAAgC,EAAE,IAA8B;IACtH,OAAO,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QAC1B,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;QACnD,KAAK,CAAC,CAAC,kBAAkB,CAAC,GAAG,CAAC,CAAC;QAC/B,OAAO,KAAK,CAAC,CAAC,SAAS,CAAC,IAAI,EAAE,IAAI,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,CAAC,CAAC;IAC7H,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,CAAC;AACxB,CAAC"}
|
|
@@ -1,6 +1,5 @@
|
|
|
1
|
-
import type { BetterAuthOptions } from "better-auth";
|
|
2
1
|
import { Effect } from "effect";
|
|
3
2
|
import { SqlClient } from "effect/sql";
|
|
4
|
-
import type
|
|
5
|
-
export declare const migrateBetterAuth: (
|
|
3
|
+
import { type AuthSchemaDeclaration } from "#server/better-auth/define.ts";
|
|
4
|
+
export declare const migrateBetterAuth: (auth: AuthSchemaDeclaration) => Effect.Effect<void, import("effect/sql/SqlError").SqlError | import("effect/Cause").UnknownError, import("effect/Scope").Scope | SqlClient.SqlClient>;
|
|
6
5
|
//# sourceMappingURL=migrate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/migrate.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/migrate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,qBAAqB,EAAc,MAAM,+BAA+B,CAAC;AAEvF,eAAO,MAAM,iBAAiB,wLAI5B,CAAC"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import { SqlClient } from "effect/sql";
|
|
3
3
|
import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
4
|
-
|
|
5
|
-
|
|
4
|
+
import { storedRole } from "#server/better-auth/define.ts";
|
|
5
|
+
export const migrateBetterAuth = Effect.fn("Identity.migrateBetterAuth")(function* (auth) {
|
|
6
|
+
const plan = yield* betterAuthMigrationPlan(auth.options, storedRole(auth));
|
|
6
7
|
const sql = yield* SqlClient.SqlClient;
|
|
7
8
|
yield* sql.unsafe(authMigrationSql(plan.ddl));
|
|
8
9
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/server/better-auth/migrate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/server/better-auth/migrate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAC1G,OAAO,EAA8B,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEvF,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,EAAE,CAAC,4BAA4B,CAAC,CAAC,QAAQ,CAAC,EAAE,IAA2B;IAC9G,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5E,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;IACvC,KAAK,CAAC,CAAC,GAAG,CAAC,MAAM,CAAC,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,CAAC;AAC/C,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,4 @@
|
|
|
1
|
-
import type { BetterAuthOptions } from "better-auth";
|
|
2
1
|
import { Effect } from "effect";
|
|
3
|
-
import type
|
|
4
|
-
export declare const generateBetterAuthMigration: (
|
|
2
|
+
import { type AuthSchemaDeclaration } from "#server/better-auth/define.ts";
|
|
3
|
+
export declare const generateBetterAuthMigration: (auth: AuthSchemaDeclaration) => Effect.Effect<string, import("effect/Cause").UnknownError, import("effect/Scope").Scope | import("effect/sql/SqlClient").SqlClient>;
|
|
5
4
|
//# sourceMappingURL=generate.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/migrations/generate.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/migrations/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,KAAK,qBAAqB,EAAc,MAAM,+BAA+B,CAAC;AAEvF,eAAO,MAAM,2BAA2B,sKAItC,CAAC"}
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
3
|
-
|
|
4
|
-
|
|
3
|
+
import { storedRole } from "#server/better-auth/define.ts";
|
|
4
|
+
export const generateBetterAuthMigration = Effect.fn("Identity.generateBetterAuthMigration")(function* (auth) {
|
|
5
|
+
const plan = yield* betterAuthMigrationPlan(auth.options, storedRole(auth));
|
|
5
6
|
const sql = authMigrationSql(plan.ddl).replaceAll("\\", "\\\\").replaceAll("`", "\\`").replaceAll("${", "\\${");
|
|
6
7
|
return `import { Effect } from "effect";\nimport { SqlClient } from "effect/sql";\n\nexport default Effect.gen(function* () {\n\tconst sql = yield* SqlClient.SqlClient;\n\tyield* sql.unsafe(\`${sql}\`);\n});\n`;
|
|
7
8
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/server/better-auth/migrations/generate.ts"],"names":[],"mappings":"
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/server/better-auth/migrations/generate.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,+CAA+C,CAAC;AAC1G,OAAO,EAA8B,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEvF,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC,EAAE,CAAC,sCAAsC,CAAC,CAAC,QAAQ,CAAC,EAAE,IAA2B;IAClI,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,uBAAuB,CAAC,IAAI,CAAC,OAAO,EAAE,UAAU,CAAC,IAAI,CAAC,CAAC,CAAC;IAC5E,MAAM,GAAG,GAAG,gBAAgB,CAAC,IAAI,CAAC,GAAG,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,UAAU,CAAC,GAAG,EAAE,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAChH,OAAO,2LAA2L,GAAG,aAAa,CAAC;AACpN,CAAC,CAAC,CAAC"}
|
|
@@ -1,17 +1,17 @@
|
|
|
1
1
|
import type { BetterAuthOptions } from "better-auth";
|
|
2
2
|
import { Effect, Layer, type Scope } from "effect";
|
|
3
|
-
import type {
|
|
3
|
+
import type { SqlClient } from "effect/sql";
|
|
4
4
|
import type { Store } from "@shivaedev/rate-limit/Store.ts";
|
|
5
5
|
import type { AccountRoleSeed } from "#server/better-auth/adapters/accountRoleSeed.ts";
|
|
6
6
|
import { type BearerSessionsOptions } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
7
7
|
import { type BetterAuthHardeningOptions } from "#server/better-auth/adapters/hardening.ts";
|
|
8
8
|
import { type SignInPolicy } from "#server/better-auth/adapters/signInGate.ts";
|
|
9
9
|
import type { BetterAuthDatabaseHooks } from "#server/better-auth/databaseHooks.ts";
|
|
10
|
+
import type { AuthDeclaration } from "#server/better-auth/define.ts";
|
|
10
11
|
import type { BetterAuthEmails } from "#server/better-auth/emails.ts";
|
|
11
12
|
import type { BetterAuthPasswordReset } from "#server/better-auth/PasswordReset.ts";
|
|
12
|
-
import { type StoredRoleOptions } from "#server/better-auth/storedRoleOptions.ts";
|
|
13
13
|
import { UndeclaredDefaultRole } from "#server/better-auth/UndeclaredDefaultRole.ts";
|
|
14
|
-
export
|
|
14
|
+
export interface BetterAuthMountOptions<E = never, R = never> {
|
|
15
15
|
readonly accountPreferences?: boolean;
|
|
16
16
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
17
17
|
readonly clientIp?: "railway";
|
|
@@ -21,15 +21,13 @@ export type BetterAuthMountOptions<E = never, R = never> = {
|
|
|
21
21
|
readonly hardening?: BetterAuthHardeningOptions;
|
|
22
22
|
readonly onPasswordReset?: BetterAuthPasswordReset<R> | undefined;
|
|
23
23
|
readonly preset?: "provider-only";
|
|
24
|
+
readonly roleSeed?: Effect.Effect<AccountRoleSeed<E>, E, R> | undefined;
|
|
24
25
|
readonly signIn?: SignInPolicy<E, R> | undefined;
|
|
25
|
-
}
|
|
26
|
-
|
|
27
|
-
readonly
|
|
28
|
-
}
|
|
29
|
-
|
|
30
|
-
readonly roleSeed?: Effect.Effect<AccountRoleSeed<E>, E, R>;
|
|
31
|
-
}));
|
|
32
|
-
declare const mountAuth: <const TOptions extends BetterAuthOptions, E = never, R = never>(options: TOptions, mount?: BetterAuthMountOptions<E, R> | undefined) => Effect.Effect<{
|
|
26
|
+
}
|
|
27
|
+
type AuthDatabase<TOptions extends BetterAuthOptions> = TOptions extends {
|
|
28
|
+
readonly database: object;
|
|
29
|
+
} ? never : SqlClient.SqlClient;
|
|
30
|
+
declare const mountAuth: <const TOptions extends BetterAuthOptions, E = never, R = never>(declaration: AuthDeclaration<TOptions>, mount?: BetterAuthMountOptions<E, R> | undefined) => Effect.Effect<{
|
|
33
31
|
admitsUser: (userId: string) => Effect.Effect<boolean, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, never>;
|
|
34
32
|
admittedSessions: {
|
|
35
33
|
<TSession extends import("../session.ts").SessionShape>(getSession: import("../adapters/betterAuthSessions.ts").GetSession<TSession>): import("../session.ts").SessionProvider<TSession>;
|
|
@@ -311,14 +309,14 @@ declare const mountAuth: <const TOptions extends BetterAuthOptions, E = never, R
|
|
|
311
309
|
revokeUnadmitted: Effect.Effect<import("#server/better-auth/adapters/revokeUnadmitted.ts").RevokedSessions, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | import("effect/Config").ConfigError, never>;
|
|
312
310
|
routes: Layer.Layer<never, never, import("effect/http/HttpRouter").HttpRouter | import("effect/http/HttpRouter").Request<"Error", import("effect/http/HttpServerError").InternalError> | import("effect/http/HttpRouter").Request<"Error", import("effect/http/HttpServerError").RequestParseError> | import("effect/http/HttpRouter").Request<"Error", import("effect/http/HttpServerError").RouteNotFound>>;
|
|
313
311
|
sessions: {
|
|
314
|
-
readonly roles?: RoleSet;
|
|
312
|
+
readonly roles?: import("@shivaedev/access/roleSet.ts").RoleSet;
|
|
315
313
|
readonly provider: import("../session.ts").SessionProvider<import("../session.ts").UserSessionShape>;
|
|
316
314
|
};
|
|
317
|
-
}, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | import("effect/Config").ConfigError | UndeclaredDefaultRole | import("@shivaedev/sql/repositoryCollection.ts").RepositoryBuildError, R | import("effect/reactivity/Reactivity").Reactivity |
|
|
315
|
+
}, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | import("effect/Config").ConfigError | UndeclaredDefaultRole | import("@shivaedev/sql/repositoryCollection.ts").RepositoryBuildError, R | import("effect/reactivity/Reactivity").Reactivity | Scope.Scope | SqlClient.SqlClient | Store>;
|
|
318
316
|
type Mounted<TOptions extends BetterAuthOptions, E, R> = ReturnType<typeof mountAuth<TOptions, E, R>>;
|
|
319
|
-
export declare function betterAuthMount<const TOptions extends BetterAuthOptions, E = never, R = never>(
|
|
317
|
+
export declare function betterAuthMount<const TOptions extends BetterAuthOptions, E = never, R = never>(auth: AuthDeclaration<TOptions>, mount?: BetterAuthMountOptions<E, R> & {
|
|
320
318
|
readonly emails?: undefined;
|
|
321
|
-
}): Effect.Effect<Effect.Success<Mounted<TOptions, E, R>>, Effect.Error<Mounted<TOptions, E, R>>, R | Scope.Scope | Store
|
|
322
|
-
export declare function betterAuthMount<const TOptions extends BetterAuthOptions, E = never, R = never>(
|
|
319
|
+
}): Effect.Effect<Effect.Success<Mounted<TOptions, E, R>>, Effect.Error<Mounted<TOptions, E, R>>, R | Scope.Scope | Store | AuthDatabase<TOptions>>;
|
|
320
|
+
export declare function betterAuthMount<const TOptions extends BetterAuthOptions, E = never, R = never>(auth: AuthDeclaration<TOptions>, mount: BetterAuthMountOptions<E, R>): Mounted<TOptions, E, R>;
|
|
323
321
|
export {};
|
|
324
322
|
//# sourceMappingURL=mount.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,KAAK,KAAK,EAAE,MAAM,QAAQ,CAAC;AACnD,OAAO,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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"}
|