@shivaedev/identity 0.16.0 → 0.17.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 +18 -0
- package/README.md +79 -53
- package/dist/server/SessionPolicy.d.ts +14 -0
- package/dist/server/SessionPolicy.d.ts.map +1 -0
- package/dist/server/SessionPolicy.js +4 -0
- package/dist/server/SessionPolicy.js.map +1 -0
- package/dist/server/adapters/betterAuthSessions.js +1 -1
- package/dist/server/adapters/betterAuthSessions.js.map +1 -1
- package/dist/server/better-auth/PasswordReset.d.ts +7 -0
- package/dist/server/better-auth/PasswordReset.d.ts.map +1 -0
- package/dist/server/better-auth/PasswordReset.js +2 -0
- package/dist/server/better-auth/PasswordReset.js.map +1 -0
- package/dist/server/better-auth/adapters/passwordResetOptions.d.ts +6 -0
- package/dist/server/better-auth/adapters/passwordResetOptions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/passwordResetOptions.js +17 -0
- package/dist/server/better-auth/adapters/passwordResetOptions.js.map +1 -0
- package/dist/server/better-auth/mount.d.ts +2 -0
- package/dist/server/better-auth/mount.d.ts.map +1 -1
- package/dist/server/better-auth/mount.js +4 -2
- package/dist/server/better-auth/mount.js.map +1 -1
- package/dist/server/better-auth/sessionPermissions.js +1 -1
- package/dist/server/better-auth/userProfiles.js +1 -1
- package/dist/server/lookupSession.d.ts +5 -4
- package/dist/server/lookupSession.d.ts.map +1 -1
- package/dist/server/lookupSession.js +8 -4
- package/dist/server/lookupSession.js.map +1 -1
- package/dist/server/permissions.d.ts +4 -4
- package/dist/server/permissions.d.ts.map +1 -1
- package/dist/server/permissions.js +11 -8
- package/dist/server/permissions.js.map +1 -1
- package/dist/server/providerAccountsUser.d.ts +16 -0
- package/dist/server/providerAccountsUser.d.ts.map +1 -0
- package/dist/server/providerAccountsUser.js +12 -0
- package/dist/server/providerAccountsUser.js.map +1 -0
- package/dist/server/recheckSession.d.ts +2 -2
- package/dist/server/recheckSession.d.ts.map +1 -1
- package/dist/server/recheckSession.js +5 -3
- package/dist/server/recheckSession.js.map +1 -1
- package/dist/server/revalidateStream.d.ts +3 -2
- package/dist/server/revalidateStream.d.ts.map +1 -1
- package/dist/server/revalidateStream.js +3 -2
- package/dist/server/revalidateStream.js.map +1 -1
- package/dist/server/session.d.ts +9 -21
- package/dist/server/session.d.ts.map +1 -1
- package/dist/server/session.js +28 -27
- package/dist/server/session.js.map +1 -1
- package/package.json +7 -7
- package/src/server/SessionPolicy.ts +14 -0
- package/src/server/adapters/betterAuthSessions.ts +1 -1
- package/src/server/better-auth/PasswordReset.ts +7 -0
- package/src/server/better-auth/adapters/passwordResetOptions.ts +25 -0
- package/src/server/better-auth/mount.ts +6 -2
- package/src/server/better-auth/sessionPermissions.ts +1 -1
- package/src/server/better-auth/userProfiles.ts +1 -1
- package/src/server/lookupSession.ts +9 -8
- package/src/server/permissions.ts +29 -21
- package/src/server/providerAccountsUser.ts +16 -0
- package/src/server/recheckSession.ts +5 -4
- package/src/server/revalidateStream.ts +7 -5
- package/src/server/session.ts +87 -85
|
@@ -2,14 +2,17 @@ import { Effect, Option } from "effect";
|
|
|
2
2
|
import { Forbidden } from "@shivaedev/errors/taxonomy.ts";
|
|
3
3
|
import { transportOriginRequest } from "./origin.js";
|
|
4
4
|
import { resolveRole } from "./resolveRole.js";
|
|
5
|
-
|
|
5
|
+
import { SessionPolicy } from "./SessionPolicy.js";
|
|
6
|
+
export const sessionRequest = Effect.fnUntraced(function* (headers, rpc) {
|
|
7
|
+
const policy = yield* SessionPolicy;
|
|
6
8
|
const request = yield* transportOriginRequest(headers, rpc);
|
|
7
9
|
if (!policy.origin(request)) {
|
|
8
10
|
return yield* new Forbidden({ message: "Origin not allowed" });
|
|
9
11
|
}
|
|
10
12
|
return request;
|
|
11
13
|
});
|
|
12
|
-
export const sessionAccess = Effect.fnUntraced(function* (
|
|
14
|
+
export const sessionAccess = Effect.fnUntraced(function* (session) {
|
|
15
|
+
const policy = yield* SessionPolicy;
|
|
13
16
|
if (Option.isNone(session) || policy.roles === undefined) {
|
|
14
17
|
return session;
|
|
15
18
|
}
|
|
@@ -17,7 +20,8 @@ export const sessionAccess = Effect.fnUntraced(function* (policy, session) {
|
|
|
17
20
|
const access = yield* resolveRole(policy.roles, role);
|
|
18
21
|
return Option.some({ ...session.value, user: { ...session.value.user, ...access } });
|
|
19
22
|
});
|
|
20
|
-
export const lookupSession = Effect.fnUntraced(function* (
|
|
21
|
-
|
|
23
|
+
export const lookupSession = Effect.fnUntraced(function* (headers) {
|
|
24
|
+
const policy = yield* SessionPolicy;
|
|
25
|
+
return yield* sessionAccess(yield* policy.provider.get(headers));
|
|
22
26
|
});
|
|
23
27
|
//# sourceMappingURL=lookupSession.js.map
|
|
@@ -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,aAAa,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;
|
|
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,aAAa,CAAC;AACrD,OAAO,EAAE,WAAW,EAAE,MAAM,kBAAkB,CAAC;AAC/C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,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,oBAAoB,EAAE,CAAC,CAAC;IAChE,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"}
|
|
@@ -4,9 +4,9 @@ import type { RpcMiddleware } from "effect/rpc";
|
|
|
4
4
|
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
5
5
|
import { Identity, SessionUser } from "#identity.ts";
|
|
6
6
|
import type { IdentityFailures } from "#middleware.ts";
|
|
7
|
-
import {
|
|
8
|
-
export declare function permissionLayer<TMiddleware
|
|
7
|
+
import { SessionPolicy } from "./SessionPolicy.ts";
|
|
8
|
+
export declare function permissionLayer<TMiddleware>(middleware: Context.Key<TMiddleware, RpcMiddleware.RpcMiddleware<Identity | SessionUser, IdentityFailures, never>> & {
|
|
9
9
|
readonly permission: Permission;
|
|
10
|
-
}
|
|
11
|
-
export declare function permissionRoute
|
|
10
|
+
}): Layer.Layer<TMiddleware, never, SessionPolicy>;
|
|
11
|
+
export declare function permissionRoute(permission: Permission): <E, R>(handler: (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, R>) => (request: HttpServerRequest.HttpServerRequest) => Effect.Effect<HttpServerResponse.HttpServerResponse, E, SessionPolicy | Exclude<R, Identity | SessionUser>>;
|
|
12
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,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,
|
|
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,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,wBAAgB,eAAe,CAAC,WAAW,EAC1C,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,kDAwBD;AAYD,wBAAgB,eAAe,CAAC,UAAU,EAAE,UAAU,IAC7C,CAAC,EAAE,CAAC,WAAW,CAAC,OAAO,EAAE,iBAAiB,CAAC,iBAAiB,KAAK,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC,EAAE,CAAC,CAAC,eAExH,iBAAiB,CAAC,iBAAiB,KAC1C,MAAM,CAAC,MAAM,CAAC,kBAAkB,CAAC,kBAAkB,EAAE,CAAC,EAAE,aAAa,GAAG,OAAO,CAAC,CAAC,EAAE,QAAQ,GAAG,WAAW,CAAC,CAAC,CAW/G"}
|
|
@@ -9,14 +9,17 @@ import { hasPermission } from "#permission.ts";
|
|
|
9
9
|
import { commandChanges } from "#server/commandChanges.ts";
|
|
10
10
|
import { recheckSession } from "./recheckSession.js";
|
|
11
11
|
import { revalidateStream } from "./revalidateStream.js";
|
|
12
|
+
import { SessionPolicy } from "./SessionPolicy.js";
|
|
12
13
|
import { withSessionUser } from "./session.js";
|
|
13
|
-
export function permissionLayer(middleware
|
|
14
|
+
export function permissionLayer(middleware) {
|
|
14
15
|
const permission = middleware.permission;
|
|
15
|
-
|
|
16
|
-
const
|
|
17
|
-
|
|
18
|
-
|
|
19
|
-
|
|
16
|
+
return Layer.effect(middleware, Effect.map(SessionPolicy, (policy) => {
|
|
17
|
+
const guard = (effect, { headers, rpc, payload }) => {
|
|
18
|
+
const lookup = Effect.tap(recheckSession(headers, rpc._tag), (session) => Option.isSome(session) && !hasPermission(session.value.user, permission) ? Effect.fail(forbidden(permission)) : Effect.void);
|
|
19
|
+
return Effect.flatMap(Identity, (viewer) => authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some(viewer))).pipe((invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(rpc, id, lookup))), (invocation) => Effect.andThen(Effect.flatMap(SessionUser, (user) => requirePermission(user, permission)), invocation), withSessionUser(headers, rpc._tag), Effect.provideService(SessionPolicy, policy));
|
|
20
|
+
};
|
|
21
|
+
return guard;
|
|
22
|
+
}));
|
|
20
23
|
}
|
|
21
24
|
function rejection(error) {
|
|
22
25
|
return HttpServerResponse.empty({
|
|
@@ -28,8 +31,8 @@ function rejection(error) {
|
|
|
28
31
|
}[error._tag],
|
|
29
32
|
});
|
|
30
33
|
}
|
|
31
|
-
export function permissionRoute(
|
|
32
|
-
return (handler) => (request) => Effect.andThen(Effect.flatMap(SessionUser, (user) => requirePermission(user, permission)), Effect.context()).pipe(withSessionUser(
|
|
34
|
+
export function permissionRoute(permission) {
|
|
35
|
+
return (handler) => (request) => Effect.andThen(Effect.flatMap(SessionUser, (user) => requirePermission(user, permission)), Effect.context()).pipe(withSessionUser(request.headers, request.url), Effect.matchEffect({
|
|
33
36
|
onFailure: (error) => Effect.succeed(rejection(error)),
|
|
34
37
|
onSuccess: (context) => Effect.provideContext(handler(request), context),
|
|
35
38
|
}));
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/server/permissions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAgB,MAAM,EAAE,KAAK,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAC7D,OAAO,EAA0B,kBAAkB,EAAE,MAAM,aAAa,CAAC;AACzE,OAAO,KAAK,UAAU,MAAM,wBAAwB,CAAC;AAGrD,OAAO,EAAE,SAAS,EAAE,MAAM,8BAA8B,CAAC;AACzD,OAAO,EAAE,iBAAiB,EAAE,MAAM,wCAAwC,CAAC;AAC3E,OAAO,EAAE,cAAc,EAAE,MAAM,mCAAmC,CAAC;AAEnE,OAAO,EAAE,QAAQ,EAAE,WAAW,EAAE,MAAM,cAAc,CAAC;AAErD,OAAO,EAAE,aAAa,EAAE,MAAM,gBAAgB,CAAC;AAC/C,OAAO,EAAE,cAAc,EAAE,MAAM,2BAA2B,CAAC;AAC3D,OAAO,EAAE,cAAc,EAAE,MAAM,qBAAqB,CAAC;AACrD,OAAO,EAAE,gBAAgB,EAAE,MAAM,uBAAuB,CAAC;AACzD,OAAO,
|
|
1
|
+
{"version":3,"file":"permissions.js","sourceRoot":"","sources":["../../src/server/permissions.ts"],"names":[],"mappings":"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"}
|
|
@@ -0,0 +1,16 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
export declare const providerAccountsUser: (value: unknown) => Effect.Effect<{
|
|
3
|
+
email: string;
|
|
4
|
+
id: string;
|
|
5
|
+
name: string;
|
|
6
|
+
permissions?: readonly {
|
|
7
|
+
readonly name: string;
|
|
8
|
+
readonly strength: "any" | "own";
|
|
9
|
+
}[];
|
|
10
|
+
role?: string | null | undefined;
|
|
11
|
+
providerAccounts: Effect.Effect<{
|
|
12
|
+
accountId: string;
|
|
13
|
+
providerId: string;
|
|
14
|
+
}[], import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Unauthorized, never>;
|
|
15
|
+
}, never, never>;
|
|
16
|
+
//# sourceMappingURL=providerAccountsUser.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"providerAccountsUser.d.ts","sourceRoot":"","sources":["../../src/server/providerAccountsUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAY,MAAM,EAAgB,MAAM,QAAQ,CAAC;AAQxD,eAAO,MAAM,oBAAoB;;;;;;;;;;;;;gBAO/B,CAAC"}
|
|
@@ -0,0 +1,12 @@
|
|
|
1
|
+
import { Duration, Effect, Exit, Schema } from "effect";
|
|
2
|
+
import { SessionUserSchema } from "#identity.ts";
|
|
3
|
+
const AccountUser = Schema.Struct({
|
|
4
|
+
...SessionUserSchema.fields,
|
|
5
|
+
providerAccounts: Schema.declare((value) => Effect.isEffect(value)),
|
|
6
|
+
});
|
|
7
|
+
export const providerAccountsUser = Effect.fnUntraced(function* (value) {
|
|
8
|
+
const { providerAccounts, ...user } = Schema.decodeUnknownSync(AccountUser)(value);
|
|
9
|
+
const accounts = yield* Effect.cachedWithTTL(Effect.map(providerAccounts, (values) => values.map(({ accountId, providerId }) => ({ accountId, providerId }))), (exit) => (Exit.isSuccess(exit) ? Duration.infinity : Duration.zero));
|
|
10
|
+
return { ...user, providerAccounts: accounts };
|
|
11
|
+
});
|
|
12
|
+
//# sourceMappingURL=providerAccountsUser.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"providerAccountsUser.js","sourceRoot":"","sources":["../../src/server/providerAccountsUser.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,QAAQ,EAAE,MAAM,EAAE,IAAI,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxD,OAAO,EAAE,iBAAiB,EAA6C,MAAM,cAAc,CAAC;AAE5F,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC;IACjC,GAAG,iBAAiB,CAAC,MAAM;IAC3B,gBAAgB,EAAE,MAAM,CAAC,OAAO,CAAC,CAAC,KAAK,EAAqE,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,KAAK,CAAC,CAAC;CACtI,CAAC,CAAC;AAEH,MAAM,CAAC,MAAM,oBAAoB,GAAG,MAAM,CAAC,UAAU,CAAC,QAAQ,CAAC,EAAE,KAAc;IAC9E,MAAM,EAAE,gBAAgB,EAAE,GAAG,IAAI,EAAE,GAAG,MAAM,CAAC,iBAAiB,CAAC,WAAW,CAAC,CAAC,KAAK,CAAC,CAAC;IACnF,MAAM,QAAQ,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAC3C,MAAM,CAAC,GAAG,CAAC,gBAAgB,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,GAAG,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,EAAE,EAAE,CAAC,CAAC,EAAE,SAAS,EAAE,UAAU,EAAE,CAAC,CAAC,CAAC,EAChH,CAAC,IAAI,EAAE,EAAE,CAAC,CAAC,IAAI,CAAC,SAAS,CAAC,IAAI,CAAC,CAAC,CAAC,CAAC,QAAQ,CAAC,QAAQ,CAAC,CAAC,CAAC,QAAQ,CAAC,IAAI,CAAC,CACpE,CAAC;IACF,OAAO,EAAE,GAAG,IAAI,EAAE,gBAAgB,EAAE,QAAQ,EAAE,CAAC;AAChD,CAAC,CAAC,CAAC"}
|
|
@@ -1,5 +1,5 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
2
|
import type { Headers } from "effect/http";
|
|
3
|
-
import
|
|
4
|
-
export declare const recheckSession: (
|
|
3
|
+
import { SessionPolicy } from "./SessionPolicy.ts";
|
|
4
|
+
export declare const recheckSession: (headers: Headers.Headers, rpc: string) => Effect.Effect<Option.None<import("./session.ts").SessionShape> | Option.Some<import("./session.ts").SessionShape>, import("@shivaedev/errors/taxonomy.ts").AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden, SessionPolicy>;
|
|
5
5
|
//# sourceMappingURL=recheckSession.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recheckSession.d.ts","sourceRoot":"","sources":["../../src/server/recheckSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,
|
|
1
|
+
{"version":3,"file":"recheckSession.d.ts","sourceRoot":"","sources":["../../src/server/recheckSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,KAAK,EAAE,OAAO,EAAE,MAAM,aAAa,CAAC;AAE3C,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAGnD,eAAO,MAAM,cAAc,2RAOzB,CAAC"}
|
|
@@ -1,11 +1,13 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
2
|
import { sessionAccess, sessionRequest } from "./lookupSession.js";
|
|
3
|
+
import { SessionPolicy } from "./SessionPolicy.js";
|
|
3
4
|
import { SocketSession } from "./socketSession.js";
|
|
4
|
-
export const recheckSession = Effect.fnUntraced(function* (
|
|
5
|
-
const
|
|
5
|
+
export const recheckSession = Effect.fnUntraced(function* (headers, rpc) {
|
|
6
|
+
const policy = yield* SessionPolicy;
|
|
7
|
+
const request = yield* sessionRequest(headers, rpc);
|
|
6
8
|
const socket = yield* Effect.serviceOption(SocketSession);
|
|
7
9
|
const lookup = Effect.suspend(() => policy.provider.get(request.headers));
|
|
8
10
|
const session = yield* Option.match(socket, { onNone: () => lookup, onSome: (shared) => shared.lookup(policy.provider, lookup) });
|
|
9
|
-
return yield* sessionAccess(
|
|
11
|
+
return yield* sessionAccess(session);
|
|
10
12
|
});
|
|
11
13
|
//# sourceMappingURL=recheckSession.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"recheckSession.js","sourceRoot":"","sources":["../../src/server/recheckSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;
|
|
1
|
+
{"version":3,"file":"recheckSession.js","sourceRoot":"","sources":["../../src/server/recheckSession.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAExC,OAAO,EAAE,aAAa,EAAE,cAAc,EAAE,MAAM,oBAAoB,CAAC;AACnE,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,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,cAAc,CAAC,OAAO,EAAE,GAAG,CAAC,CAAC;IACpD,MAAM,MAAM,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,aAAa,CAAC,aAAa,CAAC,CAAC;IAC1D,MAAM,MAAM,GAAG,MAAM,CAAC,OAAO,CAAC,GAAG,EAAE,CAAC,MAAM,CAAC,QAAQ,CAAC,GAAG,CAAC,OAAO,CAAC,OAAO,CAAC,CAAC,CAAC;IAC1E,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,EAAE,EAAE,MAAM,EAAE,GAAG,EAAE,CAAC,MAAM,EAAE,MAAM,EAAE,CAAC,MAAM,EAAE,EAAE,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,EAAE,MAAM,CAAC,EAAE,CAAC,CAAC;IAClI,OAAO,KAAK,CAAC,CAAC,aAAa,CAAC,OAAO,CAAC,CAAC;AACtC,CAAC,CAAC,CAAC"}
|
|
@@ -1,6 +1,7 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
2
|
import { type Rpc } from "effect/rpc";
|
|
3
3
|
import { type AuthUnavailable, type Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
-
import
|
|
5
|
-
|
|
4
|
+
import { SessionPolicy } from "./SessionPolicy.ts";
|
|
5
|
+
import type { SessionShape } from "./session.ts";
|
|
6
|
+
export declare function revalidateStream<TSession extends SessionShape, TLookupRequirements>(rpc: Rpc.AnyWithProps, id: string, lookup: Effect.Effect<Option.Option<TSession>, AuthUnavailable | Forbidden, TLookupRequirements>): <A, E, R>(effect: Effect.Effect<A, E, R>) => Effect.Effect<A, E | AuthUnavailable | Forbidden | Unauthorized, R | TLookupRequirements | SessionPolicy>;
|
|
6
7
|
//# sourceMappingURL=revalidateStream.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revalidateStream.d.ts","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,KAAK,GAAG,EAAa,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,SAAS,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnG,OAAO,
|
|
1
|
+
{"version":3,"file":"revalidateStream.d.ts","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAE,KAAK,GAAG,EAAa,MAAM,YAAY,CAAC;AACjD,OAAO,EAAE,KAAK,eAAe,EAAE,KAAK,SAAS,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnG,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AACnD,OAAO,KAAK,EAAE,YAAY,EAAE,MAAM,cAAc,CAAC;AAGjD,wBAAgB,gBAAgB,CAAC,QAAQ,SAAS,YAAY,EAAE,mBAAmB,EAClF,GAAG,EAAE,GAAG,CAAC,YAAY,EACrB,EAAE,EAAE,MAAM,EACV,MAAM,EAAE,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,MAAM,CAAC,QAAQ,CAAC,EAAE,eAAe,GAAG,SAAS,EAAE,mBAAmB,CAAC,IAExF,CAAC,EAAE,CAAC,EAAE,CAAC,UAAU,MAAM,CAAC,MAAM,CAAC,CAAC,EAAE,CAAC,EAAE,CAAC,CAAC,+GAc/C"}
|
|
@@ -1,8 +1,9 @@
|
|
|
1
1
|
import { Effect, Option } from "effect";
|
|
2
2
|
import { RpcSchema } from "effect/rpc";
|
|
3
3
|
import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
4
|
+
import { SessionPolicy } from "./SessionPolicy.js";
|
|
4
5
|
import { revalidateSession } from "./socketSession.js";
|
|
5
|
-
export function revalidateStream(
|
|
6
|
+
export function revalidateStream(rpc, id, lookup) {
|
|
6
7
|
return (effect) => {
|
|
7
8
|
if (!RpcSchema.isStreamSchema(rpc.successSchema)) {
|
|
8
9
|
return effect;
|
|
@@ -13,7 +14,7 @@ export function revalidateStream(policy, rpc, id, lookup) {
|
|
|
13
14
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
14
15
|
}
|
|
15
16
|
});
|
|
16
|
-
return Effect.raceFirst(effect, revalidateSession(check, policy.streamRevalidationInterval ?? "30 seconds"));
|
|
17
|
+
return Effect.flatMap(SessionPolicy, (policy) => Effect.raceFirst(effect, revalidateSession(check, policy.streamRevalidationInterval ?? "30 seconds")));
|
|
17
18
|
};
|
|
18
19
|
}
|
|
19
20
|
//# sourceMappingURL=revalidateStream.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"revalidateStream.js","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAwC,YAAY,EAAE,MAAM,+BAA+B,CAAC;
|
|
1
|
+
{"version":3,"file":"revalidateStream.js","sourceRoot":"","sources":["../../src/server/revalidateStream.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AACxC,OAAO,EAAY,SAAS,EAAE,MAAM,YAAY,CAAC;AACjD,OAAO,EAAwC,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnG,OAAO,EAAE,aAAa,EAAE,MAAM,oBAAoB,CAAC;AAEnD,OAAO,EAAE,iBAAiB,EAAE,MAAM,oBAAoB,CAAC;AAEvD,MAAM,UAAU,gBAAgB,CAC/B,GAAqB,EACrB,EAAU,EACV,MAAgG;IAEhG,OAAO,CAAU,MAA8B,EAAE,EAAE;QAClD,IAAI,CAAC,SAAS,CAAC,cAAc,CAAC,GAAG,CAAC,aAAa,CAAC,EAAE,CAAC;YAClD,OAAO,MAAM,CAAC;QACf,CAAC;QACD,MAAM,KAAK,GAAG,MAAM,CAAC,GAAG,CAAC,QAAQ,CAAC;YACjC,MAAM,OAAO,GAAG,KAAK,CAAC,CAAC,MAAM,CAAC;YAC9B,IAAI,MAAM,CAAC,MAAM,CAAC,OAAO,CAAC,IAAI,OAAO,CAAC,KAAK,CAAC,IAAI,CAAC,EAAE,KAAK,EAAE,EAAE,CAAC;gBAC5D,OAAO,KAAK,CAAC,CAAC,IAAI,YAAY,CAAC,EAAE,OAAO,EAAE,yBAAyB,EAAE,CAAC,CAAC;YACxE,CAAC;QACF,CAAC,CAAC,CAAC;QACH,OAAO,MAAM,CAAC,OAAO,CAAC,aAAa,EAAE,CAAC,MAAM,EAAE,EAAE,CAC/C,MAAM,CAAC,SAAS,CAAC,MAAM,EAAE,iBAAiB,CAAC,KAAK,EAAE,MAAM,CAAC,0BAA0B,IAAI,YAAY,CAAC,CAAC,CACrG,CAAC;IACH,CAAC,CAAC;AACH,CAAC"}
|
package/dist/server/session.d.ts
CHANGED
|
@@ -1,11 +1,9 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Effect, Layer, Option } from "effect";
|
|
2
2
|
import type { Headers } from "effect/http";
|
|
3
|
-
import type
|
|
4
|
-
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
5
|
-
import { type AuthUnavailable, type Forbidden, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import { type AuthUnavailable, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
6
4
|
import { Identity, SessionUser, type SessionUserValue, type SessionUserWithProviderAccountsValue } from "#identity.ts";
|
|
7
5
|
import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#middleware.ts";
|
|
8
|
-
import
|
|
6
|
+
import { SessionPolicy } from "#server/SessionPolicy.ts";
|
|
9
7
|
export interface SessionShape {
|
|
10
8
|
readonly user: {
|
|
11
9
|
readonly id: string;
|
|
@@ -14,26 +12,16 @@ export interface SessionShape {
|
|
|
14
12
|
export interface SessionProvider<TSession extends SessionShape> {
|
|
15
13
|
readonly get: (headers: Headers.Headers) => Effect.Effect<Option.Option<TSession>, AuthUnavailable>;
|
|
16
14
|
}
|
|
17
|
-
export
|
|
18
|
-
|
|
19
|
-
|
|
20
|
-
readonly roles?: RoleSet;
|
|
21
|
-
readonly streamRevalidationInterval?: Duration.Input | undefined;
|
|
22
|
-
}
|
|
23
|
-
export declare const resolveSession: <TSession extends SessionShape>(policy: SessionPolicy<TSession>, headers: Headers.Headers, rpc: string) => Effect.Effect<Option.Option<TSession & {
|
|
24
|
-
readonly user: {
|
|
25
|
-
readonly permissions?: readonly Permission[];
|
|
26
|
-
};
|
|
27
|
-
}>, AuthUnavailable | Forbidden>;
|
|
28
|
-
export declare function authenticatedLayer<TSession extends SessionShape>(policy: SessionPolicy<TSession>): Layer.Layer<Authenticated>;
|
|
29
|
-
export declare function maybeAuthenticatedLayer<TSession extends SessionShape>(policy: SessionPolicy<TSession>): Layer.Layer<MaybeAuthenticated>;
|
|
15
|
+
export declare const resolveSession: (headers: Headers.Headers, rpc: string) => Effect.Effect<Option.None<SessionShape> | Option.Some<SessionShape>, AuthUnavailable | import("@shivaedev/errors/taxonomy.ts").Forbidden, SessionPolicy>;
|
|
16
|
+
export declare function authenticatedLayer(): Layer.Layer<Authenticated, never, SessionPolicy>;
|
|
17
|
+
export declare function maybeAuthenticatedLayer(): Layer.Layer<MaybeAuthenticated, never, SessionPolicy>;
|
|
30
18
|
export interface UserSessionShape extends SessionShape {
|
|
31
19
|
readonly user: SessionUserValue;
|
|
32
20
|
}
|
|
33
|
-
export declare function withSessionUser
|
|
34
|
-
export declare function authenticatedUserLayer
|
|
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<R, Identity>, SessionUser>>;
|
|
22
|
+
export declare function authenticatedUserLayer(): Layer.Layer<AuthenticatedUser, never, SessionPolicy>;
|
|
35
23
|
export interface ProviderAccountsSessionShape extends UserSessionShape {
|
|
36
24
|
readonly user: SessionUserWithProviderAccountsValue;
|
|
37
25
|
}
|
|
38
|
-
export declare function authenticatedUserWithProviderAccountsLayer
|
|
26
|
+
export declare function authenticatedUserWithProviderAccountsLayer(): Layer.Layer<AuthenticatedUserWithProviderAccounts, never, SessionPolicy>;
|
|
39
27
|
//# sourceMappingURL=session.d.ts.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.d.ts","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
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;AAE3C,OAAO,EAAE,KAAK,eAAe,EAAE,YAAY,EAAE,MAAM,+BAA+B,CAAC;AACnF,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;AAG7H,OAAO,EAAE,aAAa,EAAE,MAAM,0BAA0B,CAAC;AAIzD,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,qDAqBjC;AACD,wBAAgB,uBAAuB,0DAqBtC;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,0KAc/C;AACD,wBAAgB,sBAAsB,yDAcrC;AAED,MAAM,WAAW,4BAA6B,SAAQ,gBAAgB;IACrE,QAAQ,CAAC,IAAI,EAAE,oCAAoC,CAAC;CACpD;AACD,wBAAgB,0CAA0C,6EAyBzD"}
|
package/dist/server/session.js
CHANGED
|
@@ -1,64 +1,65 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Effect, Layer, Option, Schema } from "effect";
|
|
2
2
|
import { authorizeReads } from "@shivaedev/contract/readPolicy.ts";
|
|
3
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 { commandChanges } from "#server/commandChanges.ts";
|
|
7
|
+
import { providerAccountsUser } from "#server/providerAccountsUser.ts";
|
|
8
|
+
import { SessionPolicy } from "#server/SessionPolicy.ts";
|
|
7
9
|
import { lookupSession, sessionRequest } from "./lookupSession.js";
|
|
8
10
|
import { recheckSession } from "./recheckSession.js";
|
|
9
11
|
import { revalidateStream } from "./revalidateStream.js";
|
|
10
|
-
export const resolveSession = Effect.fn("
|
|
11
|
-
const request = yield* sessionRequest(
|
|
12
|
-
return yield* lookupSession(
|
|
12
|
+
export const resolveSession = Effect.fn("Identity.resolveSession")(function* (headers, rpc) {
|
|
13
|
+
const request = yield* sessionRequest(headers, rpc);
|
|
14
|
+
return yield* lookupSession(request.headers);
|
|
13
15
|
});
|
|
14
16
|
function identified(id) {
|
|
15
17
|
return Effect.andThen(Effect.annotateCurrentSpan("user.id", id), Effect.succeed(id));
|
|
16
18
|
}
|
|
17
|
-
export function authenticatedLayer(
|
|
18
|
-
return Layer.
|
|
19
|
-
const session = yield* resolveSession(
|
|
19
|
+
export function authenticatedLayer() {
|
|
20
|
+
return Layer.effect(Authenticated, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc, payload }) => Effect.gen(function* () {
|
|
21
|
+
const session = yield* resolveSession(headers, rpc._tag);
|
|
20
22
|
if (Option.isNone(session)) {
|
|
21
23
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
22
24
|
}
|
|
23
25
|
const id = yield* identified(session.value.user.id);
|
|
24
|
-
return yield* authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some({ id })).pipe(revalidateStream(
|
|
25
|
-
}));
|
|
26
|
+
return yield* authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some({ id })).pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)), Effect.provideService(Identity, { id }), Effect.annotateLogs({ userId: id }));
|
|
27
|
+
}).pipe(Effect.provideService(SessionPolicy, policy))));
|
|
26
28
|
}
|
|
27
|
-
export function maybeAuthenticatedLayer(
|
|
28
|
-
return Layer.
|
|
29
|
-
const session = yield* resolveSession(
|
|
29
|
+
export function maybeAuthenticatedLayer() {
|
|
30
|
+
return Layer.effect(MaybeAuthenticated, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc, payload }) => Effect.gen(function* () {
|
|
31
|
+
const session = yield* resolveSession(headers, rpc._tag);
|
|
30
32
|
if (Option.isNone(session)) {
|
|
31
33
|
return yield* Effect.provideService(authorizeReads(effect, { payload, rpc }, Option.none()), OptionalIdentity, Option.none());
|
|
32
34
|
}
|
|
33
35
|
const id = yield* identified(session.value.user.id);
|
|
34
|
-
return yield* authorizeReads(effect, { payload, rpc }, Option.some({ id })).pipe(revalidateStream(
|
|
35
|
-
}));
|
|
36
|
+
return yield* authorizeReads(effect, { payload, rpc }, Option.some({ id })).pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)), Effect.provideService(OptionalIdentity, Option.some({ id })), Effect.annotateLogs({ userId: id }));
|
|
37
|
+
}).pipe(Effect.provideService(SessionPolicy, policy))));
|
|
36
38
|
}
|
|
37
|
-
export function withSessionUser(
|
|
39
|
+
export function withSessionUser(headers, operation) {
|
|
38
40
|
return (effect) => Effect.gen(function* () {
|
|
39
|
-
const session = yield* resolveSession(
|
|
41
|
+
const session = yield* resolveSession(headers, operation);
|
|
40
42
|
if (Option.isNone(session)) {
|
|
41
43
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
42
44
|
}
|
|
43
|
-
const user = Schema.
|
|
45
|
+
const user = Schema.decodeUnknownSync(SessionUserSchema)(session.value.user);
|
|
44
46
|
const id = yield* identified(session.value.user.id);
|
|
45
47
|
return yield* effect.pipe(Effect.provideService(Identity, { id }), Effect.provideService(SessionUser, user), Effect.annotateLogs({ userId: id }));
|
|
46
48
|
});
|
|
47
49
|
}
|
|
48
|
-
export function authenticatedUserLayer(
|
|
49
|
-
return Layer.
|
|
50
|
+
export function authenticatedUserLayer() {
|
|
51
|
+
return Layer.effect(AuthenticatedUser, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc, payload }) => Effect.flatMap(Identity, (viewer) => authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some(viewer))).pipe((invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)))), withSessionUser(headers, rpc._tag), Effect.provideService(SessionPolicy, policy))));
|
|
50
52
|
}
|
|
51
|
-
export function authenticatedUserWithProviderAccountsLayer(
|
|
52
|
-
return Layer.
|
|
53
|
-
const session = yield* resolveSession(
|
|
53
|
+
export function authenticatedUserWithProviderAccountsLayer() {
|
|
54
|
+
return Layer.effect(AuthenticatedUserWithProviderAccounts, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc, payload }) => Effect.gen(function* () {
|
|
55
|
+
const session = yield* resolveSession(headers, rpc._tag);
|
|
54
56
|
if (Option.isNone(session)) {
|
|
55
57
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
56
58
|
}
|
|
57
|
-
const {
|
|
58
|
-
const
|
|
59
|
-
const user = Schema.decodeSync(SessionUserSchema)(session.value.user);
|
|
59
|
+
const { providerAccounts, ...user } = yield* providerAccountsUser(session.value.user);
|
|
60
|
+
const { id } = user;
|
|
60
61
|
yield* identified(id);
|
|
61
|
-
return yield* authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some({ id })).pipe(revalidateStream(
|
|
62
|
-
}));
|
|
62
|
+
return yield* authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some({ id })).pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)), Effect.provideService(Identity, { id }), Effect.provideService(SessionUser, user), Effect.provideService(SessionUserWithProviderAccounts, { ...user, providerAccounts }), Effect.annotateLogs({ userId: id }));
|
|
63
|
+
}).pipe(Effect.provideService(SessionPolicy, policy))));
|
|
63
64
|
}
|
|
64
65
|
//# sourceMappingURL=session.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/server/session.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,
|
|
1
|
+
{"version":3,"file":"session.js","sourceRoot":"","sources":["../../src/server/session.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.17.0",
|
|
4
4
|
"description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -49,17 +49,17 @@
|
|
|
49
49
|
"@shivaedev/changes": "0.6.0",
|
|
50
50
|
"@shivaedev/contract": "0.30.1",
|
|
51
51
|
"@shivaedev/errors": "0.4.1",
|
|
52
|
-
"@shivaedev/sql": "0.
|
|
52
|
+
"@shivaedev/sql": "0.31.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.17.0",
|
|
58
|
+
"@shivaedev/quality": "0.54.0",
|
|
59
|
+
"@shivaedev/server": "0.17.0",
|
|
60
60
|
"@shivaedev/test": "0.12.0",
|
|
61
|
-
"@shivaedev/test-sql": "0.
|
|
62
|
-
"@shivaedev/test-story": "0.
|
|
61
|
+
"@shivaedev/test-sql": "0.16.0",
|
|
62
|
+
"@shivaedev/test-story": "0.32.0",
|
|
63
63
|
"@types/node": "24.19.2",
|
|
64
64
|
"better-auth": "1.7.12",
|
|
65
65
|
"effect": "4.0.6",
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Context, type Duration } from "effect";
|
|
2
|
+
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
3
|
+
import type { OriginPolicy } from "./origin.ts";
|
|
4
|
+
import type { SessionProvider, SessionShape } from "./session.ts";
|
|
5
|
+
|
|
6
|
+
export class SessionPolicy extends Context.Service<
|
|
7
|
+
SessionPolicy,
|
|
8
|
+
{
|
|
9
|
+
readonly origin: OriginPolicy;
|
|
10
|
+
readonly provider: SessionProvider<SessionShape>;
|
|
11
|
+
readonly roles?: RoleSet;
|
|
12
|
+
readonly streamRevalidationInterval?: Duration.Input | undefined;
|
|
13
|
+
}
|
|
14
|
+
>()("@shivaedev/identity/SessionPolicy") {}
|
|
@@ -19,7 +19,7 @@ export function betterAuthSessions<TSession extends SessionShape>(
|
|
|
19
19
|
getProviderAccounts: GetProviderAccounts,
|
|
20
20
|
): SessionProvider<SessionWithProviderAccounts<TSession>>;
|
|
21
21
|
export function betterAuthSessions<TSession extends SessionShape>(getSession: GetSession<TSession>, getProviderAccounts?: GetProviderAccounts) {
|
|
22
|
-
const betterAuthSession = Effect.fn("
|
|
22
|
+
const betterAuthSession = Effect.fn("Identity.betterAuthSession")(function* (headers: Headers.Headers) {
|
|
23
23
|
const transport = new globalThis.Headers(headers);
|
|
24
24
|
const session = yield* Effect.tryPromise(() => getSession(transport)).pipe(Effect.catch((error) => providerFailure(error.cause)));
|
|
25
25
|
if (Schema.is(ExpiringSession)(session) && session.session.expiresAt.getTime() <= (yield* Clock.currentTimeMillis)) {
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import type { Effect } from "effect";
|
|
3
|
+
import type { BetterAuthHookError } from "./databaseHooks.ts";
|
|
4
|
+
|
|
5
|
+
type NativePasswordReset = NonNullable<NonNullable<BetterAuthOptions["emailAndPassword"]>["onPasswordReset"]>;
|
|
6
|
+
|
|
7
|
+
export type BetterAuthPasswordReset<R = never> = (data: Parameters<NativePasswordReset>[0]) => Effect.Effect<void, BetterAuthHookError, R>;
|
|
@@ -0,0 +1,25 @@
|
|
|
1
|
+
import type { BetterAuthOptions } from "better-auth";
|
|
2
|
+
import type { Effect } from "effect";
|
|
3
|
+
import type { BetterAuthPasswordReset } from "#server/better-auth/PasswordReset.ts";
|
|
4
|
+
import type { hookRuntime } from "./hookRuntime.ts";
|
|
5
|
+
|
|
6
|
+
export function passwordResetOptions<TOptions extends BetterAuthOptions, R>(
|
|
7
|
+
options: TOptions,
|
|
8
|
+
hook: BetterAuthPasswordReset<R> | undefined,
|
|
9
|
+
runtime: Effect.Success<ReturnType<typeof hookRuntime<R>>>,
|
|
10
|
+
): TOptions {
|
|
11
|
+
if (hook === undefined) {
|
|
12
|
+
return options;
|
|
13
|
+
}
|
|
14
|
+
return {
|
|
15
|
+
...options,
|
|
16
|
+
emailAndPassword: {
|
|
17
|
+
...options.emailAndPassword,
|
|
18
|
+
enabled: options.emailAndPassword?.enabled ?? false,
|
|
19
|
+
onPasswordReset: async (data, request) => {
|
|
20
|
+
await options.emailAndPassword?.onPasswordReset?.(data, request);
|
|
21
|
+
await runtime.runHook(() => hook(data), request?.signal);
|
|
22
|
+
},
|
|
23
|
+
},
|
|
24
|
+
};
|
|
25
|
+
}
|
|
@@ -5,6 +5,7 @@ import { effectHookOptions } from "#server/better-auth/adapters/effectHookOption
|
|
|
5
5
|
import { emailOptions } from "#server/better-auth/adapters/emailOptions.ts";
|
|
6
6
|
import { type BetterAuthHardeningOptions, withHardening } from "#server/better-auth/adapters/hardening.ts";
|
|
7
7
|
import { hookRuntime } from "#server/better-auth/adapters/hookRuntime.ts";
|
|
8
|
+
import { passwordResetOptions } from "#server/better-auth/adapters/passwordResetOptions.ts";
|
|
8
9
|
import { roleSeedOptions } from "#server/better-auth/adapters/roleSeedOptions.ts";
|
|
9
10
|
import { signInPolicyOptions } from "#server/better-auth/adapters/signInPolicyOptions.ts";
|
|
10
11
|
import { type StoredRoleOptions, storedRoleOptions } from "#server/better-auth/adapters/storedRoleOptions.ts";
|
|
@@ -20,19 +21,21 @@ import { closeRoleEndpoints } from "./closeRoleEndpoints.ts";
|
|
|
20
21
|
import type { BetterAuthDatabaseHooks } from "./databaseHooks.ts";
|
|
21
22
|
import type { BetterAuthEmails } from "./emails.ts";
|
|
22
23
|
import { mountedSessions } from "./mountedSessions.ts";
|
|
24
|
+
import type { BetterAuthPasswordReset } from "./PasswordReset.ts";
|
|
23
25
|
|
|
24
26
|
export type BetterAuthMountOptions<E = never, R = never> = {
|
|
25
27
|
readonly bearerSessions?: BearerSessionsOptions | undefined;
|
|
26
28
|
readonly databaseHooks?: BetterAuthDatabaseHooks<R> | undefined;
|
|
27
29
|
readonly emails?: BetterAuthEmails<R> | undefined;
|
|
28
30
|
readonly hardening?: BetterAuthHardeningOptions;
|
|
31
|
+
readonly onPasswordReset?: BetterAuthPasswordReset<R> | undefined;
|
|
29
32
|
readonly signIn?: SignInPolicy<E, R> | undefined;
|
|
30
33
|
} & (
|
|
31
34
|
| { readonly roles?: undefined; readonly roleSeed?: undefined }
|
|
32
35
|
| (StoredRoleOptions & { readonly roles: RoleSet; readonly roleSeed?: Effect.Effect<AccountRoleSeed<E>, E, R> })
|
|
33
36
|
);
|
|
34
37
|
|
|
35
|
-
export const betterAuthMount = Effect.fn("
|
|
38
|
+
export const betterAuthMount = Effect.fn("Identity.betterAuthMount")(function* <const TOptions extends BetterAuthOptions, E = never, R = never>(
|
|
36
39
|
options: TOptions,
|
|
37
40
|
mount: BetterAuthMountOptions<E, R> = {},
|
|
38
41
|
) {
|
|
@@ -48,7 +51,8 @@ export const betterAuthMount = Effect.fn("Platform.betterAuthMount")(function* <
|
|
|
48
51
|
}
|
|
49
52
|
const gate = yield* signInGate(policy);
|
|
50
53
|
const runtime = yield* hookRuntime<R>();
|
|
51
|
-
const
|
|
54
|
+
const reset = passwordResetOptions(options, mount.onPasswordReset, runtime);
|
|
55
|
+
const hooked = effectHookOptions(yield* emailOptions(reset, mount.emails, runtime), mount.databaseHooks, runtime);
|
|
52
56
|
const configured = mount.roles === undefined ? hooked : storedRoleOptions(closeRoleEndpoints(hooked), mount);
|
|
53
57
|
const gated = yield* signInPolicyOptions(configured, gate, (): Promise<PolicyStorage> => auth.$context);
|
|
54
58
|
const seed = mount.roleSeed === undefined ? undefined : yield* mount.roleSeed;
|
|
@@ -7,7 +7,7 @@ import { resolveRole } from "#server/resolveRole.ts";
|
|
|
7
7
|
const Fields = Schema.Record(Schema.String, Schema.Unknown);
|
|
8
8
|
const SessionPayload = Schema.NullOr(Schema.StructWithRest(Schema.Struct({ user: Schema.StructWithRest(SessionUserSchema, [Fields]) }), [Fields]));
|
|
9
9
|
|
|
10
|
-
export const sessionPermissions = Effect.fn("
|
|
10
|
+
export const sessionPermissions = Effect.fn("Identity.sessionPermissions")(function* (
|
|
11
11
|
response: Response,
|
|
12
12
|
roles: RoleSet,
|
|
13
13
|
): Effect.fn.Return<Response, Cause.UnknownError | Schema.SchemaError | Forbidden> {
|