@shivaedev/identity 0.12.0 → 0.14.0
This diff represents the content of publicly available package versions that have been released to one of the supported registries. The information contained in this diff is provided for informational purposes only and reflects changes between package versions as they appear in their respective public registries.
- package/CHANGELOG.md +40 -0
- package/README.md +96 -24
- package/dist/server/better-auth/accountRoleSeed.d.ts +12 -0
- package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -0
- package/dist/server/better-auth/accountRoleSeed.js +28 -0
- package/dist/server/better-auth/accountRoleSeed.js.map +1 -0
- package/dist/server/better-auth/adapters/roleSeedOptions.d.ts +4 -0
- package/dist/server/better-auth/adapters/roleSeedOptions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/roleSeedOptions.js +34 -0
- package/dist/server/better-auth/adapters/roleSeedOptions.js.map +1 -0
- package/dist/server/better-auth/allowedAccounts.d.ts +4 -0
- package/dist/server/better-auth/allowedAccounts.d.ts.map +1 -1
- package/dist/server/better-auth/allowedAccounts.js +2 -1
- package/dist/server/better-auth/allowedAccounts.js.map +1 -1
- package/dist/server/better-auth/assertSchema.d.ts +12 -0
- package/dist/server/better-auth/assertSchema.d.ts.map +1 -0
- package/dist/server/better-auth/assertSchema.js +19 -0
- package/dist/server/better-auth/assertSchema.js.map +1 -0
- package/dist/server/better-auth/assignRole.d.ts +1 -1
- package/dist/server/better-auth/assignRole.d.ts.map +1 -1
- package/dist/server/better-auth/assignRole.js +4 -1
- package/dist/server/better-auth/assignRole.js.map +1 -1
- package/dist/server/better-auth/columnDrift.d.ts +6 -0
- package/dist/server/better-auth/columnDrift.d.ts.map +1 -0
- package/dist/server/better-auth/columnDrift.js +54 -0
- package/dist/server/better-auth/columnDrift.js.map +1 -0
- package/dist/server/better-auth/migrate.d.ts +1 -1
- package/dist/server/better-auth/migrate.d.ts.map +1 -1
- package/dist/server/better-auth/migrate.js +4 -14
- package/dist/server/better-auth/migrate.js.map +1 -1
- package/dist/server/better-auth/migrationPlan.d.ts +12 -0
- package/dist/server/better-auth/migrationPlan.d.ts.map +1 -0
- package/dist/server/better-auth/migrationPlan.js +37 -0
- package/dist/server/better-auth/migrationPlan.js.map +1 -0
- package/dist/server/better-auth/migrations/generate.d.ts +5 -0
- package/dist/server/better-auth/migrations/generate.d.ts.map +1 -0
- package/dist/server/better-auth/migrations/generate.js +8 -0
- package/dist/server/better-auth/migrations/generate.js.map +1 -0
- package/dist/server/better-auth/mount.d.ts +4 -1
- package/dist/server/better-auth/mount.d.ts.map +1 -1
- package/dist/server/better-auth/mount.js +4 -1
- package/dist/server/better-auth/mount.js.map +1 -1
- package/dist/server/better-auth/testing.d.ts +27 -4
- package/dist/server/better-auth/testing.d.ts.map +1 -1
- package/dist/server/better-auth/testing.js +11 -7
- package/dist/server/better-auth/testing.js.map +1 -1
- package/dist/server/permissions.d.ts +6 -3
- package/dist/server/permissions.d.ts.map +1 -1
- package/dist/server/permissions.js.map +1 -1
- package/dist/server/resolveRole.d.ts.map +1 -1
- package/dist/server/resolveRole.js +1 -1
- package/dist/server/resolveRole.js.map +1 -1
- package/package.json +10 -10
- package/src/server/better-auth/accountRoleSeed.ts +40 -0
- package/src/server/better-auth/adapters/roleSeedOptions.ts +39 -0
- package/src/server/better-auth/allowedAccounts.ts +4 -2
- package/src/server/better-auth/assertSchema.ts +24 -0
- package/src/server/better-auth/assignRole.ts +4 -1
- package/src/server/better-auth/columnDrift.ts +67 -0
- package/src/server/better-auth/migrate.ts +5 -14
- package/src/server/better-auth/migrationPlan.ts +43 -0
- package/src/server/better-auth/migrations/generate.ts +13 -0
- package/src/server/better-auth/mount.ts +9 -2
- package/src/server/better-auth/testing.ts +12 -8
- package/src/server/permissions.ts +5 -3
- package/src/server/resolveRole.ts +3 -1
|
@@ -1,19 +1,9 @@
|
|
|
1
|
-
import { getMigrations } from "better-auth/db/migration";
|
|
2
1
|
import { Effect } from "effect";
|
|
3
2
|
import { SqlClient } from "effect/sql";
|
|
4
|
-
import {
|
|
5
|
-
import { storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
3
|
+
import { authMigrationSql, betterAuthMigrationPlan } from "./migrationPlan.js";
|
|
6
4
|
export const migrateBetterAuth = Effect.fn("Identity.migrateBetterAuth")(function* (options, role) {
|
|
7
|
-
const
|
|
8
|
-
const
|
|
9
|
-
yield*
|
|
10
|
-
if (role !== undefined) {
|
|
11
|
-
const sql = yield* SqlClient.SqlClient;
|
|
12
|
-
const table = sql(options.user?.modelName ?? "user");
|
|
13
|
-
const defaultValue = sql.literal(`'${role.defaultRole.replaceAll("'", "''")}'`);
|
|
14
|
-
yield* sql `alter table ${table} alter column role set default ${defaultValue}`;
|
|
15
|
-
yield* sql `update ${table} set role = ${role.defaultRole} where role is null`;
|
|
16
|
-
yield* sql `alter table ${table} alter column role set not null`;
|
|
17
|
-
}
|
|
5
|
+
const plan = yield* betterAuthMigrationPlan(options, role);
|
|
6
|
+
const sql = yield* SqlClient.SqlClient;
|
|
7
|
+
yield* sql.unsafe(authMigrationSql(plan.ddl));
|
|
18
8
|
});
|
|
19
9
|
//# sourceMappingURL=migrate.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/server/better-auth/migrate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"migrate.js","sourceRoot":"","sources":["../../../src/server/better-auth/migrate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,oBAAoB,CAAC;AAE/E,MAAM,CAAC,MAAM,iBAAiB,GAAG,MAAM,CAAC,EAAE,CAAC,4BAA4B,CAAC,CAAC,QAAQ,CAAC,EACjF,OAA4C,EAC5C,IAAwB;IAExB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3D,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"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
import { SqlClient } from "effect/sql";
|
|
4
|
+
import { type StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
5
|
+
export declare const betterAuthMigrationPlan: (options: Omit<BetterAuthOptions, "database">, role?: StoredRoleOptions | undefined, safety?: {
|
|
6
|
+
readonly throwOnUnsafe: boolean;
|
|
7
|
+
} | undefined) => Effect.Effect<{
|
|
8
|
+
ddl: string;
|
|
9
|
+
missing: string[];
|
|
10
|
+
}, import("effect/Cause").UnknownError, import("effect/Scope").Scope | SqlClient.SqlClient>;
|
|
11
|
+
export declare function authMigrationSql(ddl: string): string;
|
|
12
|
+
//# sourceMappingURL=migrationPlan.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrationPlan.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/migrationPlan.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAErD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAEvC,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,mDAAmD,CAAC;AAE9G,eAAO,MAAM,uBAAuB;4BAGD,OAAO;;;;2FAuBxC,CAAC;AAEH,wBAAgB,gBAAgB,CAAC,GAAG,EAAE,MAAM,UAO3C"}
|
|
@@ -0,0 +1,37 @@
|
|
|
1
|
+
import { getMigrations } from "better-auth/db/migration";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
import { SqlClient } from "effect/sql";
|
|
4
|
+
import { betterAuthDatabase } from "#server/better-auth/adapters/database.ts";
|
|
5
|
+
import { storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
6
|
+
export const betterAuthMigrationPlan = Effect.fn("Identity.betterAuthMigrationPlan")(function* (options, role, safety = { throwOnUnsafe: true }) {
|
|
7
|
+
const database = yield* betterAuthDatabase();
|
|
8
|
+
const plan = yield* Effect.tryPromise(() => getMigrations({ ...storedRoleOptions(options, role), database }, safety));
|
|
9
|
+
const missing = [
|
|
10
|
+
...plan.toBeCreated.map(({ table, fields }) => `table ${table} (${Object.keys(fields).join(", ")})`),
|
|
11
|
+
...plan.toBeAdded.flatMap(({ table, fields }) => Object.keys(fields).map((field) => `column ${table}.${field}`)),
|
|
12
|
+
...plan.toBeAddedIndexes.map(({ table, name }) => `index ${table}.${name}`),
|
|
13
|
+
...plan.schemaProblems,
|
|
14
|
+
...plan.unsafeChanges,
|
|
15
|
+
];
|
|
16
|
+
const compiled = yield* Effect.tryPromise(() => plan.compileMigrations());
|
|
17
|
+
let ddl = compiled === ";" ? "" : compiled;
|
|
18
|
+
if (role !== undefined) {
|
|
19
|
+
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
20
|
+
const table = options.user?.modelName ?? "user";
|
|
21
|
+
const value = `'${role.defaultRole.replaceAll("'", "''")}'`;
|
|
22
|
+
const identifier = sql `${sql(table)}`.compile()[0];
|
|
23
|
+
ddl += `\nalter table ${identifier} alter column role set default ${value};\n`;
|
|
24
|
+
ddl += `update ${identifier} set role = ${value} where role is null;\n`;
|
|
25
|
+
ddl += `alter table ${identifier} alter column role set not null;`;
|
|
26
|
+
}
|
|
27
|
+
return { ddl, missing };
|
|
28
|
+
});
|
|
29
|
+
export function authMigrationSql(ddl) {
|
|
30
|
+
let tag = "$auth_migration$";
|
|
31
|
+
while (ddl.includes(tag)) {
|
|
32
|
+
tag = tag.replace("$auth", "$auth_");
|
|
33
|
+
}
|
|
34
|
+
// A DO block sends the compiled DDL as one statement on the native transaction connection.
|
|
35
|
+
return `do ${tag}\nbegin\n${ddl}\nend;\n${tag};`;
|
|
36
|
+
}
|
|
37
|
+
//# sourceMappingURL=migrationPlan.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrationPlan.js","sourceRoot":"","sources":["../../../src/server/better-auth/migrationPlan.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
import type { StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
4
|
+
export declare const generateBetterAuthMigration: (options: Omit<BetterAuthOptions, "database">, role?: StoredRoleOptions | undefined) => Effect.Effect<string, import("effect/Cause").UnknownError, import("effect/Scope").Scope | import("effect/sql/SqlClient").SqlClient>;
|
|
5
|
+
//# sourceMappingURL=generate.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generate.d.ts","sourceRoot":"","sources":["../../../../src/server/better-auth/migrations/generate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAG3F,eAAO,MAAM,2BAA2B,6NAOtC,CAAC"}
|
|
@@ -0,0 +1,8 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { authMigrationSql, betterAuthMigrationPlan } from "#server/better-auth/migrationPlan.ts";
|
|
3
|
+
export const generateBetterAuthMigration = Effect.fn("Identity.generateBetterAuthMigration")(function* (options, role) {
|
|
4
|
+
const plan = yield* betterAuthMigrationPlan(options, role);
|
|
5
|
+
const sql = authMigrationSql(plan.ddl).replaceAll("\\", "\\\\").replaceAll("`", "\\`").replaceAll("${", "\\${");
|
|
6
|
+
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
|
+
//# sourceMappingURL=generate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"generate.js","sourceRoot":"","sources":["../../../../src/server/better-auth/migrations/generate.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,gBAAgB,EAAE,uBAAuB,EAAE,MAAM,sCAAsC,CAAC;AAEjG,MAAM,CAAC,MAAM,2BAA2B,GAAG,MAAM,CAAC,EAAE,CAAC,sCAAsC,CAAC,CAAC,QAAQ,CAAC,EACrG,OAA4C,EAC5C,IAAwB;IAExB,MAAM,IAAI,GAAG,KAAK,CAAC,CAAC,uBAAuB,CAAC,OAAO,EAAE,IAAI,CAAC,CAAC;IAC3D,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"}
|
|
@@ -5,14 +5,17 @@ import { type BetterAuthHardeningOptions } from "#server/better-auth/adapters/ha
|
|
|
5
5
|
import { type StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
6
6
|
import { type BearerSessionsOptions } from "#server/better-auth/bearerSessions.ts";
|
|
7
7
|
import { type SignInPolicy } from "#server/better-auth/signInGate.ts";
|
|
8
|
+
import type { AccountRoleSeed } from "./accountRoleSeed.ts";
|
|
8
9
|
export type BetterAuthMountOptions<E = never, R = never> = {
|
|
9
10
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
10
11
|
readonly hardening?: BetterAuthHardeningOptions;
|
|
11
12
|
readonly signIn?: SignInPolicy<E, R> | undefined;
|
|
12
13
|
} & ({
|
|
13
14
|
readonly roles?: undefined;
|
|
15
|
+
readonly roleSeed?: undefined;
|
|
14
16
|
} | (StoredRoleOptions & {
|
|
15
17
|
readonly roles: RoleSet;
|
|
18
|
+
readonly roleSeed?: Effect.Effect<AccountRoleSeed<E>, E, R>;
|
|
16
19
|
}));
|
|
17
20
|
export declare const betterAuthMount: <const TOptions extends BetterAuthOptions, E = never, R = never>(options: TOptions, mount?: BetterAuthMountOptions<E, R> | undefined) => Effect.Effect<{
|
|
18
21
|
admittedSessions: {
|
|
@@ -258,5 +261,5 @@ export declare const betterAuthMount: <const TOptions extends BetterAuthOptions,
|
|
|
258
261
|
readonly roles?: RoleSet;
|
|
259
262
|
readonly provider: import("../session.ts").SessionProvider<import("../session.ts").UserSessionShape>;
|
|
260
263
|
};
|
|
261
|
-
}, Config.ConfigError, R | import("effect/Scope").Scope>;
|
|
264
|
+
}, E | Config.ConfigError, R | import("effect/Scope").Scope>;
|
|
262
265
|
//# 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,EAAE,KAAK,iBAAiB,EAAc,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAoB,MAAM,QAAQ,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,0BAA0B,EAAiB,MAAM,2CAA2C,CAAC;
|
|
1
|
+
{"version":3,"file":"mount.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,iBAAiB,EAAc,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAoB,MAAM,QAAQ,CAAC;AAC1D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,0BAA0B,EAAiB,MAAM,2CAA2C,CAAC;AAG3G,OAAO,EAAE,KAAK,iBAAiB,EAAqB,MAAM,mDAAmD,CAAC;AAC9G,OAAO,EAAE,KAAK,qBAAqB,EAAsB,MAAM,uCAAuC,CAAC;AAKvG,OAAO,EAAsB,KAAK,YAAY,EAAc,MAAM,mCAAmC,CAAC;AACtG,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,sBAAsB,CAAC;AAK5D,MAAM,MAAM,sBAAsB,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK,IAAI;IAC1D,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,SAAS,CAAC,EAAE,0BAA0B,CAAC;IAChD,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;CACjD,GAAG,CACD;IAAE,QAAQ,CAAC,KAAK,CAAC,EAAE,SAAS,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,SAAS,CAAA;CAAE,GAC7D,CAAC,iBAAiB,GAAG;IAAE,QAAQ,CAAC,KAAK,EAAE,OAAO,CAAC;IAAC,QAAQ,CAAC,QAAQ,CAAC,EAAE,MAAM,CAAC,MAAM,CAAC,eAAe,CAAC,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,CAAA;CAAE,CAAC,CAChH,CAAC;AAEF,eAAO,MAAM,eAAe,SAA0D,QAAQ,SAAS,iBAAiB,EAAE,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;4DA8DpI,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { betterAuth } from "better-auth";
|
|
2
2
|
import { Config, Effect, Option, Redacted } from "effect";
|
|
3
3
|
import { withHardening } from "#server/better-auth/adapters/hardening.ts";
|
|
4
|
+
import { roleSeedOptions } from "#server/better-auth/adapters/roleSeedOptions.ts";
|
|
4
5
|
import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
|
|
5
6
|
import { storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
6
7
|
import { withBearerSessions } from "#server/better-auth/bearerSessions.ts";
|
|
@@ -26,6 +27,8 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (
|
|
|
26
27
|
const gate = yield* signInGate(policy);
|
|
27
28
|
const configured = mount.roles === undefined ? options : storedRoleOptions(closeRoleEndpoints(options), mount);
|
|
28
29
|
const gated = yield* signInPolicyOptions(configured, gate, () => auth.$context);
|
|
30
|
+
const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
|
|
31
|
+
const seeded = roleSeedOptions(gate.active ? { ...configured, ...gated } : configured, seed);
|
|
29
32
|
const rateLimit = options.rateLimit;
|
|
30
33
|
const customStorage = rateLimit?.customStorage ?? (rateLimit?.storage === undefined || rateLimit.storage === "memory" ? yield* memoryRateLimit : undefined);
|
|
31
34
|
const auth = betterAuth({
|
|
@@ -44,7 +47,7 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (
|
|
|
44
47
|
allowedHosts: ["127.0.0.1:*", "localhost:*"],
|
|
45
48
|
protocol: "http",
|
|
46
49
|
})),
|
|
47
|
-
databaseHooks:
|
|
50
|
+
databaseHooks: seeded.databaseHooks,
|
|
48
51
|
rateLimit: {
|
|
49
52
|
...rateLimit,
|
|
50
53
|
...(customStorage === undefined ? {} : { customStorage }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"AAAA,OAAO,EAA0B,UAAU,EAAE,MAAM,aAAa,CAAC;AACjE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,EAAE,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAE1D,OAAO,EAAmC,aAAa,EAAE,MAAM,2CAA2C,CAAC;AAC3G,OAAO,EAAE,mBAAmB,EAAE,MAAM,qDAAqD,CAAC;AAC1F,OAAO,EAA0B,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAC9G,OAAO,EAA8B,kBAAkB,EAAE,MAAM,uCAAuC,CAAC;AACvG,OAAO,EAAE,cAAc,EAAE,MAAM,iCAAiC,CAAC;AACjE,OAAO,EAAE,eAAe,EAAE,MAAM,wCAAwC,CAAC;AACzE,OAAO,EAAE,WAAW,EAAE,MAAM,oCAAoC,CAAC;AACjE,OAAO,EAAE,gBAAgB,EAAE,MAAM,yCAAyC,CAAC;AAC3E,OAAO,EAAyC,UAAU,EAAE,MAAM,mCAAmC,CAAC;
|
|
1
|
+
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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"}
|
|
@@ -3,14 +3,37 @@ import type { testUtils } from "better-auth/plugins";
|
|
|
3
3
|
import { Effect } from "effect";
|
|
4
4
|
type TestContext = ReturnType<ReturnType<typeof testUtils>["init"]>["context"];
|
|
5
5
|
type AccountContext = Pick<AuthContext, "internalAdapter">;
|
|
6
|
-
export declare
|
|
7
|
-
readonly $context: Promise<TestContext & AccountContext
|
|
8
|
-
},
|
|
6
|
+
export declare const signedInUser: (auth: {
|
|
7
|
+
readonly $context: Promise<TestContext & AccountContext & Pick<AuthContext, "sessionConfig">>;
|
|
8
|
+
}, args_1: Partial<{
|
|
9
|
+
id: string;
|
|
10
|
+
createdAt: Date;
|
|
11
|
+
updatedAt: Date;
|
|
12
|
+
email: string;
|
|
13
|
+
emailVerified: boolean;
|
|
14
|
+
name: string;
|
|
15
|
+
image?: string | null | undefined;
|
|
16
|
+
}> & Record<string, unknown> & {
|
|
9
17
|
readonly providerAccounts?: readonly {
|
|
10
18
|
readonly providerId: string;
|
|
11
19
|
readonly accountId: string;
|
|
12
20
|
}[];
|
|
13
|
-
})
|
|
21
|
+
}) => Effect.Effect<{
|
|
22
|
+
user: import("better-auth").User;
|
|
23
|
+
headers: Headers;
|
|
24
|
+
cookies: import("better-auth/plugins").TestCookie[];
|
|
25
|
+
token: string;
|
|
26
|
+
session: {
|
|
27
|
+
id: string;
|
|
28
|
+
createdAt: Date;
|
|
29
|
+
updatedAt: Date;
|
|
30
|
+
userId: string;
|
|
31
|
+
token: string;
|
|
32
|
+
ipAddress?: string | null | undefined;
|
|
33
|
+
userAgent?: string | null | undefined;
|
|
34
|
+
expiresAt: Date;
|
|
35
|
+
};
|
|
36
|
+
}, never, never>;
|
|
14
37
|
export declare function storedProviderAccounts(auth: {
|
|
15
38
|
readonly $context: Promise<AccountContext>;
|
|
16
39
|
}, userId: string): Promise<{
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"testing.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/testing.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,WAAW,EAAE,MAAM,aAAa,CAAC;AAC/C,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAS,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEvC,KAAK,WAAW,GAAG,UAAU,CAAC,UAAU,CAAC,OAAO,SAAS,CAAC,CAAC,MAAM,CAAC,CAAC,CAAC,SAAS,CAAC,CAAC;AAC/E,KAAK,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,iBAAiB,CAAC,CAAC;AAE3D,eAAO,MAAM,YAAY;uBACG,OAAO,CAAC,WAAW,GAAG,cAAc,GAAG,IAAI,CAAC,WAAW,EAAE,eAAe,CAAC,CAAC;;;;;;;;;;gCAKxE,SAAS;QAAE,QAAQ,CAAC,UAAU,EAAE,MAAM,CAAC;QAAC,QAAQ,CAAC,SAAS,EAAE,MAAM,CAAA;KAAE,EAAE;;;;;;;;;;;;;;;;gBAalG,CAAC;AAEH,wBAAsB,sBAAsB,CAAC,IAAI,EAAE;IAAE,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC,cAAc,CAAC,CAAA;CAAE,EAAE,MAAM,EAAE,MAAM;;;;;;;KAWhH;AAED,eAAO,MAAM,YAAY;uBACG,OAAO,CAAC,WAAW,GAAG,cAAc,GAAG;QAAE,QAAQ,CAAC,QAAQ,EAAE,IAAI,CAAC,WAAW,CAAC,UAAU,CAAC,EAAE,MAAM,CAAC,CAAA;KAAE,CAAC;;;;;;;;;;oBACjC,MAAM;uBAAqB,MAAM;;;;;;;;;gBAO9H,CAAC"}
|
|
@@ -1,12 +1,16 @@
|
|
|
1
|
-
import { Effect } from "effect";
|
|
2
|
-
export
|
|
3
|
-
const { test, internalAdapter } =
|
|
4
|
-
const user =
|
|
1
|
+
import { Clock, Effect } from "effect";
|
|
2
|
+
export const signedInUser = Effect.fnUntraced(function* (auth, { providerAccounts = [], ...fields }) {
|
|
3
|
+
const { test, internalAdapter, sessionConfig } = yield* Effect.promise(() => auth.$context);
|
|
4
|
+
const user = yield* Effect.promise(() => test.saveUser(test.createUser(fields)));
|
|
5
5
|
for (const { providerId, accountId } of providerAccounts) {
|
|
6
|
-
|
|
6
|
+
yield* Effect.promise(() => internalAdapter.createAccount({ accountId, providerId, userId: user.id }));
|
|
7
7
|
}
|
|
8
|
-
|
|
9
|
-
}
|
|
8
|
+
const now = yield* Clock.currentTimeMillis;
|
|
9
|
+
const login = yield* Effect.promise(() => test.login({ userId: user.id }));
|
|
10
|
+
const expiresAt = new Date(now + sessionConfig.expiresIn * 1000);
|
|
11
|
+
yield* Effect.promise(() => internalAdapter.updateSession(login.token, { expiresAt }));
|
|
12
|
+
return { ...login, session: { ...login.session, expiresAt } };
|
|
13
|
+
});
|
|
10
14
|
export async function storedProviderAccounts(auth, userId) {
|
|
11
15
|
const { internalAdapter } = await auth.$context;
|
|
12
16
|
const accounts = await internalAdapter.findAccounts(userId);
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../src/server/better-auth/testing.ts"],"names":[],"mappings":"AAEA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"testing.js","sourceRoot":"","sources":["../../../src/server/better-auth/testing.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,9 +1,12 @@
|
|
|
1
|
-
import { Effect, Layer } from "effect";
|
|
1
|
+
import { type Context, Effect, Layer } from "effect";
|
|
2
2
|
import { type HttpServerRequest, HttpServerResponse } from "effect/http";
|
|
3
|
+
import type { RpcMiddleware } from "effect/rpc";
|
|
3
4
|
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
4
5
|
import { Identity, SessionUser } from "#identity.ts";
|
|
5
|
-
import {
|
|
6
|
+
import type { IdentityFailures } from "#middleware.ts";
|
|
6
7
|
import { type SessionPolicy, type UserSessionShape } from "./session.ts";
|
|
7
|
-
export declare function permissionLayer<TMiddleware, TSession extends UserSessionShape>(middleware:
|
|
8
|
+
export declare function permissionLayer<TMiddleware, TSession extends UserSessionShape>(middleware: Context.Key<TMiddleware, RpcMiddleware.RpcMiddleware<Identity | SessionUser, IdentityFailures, never>> & {
|
|
9
|
+
readonly permission: Permission;
|
|
10
|
+
}, policy: SessionPolicy<TSession>): Layer.Layer<TMiddleware, never, never>;
|
|
8
11
|
export declare function permissionRoute<TSession extends UserSessionShape>(policy: SessionPolicy<TSession>, permission: Permission): <E, R>(handler: (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>) => (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, Exclude<R, Identity | SessionUser>>;
|
|
9
12
|
//# sourceMappingURL=permissions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../src/server/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"permissions.d.ts","sourceRoot":"","sources":["../../src/server/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,OAAO,EAAE,MAAM,EAAE,KAAK,EAAU,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAAE,KAAK,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAEzE,OAAO,KAAK,EAAE,aAAa,EAAE,MAAM,YAAY,CAAC;AAChD,OAAO,KAAK,EAAE,UAAU,EAAE,MAAM,iCAAiC,CAAC;AAKlE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AACrD,OAAO,KAAK,EAAE,gBAAgB,EAAE,MAAM,gBAAgB,CAAC;AAKvD,OAAO,EAAE,KAAK,aAAa,EAAE,KAAK,gBAAgB,EAAmB,MAAM,cAAc,CAAC;AAE1F,wBAAgB,eAAe,CAAC,WAAW,EAAE,QAAQ,SAAS,gBAAgB,EAC7E,UAAU,EAAE,OAAO,CAAC,GAAG,CAAC,WAAW,EAAE,aAAa,CAAC,aAAa,CAAC,QAAQ,GAAG,WAAW,EAAE,gBAAgB,EAAE,KAAK,CAAC,CAAC,GAAG;IACpH,QAAQ,CAAC,UAAU,EAAE,UAAU,CAAC;CAChC,EACD,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,0CAkB/B;AAYD,wBAAgB,eAAe,CAAC,QAAQ,SAAS,gBAAgB,EAAE,MAAM,EAAE,aAAa,CAAC,QAAQ,CAAC,EAAE,UAAU,EAAE,UAAU,IACjH,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,iBAAiB,CAAC,iBAAiB,KAAK,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC,EAAE,CAAC,CAAC,eACxH,iBAAiB,CAAC,iBAAiB,KAAG,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC,CAW5I"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/server/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/server/permissions.ts"],"names":[],"mappings":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveRole.d.ts","sourceRoot":"","sources":["../../src/server/resolveRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO;;;;;;
|
|
1
|
+
{"version":3,"file":"resolveRole.d.ts","sourceRoot":"","sources":["../../src/server/resolveRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,wBAAgB,WAAW,CAAC,KAAK,EAAE,OAAO,EAAE,MAAM,EAAE,OAAO;;;;;;iBAa1D"}
|
|
@@ -2,7 +2,7 @@ import { Effect } from "effect";
|
|
|
2
2
|
import { Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
3
3
|
export function resolveRole(roles, stored) {
|
|
4
4
|
if (stored === undefined || stored === null) {
|
|
5
|
-
return Effect.andThen(Effect.logWarning("Stored user role is missing.
|
|
5
|
+
return Effect.andThen(Effect.logWarning("Stored user role is missing. Generate and apply an auth migration with defaultRole, then use assignRole for administrators."), Effect.fail(new Forbidden({ message: "User role is missing" })));
|
|
6
6
|
}
|
|
7
7
|
return roles.resolve(stored).pipe(Effect.mapError((cause) => new Error(`Stored user role is not declared by the application: ${String(stored)}`, { cause })), Effect.orDie);
|
|
8
8
|
}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveRole.js","sourceRoot":"","sources":["../../src/server/resolveRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,MAAM,UAAU,WAAW,CAAC,KAAc,EAAE,MAAe;IAC1D,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAC7C,OAAO,MAAM,CAAC,OAAO,CACpB,MAAM,CAAC,UAAU,
|
|
1
|
+
{"version":3,"file":"resolveRole.js","sourceRoot":"","sources":["../../src/server/resolveRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEhC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAE1D,MAAM,UAAU,WAAW,CAAC,KAAc,EAAE,MAAe;IAC1D,IAAI,MAAM,KAAK,SAAS,IAAI,MAAM,KAAK,IAAI,EAAE,CAAC;QAC7C,OAAO,MAAM,CAAC,OAAO,CACpB,MAAM,CAAC,UAAU,CAChB,6HAA6H,CAC7H,EACD,MAAM,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,sBAAsB,EAAE,CAAC,CAAC,CAC/D,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC,OAAO,CAAC,MAAM,CAAC,CAAC,IAAI,CAChC,MAAM,CAAC,QAAQ,CAAC,CAAC,KAAK,EAAE,EAAE,CAAC,IAAI,KAAK,CAAC,wDAAwD,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,KAAK,EAAE,CAAC,CAAC,EAC1H,MAAM,CAAC,KAAK,CACZ,CAAC;AACH,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/identity",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.14.0",
|
|
4
4
|
"description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -45,21 +45,21 @@
|
|
|
45
45
|
"README.md"
|
|
46
46
|
],
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@shivaedev/access": "0.3.
|
|
48
|
+
"@shivaedev/access": "0.3.4",
|
|
49
49
|
"@shivaedev/changes": "0.6.0",
|
|
50
|
-
"@shivaedev/contract": "0.
|
|
51
|
-
"@shivaedev/errors": "0.
|
|
52
|
-
"@shivaedev/sql": "0.
|
|
50
|
+
"@shivaedev/contract": "0.30.0",
|
|
51
|
+
"@shivaedev/errors": "0.4.0",
|
|
52
|
+
"@shivaedev/sql": "0.29.0"
|
|
53
53
|
},
|
|
54
54
|
"devDependencies": {
|
|
55
55
|
"@effect/platform-node": "4.0.6",
|
|
56
56
|
"@effect/sql-pg": "4.0.6",
|
|
57
|
-
"@shivaedev/admin": "0.
|
|
58
|
-
"@shivaedev/quality": "0.
|
|
59
|
-
"@shivaedev/server": "0.
|
|
57
|
+
"@shivaedev/admin": "0.16.1",
|
|
58
|
+
"@shivaedev/quality": "0.52.0",
|
|
59
|
+
"@shivaedev/server": "0.15.0",
|
|
60
60
|
"@shivaedev/test": "0.12.0",
|
|
61
|
-
"@shivaedev/test-sql": "0.15.
|
|
62
|
-
"@shivaedev/test-story": "0.31.
|
|
61
|
+
"@shivaedev/test-sql": "0.15.2",
|
|
62
|
+
"@shivaedev/test-story": "0.31.2",
|
|
63
63
|
"@types/node": "24.19.2",
|
|
64
64
|
"better-auth": "1.7.12",
|
|
65
65
|
"effect": "4.0.6",
|
|
@@ -0,0 +1,40 @@
|
|
|
1
|
+
import { type Config, Effect, Schema } from "effect";
|
|
2
|
+
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
+
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
|
+
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
5
|
+
import type { ProviderAccountValue } from "#identity.ts";
|
|
6
|
+
import { assignRole } from "./assignRole.ts";
|
|
7
|
+
|
|
8
|
+
export interface AccountRoleSeed<E> {
|
|
9
|
+
readonly onSignIn: (userId: string) => Effect.Effect<void, E>;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export const accountRoleSeed = Effect.fn("Identity.accountRoleSeed")(function* <TRole extends string>(
|
|
13
|
+
access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">,
|
|
14
|
+
role: NoInfer<TRole>,
|
|
15
|
+
accounts: Config.Config<readonly ProviderAccountValue[]>,
|
|
16
|
+
) {
|
|
17
|
+
const listed = yield* accounts;
|
|
18
|
+
const context = yield* Effect.context<SqlClient.SqlClient>();
|
|
19
|
+
const sql = yield* SqlClient.SqlClient;
|
|
20
|
+
const findUsers = SqlSchema.findAll({
|
|
21
|
+
execute: ({ accountId, providerId, userId }) => sql`
|
|
22
|
+
select distinct "userId" as id from "account"
|
|
23
|
+
where "providerId" = ${providerId} and "accountId" = ${accountId}
|
|
24
|
+
${userId === undefined ? sql.literal("") : sql`and "userId" = ${userId}`}`,
|
|
25
|
+
Request: Schema.Struct({ accountId: Schema.String, providerId: Schema.String, userId: Schema.optional(Schema.String) }),
|
|
26
|
+
Result: Schema.Struct({ id: Schema.String }),
|
|
27
|
+
});
|
|
28
|
+
const apply = Effect.fnUntraced(function* (userId?: string) {
|
|
29
|
+
for (const account of listed) {
|
|
30
|
+
const users = yield* findUsers({ ...account, userId }).pipe(
|
|
31
|
+
Effect.mapError(() => new AuthUnavailable({ message: "Could not access provider accounts" })),
|
|
32
|
+
);
|
|
33
|
+
for (const user of users) {
|
|
34
|
+
yield* assignRole(access, user.id, role);
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
});
|
|
38
|
+
yield* apply();
|
|
39
|
+
return { onSignIn: (userId: string) => apply(userId).pipe(Effect.provideContext(context)) };
|
|
40
|
+
});
|
|
@@ -0,0 +1,39 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import { APIError } from "better-auth/api";
|
|
3
|
+
import { Effect, Exit } from "effect";
|
|
4
|
+
import { redact } from "@shivaedev/errors/redact.ts";
|
|
5
|
+
import type { AccountRoleSeed } from "#server/better-auth/accountRoleSeed.ts";
|
|
6
|
+
|
|
7
|
+
export function roleSeedOptions<E>(options: BetterAuthOptions, seed: AccountRoleSeed<E> | undefined): BetterAuthOptions {
|
|
8
|
+
if (seed === undefined) {
|
|
9
|
+
return options;
|
|
10
|
+
}
|
|
11
|
+
const own = options.databaseHooks?.session?.create?.before;
|
|
12
|
+
return {
|
|
13
|
+
...options,
|
|
14
|
+
databaseHooks: {
|
|
15
|
+
...options.databaseHooks,
|
|
16
|
+
session: {
|
|
17
|
+
...options.databaseHooks?.session,
|
|
18
|
+
create: {
|
|
19
|
+
...options.databaseHooks?.session?.create,
|
|
20
|
+
before: async (session, endpoint) => {
|
|
21
|
+
const result = await own?.(session, endpoint);
|
|
22
|
+
if (result === false) {
|
|
23
|
+
return result;
|
|
24
|
+
}
|
|
25
|
+
const userId = typeof result === "object" && typeof result.data.userId === "string" ? result.data.userId : session.userId;
|
|
26
|
+
const exit = await Effect.runPromise(
|
|
27
|
+
Effect.exit(seed.onSignIn(userId).pipe(Effect.tapCause((cause) => Effect.logError("Account role seed failed", redact(cause))))),
|
|
28
|
+
{ signal: endpoint?.request?.signal },
|
|
29
|
+
);
|
|
30
|
+
if (Exit.isFailure(exit)) {
|
|
31
|
+
throw new APIError("SERVICE_UNAVAILABLE", { code: "role_seed_failed", message: "Sign-in is temporarily unavailable" });
|
|
32
|
+
}
|
|
33
|
+
return result;
|
|
34
|
+
},
|
|
35
|
+
},
|
|
36
|
+
},
|
|
37
|
+
},
|
|
38
|
+
};
|
|
39
|
+
}
|
|
@@ -22,8 +22,8 @@ const AccountEntry = Schema.String.pipe(
|
|
|
22
22
|
}),
|
|
23
23
|
);
|
|
24
24
|
|
|
25
|
-
export const
|
|
26
|
-
Schema.decodeTo(Schema.Array(AccountEntry)
|
|
25
|
+
export const ProviderAccounts = Schema.String.pipe(
|
|
26
|
+
Schema.decodeTo(Schema.Array(AccountEntry), {
|
|
27
27
|
decode: SchemaGetter.transform((value) =>
|
|
28
28
|
value
|
|
29
29
|
.split(",")
|
|
@@ -34,4 +34,6 @@ export const AllowedAccounts = Schema.String.pipe(
|
|
|
34
34
|
}),
|
|
35
35
|
);
|
|
36
36
|
|
|
37
|
+
export const AllowedAccounts = ProviderAccounts.check(Schema.isMinLength(1));
|
|
38
|
+
|
|
37
39
|
export const allowedAccounts = Config.schema(AllowedAccounts, "AUTH_ALLOWED_ACCOUNTS");
|
|
@@ -0,0 +1,24 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import { Effect, Schema } from "effect";
|
|
3
|
+
import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
4
|
+
import { authColumnDrift } from "./columnDrift.ts";
|
|
5
|
+
import { betterAuthMigrationPlan } from "./migrationPlan.ts";
|
|
6
|
+
|
|
7
|
+
export class BetterAuthSchemaDrift extends Schema.TaggedError<BetterAuthSchemaDrift>()("BetterAuthSchemaDrift", {
|
|
8
|
+
missing: Schema.Array(Schema.String),
|
|
9
|
+
}) {
|
|
10
|
+
override get message() {
|
|
11
|
+
return `Auth schema needs a new migration:\n${this.missing.join("\n")}`;
|
|
12
|
+
}
|
|
13
|
+
}
|
|
14
|
+
|
|
15
|
+
export const assertBetterAuthSchema = Effect.fn("Identity.assertBetterAuthSchema")(function* (
|
|
16
|
+
options: Omit<BetterAuthOptions, "database">,
|
|
17
|
+
role?: StoredRoleOptions,
|
|
18
|
+
) {
|
|
19
|
+
const { missing } = yield* betterAuthMigrationPlan(options, role, { throwOnUnsafe: false });
|
|
20
|
+
missing.push(...(yield* authColumnDrift(storedRoleOptions(options, role), role)));
|
|
21
|
+
if (missing.length > 0) {
|
|
22
|
+
return yield* new BetterAuthSchemaDrift({ missing });
|
|
23
|
+
}
|
|
24
|
+
});
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { Effect, Option, Schema } from "effect";
|
|
2
|
+
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
2
3
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
4
|
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
5
|
import { AssignRoles, LastRoleAssigner } from "@shivaedev/access/roles.ts";
|
|
@@ -15,6 +16,8 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole exte
|
|
|
15
16
|
role: NoInfer<TRole>,
|
|
16
17
|
) {
|
|
17
18
|
const sql = yield* SqlClient.SqlClient;
|
|
19
|
+
const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
20
|
+
const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
|
|
18
21
|
return yield* Effect.gen(function* () {
|
|
19
22
|
yield* sql`select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
|
|
20
23
|
const readTarget = SqlSchema.findOneOption({
|
|
@@ -44,5 +47,5 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole exte
|
|
|
44
47
|
yield* sql`update "user" set role = ${role}, "updatedAt" = now() where id = ${userId}`;
|
|
45
48
|
yield* invalidateOnCommit(["admin.users"]);
|
|
46
49
|
return true;
|
|
47
|
-
}).pipe(transact({ onSqlError: unavailable }));
|
|
50
|
+
}).pipe(transact({ onSqlError: unavailable }), Effect.provideService(Reactivity.Reactivity, reactivity));
|
|
48
51
|
});
|