@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
|
@@ -4,6 +4,7 @@ import { accountPreferenceOptions } from "#server/better-auth/adapters/accountPr
|
|
|
4
4
|
import { acquireAuth } from "#server/better-auth/adapters/acquire.ts";
|
|
5
5
|
import { admittedSessions } from "#server/better-auth/adapters/admittedSessions.ts";
|
|
6
6
|
import { withBearerSessions } from "#server/better-auth/adapters/bearerSessions.ts";
|
|
7
|
+
import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
|
|
7
8
|
import { effectHookOptions } from "#server/better-auth/adapters/effectHookOptions.ts";
|
|
8
9
|
import { emailOptions } from "#server/better-auth/adapters/emailOptions.ts";
|
|
9
10
|
import { withHardening } from "#server/better-auth/adapters/hardening.ts";
|
|
@@ -24,10 +25,12 @@ import { authRouteHandler } from "#server/better-auth/routeHandler.ts";
|
|
|
24
25
|
import { storedRoleOptions } from "#server/better-auth/storedRoleOptions.ts";
|
|
25
26
|
import { UndeclaredDefaultRole } from "#server/better-auth/UndeclaredDefaultRole.ts";
|
|
26
27
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
27
|
-
const mountAuth = Effect.fn("Identity.mountAuth")(function* (
|
|
28
|
-
if (
|
|
29
|
-
|
|
28
|
+
const mountAuth = Effect.fn("Identity.mountAuth")(function* (declaration, mount = {}) {
|
|
29
|
+
if (declaration.roles !== undefined) {
|
|
30
|
+
const { defaultRole } = declaration;
|
|
31
|
+
yield* declaration.roles.resolve(defaultRole).pipe(Effect.mapError(() => new UndeclaredDefaultRole({ role: defaultRole })));
|
|
30
32
|
}
|
|
33
|
+
const options = declaration.options.database === undefined ? { ...declaration.options, database: yield* betterAuthDatabase() } : declaration.options;
|
|
31
34
|
const { authOptions, clientIpHeader, rateLimitEnabled, trustedProxy } = yield* mountSettings(options, mount.clientIp);
|
|
32
35
|
const policy = mount.signIn ?? {};
|
|
33
36
|
if (policy.accounts !== undefined) {
|
|
@@ -39,7 +42,7 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* (options, mount = {}
|
|
|
39
42
|
const reset = passwordResetOptions(preferences, mount.onPasswordReset, runtime);
|
|
40
43
|
const announced = effectHookOptions(yield* emailOptions(reset, mount.emails, runtime), changeHooks, runtime);
|
|
41
44
|
const hooked = effectHookOptions(announced, mount.databaseHooks, runtime);
|
|
42
|
-
const configured =
|
|
45
|
+
const configured = declaration.roles === undefined ? hooked : storedRoleOptions(closeRoleEndpoints(hooked), declaration);
|
|
43
46
|
const gated = yield* signInPolicyOptions(configured, gate, () => auth.$context);
|
|
44
47
|
const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
|
|
45
48
|
const seeded = roleSeedOptions(gate.active ? { ...configured, ...gated } : configured, seed);
|
|
@@ -66,7 +69,7 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* (options, mount = {}
|
|
|
66
69
|
bearerSessions: mount.bearerSessions,
|
|
67
70
|
clientIpHeader,
|
|
68
71
|
ipv6Subnet: options.advanced?.ipAddress?.ipv6Subnet,
|
|
69
|
-
roles:
|
|
72
|
+
roles: declaration.roles,
|
|
70
73
|
runRequest: runtime.runRequest,
|
|
71
74
|
trustedProxy,
|
|
72
75
|
}),
|
|
@@ -82,10 +85,10 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* (options, mount = {}
|
|
|
82
85
|
});
|
|
83
86
|
const revoke = revokeUnadmitted(gate, () => auth.$context);
|
|
84
87
|
const lookupSession = Reflect.get(auth.api, "getSession");
|
|
85
|
-
const sessions = mountedSessions(lookupSession, admit,
|
|
88
|
+
const sessions = mountedSessions(lookupSession, admit, declaration.roles);
|
|
86
89
|
return { admitsUser, admittedSessions: admit, auth, profiles, revokeUnadmitted: revoke, routes: authRoutes, sessions };
|
|
87
90
|
});
|
|
88
|
-
export function betterAuthMount(
|
|
89
|
-
return mountAuth(
|
|
91
|
+
export function betterAuthMount(auth, mount = {}) {
|
|
92
|
+
return mountAuth(auth, mount);
|
|
90
93
|
}
|
|
91
94
|
//# sourceMappingURL=mount.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAc,MAAM,QAAQ,CAAC;AAGnD,OAAO,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAC/E,OAAO,EAAE,wBAAwB,EAAE,MAAM,0DAA0D,CAAC;AAEpG,OAAO,EAAE,WAAW,EAAE,MAAM,yCAAyC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,kDAAkD,CAAC;AACpF,OAAO,EAA8B,kBAAkB,EAAE,MAAM,gDAAgD,CAAC;AAChH,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,oBAAoB,EAAE,MAAM,sDAAsD,CAAC;AAC5F,OAAO,EAAE,mBAAmB,EAAE,MAAM,qDAAqD,CAAC;AAC1F,OAAO,EAAE,gBAAgB,EAAE,MAAM,kDAAkD,CAAC;AACpF,OAAO,EAAE,gBAAgB,EAAE,MAAM,kDAAkD,CAAC;AACpF,OAAO,EAAE,eAAe,EAAE,MAAM,iDAAiD,CAAC;AAClF,OAAO,EAAE,WAAW,EAAyC,UAAU,EAAE,MAAM,4CAA4C,CAAC;AAC5H,OAAO,EAAE,mBAAmB,EAAE,MAAM,qDAAqD,CAAC;AAC1F,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,4 @@
|
|
|
1
|
+
import { Layer } from "effect";
|
|
2
|
+
import type { AuthDeclaration } from "#server/better-auth/define.ts";
|
|
3
|
+
export declare function mountedUserProvisioning(auth: AuthDeclaration): Layer.Layer<import("../UserProvisioning.ts").UserProvisioning, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | import("effect/Config").ConfigError | import("./UndeclaredDefaultRole.ts").UndeclaredDefaultRole | import("@shivaedev/sql/repositoryCollection.ts").RepositoryBuildError, import("effect/sql/SqlClient").SqlClient>;
|
|
4
|
+
//# sourceMappingURL=mountedUserProvisioning.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mountedUserProvisioning.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mountedUserProvisioning.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAE,MAAM,QAAQ,CAAC;AAGvC,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAGrE,wBAAgB,uBAAuB,CAAC,IAAI,EAAE,eAAe,gVAO5D"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Effect, Layer } from "effect";
|
|
2
|
+
import { memoryStore } from "@shivaedev/rate-limit/memoryStore.ts";
|
|
3
|
+
import { betterAuthUserProvisioning } from "#server/better-auth/adapters/userProvisioning.ts";
|
|
4
|
+
import { betterAuthMount } from "#server/better-auth/mount.ts";
|
|
5
|
+
export function mountedUserProvisioning(auth) {
|
|
6
|
+
return Layer.unwrap(betterAuthMount({ ...auth, options: { emailAndPassword: { enabled: true }, ...auth.options } }).pipe(Effect.map((mounted) => betterAuthUserProvisioning(mounted.auth)), Effect.provide(memoryStore)));
|
|
7
|
+
}
|
|
8
|
+
//# sourceMappingURL=mountedUserProvisioning.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"mountedUserProvisioning.js","sourceRoot":"","sources":["../../../src/server/better-auth/mountedUserProvisioning.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,QAAQ,CAAC;AACvC,OAAO,EAAE,WAAW,EAAE,MAAM,sCAAsC,CAAC;AACnE,OAAO,EAAE,0BAA0B,EAAE,MAAM,kDAAkD,CAAC;AAE9F,OAAO,EAAE,eAAe,EAAE,MAAM,8BAA8B,CAAC;AAE/D,MAAM,UAAU,uBAAuB,CAAC,IAAqB;IAC5D,OAAO,KAAK,CAAC,MAAM,CAClB,eAAe,CAAC,EAAE,GAAG,IAAI,EAAE,OAAO,EAAE,EAAE,gBAAgB,EAAE,EAAE,OAAO,EAAE,IAAI,EAAE,EAAE,GAAG,IAAI,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,IAAI,CACnG,MAAM,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,0BAA0B,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC,EACjE,MAAM,CAAC,OAAO,CAAC,WAAW,CAAC,CAC3B,CACD,CAAC;AACH,CAAC"}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Config, Effect } from "effect";
|
|
2
|
+
import { AdminPasswordLength } from "#server/better-auth/AdminPasswordLength.ts";
|
|
3
|
+
import type { RoleAuthDeclaration } from "#server/better-auth/define.ts";
|
|
4
|
+
import { UnverifiedAdminEmail } from "#server/better-auth/UnverifiedAdminEmail.ts";
|
|
5
|
+
export declare const provisionAdmin: <TRole extends string>(auth: RoleAuthDeclaration<TRole, import("better-auth").BetterAuthOptions>, role: NoInfer<TRole>) => Effect.Effect<{
|
|
6
|
+
email: string;
|
|
7
|
+
id: string;
|
|
8
|
+
name: string;
|
|
9
|
+
}, AdminPasswordLength | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | Config.ConfigError | import("../../roles.ts").LastRoleAssigner | import("@shivaedev/errors/taxonomy.ts").NotFound | import("effect/sql/SqlError").SqlError | import("./UndeclaredDefaultRole.ts").UndeclaredDefaultRole | UnverifiedAdminEmail | import("@shivaedev/sql/repositoryCollection.ts").RepositoryBuildError, never>;
|
|
10
|
+
//# sourceMappingURL=provisionAdmin.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provisionAdmin.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/provisionAdmin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAY,MAAM,QAAQ,CAAC;AAElD,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AAEjF,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AAEzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AAGnF,eAAO,MAAM,cAAc,GAAmD,KAAK,SAAS,MAAM;;;;iZAsBhG,CAAC"}
|
|
@@ -0,0 +1,28 @@
|
|
|
1
|
+
import { Config, Effect, Redacted } from "effect";
|
|
2
|
+
import { postgresLayer } from "@shivaedev/sql/postgresLayer.ts";
|
|
3
|
+
import { AdminPasswordLength } from "#server/better-auth/AdminPasswordLength.ts";
|
|
4
|
+
import { assignRole } from "#server/better-auth/assignRole.ts";
|
|
5
|
+
import { mountedUserProvisioning } from "#server/better-auth/mountedUserProvisioning.ts";
|
|
6
|
+
import { UnverifiedAdminEmail } from "#server/better-auth/UnverifiedAdminEmail.ts";
|
|
7
|
+
import { UserProvisioning } from "#server/UserProvisioning.ts";
|
|
8
|
+
export const provisionAdmin = Effect.fn("Identity.provisionAdmin")(function* (auth, role) {
|
|
9
|
+
const email = yield* Config.String("ADMIN_EMAIL");
|
|
10
|
+
const name = yield* Config.String("ADMIN_NAME").pipe(Config.withDefault("Administrator"));
|
|
11
|
+
const password = yield* Config.Redacted("ADMIN_PASSWORD").pipe(Config.withDefault(Redacted.make("")));
|
|
12
|
+
// Provisioning skips Better Auth's sign-up endpoint, so it applies the endpoint's password limits itself.
|
|
13
|
+
const { maxPasswordLength: maximum = 128, minPasswordLength: minimum = 8 } = auth.options.emailAndPassword ?? {};
|
|
14
|
+
const length = Redacted.value(password).length;
|
|
15
|
+
if (length < minimum || length > maximum) {
|
|
16
|
+
return yield* new AdminPasswordLength({ maximum, minimum });
|
|
17
|
+
}
|
|
18
|
+
const url = yield* Config.Redacted("DATABASE_URL");
|
|
19
|
+
return yield* Effect.gen(function* () {
|
|
20
|
+
const user = yield* (yield* UserProvisioning).findOrCreateUser({ email, name, password });
|
|
21
|
+
if (!user.emailVerified) {
|
|
22
|
+
return yield* new UnverifiedAdminEmail({ email: user.email });
|
|
23
|
+
}
|
|
24
|
+
yield* assignRole(auth, user.id, role);
|
|
25
|
+
return { email: user.email, id: user.id, name: user.name };
|
|
26
|
+
}).pipe(Effect.provide(mountedUserProvisioning(auth)), Effect.provide(postgresLayer(url)), Effect.scoped);
|
|
27
|
+
});
|
|
28
|
+
//# sourceMappingURL=provisionAdmin.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"provisionAdmin.js","sourceRoot":"","sources":["../../../src/server/better-auth/provisionAdmin.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,aAAa,EAAE,MAAM,iCAAiC,CAAC;AAChE,OAAO,EAAE,mBAAmB,EAAE,MAAM,4CAA4C,CAAC;AACjF,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE/D,OAAO,EAAE,uBAAuB,EAAE,MAAM,gDAAgD,CAAC;AACzF,OAAO,EAAE,oBAAoB,EAAE,MAAM,6CAA6C,CAAC;AACnF,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,QAAQ,CAAC,EAC3E,IAAgC,EAChC,IAAoB;IAEpB,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,aAAa,CAAC,CAAC;IAClD,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,MAAM,CAAC,YAAY,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,eAAe,CAAC,CAAC,CAAC;IAC1F,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,gBAAgB,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,WAAW,CAAC,QAAQ,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC;IACtG,0GAA0G;IAC1G,MAAM,EAAE,iBAAiB,EAAE,OAAO,GAAG,GAAG,EAAE,iBAAiB,EAAE,OAAO,GAAG,CAAC,EAAE,GAAG,IAAI,CAAC,OAAO,CAAC,gBAAgB,IAAI,EAAE,CAAC;IACjH,MAAM,MAAM,GAAG,QAAQ,CAAC,KAAK,CAAC,QAAQ,CAAC,CAAC,MAAM,CAAC;IAC/C,IAAI,MAAM,GAAG,OAAO,IAAI,MAAM,GAAG,OAAO,EAAE,CAAC;QAC1C,OAAO,KAAK,CAAC,CAAC,IAAI,mBAAmB,CAAC,EAAE,OAAO,EAAE,OAAO,EAAE,CAAC,CAAC;IAC7D,CAAC;IACD,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,cAAc,CAAC,CAAC;IACnD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACjC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,gBAAgB,CAAC,CAAC,gBAAgB,CAAC,EAAE,KAAK,EAAE,IAAI,EAAE,QAAQ,EAAE,CAAC,CAAC;QAC1F,IAAI,CAAC,IAAI,CAAC,aAAa,EAAE,CAAC;YACzB,OAAO,KAAK,CAAC,CAAC,IAAI,oBAAoB,CAAC,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,CAAC,CAAC;QAC/D,CAAC;QACD,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,CAAC,CAAC;QACvC,OAAO,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,CAAC;IAC5D,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,OAAO,CAAC,uBAAuB,CAAC,IAAI,CAAC,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,aAAa,CAAC,GAAG,CAAC,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAC3G,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import { Identity, SessionUser } from "#identity.ts";
|
|
3
|
+
import type { RoleAuthDeclaration } from "#server/better-auth/define.ts";
|
|
3
4
|
import type { SeedOptions } from "#server/better-auth/SeedOptions.ts";
|
|
4
5
|
import { UserProvisioning } from "#server/UserProvisioning.ts";
|
|
5
|
-
export declare const seedUsers: <TRole extends string, E, R>(
|
|
6
|
+
export declare const seedUsers: <TRole extends string, E, R>(auth: RoleAuthDeclaration<TRole, import("better-auth").BetterAuthOptions>, seed: SeedOptions<TRole, E, R>) => Effect.Effect<void, E | import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | import("../../roles.ts").LastRoleAssigner | import("@shivaedev/errors/taxonomy.ts").NotFound | import("effect/Schema").SchemaError, import("effect/sql/SqlClient").SqlClient | UserProvisioning | Exclude<Exclude<Exclude<R, Identity>, SessionUser>, never>>;
|
|
6
7
|
//# sourceMappingURL=seedUsers.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seedUsers.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/seedUsers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,eAAO,MAAM,SAAS,GAA8C,KAAK,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,
|
|
1
|
+
{"version":3,"file":"seedUsers.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/seedUsers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,KAAK,EAAE,mBAAmB,EAAE,MAAM,+BAA+B,CAAC;AACzE,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACtE,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,eAAO,MAAM,SAAS,GAA8C,KAAK,SAAS,MAAM,EAAE,CAAC,EAAE,CAAC,+bAgB5F,CAAC"}
|
|
@@ -3,13 +3,13 @@ import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
|
3
3
|
import { Identity, SessionUser } from "#identity.ts";
|
|
4
4
|
import { assignRole } from "#server/better-auth/assignRole.ts";
|
|
5
5
|
import { UserProvisioning } from "#server/UserProvisioning.ts";
|
|
6
|
-
export const seedUsers = Effect.fn("Identity.seedUsers")(function* (
|
|
6
|
+
export const seedUsers = Effect.fn("Identity.seedUsers")(function* (auth, seed) {
|
|
7
7
|
const provisioning = yield* UserProvisioning;
|
|
8
|
-
for (const persona of
|
|
8
|
+
for (const persona of seed.users) {
|
|
9
9
|
const user = yield* provisioning.findOrCreateUser(persona);
|
|
10
|
-
yield* assignRole(
|
|
11
|
-
const access = yield*
|
|
12
|
-
yield*
|
|
10
|
+
yield* assignRole(auth, user.id, persona.role);
|
|
11
|
+
const access = yield* auth.roles.resolve(persona.role);
|
|
12
|
+
yield* seed.run.pipe(Effect.provideService(Identity, { id: user.id }), Effect.provideService(SessionUser, { email: user.email, id: user.id, name: user.name, ...access }), Effect.provideService(CurrentViewer, Option.some({ id: user.id })), Effect.annotateLogs({ userId: user.id }));
|
|
13
13
|
}
|
|
14
14
|
});
|
|
15
15
|
//# sourceMappingURL=seedUsers.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"seedUsers.js","sourceRoot":"","sources":["../../../src/server/better-auth/seedUsers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"seedUsers.js","sourceRoot":"","sources":["../../../src/server/better-auth/seedUsers.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAClE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAG/D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAE/D,MAAM,CAAC,MAAM,SAAS,GAAG,MAAM,CAAC,EAAE,CAAC,oBAAoB,CAAC,CAAC,QAAQ,CAAC,EACjE,IAAgC,EAChC,IAA8B;IAE9B,MAAM,YAAY,GAAG,KAAK,CAAC,CAAC,gBAAgB,CAAC;IAC7C,KAAK,MAAM,OAAO,IAAI,IAAI,CAAC,KAAK,EAAE,CAAC;QAClC,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,gBAAgB,CAAC,OAAO,CAAC,CAAC;QAC3D,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,EAAE,IAAI,CAAC,EAAE,EAAE,OAAO,CAAC,IAAI,CAAC,CAAC;QAC/C,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,KAAK,CAAC,OAAO,CAAC,OAAO,CAAC,IAAI,CAAC,CAAC;QACvD,KAAK,CAAC,CAAC,IAAI,CAAC,GAAG,CAAC,IAAI,CACnB,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,EAChD,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,EAAE,KAAK,EAAE,IAAI,CAAC,KAAK,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,CAAC,IAAI,EAAE,GAAG,MAAM,EAAE,CAAC,EAClG,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CAAC,EAClE,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,IAAI,CAAC,EAAE,EAAE,CAAC,CACxC,CAAC;IACH,CAAC;AACF,CAAC,CAAC,CAAC"}
|
|
@@ -3,7 +3,7 @@ import { SqlClient } from "effect/sql";
|
|
|
3
3
|
export declare const authTestDatabase: Effect.Effect<{
|
|
4
4
|
deleteSessions: Effect.Effect<void, import("effect/sql/SqlError").SqlError, never>;
|
|
5
5
|
expireSessions: (userId?: string) => Effect.Effect<void, import("effect/sql/SqlError").SqlError, never>;
|
|
6
|
-
migrate: (
|
|
6
|
+
migrate: (auth: import("./define.ts").AuthSchemaDeclaration) => Effect.Effect<void, import("effect/sql/SqlError").SqlError | import("effect/Cause").UnknownError, import("effect/Scope").Scope | SqlClient.SqlClient>;
|
|
7
7
|
omitImageColumn: Effect.Effect<void, import("effect/sql/SqlError").SqlError, never>;
|
|
8
8
|
omitRole: (userId: string) => Effect.Effect<void, import("effect/sql/SqlError").SqlError, never>;
|
|
9
9
|
roleColumn: Effect.Effect<{
|
|
@@ -1,7 +1,6 @@
|
|
|
1
1
|
import { Layer } from "effect";
|
|
2
2
|
import { SqlClient } from "effect/sql";
|
|
3
|
-
import type {
|
|
4
|
-
import type { AuthTableOptions } from "#server/better-auth/tables.ts";
|
|
3
|
+
import type { RoleTables } from "#server/better-auth/define.ts";
|
|
5
4
|
import { UserDirectory } from "#server/UserDirectory.ts";
|
|
6
|
-
export declare function betterAuthUserDirectory<TRole extends string>(
|
|
5
|
+
export declare function betterAuthUserDirectory<TRole extends string>(auth: RoleTables<TRole>): Layer.Layer<UserDirectory, never, SqlClient.SqlClient>;
|
|
7
6
|
//# sourceMappingURL=userDirectory.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userDirectory.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"userDirectory.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAEvD,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAGvC,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,+BAA+B,CAAC;AAEhE,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,wBAAgB,uBAAuB,CAAC,KAAK,SAAS,MAAM,EAAE,IAAI,EAAE,UAAU,CAAC,KAAK,CAAC,0DAmBpF"}
|
|
@@ -5,15 +5,15 @@ import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
|
5
5
|
import { assignRole } from "#server/better-auth/assignRole.ts";
|
|
6
6
|
import { userDirectoryReads } from "#server/better-auth/userDirectoryReads.ts";
|
|
7
7
|
import { UserDirectory } from "#server/UserDirectory.ts";
|
|
8
|
-
export function betterAuthUserDirectory(
|
|
8
|
+
export function betterAuthUserDirectory(auth) {
|
|
9
9
|
return Layer.effect(UserDirectory)(Effect.gen(function* () {
|
|
10
10
|
const sql = yield* SqlClient.SqlClient;
|
|
11
11
|
const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
12
12
|
const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
|
|
13
|
-
const reads = yield* userDirectoryReads(
|
|
13
|
+
const reads = yield* userDirectoryReads(auth.roles, auth.options);
|
|
14
14
|
return {
|
|
15
15
|
...reads,
|
|
16
|
-
assignRole: (userId, role) => Schema.decodeUnknownEffect(
|
|
16
|
+
assignRole: (userId, role) => Schema.decodeUnknownEffect(auth.roles.Role)(role).pipe(Effect.mapError(() => new AuthUnavailable({ message: "User role is not declared by the application" })), Effect.flatMap((declared) => assignRole(auth, userId, declared)), Effect.provideService(SqlClient.SqlClient, sql), Effect.provideService(Reactivity.Reactivity, reactivity)),
|
|
17
17
|
};
|
|
18
18
|
}));
|
|
19
19
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userDirectory.js","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"userDirectory.js","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectory.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,UAAU,MAAM,8BAA8B,CAAC;AAC3D,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AAChE,OAAO,EAAE,UAAU,EAAE,MAAM,mCAAmC,CAAC;AAE/D,OAAO,EAAE,kBAAkB,EAAE,MAAM,2CAA2C,CAAC;AAC/E,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAEzD,MAAM,UAAU,uBAAuB,CAAuB,IAAuB;IACpF,OAAO,KAAK,CAAC,MAAM,CAAC,aAAa,CAAC,CACjC,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC;QACvC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,UAAU,CAAC,UAAU,CAAC,CAAC;QACpE,MAAM,UAAU,GAAG,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,UAAU,CAAC,IAAI,CAAC;QACrF,MAAM,KAAK,GAAG,KAAK,CAAC,CAAC,kBAAkB,CAAC,IAAI,CAAC,KAAK,EAAE,IAAI,CAAC,OAAO,CAAC,CAAC;QAClE,OAAO;YACN,GAAG,KAAK;YACR,UAAU,EAAE,CAAC,MAAc,EAAE,IAAY,EAAE,EAAE,CAC5C,MAAM,CAAC,mBAAmB,CAAC,IAAI,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC,IAAI,CAAC,CAAC,IAAI,CACrD,MAAM,CAAC,QAAQ,CAAC,GAAG,EAAE,CAAC,IAAI,eAAe,CAAC,EAAE,OAAO,EAAE,8CAA8C,EAAE,CAAC,CAAC,EACvG,MAAM,CAAC,OAAO,CAAC,CAAC,QAAQ,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,EAAE,QAAQ,CAAC,CAAC,EAChE,MAAM,CAAC,cAAc,CAAC,SAAS,CAAC,SAAS,EAAE,GAAG,CAAC,EAC/C,MAAM,CAAC,cAAc,CAAC,UAAU,CAAC,UAAU,EAAE,UAAU,CAAC,CACxD;SACF,CAAC;IACH,CAAC,CAAC,CACF,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/identity",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.38.1",
|
|
4
4
|
"description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -48,7 +48,7 @@
|
|
|
48
48
|
"dependencies": {
|
|
49
49
|
"@shivaedev/access": "0.7.0",
|
|
50
50
|
"@shivaedev/changes": "0.14.1",
|
|
51
|
-
"@shivaedev/contract": "0.
|
|
51
|
+
"@shivaedev/contract": "0.55.0",
|
|
52
52
|
"@shivaedev/errors": "0.14.1",
|
|
53
53
|
"@shivaedev/rate-limit": "0.8.0",
|
|
54
54
|
"@shivaedev/service": "0.9.2",
|
|
@@ -58,13 +58,13 @@
|
|
|
58
58
|
"@better-auth/oauth-provider": "1.7.22",
|
|
59
59
|
"@effect/platform-node": "4.1.4",
|
|
60
60
|
"@effect/sql-pg": "4.1.4",
|
|
61
|
-
"@shivaedev/admin": "0.28.
|
|
62
|
-
"@shivaedev/build": "0.
|
|
63
|
-
"@shivaedev/quality": "0.
|
|
64
|
-
"@shivaedev/server": "0.
|
|
65
|
-
"@shivaedev/test-kits": "0.
|
|
61
|
+
"@shivaedev/admin": "0.28.2",
|
|
62
|
+
"@shivaedev/build": "0.5.1",
|
|
63
|
+
"@shivaedev/quality": "0.83.0",
|
|
64
|
+
"@shivaedev/server": "0.41.0",
|
|
65
|
+
"@shivaedev/test-kits": "0.16.1",
|
|
66
66
|
"@shivaedev/test-sql": "0.26.0",
|
|
67
|
-
"@shivaedev/test-story": "0.
|
|
67
|
+
"@shivaedev/test-story": "0.52.1",
|
|
68
68
|
"@types/node": "24.19.2",
|
|
69
69
|
"better-auth": "1.7.22",
|
|
70
70
|
"effect": "4.1.4",
|
|
@@ -11,6 +11,8 @@ export interface PasswordUser {
|
|
|
11
11
|
export class UserProvisioning extends Context.Service<
|
|
12
12
|
UserProvisioning,
|
|
13
13
|
{
|
|
14
|
-
readonly findOrCreateUser: (
|
|
14
|
+
readonly findOrCreateUser: (
|
|
15
|
+
user: PasswordUser,
|
|
16
|
+
) => Effect.Effect<Pick<SessionUserValue, "id" | "email" | "name"> & { readonly emailVerified: boolean }, AuthUnavailable>;
|
|
15
17
|
}
|
|
16
18
|
>()("@shivaedev/identity/UserProvisioning") {}
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
|
|
3
|
+
export class AdminPasswordLength extends Schema.TaggedError<AdminPasswordLength>()("AdminPasswordLength", {
|
|
4
|
+
maximum: Schema.Number,
|
|
5
|
+
minimum: Schema.Number,
|
|
6
|
+
}) {
|
|
7
|
+
override get message() {
|
|
8
|
+
return `ADMIN_PASSWORD must be ${this.minimum} to ${this.maximum} characters long`;
|
|
9
|
+
}
|
|
10
|
+
}
|
|
@@ -1,12 +1,7 @@
|
|
|
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
|
|
|
6
4
|
export interface SeedOptions<TRole extends string, E, R> {
|
|
7
|
-
readonly auth?: Omit<BetterAuthOptions, "database">;
|
|
8
|
-
readonly defaultRole: NoInfer<TRole>;
|
|
9
|
-
readonly roles: AccessPolicy<TRole>;
|
|
10
5
|
readonly run: Effect.Effect<unknown, E, R>;
|
|
11
6
|
readonly users: readonly (PasswordUser & { readonly role: NoInfer<TRole> })[];
|
|
12
7
|
}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
|
|
3
|
+
export class UnverifiedAdminEmail extends Schema.TaggedError<UnverifiedAdminEmail>()("UnverifiedAdminEmail", {
|
|
4
|
+
email: Schema.String,
|
|
5
|
+
}) {
|
|
6
|
+
override get message() {
|
|
7
|
+
return `ADMIN_EMAIL ${this.email} belongs to an account whose address is not verified; verify it or choose another address`;
|
|
8
|
+
}
|
|
9
|
+
}
|
|
@@ -1,25 +1,24 @@
|
|
|
1
1
|
import { type Config, Effect, Schema } from "effect";
|
|
2
2
|
import { SqlClient, SqlSchema } 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
5
|
import { assignRole } from "#server/better-auth/assignRole.ts";
|
|
7
|
-
import
|
|
6
|
+
import type { RoleTables } from "#server/better-auth/define.ts";
|
|
7
|
+
import { tables } from "#server/better-auth/tables.ts";
|
|
8
8
|
|
|
9
9
|
export interface AccountRoleSeed<E> {
|
|
10
10
|
readonly onSignIn: (userId: string) => Effect.Effect<void, E>;
|
|
11
11
|
}
|
|
12
12
|
|
|
13
13
|
export const accountRoleSeed = Effect.fn("Identity.accountRoleSeed")(function* <TRole extends string>(
|
|
14
|
-
|
|
14
|
+
auth: RoleTables<TRole>,
|
|
15
15
|
role: NoInfer<TRole>,
|
|
16
16
|
accounts: Config.Config<readonly ProviderAccountValue[]>,
|
|
17
|
-
options?: AuthTableOptions,
|
|
18
17
|
) {
|
|
19
18
|
const listed = yield* accounts;
|
|
20
19
|
const context = yield* Effect.context<SqlClient.SqlClient>();
|
|
21
20
|
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
22
|
-
const { account: accountTable } = tables(options);
|
|
21
|
+
const { account: accountTable } = tables(auth.options);
|
|
23
22
|
const findUsers = SqlSchema.findAll({
|
|
24
23
|
execute: ({ accountId, providerId, userId }) => sql`
|
|
25
24
|
select distinct ${sql(accountTable.userId)} as id from ${sql(accountTable.table)}
|
|
@@ -34,7 +33,7 @@ export const accountRoleSeed = Effect.fn("Identity.accountRoleSeed")(function* <
|
|
|
34
33
|
Effect.mapError(() => new AuthUnavailable({ message: "Could not access provider accounts" })),
|
|
35
34
|
);
|
|
36
35
|
for (const user of users) {
|
|
37
|
-
yield* assignRole(
|
|
36
|
+
yield* assignRole(auth, user.id, role);
|
|
38
37
|
}
|
|
39
38
|
}
|
|
40
39
|
});
|
|
@@ -13,12 +13,12 @@ export function betterAuthUserProvisioning(auth: {
|
|
|
13
13
|
const normalized = email.toLowerCase();
|
|
14
14
|
const existing = await context.internalAdapter.findUserByEmail(normalized);
|
|
15
15
|
if (existing !== null) {
|
|
16
|
-
return { email: existing.user.email, id: existing.user.id, name: existing.user.name };
|
|
16
|
+
return { email: existing.user.email, emailVerified: existing.user.emailVerified, id: existing.user.id, name: existing.user.name };
|
|
17
17
|
}
|
|
18
18
|
const hash = await context.password.hash(Redacted.value(password));
|
|
19
19
|
const user = await context.internalAdapter.createUser({ email: normalized, emailVerified: true, name }, { method: "seed" });
|
|
20
20
|
await context.internalAdapter.createAccount({ accountId: user.id, password: hash, providerId: "credential", userId: user.id });
|
|
21
|
-
return { email: user.email, id: user.id, name: user.name };
|
|
21
|
+
return { email: user.email, emailVerified: true, id: user.id, name: user.name };
|
|
22
22
|
}).pipe(Effect.catch((error) => providerFailure(error.cause)));
|
|
23
23
|
}),
|
|
24
24
|
});
|
|
@@ -1,8 +1,8 @@
|
|
|
1
|
-
import type { BetterAuthOptions } from "better-auth";
|
|
2
1
|
import { Effect, Schema } from "effect";
|
|
3
2
|
import { betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
4
3
|
import { authColumnDrift } from "#server/better-auth/columnDrift.ts";
|
|
5
|
-
import { type
|
|
4
|
+
import { type AuthSchemaDeclaration, storedRole } from "#server/better-auth/define.ts";
|
|
5
|
+
import { storedRoleOptions } from "#server/better-auth/storedRoleOptions.ts";
|
|
6
6
|
|
|
7
7
|
export class BetterAuthSchemaDrift extends Schema.TaggedError<BetterAuthSchemaDrift>()("BetterAuthSchemaDrift", {
|
|
8
8
|
missing: Schema.Array(Schema.String),
|
|
@@ -12,10 +12,9 @@ export class BetterAuthSchemaDrift extends Schema.TaggedError<BetterAuthSchemaDr
|
|
|
12
12
|
}
|
|
13
13
|
}
|
|
14
14
|
|
|
15
|
-
export const assertBetterAuthSchema = Effect.fn("Identity.assertBetterAuthSchema")(function* (
|
|
16
|
-
options
|
|
17
|
-
role
|
|
18
|
-
) {
|
|
15
|
+
export const assertBetterAuthSchema = Effect.fn("Identity.assertBetterAuthSchema")(function* (auth: AuthSchemaDeclaration) {
|
|
16
|
+
const { options } = auth;
|
|
17
|
+
const role = storedRole(auth);
|
|
19
18
|
const { missing } = yield* betterAuthMigrationPlan(options, role, { throwOnUnsafe: false });
|
|
20
19
|
missing.push(...(yield* authColumnDrift(storedRoleOptions(options, role), role)));
|
|
21
20
|
if (missing.length > 0) {
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { Effect, Option, Schema } from "effect";
|
|
2
2
|
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
3
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
4
|
-
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
5
4
|
import { invalidationKeys } from "@shivaedev/changes/keys.ts";
|
|
6
5
|
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
7
6
|
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
8
7
|
import { AssignRoles, LastRoleAssigner } from "#roles.ts";
|
|
9
|
-
import
|
|
8
|
+
import type { RoleTables } from "#server/better-auth/define.ts";
|
|
9
|
+
import { tables } from "#server/better-auth/tables.ts";
|
|
10
10
|
import { roleKeys, userKeys } from "#users.ts";
|
|
11
11
|
|
|
12
12
|
function unavailable() {
|
|
@@ -14,13 +14,13 @@ function unavailable() {
|
|
|
14
14
|
}
|
|
15
15
|
|
|
16
16
|
export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole extends string>(
|
|
17
|
-
|
|
17
|
+
auth: RoleTables<TRole>,
|
|
18
18
|
userId: string,
|
|
19
19
|
role: NoInfer<TRole>,
|
|
20
|
-
options?: AuthTableOptions,
|
|
21
20
|
) {
|
|
21
|
+
const access = auth.roles;
|
|
22
22
|
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
23
|
-
const { user } = tables(options);
|
|
23
|
+
const { user } = tables(auth.options);
|
|
24
24
|
const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
25
25
|
const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
|
|
26
26
|
return yield* Effect.gen(function* () {
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import type { AccessPolicy, RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
|
+
|
|
4
|
+
export type AuthDeclaration<TOptions extends BetterAuthOptions = BetterAuthOptions> = { readonly options: TOptions } & (
|
|
5
|
+
| { readonly defaultRole?: undefined; readonly roles?: undefined }
|
|
6
|
+
| { readonly defaultRole: string; readonly roles: RoleSet }
|
|
7
|
+
);
|
|
8
|
+
|
|
9
|
+
export interface RoleAuthDeclaration<TRole extends string, TOptions extends BetterAuthOptions = BetterAuthOptions> {
|
|
10
|
+
readonly defaultRole: TRole;
|
|
11
|
+
readonly options: TOptions;
|
|
12
|
+
readonly roles: AccessPolicy<TRole>;
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export interface AuthSchemaDeclaration {
|
|
16
|
+
readonly defaultRole?: string | undefined;
|
|
17
|
+
readonly options: Omit<BetterAuthOptions, "database">;
|
|
18
|
+
}
|
|
19
|
+
|
|
20
|
+
export function storedRole(auth: AuthSchemaDeclaration) {
|
|
21
|
+
return auth.defaultRole === undefined ? undefined : { defaultRole: auth.defaultRole };
|
|
22
|
+
}
|
|
23
|
+
|
|
24
|
+
export interface RoleTables<TRole extends string> {
|
|
25
|
+
readonly options?: BetterAuthOptions | undefined;
|
|
26
|
+
readonly roles: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">;
|
|
27
|
+
}
|
|
28
|
+
|
|
29
|
+
export function defineAuth<const TOptions extends BetterAuthOptions, TRole extends string>(declaration: {
|
|
30
|
+
readonly defaultRole: NoInfer<TRole>;
|
|
31
|
+
readonly options: TOptions;
|
|
32
|
+
readonly roles: AccessPolicy<TRole>;
|
|
33
|
+
}): RoleAuthDeclaration<TRole, TOptions>;
|
|
34
|
+
export function defineAuth<const TOptions extends BetterAuthOptions>(declaration: { readonly options: TOptions }): AuthDeclaration<TOptions>;
|
|
35
|
+
export function defineAuth(declaration: AuthDeclaration) {
|
|
36
|
+
return declaration;
|
|
37
|
+
}
|
|
@@ -1,23 +1,15 @@
|
|
|
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 type { RoleAuthDeclaration } from "#server/better-auth/define.ts";
|
|
5
|
+
import { mountedUserProvisioning } from "#server/better-auth/mountedUserProvisioning.ts";
|
|
8
6
|
import type { SeedOptions } from "#server/better-auth/SeedOptions.ts";
|
|
9
7
|
import { seedUsers } from "#server/better-auth/seedUsers.ts";
|
|
10
8
|
|
|
11
|
-
export function defineSeed<TRole extends string, E, R>(
|
|
9
|
+
export function defineSeed<TRole extends string, E, R>(auth: RoleAuthDeclaration<TRole>, seed: SeedOptions<TRole, E, R>) {
|
|
12
10
|
return Effect.gen(function* () {
|
|
13
11
|
const url = yield* Config.Redacted("DATABASE_URL");
|
|
14
12
|
yield* assertSeedDatabase(url);
|
|
15
|
-
return yield* Effect.
|
|
16
|
-
const { auth } = yield* betterAuthMount(
|
|
17
|
-
{ emailAndPassword: { enabled: true }, ...options.auth, database: yield* betterAuthDatabase() },
|
|
18
|
-
{ defaultRole: options.defaultRole, roles: options.roles },
|
|
19
|
-
).pipe(Effect.provide(memoryStore));
|
|
20
|
-
return yield* seedUsers(options).pipe(Effect.provide(betterAuthUserProvisioning(auth)));
|
|
21
|
-
}).pipe(Effect.provide(postgresLayer(url)));
|
|
13
|
+
return yield* seedUsers(auth, seed).pipe(Effect.provide(mountedUserProvisioning(auth)), Effect.provide(postgresLayer(url)));
|
|
22
14
|
}).pipe(Effect.scoped);
|
|
23
15
|
}
|
|
@@ -1,14 +1,10 @@
|
|
|
1
|
-
import type { BetterAuthOptions } from "better-auth";
|
|
2
1
|
import { Effect } from "effect";
|
|
3
2
|
import { SqlClient } from "effect/sql";
|
|
4
3
|
import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
5
|
-
import type
|
|
4
|
+
import { type AuthSchemaDeclaration, storedRole } from "#server/better-auth/define.ts";
|
|
6
5
|
|
|
7
|
-
export const migrateBetterAuth = Effect.fn("Identity.migrateBetterAuth")(function* (
|
|
8
|
-
options
|
|
9
|
-
role?: StoredRoleOptions,
|
|
10
|
-
) {
|
|
11
|
-
const plan = yield* betterAuthMigrationPlan(options, role);
|
|
6
|
+
export const migrateBetterAuth = Effect.fn("Identity.migrateBetterAuth")(function* (auth: AuthSchemaDeclaration) {
|
|
7
|
+
const plan = yield* betterAuthMigrationPlan(auth.options, storedRole(auth));
|
|
12
8
|
const sql = yield* SqlClient.SqlClient;
|
|
13
9
|
yield* sql.unsafe(authMigrationSql(plan.ddl));
|
|
14
10
|
});
|
|
@@ -1,13 +1,9 @@
|
|
|
1
|
-
import type { BetterAuthOptions } from "better-auth";
|
|
2
1
|
import { Effect } from "effect";
|
|
3
2
|
import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/adapters/migrationPlan.ts";
|
|
4
|
-
import type
|
|
3
|
+
import { type AuthSchemaDeclaration, storedRole } from "#server/better-auth/define.ts";
|
|
5
4
|
|
|
6
|
-
export const generateBetterAuthMigration = Effect.fn("Identity.generateBetterAuthMigration")(function* (
|
|
7
|
-
options
|
|
8
|
-
role?: StoredRoleOptions,
|
|
9
|
-
) {
|
|
10
|
-
const plan = yield* betterAuthMigrationPlan(options, role);
|
|
5
|
+
export const generateBetterAuthMigration = Effect.fn("Identity.generateBetterAuthMigration")(function* (auth: AuthSchemaDeclaration) {
|
|
6
|
+
const plan = yield* betterAuthMigrationPlan(auth.options, storedRole(auth));
|
|
11
7
|
const sql = authMigrationSql(plan.ddl).replaceAll("\\", "\\\\").replaceAll("`", "\\`").replaceAll("${", "\\${");
|
|
12
8
|
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`;
|
|
13
9
|
});
|