@shivaedev/identity 0.35.0 → 0.36.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 +19 -0
- package/README.md +32 -8
- package/dist/client/SessionMemory.d.ts.map +1 -1
- package/dist/client/SessionMemory.js +7 -0
- package/dist/client/SessionMemory.js.map +1 -1
- package/dist/server/account-preferences/Rows.d.ts +34 -1
- package/dist/server/account-preferences/Rows.d.ts.map +1 -1
- package/dist/server/adapters/betterAuthSessions.d.ts +1 -1
- package/dist/server/adapters/betterAuthSessions.d.ts.map +1 -1
- package/dist/server/adapters/betterAuthSessions.js +2 -2
- package/dist/server/adapters/betterAuthSessions.js.map +1 -1
- package/dist/server/adapters/currentSessionContext.d.ts +2 -2
- package/dist/server/adapters/currentSessionContext.d.ts.map +1 -1
- package/dist/server/adapters/currentSessionContext.js +2 -2
- package/dist/server/adapters/currentSessionContext.js.map +1 -1
- package/dist/server/better-auth/adapters/mount.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/mount.js +3 -1
- package/dist/server/better-auth/adapters/mount.js.map +1 -1
- package/dist/server/better-auth/assignRole.js +1 -1
- package/dist/server/better-auth/assignRole.js.map +1 -1
- package/dist/server/better-auth/changeHooks.d.ts +3 -0
- package/dist/server/better-auth/changeHooks.d.ts.map +1 -0
- package/dist/server/better-auth/changeHooks.js +36 -0
- package/dist/server/better-auth/changeHooks.js.map +1 -0
- package/dist/server/better-auth/sessionAdministration.js +1 -1
- package/dist/server/better-auth/sessionAdministration.js.map +1 -1
- package/dist/server/better-auth/sweepExpiredSessions.d.ts.map +1 -1
- package/dist/server/better-auth/sweepExpiredSessions.js +17 -6
- package/dist/server/better-auth/sweepExpiredSessions.js.map +1 -1
- package/dist/server/better-auth/testDatabase.d.ts +1 -0
- package/dist/server/better-auth/testDatabase.d.ts.map +1 -1
- package/dist/server/better-auth/testDatabase.js +1 -0
- package/dist/server/better-auth/testDatabase.js.map +1 -1
- package/dist/server/better-auth/userDirectoryReads.js +1 -1
- package/dist/server/better-auth/userDirectoryReads.js.map +1 -1
- package/dist/server/lookupSession.d.ts.map +1 -1
- package/dist/server/lookupSession.js +3 -1
- package/dist/server/lookupSession.js.map +1 -1
- package/dist/server/resolveRole.js +1 -1
- package/dist/server/resolveRole.js.map +1 -1
- package/dist/server/session.d.ts +2 -2
- package/dist/server/session.d.ts.map +1 -1
- package/dist/server/session.js +4 -4
- package/dist/server/session.js.map +1 -1
- package/dist/server/subjectResolverLayer.js +3 -3
- package/dist/server/subjectResolverLayer.js.map +1 -1
- package/package.json +13 -13
- package/src/client/SessionMemory.ts +7 -0
- package/src/server/adapters/betterAuthSessions.ts +3 -2
- package/src/server/adapters/currentSessionContext.ts +3 -2
- package/src/server/better-auth/adapters/mount.ts +3 -1
- package/src/server/better-auth/assignRole.ts +1 -1
- package/src/server/better-auth/changeHooks.ts +49 -0
- package/src/server/better-auth/sessionAdministration.ts +1 -1
- package/src/server/better-auth/sweepExpiredSessions.ts +17 -6
- package/src/server/better-auth/testDatabase.ts +1 -0
- package/src/server/better-auth/userDirectoryReads.ts +1 -1
- package/src/server/lookupSession.ts +5 -1
- package/src/server/resolveRole.ts +1 -1
- package/src/server/session.ts +5 -4
- package/src/server/subjectResolverLayer.ts +3 -3
|
@@ -18,6 +18,7 @@ export const authTestDatabase = Effect.gen(function* () {
|
|
|
18
18
|
Result: StoredSession,
|
|
19
19
|
});
|
|
20
20
|
return {
|
|
21
|
+
deleteSessions: sql `delete from "session"`.pipe(Effect.asVoid),
|
|
21
22
|
expireSessions: (userId) => Effect.gen(function* () {
|
|
22
23
|
const expiredAt = DateTime.toDateUtc(DateTime.subtract(yield* DateTime.now, { seconds: 1 }));
|
|
23
24
|
yield* sql `update "session" set "expiresAt" = ${expiredAt} ${userId === undefined ? sql.literal("") : sql `where "userId" = ${userId}`}`;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"testDatabase.js","sourceRoot":"","sources":["../../../src/server/better-auth/testDatabase.ts"],"names":[],"mappings":"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"}
|
|
1
|
+
{"version":3,"file":"testDatabase.js","sourceRoot":"","sources":["../../../src/server/better-auth/testDatabase.ts"],"names":[],"mappings":"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"}
|
|
@@ -43,7 +43,7 @@ export const userDirectoryReads = Effect.fnUntraced(function* (access, options)
|
|
|
43
43
|
names: (ids) => (ids.length === 0 ? Effect.succeed([]) : readNames(ids).pipe(Effect.mapError(unavailable))),
|
|
44
44
|
role: Effect.fn("UserDirectory.role")(function* (id) {
|
|
45
45
|
const found = yield* readRole(id).pipe(Effect.mapError(unavailable));
|
|
46
|
-
return Option.isSome(found) ? found.value.role : yield* new NotFound({ message: "
|
|
46
|
+
return Option.isSome(found) ? found.value.role : yield* new NotFound({ message: "This user no longer exists." });
|
|
47
47
|
}),
|
|
48
48
|
};
|
|
49
49
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"userDirectoryReads.js","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectoryReads.ts"],"names":[],"mappings":"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
|
|
1
|
+
{"version":3,"file":"userDirectoryReads.js","sourceRoot":"","sources":["../../../src/server/better-auth/userDirectoryReads.ts"],"names":[],"mappings":"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"}
|
|
@@ -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,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,eAAO,MAAM,cAAc,+
|
|
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,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,oBAAoB,CAAC;AAEvD,eAAO,MAAM,cAAc,+HAWzB,CAAC;AAEH,eAAO,MAAM,aAAa,GAAgC,QAAQ,SAAS,YAAY,6HAQrF,CAAC;AAEH,eAAO,MAAM,aAAa,wLAGxB,CAAC"}
|
|
@@ -7,7 +7,9 @@ export const sessionRequest = Effect.fnUntraced(function* (headers, rpc) {
|
|
|
7
7
|
const policy = yield* SessionPolicy;
|
|
8
8
|
const request = yield* transportOriginRequest(headers, rpc);
|
|
9
9
|
if (!policy.origin(request)) {
|
|
10
|
-
|
|
10
|
+
const refused = Option.match(request.origin, { onNone: () => "a request without an Origin header", onSome: (origin) => `origin ${origin}` });
|
|
11
|
+
yield* Effect.logWarning(`The session policy refused ${refused} calling ${rpc}. Add the origin to the policy's trusted origins if the application is served from it.`);
|
|
12
|
+
return yield* new Forbidden({ message: "Open this application from its own address to continue." });
|
|
11
13
|
}
|
|
12
14
|
return request;
|
|
13
15
|
});
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"lookupSession.js","sourceRoot":"","sources":["../../src/server/lookupSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,OAAwB,EAAE,GAAW;IAC/F,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACpC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,OAAO,KAAK,CAAC,CAAC,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"lookupSession.js","sourceRoot":"","sources":["../../src/server/lookupSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,SAAS,EAAE,MAAM,+BAA+B,CAAC;AAC1D,OAAO,EAAE,sBAAsB,EAAE,MAAM,mBAAmB,CAAC;AAC3D,OAAO,EAAE,WAAW,EAAE,MAAM,wBAAwB,CAAC;AACrD,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAGzD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,OAAwB,EAAE,GAAW;IAC/F,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACpC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,sBAAsB,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IAC5D,IAAI,CAAC,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;QAC7B,MAAM,OAAO,GAAG,MAAM,CAAC,KAAK,CAAC,OAAO,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,oCAAoC,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,UAAU,MAAM,EAAE,EAAE,CAAC,CAAC;QAC7I,KAAK,CAAC,CAAC,MAAM,CAAC,UAAU,CACvB,8BAA8B,OAAO,YAAY,GAAG,wFAAwF,CAC5I,CAAC;QACF,OAAO,KAAK,CAAC,CAAC,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,yDAAyD,EAAE,CAAC,CAAC;IACrG,CAAC;IACD,OAAO,OAAO,CAAC;AAChB,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAiC,OAAgC;IACxH,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACpC,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,MAAM,CAAC,KAAK,KAAK,SAAS,EAAE,CAAC;QAC1D,OAAO,OAAO,CAAC;IAChB,CAAC;IACD,MAAM,IAAI,GAAY,OAAO,CAAC,GAAG,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,MAAM,CAAC,CAAC;IAC9D,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,WAAW,CAAC,MAAM,CAAC,KAAK,EAAE,IAAI,CAAC,CAAC;IACtD,OAAO,MAAM,CAAC,IAAI,CAAC,EAAE,GAAG,OAAO,CAAC,KAAK,EAAE,IAAI,EAAE,EAAE,GAAG,OAAO,CAAC,KAAK,CAAC,IAAI,EAAE,GAAG,MAAM,EAAE,EAAE,CAAC,CAAC;AACtF,CAAC,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,OAAwB;IACjF,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,aAAa,CAAC;IACpC,OAAO,KAAK,CAAC,CAAC,aAAa,CAAC,KAAK,CAAC,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,CAAC,CAAC;AAClE,CAAC,CAAC,CAAC"}
|
|
@@ -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. Generate and apply an auth migration with defaultRole, then use assignRole for administrators."), Effect.fail(new Forbidden({ message: "
|
|
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: "Your account has no role yet. Ask an administrator to assign one." })));
|
|
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,CAChB,6HAA6H,CAC7H,EACD,MAAM,CAAC,IAAI,CAAC,IAAI,SAAS,CAAC,EAAE,OAAO,EAAE,
|
|
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,mEAAmE,EAAE,CAAC,CAAC,CAC5G,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/server/session.d.ts
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Effect, Layer, Option } from "effect";
|
|
2
2
|
import type { Headers } from "effect/http";
|
|
3
|
-
import {
|
|
3
|
+
import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
4
4
|
import { Identity, SessionUser, type SessionUserValue, type SessionUserWithProviderAccountsValue } from "#identity.ts";
|
|
5
5
|
import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#middleware.ts";
|
|
6
6
|
import { SessionPolicy } from "#server/SessionPolicy.ts";
|
|
@@ -18,7 +18,7 @@ export declare function maybeAuthenticatedLayer(): Layer.Layer<MaybeAuthenticate
|
|
|
18
18
|
export interface UserSessionShape extends SessionShape {
|
|
19
19
|
readonly user: SessionUserValue;
|
|
20
20
|
}
|
|
21
|
-
export declare function withSessionUser(headers: Headers.Headers, operation: string): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E | AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden | Unauthorized, SessionPolicy | Exclude<Exclude<Exclude<R, Identity>, never>, SessionUser>>;
|
|
21
|
+
export declare function withSessionUser(headers: Headers.Headers, operation: string): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E | AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden | import("@shivaedev/errors/taxonomy.ts").Unauthorized, SessionPolicy | Exclude<Exclude<Exclude<R, Identity>, never>, SessionUser>>;
|
|
22
22
|
export declare function authenticatedUserLayer(): Layer.Layer<AuthenticatedUser, never, SessionPolicy>;
|
|
23
23
|
export interface ProviderAccountsSessionShape extends UserSessionShape {
|
|
24
24
|
readonly user: SessionUserWithProviderAccountsValue;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;
|
|
1
|
+
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAU,MAAM,QAAQ,CAAC;AACvD,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAG3C,OAAO,KAAK,EAAE,eAAe,EAAE,MAAM,+BAA+B,CAAC;AACrE,OAAO,EACN,QAAQ,EAER,WAAW,EAEX,KAAK,gBAAgB,EAErB,KAAK,oCAAoC,EACzC,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,qCAAqC,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAK7H,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AACzD,MAAM,WAAW,YAAY;IAC5B,QAAQ,CAAC,IAAI,EAAE;QACd,QAAQ,CAAC,EAAE,EAAE,MAAM,CAAC;KACpB,CAAC;CACF;AACD,MAAM,WAAW,eAAe,CAAC,QAAQ,SAAS,YAAY;IAC7D,QAAQ,CAAC,GAAG,EAAE,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,KAAK,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,CAAC,CAAC;CACpG;AACD,eAAO,MAAM,cAAc,qMAGzB,CAAC;AAIH,wBAAgB,kBAAkB,qDAsBjC;AACD,wBAAgB,uBAAuB,0DAuBtC;AACD,MAAM,WAAW,gBAAiB,SAAQ,YAAY;IACrD,QAAQ,CAAC,IAAI,EAAE,gBAAgB,CAAC;CAChC;AACD,wBAAgB,eAAe,CAAC,OAAO,EAAE,OAAO,CAAC,OAAO,EAAE,SAAS,EAAE,MAAM,IAClE,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,kOAe/C;AACD,wBAAgB,sBAAsB,yDAcrC;AAED,MAAM,WAAW,4BAA6B,SAAQ,gBAAgB;IACrE,QAAQ,CAAC,IAAI,EAAE,oCAAoC,CAAC;CACpD;AACD,wBAAgB,0CAA0C,6EA0BzD"}
|
package/dist/server/session.js
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
import { Effect, Layer, Option, Schema } from "effect";
|
|
2
|
+
import { unauthorized } from "@shivaedev/access/refusal.ts";
|
|
2
3
|
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
3
|
-
import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
4
4
|
import { Identity, OptionalIdentity, SessionUser, SessionUserSchema, SessionUserWithProviderAccounts, } from "#identity.ts";
|
|
5
5
|
import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#middleware.ts";
|
|
6
6
|
import { lookupSession, sessionRequest } from "#server/lookupSession.ts";
|
|
@@ -19,7 +19,7 @@ export function authenticatedLayer() {
|
|
|
19
19
|
return Layer.effect(Authenticated, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc }) => Effect.gen(function* () {
|
|
20
20
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
21
21
|
if (Option.isNone(session)) {
|
|
22
|
-
return yield*
|
|
22
|
+
return yield* unauthorized();
|
|
23
23
|
}
|
|
24
24
|
const id = yield* identified(session.value.user.id);
|
|
25
25
|
return yield* effect.pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)), Effect.provideService(Identity, { id }), Effect.provideService(CurrentViewer, Option.some({ id })), Effect.annotateLogs({ userId: id }));
|
|
@@ -40,7 +40,7 @@ export function withSessionUser(headers, operation) {
|
|
|
40
40
|
return (effect) => Effect.gen(function* () {
|
|
41
41
|
const session = yield* resolveSession(headers, operation);
|
|
42
42
|
if (Option.isNone(session)) {
|
|
43
|
-
return yield*
|
|
43
|
+
return yield* unauthorized();
|
|
44
44
|
}
|
|
45
45
|
const user = Schema.decodeUnknownSync(SessionUserSchema)(session.value.user);
|
|
46
46
|
const id = yield* identified(session.value.user.id);
|
|
@@ -54,7 +54,7 @@ export function authenticatedUserWithProviderAccountsLayer() {
|
|
|
54
54
|
return Layer.effect(AuthenticatedUserWithProviderAccounts, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc }) => Effect.gen(function* () {
|
|
55
55
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
56
56
|
if (Option.isNone(session)) {
|
|
57
|
-
return yield*
|
|
57
|
+
return yield* unauthorized();
|
|
58
58
|
}
|
|
59
59
|
const { providerAccounts, ...user } = yield* providerAccountsUser(session.value.user);
|
|
60
60
|
const { id } = user;
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEvD,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAEvD,OAAO,EAAE,YAAY,EAAE,MAAM,8BAA8B,CAAC;AAC5D,OAAO,EAAE,aAAa,EAAE,MAAM,mCAAmC,CAAC;AAElE,OAAO,EACN,QAAQ,EACR,gBAAgB,EAChB,WAAW,EACX,iBAAiB,EAEjB,+BAA+B,GAE/B,MAAM,cAAc,CAAC;AACtB,OAAO,EAAE,aAAa,EAAE,iBAAiB,EAAE,qCAAqC,EAAE,kBAAkB,EAAE,MAAM,gBAAgB,CAAC;AAC7H,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,0BAA0B,CAAC;AACzE,OAAO,EAAE,oBAAoB,EAAE,MAAM,iCAAiC,CAAC;AACvE,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,gBAAgB,EAAE,MAAM,6BAA6B,CAAC;AAC/D,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AASzD,MAAM,CAAC,MAAM,cAAc,GAAG,MAAM,CAAC,EAAE,CAAC,yBAAyB,CAAC,CAAC,QAAQ,CAAC,EAAE,OAAwB,EAAE,GAAW;IAClH,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACpD,OAAO,KAAK,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC;AAC9C,CAAC,CAAC,CAAC;AACH,SAAS,UAAU,CAAC,EAAU;IAC7B,OAAO,MAAM,CAAC,OAAO,CAAC,MAAM,CAAC,mBAAmB,CAAC,SAAS,EAAE,EAAE,CAAC,EAAE,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC,CAAC,CAAC;AACtF,CAAC;AACD,MAAM,UAAU,kBAAkB;IACjC,OAAO,KAAK,CAAC,MAAM,CAClB,aAAa,EACb,MAAM,CAAC,GAAG,CACT,aAAa,EACb,CAAC,MAAM,EAAE,EAAE,CACV,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,CAC5B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC,CAAC,YAAY,EAAE,CAAC;QAC9B,CAAC;QACD,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACxB,gBAAgB,CAAC,GAAG,EAAE,EAAE,EAAE,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,EAC5D,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EACvC,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EACzD,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CACnC,CAAC;IACH,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CACvD,CACD,CAAC;AACH,CAAC;AACD,MAAM,UAAU,uBAAuB;IACtC,OAAO,KAAK,CAAC,MAAM,CAClB,kBAAkB,EAClB,MAAM,CAAC,GAAG,CACT,aAAa,EACb,CAAC,MAAM,EAAE,EAAE,CACV,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,CAC5B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,MAAM,UAAU,GAAG,MAAM,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC,CAAC;YACpF,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,cAAc,CAAC,UAAU,EAAE,gBAAgB,EAAE,MAAM,CAAC,IAAI,EAAE,CAAC,CAAC;QAClF,CAAC;QACD,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACxB,gBAAgB,CAAC,GAAG,EAAE,EAAE,EAAE,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,EAC5D,MAAM,CAAC,cAAc,CAAC,gBAAgB,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EAC5D,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EACzD,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CACnC,CAAC;IACH,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CACvD,CACD,CAAC;AACH,CAAC;AAID,MAAM,UAAU,eAAe,CAAC,OAAwB,EAAE,SAAiB;IAC1E,OAAO,CAAU,MAA8B,EAAE,EAAE,CAClD,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,SAAS,CAAC,CAAC;QAC1D,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC,CAAC,YAAY,EAAE,CAAC;QAC9B,CAAC;QACD,MAAM,IAAI,GAAG,MAAM,CAAC,iBAAiB,CAAC,iBAAiB,CAAC,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QAC7E,MAAM,EAAE,GAAG,KAAK,CAAC,CAAC,UAAU,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,CAAC,CAAC;QACpD,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACxB,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EACvC,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EACzD,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,EACxC,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CACnC,CAAC;IACH,CAAC,CAAC,CAAC;AACL,CAAC;AACD,MAAM,UAAU,sBAAsB;IACrC,OAAO,KAAK,CAAC,MAAM,CAClB,iBAAiB,EACjB,MAAM,CAAC,GAAG,CACT,aAAa,EACb,CAAC,MAAM,EAAE,EAAE,CACV,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,CAC5B,MAAM,CAAC,IAAI,CACV,CAAC,UAAU,EAAE,EAAE,CAAC,MAAM,CAAC,OAAO,CAAC,QAAQ,EAAE,CAAC,EAAE,EAAE,EAAE,EAAE,EAAE,CAAC,UAAU,CAAC,IAAI,CAAC,gBAAgB,CAAC,GAAG,EAAE,EAAE,EAAE,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,EACnI,eAAe,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,EAClC,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,CAAC,CAC5C,CACH,CACD,CAAC;AACH,CAAC;AAKD,MAAM,UAAU,0CAA0C;IACzD,OAAO,KAAK,CAAC,MAAM,CAClB,qCAAqC,EACrC,MAAM,CAAC,GAAG,CACT,aAAa,EACb,CAAC,MAAM,EAAE,EAAE,CACV,CAAC,MAAM,EAAE,EAAE,OAAO,EAAE,GAAG,EAAE,EAAE,EAAE,CAC5B,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;QACnB,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC;QACzD,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,EAAE,CAAC;YAC5B,OAAO,KAAK,CAAC,CAAC,YAAY,EAAE,CAAC;QAC9B,CAAC;QACD,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,EAAE,GAAG,KAAK,CAAC,CAAC,oBAAoB,CAAC,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,CAAC;QACtF,MAAM,EAAE,EAAE,EAAE,GAAG,IAAI,CAAC;QACpB,KAAK,CAAC,CAAC,UAAU,CAAC,EAAE,CAAC,CAAC;QACtB,OAAO,KAAK,CAAC,CAAC,MAAM,CAAC,IAAI,CACxB,gBAAgB,CAAC,GAAG,EAAE,EAAE,EAAE,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,IAAI,CAAC,CAAC,EAC5D,MAAM,CAAC,cAAc,CAAC,QAAQ,EAAE,EAAE,EAAE,EAAE,CAAC,EACvC,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,CAAC,IAAI,CAAC,EAAE,EAAE,EAAE,CAAC,CAAC,EACzD,MAAM,CAAC,cAAc,CAAC,WAAW,EAAE,IAAI,CAAC,EACxC,MAAM,CAAC,cAAc,CAAC,+BAA+B,EAAE,EAAE,GAAG,IAAI,EAAE,gBAAgB,EAAE,CAAC,EACrF,MAAM,CAAC,YAAY,CAAC,EAAE,MAAM,EAAE,EAAE,EAAE,CAAC,CACnC,CAAC;IACH,CAAC,CAAC,CAAC,IAAI,CAAC,MAAM,CAAC,cAAc,CAAC,aAAa,EAAE,MAAM,CAAC,CAAC,CACvD,CACD,CAAC;AACH,CAAC"}
|
|
@@ -1,9 +1,9 @@
|
|
|
1
1
|
import { Context, Deferred, Effect, Layer, Option, Schema } from "effect";
|
|
2
|
+
import { unauthorized } from "@shivaedev/access/refusal.ts";
|
|
2
3
|
import { DefinedModule } from "@shivaedev/contract/defineModule.ts";
|
|
3
4
|
import { operationKind } from "@shivaedev/contract/operationKind.ts";
|
|
4
5
|
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
5
6
|
import { subjectHeader } from "@shivaedev/contract/subjectHeader.ts";
|
|
6
|
-
import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
7
7
|
import { Identity, SessionUser, SessionUserSchema } from "#identity.ts";
|
|
8
8
|
import { hasPermission } from "#permission.ts";
|
|
9
9
|
import { recheckSession } from "#server/recheckSession.ts";
|
|
@@ -35,7 +35,7 @@ function guard(policy) {
|
|
|
35
35
|
return (effect, { headers, rpc }) => Effect.gen(function* () {
|
|
36
36
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
37
37
|
if (Option.isNone(session)) {
|
|
38
|
-
return yield*
|
|
38
|
+
return yield* unauthorized();
|
|
39
39
|
}
|
|
40
40
|
const user = session.value.user;
|
|
41
41
|
// RPC merges each call's message headers over its transport's, so the call's own subject comes first and a subject set on the
|
|
@@ -55,7 +55,7 @@ export function subjectResolverLayer() {
|
|
|
55
55
|
const middleware = guard(policy);
|
|
56
56
|
return (effect, request) => Option.isSome(sessions)
|
|
57
57
|
? middleware(effect, request).pipe(Effect.provideService(SessionPolicy, sessions.value))
|
|
58
|
-
: Effect.fail(
|
|
58
|
+
: Effect.fail(unauthorized());
|
|
59
59
|
}
|
|
60
60
|
return {
|
|
61
61
|
account: (permission, deny) => resolved({ deny, kind: "account", permission }),
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"subjectResolverLayer.js","sourceRoot":"","sources":["../../src/server/subjectResolverLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAG1E,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"subjectResolverLayer.js","sourceRoot":"","sources":["../../src/server/subjectResolverLayer.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.36.0",
|
|
4
4
|
"description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -46,25 +46,25 @@
|
|
|
46
46
|
"README.md"
|
|
47
47
|
],
|
|
48
48
|
"dependencies": {
|
|
49
|
-
"@shivaedev/access": "0.
|
|
49
|
+
"@shivaedev/access": "0.7.0",
|
|
50
50
|
"@shivaedev/changes": "0.14.1",
|
|
51
|
-
"@shivaedev/contract": "0.
|
|
52
|
-
"@shivaedev/errors": "0.14.
|
|
53
|
-
"@shivaedev/rate-limit": "0.
|
|
51
|
+
"@shivaedev/contract": "0.53.0",
|
|
52
|
+
"@shivaedev/errors": "0.14.1",
|
|
53
|
+
"@shivaedev/rate-limit": "0.7.0",
|
|
54
54
|
"@shivaedev/service": "0.9.2",
|
|
55
|
-
"@shivaedev/sql": "0.
|
|
55
|
+
"@shivaedev/sql": "0.53.0"
|
|
56
56
|
},
|
|
57
57
|
"devDependencies": {
|
|
58
58
|
"@better-auth/oauth-provider": "1.7.22",
|
|
59
59
|
"@effect/platform-node": "4.1.4",
|
|
60
60
|
"@effect/sql-pg": "4.1.4",
|
|
61
|
-
"@shivaedev/admin": "0.27.
|
|
62
|
-
"@shivaedev/build": "0.3.
|
|
63
|
-
"@shivaedev/quality": "0.
|
|
64
|
-
"@shivaedev/server": "0.38.
|
|
65
|
-
"@shivaedev/test-kits": "0.
|
|
66
|
-
"@shivaedev/test-sql": "0.25.
|
|
67
|
-
"@shivaedev/test-story": "0.50.
|
|
61
|
+
"@shivaedev/admin": "0.27.3",
|
|
62
|
+
"@shivaedev/build": "0.3.5",
|
|
63
|
+
"@shivaedev/quality": "0.81.1",
|
|
64
|
+
"@shivaedev/server": "0.38.3",
|
|
65
|
+
"@shivaedev/test-kits": "0.14.0",
|
|
66
|
+
"@shivaedev/test-sql": "0.25.6",
|
|
67
|
+
"@shivaedev/test-story": "0.50.2",
|
|
68
68
|
"@types/node": "24.19.2",
|
|
69
69
|
"better-auth": "1.7.22",
|
|
70
70
|
"effect": "4.1.4",
|
|
@@ -1,5 +1,7 @@
|
|
|
1
1
|
import { Clock, Context, Data, Effect, Option, Schema } from "effect";
|
|
2
2
|
import { Permission } from "@shivaedev/access/permission.ts";
|
|
3
|
+
import { clearStoredQueries } from "@shivaedev/contract/adapters/storedQueryAccess.ts";
|
|
4
|
+
import { QueryStorageProvider } from "@shivaedev/contract/QueryStorage.ts";
|
|
3
5
|
|
|
4
6
|
export class SessionMemoryUnavailable extends Data.TaggedError("SessionMemoryUnavailable")<{ readonly cause: unknown }> {}
|
|
5
7
|
|
|
@@ -27,9 +29,14 @@ const Stored = Schema.fromJsonString(RememberedSession);
|
|
|
27
29
|
const decodeStored = Schema.decodeEffect(Stored);
|
|
28
30
|
const encodeStored = Schema.encodeEffect(Stored);
|
|
29
31
|
|
|
32
|
+
// A Layer that also supplies query storage gets the device's stored query results wiped with the memory, by every path that forgets.
|
|
30
33
|
export const forgetSession: Effect.Effect<void, never, SessionMemory> = Effect.gen(function* () {
|
|
31
34
|
const memory = yield* SessionMemory;
|
|
32
35
|
yield* Effect.ignore(memory.clear);
|
|
36
|
+
const queries = yield* Effect.serviceOption(QueryStorageProvider);
|
|
37
|
+
if (Option.isSome(queries)) {
|
|
38
|
+
yield* clearStoredQueries().pipe(Effect.provideService(QueryStorageProvider, queries.value));
|
|
39
|
+
}
|
|
33
40
|
});
|
|
34
41
|
|
|
35
42
|
const stored = Effect.gen(function* () {
|
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Clock, Effect, Option, Predicate, Schema } from "effect";
|
|
2
2
|
import type { Headers } from "effect/http";
|
|
3
3
|
import * as HttpStatus from "effect/http/HttpStatus";
|
|
4
|
-
import {
|
|
4
|
+
import { unauthorized } from "@shivaedev/access/refusal.ts";
|
|
5
|
+
import type { AuthUnavailable, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
5
6
|
import type { ProviderAccountValue } from "#identity.ts";
|
|
6
7
|
import { authCall } from "#server/adapters/authCall.ts";
|
|
7
8
|
import { providerFailure } from "#server/providerFailure.ts";
|
|
@@ -33,7 +34,7 @@ export function betterAuthSessions<TSession extends SessionShape>(getSession: Ge
|
|
|
33
34
|
Effect.catch(
|
|
34
35
|
({ cause }): Effect.Effect<never, AuthUnavailable | Unauthorized> =>
|
|
35
36
|
Predicate.hasProperty(cause, "statusCode") && cause.statusCode === HttpStatus.fromLiteral("Unauthorized")
|
|
36
|
-
? Effect.fail(
|
|
37
|
+
? Effect.fail(unauthorized())
|
|
37
38
|
: providerFailure(cause),
|
|
38
39
|
),
|
|
39
40
|
);
|
|
@@ -1,5 +1,6 @@
|
|
|
1
1
|
import { Context, Effect, Option, Schema } from "effect";
|
|
2
|
-
import {
|
|
2
|
+
import { unauthorized } from "@shivaedev/access/refusal.ts";
|
|
3
|
+
import type { AuthUnavailable, Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
3
4
|
import { SessionUser, SessionUserSchema, SessionUserWithProviderAccounts } from "#identity.ts";
|
|
4
5
|
import { providerAccountsUser } from "#server/providerAccountsUser.ts";
|
|
5
6
|
import type { SessionShape } from "#server/session.ts";
|
|
@@ -10,7 +11,7 @@ export const currentSessionContext = Effect.fnUntraced(function* <TSession exten
|
|
|
10
11
|
) {
|
|
11
12
|
const session = yield* lookup;
|
|
12
13
|
if (Option.isNone(session) || session.value.user.id !== id) {
|
|
13
|
-
return yield*
|
|
14
|
+
return yield* unauthorized();
|
|
14
15
|
}
|
|
15
16
|
let context = yield* Effect.context<never>();
|
|
16
17
|
if (Option.isSome(Context.getOption(context, SessionUser))) {
|
|
@@ -24,6 +24,7 @@ import { authRouteHandler } from "#server/better-auth/adapters/routeHandler.ts";
|
|
|
24
24
|
import { fromStorage, type PolicyStorage, type SignInPolicy, signInGate } from "#server/better-auth/adapters/signInGate.ts";
|
|
25
25
|
import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
|
|
26
26
|
import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
27
|
+
import { changeHooks } from "#server/better-auth/changeHooks.ts";
|
|
27
28
|
import type { BetterAuthDatabaseHooks } from "#server/better-auth/databaseHooks.ts";
|
|
28
29
|
import type { BetterAuthEmails } from "#server/better-auth/emails.ts";
|
|
29
30
|
import { AuthRouteHandler, mountRoutes } from "#server/better-auth/mountRoutes.ts";
|
|
@@ -64,7 +65,8 @@ const mountAuth = Effect.fn("Identity.mountAuth")(function* <const TOptions exte
|
|
|
64
65
|
const preferences =
|
|
65
66
|
mount.accountPreferences === true ? yield* accountPreferenceOptions(options).pipe(Effect.provide(accountPreferencesStore)) : options;
|
|
66
67
|
const reset = passwordResetOptions(preferences, mount.onPasswordReset, runtime);
|
|
67
|
-
const
|
|
68
|
+
const announced = effectHookOptions(yield* emailOptions(reset, mount.emails, runtime), changeHooks, runtime);
|
|
69
|
+
const hooked = effectHookOptions(announced, mount.databaseHooks, runtime);
|
|
68
70
|
const configured = mount.roles === undefined ? hooked : storedRoleOptions(closeRoleEndpoints(hooked), mount);
|
|
69
71
|
const gated = yield* signInPolicyOptions(configured, gate, (): Promise<PolicyStorage> => auth.$context);
|
|
70
72
|
const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
|
|
@@ -32,7 +32,7 @@ export const assignRole = Effect.fn("Identity.assignRole")(function* <TRole exte
|
|
|
32
32
|
});
|
|
33
33
|
const target = yield* readTarget(userId).pipe(Effect.mapError(unavailable));
|
|
34
34
|
if (Option.isNone(target)) {
|
|
35
|
-
return yield* Effect.fail(new NotFound({ message: "
|
|
35
|
+
return yield* Effect.fail(new NotFound({ message: "This user no longer exists." }));
|
|
36
36
|
}
|
|
37
37
|
if (target.value.role === role) {
|
|
38
38
|
return false;
|
|
@@ -0,0 +1,49 @@
|
|
|
1
|
+
import { Effect, Option } from "effect";
|
|
2
|
+
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
3
|
+
import { SqlClient } from "effect/sql";
|
|
4
|
+
import { invalidationKeys, type Key } from "@shivaedev/changes/keys.ts";
|
|
5
|
+
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
6
|
+
import type { BetterAuthDatabaseHooks } from "#server/better-auth/databaseHooks.ts";
|
|
7
|
+
import { sessionKeys } from "#signedInSessions.ts";
|
|
8
|
+
import { userKeys } from "#users.ts";
|
|
9
|
+
|
|
10
|
+
// Inside an application transaction the nested transact joins its commit; otherwise it is a transaction of its own after Better Auth's commit.
|
|
11
|
+
// An announcement that fails must not fail an auth write that may already have committed.
|
|
12
|
+
// A user change also announces the sessions list, which shows each session's user name and email.
|
|
13
|
+
const announce = Effect.fnUntraced(function* (keys: readonly Key[]) {
|
|
14
|
+
const sql = yield* Effect.serviceOption(SqlClient.SqlClient);
|
|
15
|
+
const reactivity = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
16
|
+
if (Option.isNone(sql) || Option.isNone(reactivity)) {
|
|
17
|
+
return;
|
|
18
|
+
}
|
|
19
|
+
yield* invalidateOnCommit(invalidationKeys(keys)).pipe(
|
|
20
|
+
transact(),
|
|
21
|
+
Effect.catch((error) => Effect.logError("Better Auth change announcement failed; open screens stay stale until they resync", error)),
|
|
22
|
+
Effect.provideService(SqlClient.SqlClient, sql.value),
|
|
23
|
+
Effect.provideService(Reactivity.Reactivity, reactivity.value),
|
|
24
|
+
);
|
|
25
|
+
});
|
|
26
|
+
|
|
27
|
+
type Row = { readonly id: string } | null;
|
|
28
|
+
|
|
29
|
+
// Better Auth hands an update's after hook null when the update matched no row, as when a refreshing session was deleted meanwhile.
|
|
30
|
+
function announceRow(row: Row, keys: (id: string) => readonly Key[]) {
|
|
31
|
+
return row === null ? Effect.void : announce(keys(row.id));
|
|
32
|
+
}
|
|
33
|
+
|
|
34
|
+
function userCreated(user: Row) {
|
|
35
|
+
return announceRow(user, (id) => [userKeys.item(id)]);
|
|
36
|
+
}
|
|
37
|
+
|
|
38
|
+
function userChanged(user: Row) {
|
|
39
|
+
return announceRow(user, (id) => [userKeys.item(id), sessionKeys.list]);
|
|
40
|
+
}
|
|
41
|
+
|
|
42
|
+
function sessionChanged(session: Row) {
|
|
43
|
+
return announceRow(session, (id) => [sessionKeys.item(id)]);
|
|
44
|
+
}
|
|
45
|
+
|
|
46
|
+
export const changeHooks: BetterAuthDatabaseHooks = {
|
|
47
|
+
session: { create: { after: sessionChanged }, delete: { after: sessionChanged }, update: { after: sessionChanged } },
|
|
48
|
+
user: { create: { after: userCreated }, delete: { after: userChanged }, update: { after: userChanged } },
|
|
49
|
+
};
|
|
@@ -46,6 +46,6 @@ export const revokeSession = Effect.fn("Identity.revokeSession")(function* (id:
|
|
|
46
46
|
});
|
|
47
47
|
const removed = yield* remove(id).pipe(Effect.mapError(unavailable));
|
|
48
48
|
if (Option.isNone(removed)) {
|
|
49
|
-
return yield* new NotFound({ message: "
|
|
49
|
+
return yield* new NotFound({ message: "This session has already ended." });
|
|
50
50
|
}
|
|
51
51
|
});
|
|
@@ -1,14 +1,25 @@
|
|
|
1
|
-
import { DateTime, Effect, Schema } from "effect";
|
|
1
|
+
import { DateTime, Effect, Option, Schema } from "effect";
|
|
2
|
+
import * as Reactivity from "effect/reactivity/Reactivity";
|
|
2
3
|
import { SqlClient } from "effect/sql";
|
|
4
|
+
import { invalidationKeys } from "@shivaedev/changes/keys.ts";
|
|
5
|
+
import { invalidateOnCommit, transact } from "@shivaedev/sql/transact.ts";
|
|
6
|
+
import { sessionKeys } from "#signedInSessions.ts";
|
|
3
7
|
|
|
4
8
|
const SweepResult = Schema.Tuple([Schema.Struct({ removed: Schema.NumberFromString })]);
|
|
5
9
|
|
|
6
10
|
export const sweepExpiredSessions = Effect.gen(function* () {
|
|
7
11
|
const sql = yield* SqlClient.SqlClient;
|
|
8
12
|
const now = DateTime.toDateUtc(yield* DateTime.now);
|
|
9
|
-
const
|
|
10
|
-
|
|
11
|
-
|
|
12
|
-
|
|
13
|
-
|
|
13
|
+
const existing = yield* Effect.serviceOption(Reactivity.Reactivity);
|
|
14
|
+
const reactivity = Option.isSome(existing) ? existing.value : yield* Reactivity.make;
|
|
15
|
+
return yield* Effect.gen(function* () {
|
|
16
|
+
const rows = yield* sql`with expired as (
|
|
17
|
+
delete from "session" where "expiresAt" <= ${now} returning 1
|
|
18
|
+
) select count(*)::text as removed from expired`;
|
|
19
|
+
const [result] = yield* Schema.decodeUnknownEffect(SweepResult)(rows);
|
|
20
|
+
if (result.removed > 0) {
|
|
21
|
+
yield* invalidateOnCommit(invalidationKeys([sessionKeys.list]));
|
|
22
|
+
}
|
|
23
|
+
return result.removed;
|
|
24
|
+
}).pipe(transact(), Effect.provideService(Reactivity.Reactivity, reactivity));
|
|
14
25
|
}).pipe(Effect.withSpan("Identity.sweepExpiredSessions"));
|
|
@@ -21,6 +21,7 @@ export const authTestDatabase = Effect.gen(function* () {
|
|
|
21
21
|
Result: StoredSession,
|
|
22
22
|
});
|
|
23
23
|
return {
|
|
24
|
+
deleteSessions: sql`delete from "session"`.pipe(Effect.asVoid),
|
|
24
25
|
expireSessions: (userId?: string) =>
|
|
25
26
|
Effect.gen(function* () {
|
|
26
27
|
const expiredAt = DateTime.toDateUtc(DateTime.subtract(yield* DateTime.now, { seconds: 1 }));
|
|
@@ -50,7 +50,7 @@ export const userDirectoryReads = Effect.fnUntraced(function* <TRole extends str
|
|
|
50
50
|
names: (ids: readonly string[]) => (ids.length === 0 ? Effect.succeed([]) : readNames(ids).pipe(Effect.mapError(unavailable))),
|
|
51
51
|
role: Effect.fn("UserDirectory.role")(function* (id: string) {
|
|
52
52
|
const found = yield* readRole(id).pipe(Effect.mapError(unavailable));
|
|
53
|
-
return Option.isSome(found) ? found.value.role : yield* new NotFound({ message: "
|
|
53
|
+
return Option.isSome(found) ? found.value.role : yield* new NotFound({ message: "This user no longer exists." });
|
|
54
54
|
}),
|
|
55
55
|
};
|
|
56
56
|
});
|
|
@@ -10,7 +10,11 @@ export const sessionRequest = Effect.fnUntraced(function* (headers: Headers.Head
|
|
|
10
10
|
const policy = yield* SessionPolicy;
|
|
11
11
|
const request = yield* transportOriginRequest(headers, rpc);
|
|
12
12
|
if (!policy.origin(request)) {
|
|
13
|
-
|
|
13
|
+
const refused = Option.match(request.origin, { onNone: () => "a request without an Origin header", onSome: (origin) => `origin ${origin}` });
|
|
14
|
+
yield* Effect.logWarning(
|
|
15
|
+
`The session policy refused ${refused} calling ${rpc}. Add the origin to the policy's trusted origins if the application is served from it.`,
|
|
16
|
+
);
|
|
17
|
+
return yield* new Forbidden({ message: "Open this application from its own address to continue." });
|
|
14
18
|
}
|
|
15
19
|
return request;
|
|
16
20
|
});
|
|
@@ -8,7 +8,7 @@ export function resolveRole(roles: RoleSet, stored: unknown) {
|
|
|
8
8
|
Effect.logWarning(
|
|
9
9
|
"Stored user role is missing. Generate and apply an auth migration with defaultRole, then use assignRole for administrators.",
|
|
10
10
|
),
|
|
11
|
-
Effect.fail(new Forbidden({ message: "
|
|
11
|
+
Effect.fail(new Forbidden({ message: "Your account has no role yet. Ask an administrator to assign one." })),
|
|
12
12
|
);
|
|
13
13
|
}
|
|
14
14
|
return roles.resolve(stored).pipe(
|
package/src/server/session.ts
CHANGED
|
@@ -1,7 +1,8 @@
|
|
|
1
1
|
import { Effect, Layer, Option, Schema } from "effect";
|
|
2
2
|
import type { Headers } from "effect/http";
|
|
3
|
+
import { unauthorized } from "@shivaedev/access/refusal.ts";
|
|
3
4
|
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
4
|
-
import {
|
|
5
|
+
import type { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
5
6
|
import {
|
|
6
7
|
Identity,
|
|
7
8
|
OptionalIdentity,
|
|
@@ -42,7 +43,7 @@ export function authenticatedLayer() {
|
|
|
42
43
|
Effect.gen(function* () {
|
|
43
44
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
44
45
|
if (Option.isNone(session)) {
|
|
45
|
-
return yield*
|
|
46
|
+
return yield* unauthorized();
|
|
46
47
|
}
|
|
47
48
|
const id = yield* identified(session.value.user.id);
|
|
48
49
|
return yield* effect.pipe(
|
|
@@ -87,7 +88,7 @@ export function withSessionUser(headers: Headers.Headers, operation: string) {
|
|
|
87
88
|
Effect.gen(function* () {
|
|
88
89
|
const session = yield* resolveSession(headers, operation);
|
|
89
90
|
if (Option.isNone(session)) {
|
|
90
|
-
return yield*
|
|
91
|
+
return yield* unauthorized();
|
|
91
92
|
}
|
|
92
93
|
const user = Schema.decodeUnknownSync(SessionUserSchema)(session.value.user);
|
|
93
94
|
const id = yield* identified(session.value.user.id);
|
|
@@ -128,7 +129,7 @@ export function authenticatedUserWithProviderAccountsLayer() {
|
|
|
128
129
|
Effect.gen(function* () {
|
|
129
130
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
130
131
|
if (Option.isNone(session)) {
|
|
131
|
-
return yield*
|
|
132
|
+
return yield* unauthorized();
|
|
132
133
|
}
|
|
133
134
|
const { providerAccounts, ...user } = yield* providerAccountsUser(session.value.user);
|
|
134
135
|
const { id } = user;
|
|
@@ -1,11 +1,11 @@
|
|
|
1
1
|
import { Context, Deferred, Effect, Layer, Option, Schema } from "effect";
|
|
2
2
|
import type { Rpc } from "effect/rpc";
|
|
3
3
|
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
4
|
+
import { unauthorized } from "@shivaedev/access/refusal.ts";
|
|
4
5
|
import { DefinedModule } from "@shivaedev/contract/defineModule.ts";
|
|
5
6
|
import { operationKind } from "@shivaedev/contract/operationKind.ts";
|
|
6
7
|
import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
|
|
7
8
|
import { subjectHeader } from "@shivaedev/contract/subjectHeader.ts";
|
|
8
|
-
import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
9
9
|
import { Identity, SessionUser, SessionUserSchema } from "#identity.ts";
|
|
10
10
|
import type { IdentityFailures } from "#middleware.ts";
|
|
11
11
|
import { hasPermission } from "#permission.ts";
|
|
@@ -66,7 +66,7 @@ function guard<E>(policy: Policy<E>): SubjectMiddleware<E, SessionPolicy> {
|
|
|
66
66
|
Effect.gen(function* () {
|
|
67
67
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
68
68
|
if (Option.isNone(session)) {
|
|
69
|
-
return yield*
|
|
69
|
+
return yield* unauthorized();
|
|
70
70
|
}
|
|
71
71
|
const user = session.value.user;
|
|
72
72
|
// RPC merges each call's message headers over its transport's, so the call's own subject comes first and a subject set on the
|
|
@@ -99,7 +99,7 @@ export function subjectResolverLayer() {
|
|
|
99
99
|
return (effect, request) =>
|
|
100
100
|
Option.isSome(sessions)
|
|
101
101
|
? middleware(effect, request).pipe(Effect.provideService(SessionPolicy, sessions.value))
|
|
102
|
-
: Effect.fail(
|
|
102
|
+
: Effect.fail(unauthorized());
|
|
103
103
|
}
|
|
104
104
|
return {
|
|
105
105
|
account: <E>(permission: Permission, deny: (id: string) => E) => resolved({ deny, kind: "account", permission }),
|