@shivaedev/identity 0.7.0 → 0.9.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/README.md +19 -4
- package/dist/server/better-auth/admittedSessions.d.ts +5 -2
- package/dist/server/better-auth/admittedSessions.d.ts.map +1 -1
- package/dist/server/better-auth/admittedSessions.js +5 -4
- package/dist/server/better-auth/admittedSessions.js.map +1 -1
- package/dist/server/better-auth/assignRole.d.ts +7 -0
- package/dist/server/better-auth/assignRole.d.ts.map +1 -0
- package/dist/server/better-auth/assignRole.js +42 -0
- package/dist/server/better-auth/assignRole.js.map +1 -0
- package/dist/server/better-auth/closeRoleEndpoints.d.ts +3 -0
- package/dist/server/better-auth/closeRoleEndpoints.d.ts.map +1 -0
- package/dist/server/better-auth/closeRoleEndpoints.js +9 -0
- package/dist/server/better-auth/closeRoleEndpoints.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 +3 -1
- package/dist/server/better-auth/mount.js.map +1 -1
- package/package.json +11 -8
- package/src/server/better-auth/admittedSessions.ts +15 -4
- package/src/server/better-auth/assignRole.ts +48 -0
- package/src/server/better-auth/closeRoleEndpoints.ts +10 -0
- package/src/server/better-auth/mount.ts +3 -1
package/README.md
CHANGED
|
@@ -118,6 +118,20 @@ The mount reads `BETTER_AUTH_SECRET` unless options supply `secret`. `PUBLIC_URL
|
|
|
118
118
|
|
|
119
119
|
For email sign-in through `appHost`, the session record's `ipAddress` follows the same rule. With a trusted peer, `AUTH_CLIENT_IP_HEADER=x-real-ip` stores `X-Real-IP` even if `X-Forwarded-For` supplies a different address; the default header selects the rightmost untrusted address in the `X-Forwarded-For` chain, ignoring trusted proxy hops on the right. With an untrusted peer, neither header can supply the stored address. Sign-in attempts from an untrusted peer share one bucket per path; with a trusted peer and `x-real-ip`, changing `X-Forwarded-For` does not change the bucket, while changing `X-Real-IP` does.
|
|
120
120
|
|
|
121
|
+
### Role assignments
|
|
122
|
+
|
|
123
|
+
Pass `{ roles: AppAccess }` as the second argument to `betterAuthMount`. Identity adds `/admin/set-role`, `/admin/update-user` and `/admin/create-user` to the disabled HTTP paths and sets the Better Auth admin plugin's `adminRoles` to `[]`. Existing disabled paths remain in effect. The admin Users page remains the application path for role changes.
|
|
124
|
+
|
|
125
|
+
Seeds and trusted operator commands use the same transactional write and last-role-assigner guard as the Users page:
|
|
126
|
+
|
|
127
|
+
```ts
|
|
128
|
+
import { assignRole } from "@shivaedev/identity/server/better-auth/assignRole.ts";
|
|
129
|
+
|
|
130
|
+
yield* assignRole(AppAccess, userId, "owner");
|
|
131
|
+
```
|
|
132
|
+
|
|
133
|
+
Supply the application's `SqlClient` and `Reactivity` Layers. This trusted server verb has no caller authorization check; authorize operator access before calling it. It returns whether the role changed, fails with `NotFound` for a missing user, and refuses to remove the final holder of `AssignRoles` (`roles.assign`) with `LastRoleAssigner`. Both declarations live in `@shivaedev/access/roles.ts`. Writes serialize through the same PostgreSQL transaction lock and invalidate the Users list after commit. The Users page adds its caller permission check and audit log.
|
|
134
|
+
|
|
121
135
|
### Bundled native clients
|
|
122
136
|
|
|
123
137
|
For a Capacitor or similar WebView whose page is served from the app bundle, opt in with the auth host mount's `bearerSessions` option. It installs Better Auth's own `bearer({ requireSignature: true })` plugin from the existing dependency; do not add a second bearer plugin. The option is absent by default. List only bundled-client origins here, and include them in Better Auth's `trustedOrigins` as well.
|
|
@@ -254,7 +268,7 @@ Here `sessions` is the application's policy from the previous example, with a Be
|
|
|
254
268
|
|
|
255
269
|
#### Reading provider account IDs
|
|
256
270
|
|
|
257
|
-
Pass Better Auth's account lookup as the second argument to `betterAuthSessions
|
|
271
|
+
Pass Better Auth's account lookup as the second argument to the mount's `admittedSessions` to combine provider accounts with its sign-in policy and credential selection. Without a mount, `betterAuthSessions` accepts the same two lookups. Declare `AuthenticatedUserWithProviderAccounts` on account-reading RPCs and merge `authenticatedUserWithProviderAccountsLayer(sessions)` alongside their handlers. This boundary requires a provider whose user has a `providerAccounts` Effect; a provider without the second lookup does not satisfy that type.
|
|
258
272
|
|
|
259
273
|
```ts
|
|
260
274
|
import { SessionUserWithProviderAccounts } from "@shivaedev/identity/identity.ts";
|
|
@@ -264,9 +278,10 @@ import { authenticatedUserWithProviderAccountsLayer } from "@shivaedev/identity/
|
|
|
264
278
|
|
|
265
279
|
const sessions = {
|
|
266
280
|
origin: trustedOrigins({ allow: ["https://app.example"], missing: "reject" }),
|
|
267
|
-
|
|
268
|
-
|
|
269
|
-
(headers) => auth.api.
|
|
281
|
+
...mounted.sessions,
|
|
282
|
+
provider: mounted.admittedSessions(
|
|
283
|
+
(headers) => mounted.auth.api.getSession({ headers }),
|
|
284
|
+
(headers) => mounted.auth.api.listUserAccounts({ headers }),
|
|
270
285
|
),
|
|
271
286
|
};
|
|
272
287
|
|
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { type GetSession } from "#server/adapters/betterAuthSessions.ts";
|
|
1
|
+
import { type GetProviderAccounts, type GetSession, type SessionWithProviderAccounts } from "#server/adapters/betterAuthSessions.ts";
|
|
2
2
|
import type { SessionProvider, SessionShape } from "#server/session.ts";
|
|
3
3
|
import { type BearerSessionsOptions } from "./bearerSessions.ts";
|
|
4
4
|
import { type PolicyStorage, type SignInGate } from "./signInGate.ts";
|
|
@@ -9,6 +9,9 @@ interface SessionStorage extends PolicyStorage {
|
|
|
9
9
|
};
|
|
10
10
|
};
|
|
11
11
|
}
|
|
12
|
-
export declare function admittedSessions<E>(gate: SignInGate<E>, storage: () => Promise<SessionStorage>, bearerSessions?: BearerSessionsOptions):
|
|
12
|
+
export declare function admittedSessions<E>(gate: SignInGate<E>, storage: () => Promise<SessionStorage>, bearerSessions?: BearerSessionsOptions): {
|
|
13
|
+
<TSession extends SessionShape>(getSession: GetSession<TSession>): SessionProvider<TSession>;
|
|
14
|
+
<TSession extends SessionShape>(getSession: GetSession<TSession>, getProviderAccounts: GetProviderAccounts): SessionProvider<SessionWithProviderAccounts<TSession>>;
|
|
15
|
+
};
|
|
13
16
|
export {};
|
|
14
17
|
//# sourceMappingURL=admittedSessions.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admittedSessions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/admittedSessions.ts"],"names":[],"mappings":"AAEA,OAAO,
|
|
1
|
+
{"version":3,"file":"admittedSessions.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/admittedSessions.ts"],"names":[],"mappings":"AAEA,OAAO,EAEN,KAAK,mBAAmB,EACxB,KAAK,UAAU,EACf,KAAK,2BAA2B,EAChC,MAAM,wCAAwC,CAAC;AAEhD,OAAO,KAAK,EAAE,eAAe,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AACxE,OAAO,EAAE,KAAK,qBAAqB,EAAkB,MAAM,qBAAqB,CAAC;AACjF,OAAO,EAAe,KAAK,aAAa,EAAE,KAAK,UAAU,EAAE,MAAM,iBAAiB,CAAC;AAEnF,UAAU,cAAe,SAAQ,aAAa;IAC7C,QAAQ,CAAC,WAAW,EAAE;QAAE,QAAQ,CAAC,YAAY,EAAE;YAAE,QAAQ,CAAC,IAAI,EAAE,MAAM,CAAA;SAAE,CAAA;KAAE,CAAC;CAC3E;AAED,wBAAgB,gBAAgB,CAAC,CAAC,EAAE,IAAI,EAAE,UAAU,CAAC,CAAC,CAAC,EAAE,OAAO,EAAE,MAAM,OAAO,CAAC,cAAc,CAAC,EAAE,cAAc,CAAC,EAAE,qBAAqB;KACvH,QAAQ,SAAS,YAAY,cAAc,UAAU,CAAC,QAAQ,CAAC,GAAG,eAAe,CAAC,QAAQ,CAAC;KAC3F,QAAQ,SAAS,YAAY,cAC/B,UAAU,CAAC,QAAQ,CAAC,uBACX,mBAAmB,GACtC,eAAe,CAAC,2BAA2B,CAAC,QAAQ,CAAC,CAAC;EA0BzD"}
|
|
@@ -1,12 +1,12 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
2
|
import { Headers as HttpHeaders } from "effect/http";
|
|
3
|
-
import { betterAuthSessions } from "#server/adapters/betterAuthSessions.ts";
|
|
3
|
+
import { betterAuthSessions, } from "#server/adapters/betterAuthSessions.ts";
|
|
4
4
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
5
5
|
import { sessionHeaders } from "./bearerSessions.js";
|
|
6
6
|
import { fromStorage } from "./signInGate.js";
|
|
7
7
|
export function admittedSessions(gate, storage, bearerSessions) {
|
|
8
|
-
|
|
9
|
-
const provider = betterAuthSessions(getSession);
|
|
8
|
+
function admit(getSession, getProviderAccounts) {
|
|
9
|
+
const provider = getProviderAccounts === undefined ? betterAuthSessions(getSession) : betterAuthSessions(getSession, getProviderAccounts);
|
|
10
10
|
return {
|
|
11
11
|
get: Effect.fnUntraced(function* (headers) {
|
|
12
12
|
const auth = gate.active || bearerSessions !== undefined ? yield* fromStorage(storage) : undefined;
|
|
@@ -27,6 +27,7 @@ export function admittedSessions(gate, storage, bearerSessions) {
|
|
|
27
27
|
return Option.none();
|
|
28
28
|
}),
|
|
29
29
|
};
|
|
30
|
-
}
|
|
30
|
+
}
|
|
31
|
+
return admit;
|
|
31
32
|
}
|
|
32
33
|
//# sourceMappingURL=admittedSessions.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"admittedSessions.js","sourceRoot":"","sources":["../../../src/server/better-auth/admittedSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,
|
|
1
|
+
{"version":3,"file":"admittedSessions.js","sourceRoot":"","sources":["../../../src/server/better-auth/admittedSessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,OAAO,IAAI,WAAW,EAAE,MAAM,aAAa,CAAC;AACrD,OAAO,EACN,kBAAkB,GAIlB,MAAM,wCAAwC,CAAC;AAChD,OAAO,EAAE,eAAe,EAAE,MAAM,4BAA4B,CAAC;AAE7D,OAAO,EAA8B,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACjF,OAAO,EAAE,WAAW,EAAuC,MAAM,iBAAiB,CAAC;AAMnF,MAAM,UAAU,gBAAgB,CAAI,IAAmB,EAAE,OAAsC,EAAE,cAAsC;IAMtI,SAAS,KAAK,CAAgC,UAAgC,EAAE,mBAAyC;QACxH,MAAM,QAAQ,GAAG,mBAAmB,KAAK,SAAS,CAAC,CAAC,CAAC,kBAAkB,CAAC,UAAU,CAAC,CAAC,CAAC,CAAC,kBAAkB,CAAC,UAAU,EAAE,mBAAmB,CAAC,CAAC;QAC1I,OAAO;YACN,GAAG,EAAE,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,OAAO;gBACxC,MAAM,IAAI,GAAG,IAAI,CAAC,MAAM,IAAI,cAAc,KAAK,SAAS,CAAC,CAAC,CAAC,KAAK,CAAC,CAAC,WAAW,CAAC,OAAO,CAAC,CAAC,CAAC,CAAC,SAAS,CAAC;gBACnG,MAAM,QAAQ,GACb,cAAc,KAAK,SAAS,IAAI,IAAI,KAAK,SAAS;oBACjD,CAAC,CAAC,OAAO;oBACT,CAAC,CAAC,WAAW,CAAC,SAAS,CAAC,cAAc,CAAC,IAAI,OAAO,CAAC,OAAO,CAAC,EAAE,IAAI,CAAC,WAAW,CAAC,YAAY,CAAC,IAAI,CAAC,CAAC,CAAC;gBACpG,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,QAAQ,CAAC,GAAG,CAAC,QAAQ,CAAC,CAAC;gBAC9C,IAAI,CAAC,IAAI,CAAC,MAAM,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,IAAI,KAAK,SAAS,EAAE,CAAC;oBAClE,OAAO,OAAO,CAAC;gBAChB,CAAC;gBACD,MAAM,MAAM,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC;gBACrC,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,IAAI,CAAC,UAAU,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,KAAK,CAAC,eAAe,CAAC,CAAC,CAAC;gBAC1F,IAAI,QAAQ,EAAE,CAAC;oBACd,OAAO,OAAO,CAAC;gBAChB,CAAC;gBACD,KAAK,CAAC,CAAC,WAAW,CAAC,GAAG,EAAE,CAAC,IAAI,CAAC,eAAe,CAAC,kBAAkB,CAAC,MAAM,CAAC,CAAC,CAAC;gBAC1E,KAAK,CAAC,CAAC,MAAM,CAAC,OAAO,CAAC,8CAA8C,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,CAAC,CAAC,CAAC;gBAC5G,OAAO,MAAM,CAAC,IAAI,EAAE,CAAC;YACtB,CAAC,CAAC;SACF,CAAC;IACH,CAAC;IACD,OAAO,KAAK,CAAC;AACd,CAAC"}
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { SqlClient } from "effect/sql";
|
|
3
|
+
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
|
+
import { LastRoleAssigner } from "@shivaedev/access/roles.ts";
|
|
5
|
+
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
6
|
+
export declare const assignRole: <TRole extends string>(access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">, userId: string, role: NoInfer<TRole>) => Effect.Effect<boolean, AuthUnavailable | LastRoleAssigner | NotFound, import("effect/reactivity/Reactivity").Reactivity | SqlClient.SqlClient>;
|
|
7
|
+
//# sourceMappingURL=assignRole.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"assignRole.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAkB,MAAM,QAAQ,CAAC;AAChD,OAAO,EAAE,SAAS,EAAa,MAAM,YAAY,CAAC;AAClD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AACjE,OAAO,EAAe,gBAAgB,EAAE,MAAM,4BAA4B,CAAC;AAC3E,OAAO,EAAE,eAAe,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AAO1E,eAAO,MAAM,UAAU,GAA+C,KAAK,SAAS,MAAM,sPAoCxF,CAAC"}
|
|
@@ -0,0 +1,42 @@
|
|
|
1
|
+
import { Effect, Option, Schema } from "effect";
|
|
2
|
+
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
+
import { AssignRoles, LastRoleAssigner } from "@shivaedev/access/roles.ts";
|
|
4
|
+
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
5
|
+
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
6
|
+
function unavailable() {
|
|
7
|
+
return new AuthUnavailable({ message: "Could not access app users" });
|
|
8
|
+
}
|
|
9
|
+
export const assignRole = Effect.fn("Identity.assignRole")(function* (access, userId, role) {
|
|
10
|
+
const sql = yield* SqlClient.SqlClient;
|
|
11
|
+
return yield* Effect.gen(function* () {
|
|
12
|
+
yield* sql `select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
|
|
13
|
+
const readTarget = SqlSchema.findOneOption({
|
|
14
|
+
execute: (id) => sql `select id, role from "user" where id = ${id} for update`,
|
|
15
|
+
Request: Schema.String,
|
|
16
|
+
Result: Schema.Struct({ id: Schema.String, role: Schema.NullOr(Schema.String) }),
|
|
17
|
+
});
|
|
18
|
+
const target = yield* readTarget(userId).pipe(Effect.mapError(unavailable));
|
|
19
|
+
if (Option.isNone(target)) {
|
|
20
|
+
return yield* Effect.fail(new NotFound({ message: "User not found" }));
|
|
21
|
+
}
|
|
22
|
+
if (target.value.role === role) {
|
|
23
|
+
return false;
|
|
24
|
+
}
|
|
25
|
+
const assigners = access.Role.literals.filter((candidate) => access.hasPermission(candidate, AssignRoles));
|
|
26
|
+
if (assigners.some((candidate) => candidate === target.value.role) && !access.hasPermission(role, AssignRoles)) {
|
|
27
|
+
const readHolders = SqlSchema.findAll({
|
|
28
|
+
execute: () => sql `select id from "user" where role in ${sql.in(assigners)}`,
|
|
29
|
+
Request: Schema.Void,
|
|
30
|
+
Result: Schema.Struct({ id: Schema.String }),
|
|
31
|
+
});
|
|
32
|
+
const holders = yield* readHolders(undefined).pipe(Effect.mapError(unavailable));
|
|
33
|
+
if (holders.length === 1) {
|
|
34
|
+
return yield* Effect.fail(new LastRoleAssigner({ userId }));
|
|
35
|
+
}
|
|
36
|
+
}
|
|
37
|
+
yield* sql `update "user" set role = ${role}, "updatedAt" = now() where id = ${userId}`;
|
|
38
|
+
yield* invalidateOnCommit(["admin.users"]);
|
|
39
|
+
return true;
|
|
40
|
+
}).pipe(transact({ onSqlError: unavailable }));
|
|
41
|
+
});
|
|
42
|
+
//# sourceMappingURL=assignRole.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"assignRole.js","sourceRoot":"","sources":["../../../src/server/better-auth/assignRole.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"closeRoleEndpoints.d.ts","sourceRoot":"","sources":["../../../src/server/better-auth/closeRoleEndpoints.ts"],"names":[],"mappings":"AAAA,OAAO,KAAK,EAAE,iBAAiB,EAAE,MAAM,aAAa,CAAC;AAGrD,wBAAgB,kBAAkB,CAAC,QAAQ,SAAS,iBAAiB,EAAE,OAAO,EAAE,QAAQ,GAAG,QAAQ,CAMlG"}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { admin } from "better-auth/plugins/admin";
|
|
2
|
+
export function closeRoleEndpoints(options) {
|
|
3
|
+
return {
|
|
4
|
+
...options,
|
|
5
|
+
disabledPaths: [...(options.disabledPaths ?? []), "/admin/set-role", "/admin/update-user", "/admin/create-user"],
|
|
6
|
+
plugins: options.plugins?.map((plugin) => (plugin.id === "admin" ? admin({ ...plugin.options, adminRoles: [] }) : plugin)),
|
|
7
|
+
};
|
|
8
|
+
}
|
|
9
|
+
//# sourceMappingURL=closeRoleEndpoints.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"closeRoleEndpoints.js","sourceRoot":"","sources":["../../../src/server/better-auth/closeRoleEndpoints.ts"],"names":[],"mappings":"AACA,OAAO,EAAE,KAAK,EAAE,MAAM,2BAA2B,CAAC;AAElD,MAAM,UAAU,kBAAkB,CAAqC,OAAiB;IACvF,OAAO;QACN,GAAG,OAAO;QACV,aAAa,EAAE,CAAC,GAAG,CAAC,OAAO,CAAC,aAAa,IAAI,EAAE,CAAC,EAAE,iBAAiB,EAAE,oBAAoB,EAAE,oBAAoB,CAAC;QAChH,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC,MAAM,EAAE,EAAE,CAAC,CAAC,MAAM,CAAC,EAAE,KAAK,OAAO,CAAC,CAAC,CAAC,KAAK,CAAC,EAAE,GAAG,MAAM,CAAC,OAAO,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,CAAC,CAAC,MAAM,CAAC,CAAC;KAC1H,CAAC;AACH,CAAC"}
|
|
@@ -10,7 +10,10 @@ export interface BetterAuthMountOptions<E = never, R = never> {
|
|
|
10
10
|
readonly signIn?: SignInPolicy<E, R> | undefined;
|
|
11
11
|
}
|
|
12
12
|
export declare const betterAuthMount: <const TOptions extends BetterAuthOptions, E = never, R = never>(options: TOptions, mount?: BetterAuthMountOptions<E, R> | undefined) => Effect.Effect<{
|
|
13
|
-
admittedSessions:
|
|
13
|
+
admittedSessions: {
|
|
14
|
+
<TSession extends import("../session.ts").SessionShape>(getSession: import("../adapters/betterAuthSessions.ts").GetSession<TSession>): import("../session.ts").SessionProvider<TSession>;
|
|
15
|
+
<TSession extends import("../session.ts").SessionShape>(getSession: import("../adapters/betterAuthSessions.ts").GetSession<TSession>, getProviderAccounts: import("../adapters/betterAuthSessions.ts").GetProviderAccounts): import("../session.ts").SessionProvider<import("../adapters/betterAuthSessions.ts").SessionWithProviderAccounts<TSession>>;
|
|
16
|
+
};
|
|
14
17
|
auth: import("better-auth").Auth<TOptions & {
|
|
15
18
|
advanced: {
|
|
16
19
|
disableCSRFCheck?: boolean | undefined;
|
|
@@ -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,EAAU,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAmB,KAAK,UAAU,EAAE,MAAM,IAAI,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAAsB,MAAM,uCAAuC,CAAC;AAKvG,OAAO,EAAsB,KAAK,YAAY,EAAc,MAAM,mCAAmC,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,EAAU,QAAQ,EAAE,MAAM,QAAQ,CAAC;AAC1D,OAAO,EAAE,IAAI,EAAmB,KAAK,UAAU,EAAE,MAAM,IAAI,CAAC;AAC5D,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,KAAK,qBAAqB,EAAsB,MAAM,uCAAuC,CAAC;AAKvG,OAAO,EAAsB,KAAK,YAAY,EAAc,MAAM,mCAAmC,CAAC;AAMtG,MAAM,WAAW,sBAAsB,CAAC,CAAC,GAAG,KAAK,EAAE,CAAC,GAAG,KAAK;IAC3D,QAAQ,CAAC,cAAc,CAAC,EAAE,qBAAqB,GAAG,SAAS,CAAC;IAC5D,QAAQ,CAAC,KAAK,CAAC,EAAE,OAAO,CAAC;IACzB,QAAQ,CAAC,MAAM,CAAC,EAAE,YAAY,CAAC,CAAC,EAAE,CAAC,CAAC,GAAG,SAAS,CAAC;CACjD;AAED,eAAO,MAAM,eAAe,SAA0D,QAAQ,SAAS,iBAAiB,EAAE,CAAC,UAAU,CAAC;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;wDA8DpI,CAAC;AAEH,eAAO,MAAM,YAAY,kKAgCvB,CAAC"}
|
|
@@ -9,6 +9,7 @@ import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
|
|
|
9
9
|
import { signInGate } from "#server/better-auth/signInGate.ts";
|
|
10
10
|
import { signInPolicyOptions } from "#server/better-auth/signInPolicy.ts";
|
|
11
11
|
import { admittedSessions } from "./admittedSessions.js";
|
|
12
|
+
import { closeRoleEndpoints } from "./closeRoleEndpoints.js";
|
|
12
13
|
import { mountedSessions } from "./mountedSessions.js";
|
|
13
14
|
export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (options, mount = {}) {
|
|
14
15
|
const secret = options.secret ?? Redacted.value(yield* Config.Redacted("BETTER_AUTH_SECRET"));
|
|
@@ -27,8 +28,9 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* (
|
|
|
27
28
|
const gated = signInPolicyOptions(options, gate, run, () => auth.$context);
|
|
28
29
|
const rateLimit = options.rateLimit;
|
|
29
30
|
const customStorage = rateLimit?.customStorage ?? (rateLimit?.storage === undefined || rateLimit.storage === "memory" ? yield* memoryRateLimit : undefined);
|
|
31
|
+
const configured = mount.roles === undefined ? options : closeRoleEndpoints(options);
|
|
30
32
|
const auth = betterAuth({
|
|
31
|
-
...withBearerSessions(
|
|
33
|
+
...withBearerSessions(configured, mount.bearerSessions !== undefined),
|
|
32
34
|
advanced: {
|
|
33
35
|
useSecureCookies: Option.isSome(publicUrl) && publicUrl.value.protocol === "https:",
|
|
34
36
|
...options.advanced,
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"mount.js","sourceRoot":"","sources":["../../../src/server/better-auth/mount.ts"],"names":[],"mappings":"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"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/identity",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.9.0",
|
|
4
4
|
"description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -44,18 +44,21 @@
|
|
|
44
44
|
"README.md"
|
|
45
45
|
],
|
|
46
46
|
"dependencies": {
|
|
47
|
-
"@shivaedev/access": "0.
|
|
48
|
-
"@shivaedev/changes": "0.
|
|
49
|
-
"@shivaedev/contract": "0.
|
|
47
|
+
"@shivaedev/access": "0.3.0",
|
|
48
|
+
"@shivaedev/changes": "0.6.0",
|
|
49
|
+
"@shivaedev/contract": "0.24.1",
|
|
50
50
|
"@shivaedev/errors": "0.1.2",
|
|
51
|
-
"@shivaedev/sql": "0.
|
|
51
|
+
"@shivaedev/sql": "0.27.0"
|
|
52
52
|
},
|
|
53
53
|
"devDependencies": {
|
|
54
54
|
"@effect/platform-node": "4.0.6",
|
|
55
55
|
"@effect/sql-pg": "4.0.6",
|
|
56
|
-
"@shivaedev/
|
|
57
|
-
"@shivaedev/
|
|
58
|
-
"@shivaedev/
|
|
56
|
+
"@shivaedev/admin": "0.12.0",
|
|
57
|
+
"@shivaedev/quality": "0.48.0",
|
|
58
|
+
"@shivaedev/server": "0.9.1",
|
|
59
|
+
"@shivaedev/test": "0.12.0",
|
|
60
|
+
"@shivaedev/test-sql": "0.15.0",
|
|
61
|
+
"@shivaedev/test-story": "0.26.2",
|
|
59
62
|
"@types/node": "24.19.2",
|
|
60
63
|
"@types/pg": "8.20.0",
|
|
61
64
|
"better-auth": "1.7.12",
|
|
@@ -1,6 +1,11 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
2
|
import { Headers as HttpHeaders } from "effect/http";
|
|
3
|
-
import {
|
|
3
|
+
import {
|
|
4
|
+
betterAuthSessions,
|
|
5
|
+
type GetProviderAccounts,
|
|
6
|
+
type GetSession,
|
|
7
|
+
type SessionWithProviderAccounts,
|
|
8
|
+
} from "#server/adapters/betterAuthSessions.ts";
|
|
4
9
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
5
10
|
import type { SessionProvider, SessionShape } from "#server/session.ts";
|
|
6
11
|
import { type BearerSessionsOptions, sessionHeaders } from "./bearerSessions.ts";
|
|
@@ -11,8 +16,13 @@ interface SessionStorage extends PolicyStorage {
|
|
|
11
16
|
}
|
|
12
17
|
|
|
13
18
|
export function admittedSessions<E>(gate: SignInGate<E>, storage: () => Promise<SessionStorage>, bearerSessions?: BearerSessionsOptions) {
|
|
14
|
-
|
|
15
|
-
|
|
19
|
+
function admit<TSession extends SessionShape>(getSession: GetSession<TSession>): SessionProvider<TSession>;
|
|
20
|
+
function admit<TSession extends SessionShape>(
|
|
21
|
+
getSession: GetSession<TSession>,
|
|
22
|
+
getProviderAccounts: GetProviderAccounts,
|
|
23
|
+
): SessionProvider<SessionWithProviderAccounts<TSession>>;
|
|
24
|
+
function admit<TSession extends SessionShape>(getSession: GetSession<TSession>, getProviderAccounts?: GetProviderAccounts) {
|
|
25
|
+
const provider = getProviderAccounts === undefined ? betterAuthSessions(getSession) : betterAuthSessions(getSession, getProviderAccounts);
|
|
16
26
|
return {
|
|
17
27
|
get: Effect.fnUntraced(function* (headers) {
|
|
18
28
|
const auth = gate.active || bearerSessions !== undefined ? yield* fromStorage(storage) : undefined;
|
|
@@ -34,5 +44,6 @@ export function admittedSessions<E>(gate: SignInGate<E>, storage: () => Promise<
|
|
|
34
44
|
return Option.none();
|
|
35
45
|
}),
|
|
36
46
|
};
|
|
37
|
-
}
|
|
47
|
+
}
|
|
48
|
+
return admit;
|
|
38
49
|
}
|
|
@@ -0,0 +1,48 @@
|
|
|
1
|
+
import { Effect, Option, Schema } from "effect";
|
|
2
|
+
import { SqlClient, SqlSchema } from "effect/sql";
|
|
3
|
+
import type { AccessPolicy } from "@shivaedev/access/roleSet.ts";
|
|
4
|
+
import { AssignRoles, LastRoleAssigner } from "@shivaedev/access/roles.ts";
|
|
5
|
+
import { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
6
|
+
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
7
|
+
|
|
8
|
+
function unavailable() {
|
|
9
|
+
return new AuthUnavailable({ message: "Could not access app users" });
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole extends string>(
|
|
13
|
+
access: Pick<AccessPolicy<TRole>, "Role" | "hasPermission">,
|
|
14
|
+
userId: string,
|
|
15
|
+
role: NoInfer<TRole>,
|
|
16
|
+
) {
|
|
17
|
+
const sql = yield* SqlClient.SqlClient;
|
|
18
|
+
return yield* Effect.gen(function* () {
|
|
19
|
+
yield* sql`select pg_advisory_xact_lock(hashtext('platform.auth.user-roles'))`;
|
|
20
|
+
const readTarget = SqlSchema.findOneOption({
|
|
21
|
+
execute: (id) => sql`select id, role from "user" where id = ${id} for update`,
|
|
22
|
+
Request: Schema.String,
|
|
23
|
+
Result: Schema.Struct({ id: Schema.String, role: Schema.NullOr(Schema.String) }),
|
|
24
|
+
});
|
|
25
|
+
const target = yield* readTarget(userId).pipe(Effect.mapError(unavailable));
|
|
26
|
+
if (Option.isNone(target)) {
|
|
27
|
+
return yield* Effect.fail(new NotFound({ message: "User not found" }));
|
|
28
|
+
}
|
|
29
|
+
if (target.value.role === role) {
|
|
30
|
+
return false;
|
|
31
|
+
}
|
|
32
|
+
const assigners = access.Role.literals.filter((candidate) => access.hasPermission(candidate, AssignRoles));
|
|
33
|
+
if (assigners.some((candidate) => candidate === target.value.role) && !access.hasPermission(role, AssignRoles)) {
|
|
34
|
+
const readHolders = SqlSchema.findAll({
|
|
35
|
+
execute: () => sql`select id from "user" where role in ${sql.in(assigners)}`,
|
|
36
|
+
Request: Schema.Void,
|
|
37
|
+
Result: Schema.Struct({ id: Schema.String }),
|
|
38
|
+
});
|
|
39
|
+
const holders = yield* readHolders(undefined).pipe(Effect.mapError(unavailable));
|
|
40
|
+
if (holders.length === 1) {
|
|
41
|
+
return yield* Effect.fail(new LastRoleAssigner({ userId }));
|
|
42
|
+
}
|
|
43
|
+
}
|
|
44
|
+
yield* sql`update "user" set role = ${role}, "updatedAt" = now() where id = ${userId}`;
|
|
45
|
+
yield* invalidateOnCommit(["admin.users"]);
|
|
46
|
+
return true;
|
|
47
|
+
}).pipe(transact({ onSqlError: unavailable }));
|
|
48
|
+
});
|
|
@@ -0,0 +1,10 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import { admin } from "better-auth/plugins/admin";
|
|
3
|
+
|
|
4
|
+
export function closeRoleEndpoints<TOptions extends BetterAuthOptions>(options: TOptions): TOptions {
|
|
5
|
+
return {
|
|
6
|
+
...options,
|
|
7
|
+
disabledPaths: [...(options.disabledPaths ?? []), "/admin/set-role", "/admin/update-user", "/admin/create-user"],
|
|
8
|
+
plugins: options.plugins?.map((plugin) => (plugin.id === "admin" ? admin({ ...plugin.options, adminRoles: [] }) : plugin)),
|
|
9
|
+
};
|
|
10
|
+
}
|
|
@@ -10,6 +10,7 @@ import { revokeUnadmitted } from "#server/better-auth/revokeUnadmitted.ts";
|
|
|
10
10
|
import { type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/signInGate.ts";
|
|
11
11
|
import { signInPolicyOptions } from "#server/better-auth/signInPolicy.ts";
|
|
12
12
|
import { admittedSessions } from "./admittedSessions.ts";
|
|
13
|
+
import { closeRoleEndpoints } from "./closeRoleEndpoints.ts";
|
|
13
14
|
import { mountedSessions } from "./mountedSessions.ts";
|
|
14
15
|
|
|
15
16
|
export interface BetterAuthMountOptions<E = never, R = never> {
|
|
@@ -39,8 +40,9 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
|
|
|
39
40
|
const rateLimit = options.rateLimit;
|
|
40
41
|
const customStorage =
|
|
41
42
|
rateLimit?.customStorage ?? (rateLimit?.storage === undefined || rateLimit.storage === "memory" ? yield* memoryRateLimit : undefined);
|
|
43
|
+
const configured = mount.roles === undefined ? options : closeRoleEndpoints(options);
|
|
42
44
|
const auth = betterAuth({
|
|
43
|
-
...withBearerSessions(
|
|
45
|
+
...withBearerSessions(configured, mount.bearerSessions !== undefined),
|
|
44
46
|
advanced: {
|
|
45
47
|
useSecureCookies: Option.isSome(publicUrl) && publicUrl.value.protocol === "https:",
|
|
46
48
|
...options.advanced,
|