@shivaedev/identity 0.11.1 → 0.13.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 +49 -0
- package/README.md +100 -9
- 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/adapters/storedRoleOptions.d.ts +6 -0
- package/dist/server/better-auth/adapters/storedRoleOptions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/storedRoleOptions.js +16 -0
- package/dist/server/better-auth/adapters/storedRoleOptions.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 +6 -0
- package/dist/server/better-auth/migrate.d.ts.map +1 -0
- package/dist/server/better-auth/migrate.js +9 -0
- package/dist/server/better-auth/migrate.js.map +1 -0
- 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 +11 -4
- package/dist/server/better-auth/mount.d.ts.map +1 -1
- package/dist/server/better-auth/mount.js +8 -4
- package/dist/server/better-auth/mount.js.map +1 -1
- package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
- package/dist/server/better-auth/mountRoutes.js +1 -1
- package/dist/server/better-auth/mountRoutes.js.map +1 -1
- package/dist/server/better-auth/sessionPermissions.d.ts +2 -1
- package/dist/server/better-auth/sessionPermissions.d.ts.map +1 -1
- package/dist/server/better-auth/sessionPermissions.js.map +1 -1
- package/dist/server/better-auth/testDatabase.d.ts +11 -0
- package/dist/server/better-auth/testDatabase.d.ts.map +1 -1
- package/dist/server/better-auth/testDatabase.js +10 -0
- package/dist/server/better-auth/testDatabase.js.map +1 -1
- package/dist/server/lookupSession.d.ts +2 -2
- package/dist/server/lookupSession.d.ts.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 +2 -1
- package/dist/server/resolveRole.d.ts.map +1 -1
- package/dist/server/resolveRole.js +4 -0
- package/dist/server/resolveRole.js.map +1 -1
- package/dist/sessions.d.ts +4 -4
- package/dist/sessions.d.ts.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/adapters/storedRoleOptions.ts +21 -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 +14 -0
- 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 +14 -7
- package/src/server/better-auth/mountRoutes.ts +8 -1
- package/src/server/better-auth/sessionPermissions.ts +2 -1
- package/src/server/better-auth/testDatabase.ts +11 -0
- package/src/server/permissions.ts +5 -3
- package/src/server/resolveRole.ts +9 -0
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"migrate.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/migrate.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AACvC,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,mDAAmD,CAAC;AAG3F,eAAO,MAAM,iBAAiB,+OAO5B,CAAC"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { SqlClient } from "effect/sql";
|
|
3
|
+
import { authMigrationSql, betterAuthMigrationPlan } from "./migrationPlan.js";
|
|
4
|
+
export const migrateBetterAuth = Effect.fn("Identity.migrateBetterAuth")(function* (options, role) {
|
|
5
|
+
const plan = yield* betterAuthMigrationPlan(options, role);
|
|
6
|
+
const sql = yield* SqlClient.SqlClient;
|
|
7
|
+
yield* sql.unsafe(authMigrationSql(plan.ddl));
|
|
8
|
+
});
|
|
9
|
+
//# sourceMappingURL=migrate.js.map
|
|
@@ -0,0 +1 @@
|
|
|
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"}
|
|
@@ -2,14 +2,21 @@ import { type BetterAuthOptions } from "better-auth";
|
|
|
2
2
|
import { Config, Effect } from "effect";
|
|
3
3
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
4
4
|
import { type BetterAuthHardeningOptions } from "#server/better-auth/adapters/hardening.ts";
|
|
5
|
+
import { type StoredRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
5
6
|
import { type BearerSessionsOptions } from "#server/better-auth/bearerSessions.ts";
|
|
6
7
|
import { type SignInPolicy } from "#server/better-auth/signInGate.ts";
|
|
7
|
-
|
|
8
|
+
import type { AccountRoleSeed } from "./accountRoleSeed.ts";
|
|
9
|
+
export type BetterAuthMountOptions<E = never, R = never> = {
|
|
8
10
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
9
11
|
readonly hardening?: BetterAuthHardeningOptions;
|
|
10
|
-
readonly roles?: RoleSet;
|
|
11
12
|
readonly signIn?: SignInPolicy<E, R> | undefined;
|
|
12
|
-
}
|
|
13
|
+
} & ({
|
|
14
|
+
readonly roles?: undefined;
|
|
15
|
+
readonly roleSeed?: undefined;
|
|
16
|
+
} | (StoredRoleOptions & {
|
|
17
|
+
readonly roles: RoleSet;
|
|
18
|
+
readonly roleSeed?: Effect.Effect<AccountRoleSeed<E>, E, R>;
|
|
19
|
+
}));
|
|
13
20
|
export declare const betterAuthMount: <const TOptions extends BetterAuthOptions, E = never, R = never>(options: TOptions, mount?: BetterAuthMountOptions<E, R> | undefined) => Effect.Effect<{
|
|
14
21
|
admittedSessions: {
|
|
15
22
|
<TSession extends import("../session.ts").SessionShape>(getSession: import("../adapters/betterAuthSessions.ts").GetSession<TSession>): import("../session.ts").SessionProvider<TSession>;
|
|
@@ -254,5 +261,5 @@ export declare const betterAuthMount: <const TOptions extends BetterAuthOptions,
|
|
|
254
261
|
readonly roles?: RoleSet;
|
|
255
262
|
readonly provider: import("../session.ts").SessionProvider<import("../session.ts").UserSessionShape>;
|
|
256
263
|
};
|
|
257
|
-
}, Config.ConfigError, R | import("effect/Scope").Scope>;
|
|
264
|
+
}, E | Config.ConfigError, R | import("effect/Scope").Scope>;
|
|
258
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,7 +1,9 @@
|
|
|
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";
|
|
6
|
+
import { storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
5
7
|
import { withBearerSessions } from "#server/better-auth/bearerSessions.ts";
|
|
6
8
|
import { PEER_IP_HEADER } from "#server/better-auth/clientIp.ts";
|
|
7
9
|
import { memoryRateLimit } from "#server/better-auth/memoryRateLimit.ts";
|
|
@@ -23,10 +25,12 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (
|
|
|
23
25
|
yield* policy.accounts;
|
|
24
26
|
}
|
|
25
27
|
const gate = yield* signInGate(policy);
|
|
26
|
-
const
|
|
28
|
+
const configured = mount.roles === undefined ? options : storedRoleOptions(closeRoleEndpoints(options), mount);
|
|
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);
|
|
27
32
|
const rateLimit = options.rateLimit;
|
|
28
33
|
const customStorage = rateLimit?.customStorage ?? (rateLimit?.storage === undefined || rateLimit.storage === "memory" ? yield* memoryRateLimit : undefined);
|
|
29
|
-
const configured = mount.roles === undefined ? options : closeRoleEndpoints(options);
|
|
30
34
|
const auth = betterAuth({
|
|
31
35
|
...withHardening(withBearerSessions(configured, mount.bearerSessions !== undefined), mount.hardening),
|
|
32
36
|
advanced: {
|
|
@@ -43,7 +47,7 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (
|
|
|
43
47
|
allowedHosts: ["127.0.0.1:*", "localhost:*"],
|
|
44
48
|
protocol: "http",
|
|
45
49
|
})),
|
|
46
|
-
databaseHooks:
|
|
50
|
+
databaseHooks: seeded.databaseHooks,
|
|
47
51
|
rateLimit: {
|
|
48
52
|
...rateLimit,
|
|
49
53
|
...(customStorage === undefined ? {} : { customStorage }),
|
|
@@ -51,7 +55,7 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (
|
|
|
51
55
|
},
|
|
52
56
|
secret,
|
|
53
57
|
trustedOrigins: options.trustedOrigins ?? Option.match(origin, { onNone: () => ["http://127.0.0.1:*", "http://localhost:*"], onSome: (url) => [url] }),
|
|
54
|
-
user: gate.active ? gated.user :
|
|
58
|
+
user: gate.active ? gated.user : configured.user,
|
|
55
59
|
});
|
|
56
60
|
const authRoutes = mountRoutes(auth, {
|
|
57
61
|
bearerSessions: mount.bearerSessions,
|
|
@@ -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,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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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mountRoutes.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAyC,MAAM,aAAa,CAAC;AAEhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAA2D,MAAM,uCAAuC,CAAC;AAK5I,UAAU,WAAW;IACpB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAAE,QAAQ,CAAC,WAAW,EAAE;YAAE,QAAQ,CAAC,YAAY,EAAE;gBAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IAC3G,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC1D;AACD,UAAU,iBAAiB;IAC1B,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C;AAuCD,wBAAgB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,
|
|
1
|
+
{"version":3,"file":"mountRoutes.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,UAAU,EAAyC,MAAM,aAAa,CAAC;AAEhF,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAA2D,MAAM,uCAAuC,CAAC;AAK5I,UAAU,WAAW;IACpB,QAAQ,CAAC,QAAQ,EAAE,OAAO,CAAC;QAAE,QAAQ,CAAC,WAAW,EAAE;YAAE,QAAQ,CAAC,YAAY,EAAE;gBAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;aAAE,CAAA;SAAE,CAAA;KAAE,CAAC,CAAC;IAC3G,QAAQ,CAAC,OAAO,EAAE,CAAC,OAAO,EAAE,OAAO,KAAK,OAAO,CAAC,QAAQ,CAAC,CAAC;CAC1D;AACD,UAAU,iBAAiB;IAC1B,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,cAAc,EAAE,MAAM,CAAC;IAChC,QAAQ,CAAC,UAAU,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;IACzC,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,GAAG,SAAS,CAAC;IACrC,QAAQ,CAAC,YAAY,CAAC,EAAE,MAAM,GAAG,SAAS,CAAC;CAC3C;AAuCD,wBAAgB,WAAW,CAAC,IAAI,EAAE,WAAW,EAAE,OAAO,EAAE,iBAAiB,qEA4BxE"}
|
|
@@ -50,7 +50,7 @@ export function mountRoutes(auth, options) {
|
|
|
50
50
|
"auth.rate_limit.address": clientIp.address,
|
|
51
51
|
"auth.rate_limit.address_source": clientIp.source,
|
|
52
52
|
});
|
|
53
|
-
return HttpServerResponse.fromWeb(yield* authResponse(auth, web, options).pipe(Effect.catch(providerFailure)));
|
|
53
|
+
return HttpServerResponse.fromWeb(yield* authResponse(auth, web, options).pipe(Effect.catchTag("Forbidden", (error) => Effect.succeed(Response.json({ message: error.message }, { status: HttpStatus.fromLiteral("Forbidden") }))), Effect.catch(providerFailure)));
|
|
54
54
|
}).pipe(Effect.catch(() => Effect.succeed(HttpServerResponse.text("Authentication is temporarily unavailable", { status: HttpStatus.fromLiteral("ServiceUnavailable") }))))));
|
|
55
55
|
}
|
|
56
56
|
//# sourceMappingURL=mountRoutes.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mountRoutes.js","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,iBAAiB,EAAE,kBAAkB,EAAE,MAAM,aAAa,CAAC;AAChF,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AAErD,OAAO,EAA8B,qBAAqB,EAAE,gBAAgB,EAAE,cAAc,EAAE,MAAM,uCAAuC,CAAC;AAC5I,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAC7D,OAAO,EAAE,eAAe,EAAE,MAAM,eAAe,CAAC;AAChD,OAAO,EAAE,kBAAkB,EAAE,MAAM,yBAAyB,CAAC;AAa7D,SAAS,eAAe,CAAC,OAAgB,EAAE,QAAkB,EAAE,MAAe;IAC7E,OAAO,CACN,MAAM;WACH,QAAQ,CAAC,EAAE;WACX,QAAQ,CAAC,OAAO,CAAC,GAAG,CAAC,gBAAgB,CAAC;WACtC,OAAO,CAAC,OAAO,CAAC,GAAG,CAAC,eAAe,CAAC;WACpC,IAAI,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC,QAAQ,CAAC,UAAU,CAAC,oBAAoB,CAAC,CACjE,CAAC;AACH,CAAC;AACD,KAAK,UAAU,gBAAgB,CAAC,IAAiB,EAAE,GAAY,EAAE,OAA0B;IAC1F,IAAI,OAAO,CAAC,cAAc,KAAK,SAAS,EAAE,CAAC;QAC1C,OAAO,IAAI,CAAC,OAAO,CAAC,GAAG,CAAC,CAAC;IAC1B,CAAC;IACD,MAAM,EAAE,WAAW,EAAE,GAAG,MAAM,IAAI,CAAC,QAAQ,CAAC;IAC5C,MAAM,UAAU,GAAG,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC;IACjD,MAAM,OAAO,GAAG,cAAc,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACxD,MAAM,MAAM,GAAG,OAAO,CAAC,cAAc,CAAC,OAAO,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,GAAG,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,CAAC,OAAO,EAAE,UAAU,CAAC,CAAC;IACtI,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,GAAG,EAAE,EAAE,OAAO,EAAE,CAAC,CAAC;IAC9C,MAAM,QAAQ,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;IAC7C,IAAI,eAAe,CAAC,OAAO,EAAE,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC;QAChD,MAAM,OAAO,GAAG,MAAM,IAAI,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,IAAI,GAAG,CAAC,oBAAoB,EAAE,GAAG,CAAC,GAAG,CAAC,EAAE,EAAE,IAAI,EAAE,IAAI,EAAE,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;QACjI,MAAM,OAAO,CAAC,IAAI,EAAE,MAAM,EAAE,CAAC;QAC7B,IAAI,CAAC,OAAO,CAAC,EAAE,EAAE,CAAC;YACjB,MAAM,IAAI,KAAK,CAAC,4BAA4B,CAAC,CAAC;QAC/C,CAAC;IACF,CAAC;IACD,OAAO,MAAM,CAAC,CAAC,CAAC,QAAQ,CAAC,CAAC,CAAC,qBAAqB,CAAC,QAAQ,CAAC,CAAC;AAC5D,CAAC;AACD,MAAM,YAAY,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,IAAiB,EAAE,GAAY,EAAE,OAA0B;IAC5G,MAAM,cAAc,GAAG,OAAO,CAAC,KAAK,KAAK,SAAS,IAAI,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC,QAAQ,KAAK,uBAAuB,CAAC;IAC5G,MAAM,GAAG,GAAG,IAAI,GAAG,CAAC,GAAG,CAAC,GAAG,CAAC,CAAC;IAC7B,IAAI,cAAc,EAAE,CAAC;QACpB,GAAG,CAAC,YAAY,CAAC,GAAG,CAAC,oBAAoB,EAAE,MAAM,CAAC,CAAC;IACpD,CAAC;IACD,MAAM,OAAO,GAAG,cAAc,CAAC,CAAC,CAAC,IAAI,OAAO,CAAC,GAAG,EAAE,GAAG,CAAC,CAAC,CAAC,CAAC,GAAG,CAAC;IAC7D,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,gBAAgB,CAAC,IAAI,EAAE,IAAI,OAAO,CAAC,OAAO,EAAE,EAAE,MAAM,EAAE,CAAC,EAAE,OAAO,CAAC,CAAC,CAAC;IACzH,OAAO,cAAc,IAAI,QAAQ,CAAC,EAAE,IAAI,OAAO,CAAC,KAAK,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,kBAAkB,CAAC,QAAQ,EAAE,OAAO,CAAC,KAAK,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC;AACrI,CAAC,CAAC,CAAC;AACH,MAAM,UAAU,WAAW,CAAC,IAAiB,EAAE,OAA0B;IACxE,MAAM,WAAW,GAAG,eAAe,CAAC,OAAO,CAAC,CAAC;IAC7C,OAAO,UAAU,CAAC,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAChC,MAAM,CAAC,GAAG,CAAC,GAAG,EAAE,aAAa,EAAE,CAAC,OAAO,EAAE,EAAE,CAC1C,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,iBAAiB,CAAC,KAAK,CAAC,OAAO,CAAC,CAAC;QACpD,MAAM,QAAQ,GAAG,WAAW,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;QAC3C,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC;YACjC,yBAAyB,EAAE,QAAQ,CAAC,OAAO;YAC3C,gCAAgC,EAAE,QAAQ,CAAC,MAAM;SACjD,CAAC,CAAC;QACH,OAAO,kBAAkB,CAAC,OAAO,
|
|
1
|
+
{"version":3,"file":"mountRoutes.js","sourceRoot":"","sources":["../../../src/server/better-auth/mountRoutes.ts"],"names":[],"mappings":"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"}
|
|
@@ -1,4 +1,5 @@
|
|
|
1
1
|
import { type Cause, Effect, Schema } from "effect";
|
|
2
2
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
|
-
|
|
3
|
+
import type { Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
export declare const sessionPermissions: (response: Response, roles: RoleSet) => Effect.Effect<Response, Forbidden | Schema.SchemaError | Cause.UnknownError, never>;
|
|
4
5
|
//# sourceMappingURL=sessionPermissions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionPermissions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/sessionPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;
|
|
1
|
+
{"version":3,"file":"sessionPermissions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/sessionPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACpD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,KAAK,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAO/D,eAAO,MAAM,kBAAkB,6HAa7B,CAAC"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessionPermissions.js","sourceRoot":"","sources":["../../../src/server/better-auth/sessionPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
1
|
+
{"version":3,"file":"sessionPermissions.js","sourceRoot":"","sources":["../../../src/server/better-auth/sessionPermissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAc,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGpD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AACjD,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AAErD,MAAM,MAAM,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC;AAC5D,MAAM,cAAc,GAAG,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,cAAc,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,cAAc,CAAC,iBAAiB,EAAE,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,MAAM,CAAC,CAAC,CAAC,CAAC;AAEnJ,MAAM,CAAC,MAAM,kBAAkB,GAAG,MAAM,CAAC,EAAE,CAAC,6BAA6B,CAAC,CAAC,QAAQ,CAAC,EACnF,QAAkB,EAClB,KAAc;IAEd,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,mBAAmB,CAAC,cAAc,CAAC,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CAAC,GAAG,EAAE,CAAC,QAAQ,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;IACnH,IAAI,OAAO,KAAK,IAAI,EAAE,CAAC;QACtB,OAAO,QAAQ,CAAC,IAAI,CAAC,IAAI,EAAE,QAAQ,CAAC,CAAC;IACtC,CAAC;IACD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,KAAK,EAAE,OAAO,CAAC,IAAI,CAAC,IAAI,CAAC,CAAC;IAC5D,MAAM,OAAO,GAAG,IAAI,OAAO,CAAC,QAAQ,CAAC,OAAO,CAAC,CAAC;IAC9C,OAAO,CAAC,MAAM,CAAC,gBAAgB,CAAC,CAAC;IACjC,OAAO,CAAC,GAAG,CAAC,eAAe,EAAE,mBAAmB,CAAC,CAAC;IAClD,OAAO,QAAQ,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,IAAI,EAAE,GAAG,MAAM,EAAE,EAAE,EAAE,EAAE,OAAO,EAAE,MAAM,EAAE,QAAQ,CAAC,MAAM,EAAE,CAAC,CAAC;AAClH,CAAC,CAAC,CAAC"}
|
|
@@ -2,7 +2,14 @@ import { DateTime, Effect, Schema } from "effect";
|
|
|
2
2
|
import { SqlClient } from "effect/sql";
|
|
3
3
|
export declare const authTestDatabase: Effect.Effect<{
|
|
4
4
|
expireSessions: (userId?: string) => Effect.Effect<void, import("effect/sql/SqlError").SqlError, never>;
|
|
5
|
+
migrate: (options: Omit<import("better-auth").BetterAuthOptions, "database">, role?: import("./adapters/storedRoleOptions.ts").StoredRoleOptions | undefined) => Effect.Effect<void, import("effect/sql/SqlError").SqlError | import("effect/Cause").UnknownError, import("effect/Scope").Scope | SqlClient.SqlClient>;
|
|
5
6
|
omitImageColumn: Effect.Effect<void, import("effect/sql/SqlError").SqlError, never>;
|
|
7
|
+
omitRole: (userId: string) => Effect.Effect<void, import("effect/sql/SqlError").SqlError, never>;
|
|
8
|
+
roleColumn: import("effect/sql/Statement").Statement<{
|
|
9
|
+
type: string;
|
|
10
|
+
nullable: string;
|
|
11
|
+
default: string | null;
|
|
12
|
+
}>;
|
|
6
13
|
sessionIpAddresses: import("effect/sql/Statement").Statement<{
|
|
7
14
|
ipAddress: string | null;
|
|
8
15
|
}>;
|
|
@@ -16,6 +23,10 @@ export declare const authTestDatabase: Effect.Effect<{
|
|
|
16
23
|
id: string;
|
|
17
24
|
expired: boolean;
|
|
18
25
|
}[], Schema.SchemaError | import("effect/sql/SqlError").SqlError, never>;
|
|
26
|
+
userRoles: import("effect/sql/Statement").Statement<{
|
|
27
|
+
email: string;
|
|
28
|
+
role: string | null;
|
|
29
|
+
}>;
|
|
19
30
|
users: import("effect/sql/Statement").Statement<{
|
|
20
31
|
email: string;
|
|
21
32
|
id: string;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testDatabase.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/testDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"testDatabase.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/testDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAKlD,eAAO,MAAM,gBAAgB;8BAQD,MAAM;;;uBAMb,MAAM;;cAKD,MAAM;kBAAY,MAAM;iBAAW,MAAM,GAAG,IAAI;;;mBAGnC,MAAM,GAAG,IAAI;;;eAE1C,MAAM;YACT,MAAM;gBACF,MAAM;;;;;;;;eAOS,MAAM;cAAQ,MAAM,GAAG,IAAI;;;eAC/B,MAAM;YAAM,MAAM;;8BAEtC,CAAC"}
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { DateTime, Effect, Schema } from "effect";
|
|
2
2
|
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
+
import { migrateBetterAuth } from "./migrate.js";
|
|
3
4
|
const StoredSession = Schema.Struct({ expiresAt: Schema.DateTimeUtcFromDate, id: Schema.String });
|
|
4
5
|
export const authTestDatabase = Effect.gen(function* () {
|
|
5
6
|
const sql = (yield* SqlClient.SqlClient).withoutTransforms();
|
|
@@ -10,7 +11,15 @@ export const authTestDatabase = Effect.gen(function* () {
|
|
|
10
11
|
});
|
|
11
12
|
return {
|
|
12
13
|
expireSessions: (userId) => sql `update "session" set "expiresAt" = now() - interval '1 second' ${userId === undefined ? sql.literal("") : sql `where "userId" = ${userId}`}`.pipe(Effect.asVoid),
|
|
14
|
+
migrate: migrateBetterAuth,
|
|
13
15
|
omitImageColumn: sql `alter table "user" drop column image`.pipe(Effect.asVoid),
|
|
16
|
+
omitRole: (userId) => Effect.gen(function* () {
|
|
17
|
+
yield* sql `alter table "user" alter column role drop not null`;
|
|
18
|
+
yield* sql `update "user" set role = null where id = ${userId}`;
|
|
19
|
+
}),
|
|
20
|
+
roleColumn: sql `
|
|
21
|
+
select data_type as type, is_nullable as nullable, column_default as "default"
|
|
22
|
+
from information_schema.columns where table_schema = current_schema() and table_name = 'user' and column_name = 'role'`,
|
|
14
23
|
sessionIpAddresses: sql `select "ipAddress" from "session" order by "createdAt", id`,
|
|
15
24
|
sessions: sql `select s.id, s."userId", u.email from "session" s join "user" u on u.id = s."userId" order by u.email, s.id`,
|
|
16
25
|
sessionsFor: Effect.fnUntraced(function* (userId) {
|
|
@@ -18,6 +27,7 @@ export const authTestDatabase = Effect.gen(function* () {
|
|
|
18
27
|
const now = yield* DateTime.now;
|
|
19
28
|
return sessions.map((session) => ({ ...session, expired: DateTime.toEpochMillis(session.expiresAt) <= DateTime.toEpochMillis(now) }));
|
|
20
29
|
}),
|
|
30
|
+
userRoles: sql `select email, role from "user" order by email`,
|
|
21
31
|
users: sql `select id, email from "user" order by email`,
|
|
22
32
|
};
|
|
23
33
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testDatabase.js","sourceRoot":"","sources":["../../../src/server/better-auth/testDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;
|
|
1
|
+
{"version":3,"file":"testDatabase.js","sourceRoot":"","sources":["../../../src/server/better-auth/testDatabase.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAClD,OAAO,EAAE,SAAS,EAAE,SAAS,EAAE,MAAM,YAAY,CAAC;AAClD,OAAO,EAAE,iBAAiB,EAAE,MAAM,cAAc,CAAC;AAEjD,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,SAAS,EAAE,MAAM,CAAC,mBAAmB,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC;AAElG,MAAM,CAAC,MAAM,gBAAgB,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;IACnD,MAAM,GAAG,GAAG,CAAC,KAAK,CAAC,CAAC,SAAS,CAAC,SAAS,CAAC,CAAC,iBAAiB,EAAE,CAAC;IAC7D,MAAM,YAAY,GAAG,SAAS,CAAC,OAAO,CAAC;QACtC,OAAO,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,GAAG,CAAA,0DAA0D,MAAM,cAAc;QACtG,OAAO,EAAE,MAAM,CAAC,MAAM;QACtB,MAAM,EAAE,aAAa;KACrB,CAAC,CAAC;IACH,OAAO;QACN,cAAc,EAAE,CAAC,MAAe,EAAE,EAAE,CACnC,GAAG,CAAA,kEAAkE,MAAM,KAAK,SAAS,CAAC,CAAC,CAAC,GAAG,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC,CAAC,GAAG,CAAA,oBAAoB,MAAM,EAAE,EAAE,CAAC,IAAI,CACnJ,MAAM,CAAC,MAAM,CACb;QACF,OAAO,EAAE,iBAAiB;QAC1B,eAAe,EAAE,GAAG,CAAA,sCAAsC,CAAC,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC;QAC9E,QAAQ,EAAE,CAAC,MAAc,EAAE,EAAE,CAC5B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACnB,KAAK,CAAC,CAAC,GAAG,CAAA,oDAAoD,CAAC;YAC/D,KAAK,CAAC,CAAC,GAAG,CAAA,4CAA4C,MAAM,EAAE,CAAC;QAChE,CAAC,CAAC;QACH,UAAU,EAAE,GAAG,CAA4D;;0HAE6C;QACxH,kBAAkB,EAAE,GAAG,CAA8B,4DAA4D;QACjH,QAAQ,EAAE,GAAG,CAIX,6GAA6G;QAC/G,WAAW,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,MAAc;YACvD,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,YAAY,CAAC,MAAM,CAAC,CAAC;YAC7C,MAAM,GAAG,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC;YAChC,OAAO,QAAQ,CAAC,GAAG,CAAC,CAAC,OAAO,EAAE,EAAE,CAAC,CAAC,EAAE,GAAG,OAAO,EAAE,OAAO,EAAE,QAAQ,CAAC,aAAa,CAAC,OAAO,CAAC,SAAS,CAAC,IAAI,QAAQ,CAAC,aAAa,CAAC,GAAG,CAAC,EAAE,CAAC,CAAC,CAAC;QACvI,CAAC,CAAC;QACF,SAAS,EAAE,GAAG,CAAwC,+CAA+C;QACrG,KAAK,EAAE,GAAG,CAA+B,6CAA6C;KACtF,CAAC;AACH,CAAC,CAAC,CAAC"}
|
|
@@ -3,6 +3,6 @@ import type { Headers } from "effect/http";
|
|
|
3
3
|
import { Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
4
4
|
import type { SessionPolicy, SessionShape } from "./session.ts";
|
|
5
5
|
export declare const sessionRequest: (policy: SessionPolicy<SessionShape>, headers: Headers.Headers, rpc: string) => Effect.Effect<import("./origin.ts").OriginRequest, Forbidden, never>;
|
|
6
|
-
export declare const sessionAccess: <TSession extends SessionShape>(policy: SessionPolicy<SessionShape>, session: Option.Option<TSession>) => Effect.Effect<Option.None<TSession> | Option.Some<TSession>,
|
|
7
|
-
export declare const lookupSession: <TSession extends SessionShape>(policy: SessionPolicy<TSession>, headers: Headers.Headers) => Effect.Effect<Option.None<TSession> | Option.Some<TSession>, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable, never>;
|
|
6
|
+
export declare const sessionAccess: <TSession extends SessionShape>(policy: SessionPolicy<SessionShape>, session: Option.Option<TSession>) => Effect.Effect<Option.None<TSession> | Option.Some<TSession>, Forbidden, never>;
|
|
7
|
+
export declare const lookupSession: <TSession extends SessionShape>(policy: SessionPolicy<TSession>, headers: Headers.Headers) => Effect.Effect<Option.None<TSession> | Option.Some<TSession>, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | Forbidden, never>;
|
|
8
8
|
//# sourceMappingURL=lookupSession.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lookupSession.d.ts","sourceRoot":"","sources":["../../src/server/lookupSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEhE,eAAO,MAAM,cAAc,sJAMzB,CAAC;AAEH,eAAO,MAAM,aAAa,GAAgC,QAAQ,SAAS,YAAY,
|
|
1
|
+
{"version":3,"file":"lookupSession.d.ts","sourceRoot":"","sources":["../../src/server/lookupSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAC3C,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAG1D,OAAO,KAAK,EAAE,aAAa,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAEhE,eAAO,MAAM,cAAc,sJAMzB,CAAC;AAEH,eAAO,MAAM,aAAa,GAAgC,QAAQ,SAAS,YAAY,0JAUrF,CAAC;AAEH,eAAO,MAAM,aAAa,GAAgC,QAAQ,SAAS,YAAY,wMAErF,CAAC"}
|
|
@@ -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,6 +1,7 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
2
|
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
|
-
|
|
3
|
+
import { Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
export declare function resolveRole(roles: RoleSet, stored: unknown): Effect.Effect<never, Forbidden, never> | Effect.Effect<{
|
|
4
5
|
permissions: readonly {
|
|
5
6
|
readonly name: string;
|
|
6
7
|
readonly strength: "any" | "own";
|
|
@@ -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;
|
|
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"}
|
|
@@ -1,5 +1,9 @@
|
|
|
1
1
|
import { Effect } from "effect";
|
|
2
|
+
import { Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
2
3
|
export function resolveRole(roles, stored) {
|
|
4
|
+
if (stored === undefined || stored === null) {
|
|
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
|
+
}
|
|
3
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);
|
|
4
8
|
}
|
|
5
9
|
//# sourceMappingURL=resolveRole.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"resolveRole.js","sourceRoot":"","sources":["../../src/server/resolveRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;
|
|
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/dist/sessions.d.ts
CHANGED
|
@@ -100,7 +100,9 @@ export declare const Sessions: import("@shivaedev/contract/contract.ts").Contrac
|
|
|
100
100
|
readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
|
|
101
101
|
}>, Schema.Struct<{
|
|
102
102
|
readonly _tag: Schema.Literal<"Resync">;
|
|
103
|
-
}>]>, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.
|
|
103
|
+
}>]>, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.revoke", Schema.Struct<{
|
|
104
|
+
id: Schema.String;
|
|
105
|
+
}>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable)[]>, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.list", Schema.Struct<{
|
|
104
106
|
readonly cursor: Schema.optionalKey<Schema.Struct<{
|
|
105
107
|
readonly id: Schema.String;
|
|
106
108
|
readonly lastActivityAt: Schema.DateTimeUtcFromString;
|
|
@@ -122,7 +124,5 @@ export declare const Sessions: import("@shivaedev/contract/contract.ts").Contrac
|
|
|
122
124
|
readonly name: Schema.String;
|
|
123
125
|
}>;
|
|
124
126
|
}>>;
|
|
125
|
-
}>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof SessionsPermission, never
|
|
126
|
-
id: Schema.String;
|
|
127
|
-
}>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable)[]>, typeof SessionsPermission, never>, readonly [], undefined>;
|
|
127
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof SessionsPermission, never>, readonly [], undefined>;
|
|
128
128
|
//# sourceMappingURL=sessions.d.ts.map
|
package/dist/sessions.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIxC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAI5D,eAAO,MAAM,eAAe;;;;;;;;;;EAM1B,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAAqF,CAAC;AAChH,eAAO,MAAM,gBAAgB;;;;;;EAG3B,CAAC;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;EAA2G,CAAC;AAEpI,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;
|
|
1
|
+
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIxC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAI5D,eAAO,MAAM,eAAe;;;;;;;;;;EAM1B,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAAqF,CAAC;AAChH,eAAO,MAAM,gBAAgB;;;;;;EAG3B,CAAC;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;EAA2G,CAAC;AAEpI,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;uOAiBY,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/identity",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.13.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.28.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.0",
|
|
58
|
+
"@shivaedev/quality": "0.52.0",
|
|
59
|
+
"@shivaedev/server": "0.14.0",
|
|
60
60
|
"@shivaedev/test": "0.12.0",
|
|
61
|
-
"@shivaedev/test-sql": "0.15.
|
|
62
|
-
"@shivaedev/test-story": "0.
|
|
61
|
+
"@shivaedev/test-sql": "0.15.1",
|
|
62
|
+
"@shivaedev/test-story": "0.31.1",
|
|
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
|
+
});
|