@shivaedev/identity 0.16.0 → 0.18.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 +37 -0
- package/README.md +84 -54
- 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/authCall.d.ts +5 -0
- package/dist/server/adapters/authCall.d.ts.map +1 -0
- package/dist/server/adapters/authCall.js +7 -0
- package/dist/server/adapters/authCall.js.map +1 -0
- package/dist/server/adapters/betterAuthSessions.d.ts.map +1 -1
- package/dist/server/adapters/betterAuthSessions.js +4 -6
- 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/accountRoleSeed.d.ts +2 -1
- package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -1
- package/dist/server/better-auth/accountRoleSeed.js +8 -6
- package/dist/server/better-auth/accountRoleSeed.js.map +1 -1
- package/dist/server/better-auth/adapters/database.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/database.js +18 -3
- package/dist/server/better-auth/adapters/database.js.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.js +2 -1
- package/dist/server/better-auth/adapters/hookRuntime.js.map +1 -1
- 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/adapters/storedRoleOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.js +8 -1
- package/dist/server/better-auth/adapters/storedRoleOptions.js.map +1 -1
- package/dist/server/better-auth/assignRole.d.ts +2 -1
- package/dist/server/better-auth/assignRole.d.ts.map +1 -1
- package/dist/server/better-auth/assignRole.js +7 -5
- package/dist/server/better-auth/assignRole.js.map +1 -1
- package/dist/server/better-auth/columnDrift.d.ts.map +1 -1
- package/dist/server/better-auth/columnDrift.js +4 -3
- package/dist/server/better-auth/columnDrift.js.map +1 -1
- package/dist/server/better-auth/migrationPlan.d.ts.map +1 -1
- package/dist/server/better-auth/migrationPlan.js +7 -5
- package/dist/server/better-auth/migrationPlan.js.map +1 -1
- package/dist/server/better-auth/mount.d.ts +3 -0
- package/dist/server/better-auth/mount.d.ts.map +1 -1
- package/dist/server/better-auth/mount.js +15 -4
- package/dist/server/better-auth/mount.js.map +1 -1
- package/dist/server/better-auth/sessionPermissions.js +1 -1
- package/dist/server/better-auth/signInGate.d.ts.map +1 -1
- package/dist/server/better-auth/signInGate.js +2 -1
- package/dist/server/better-auth/signInGate.js.map +1 -1
- package/dist/server/better-auth/tables.d.ts +19 -0
- package/dist/server/better-auth/tables.d.ts.map +1 -0
- package/dist/server/better-auth/tables.js +24 -0
- package/dist/server/better-auth/tables.js.map +1 -0
- 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 +30 -28
- package/dist/server/session.js.map +1 -1
- package/dist/server/tracing.d.ts.map +1 -1
- package/dist/server/tracing.js +3 -2
- package/dist/server/tracing.js.map +1 -1
- package/package.json +12 -12
- package/src/server/SessionPolicy.ts +14 -0
- package/src/server/adapters/authCall.ts +8 -0
- package/src/server/adapters/betterAuthSessions.ts +5 -7
- package/src/server/better-auth/PasswordReset.ts +7 -0
- package/src/server/better-auth/accountRoleSeed.ts +8 -5
- package/src/server/better-auth/adapters/database.ts +21 -4
- package/src/server/better-auth/adapters/hookRuntime.ts +2 -1
- package/src/server/better-auth/adapters/passwordResetOptions.ts +25 -0
- package/src/server/better-auth/adapters/storedRoleOptions.ts +8 -1
- package/src/server/better-auth/assignRole.ts +7 -4
- package/src/server/better-auth/columnDrift.ts +4 -3
- package/src/server/better-auth/migrationPlan.ts +7 -5
- package/src/server/better-auth/mount.ts +17 -4
- package/src/server/better-auth/sessionPermissions.ts +1 -1
- package/src/server/better-auth/signInGate.ts +2 -1
- package/src/server/better-auth/tables.ts +28 -0
- 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 +88 -85
- package/src/server/tracing.ts +5 -2
package/src/server/session.ts
CHANGED
|
@@ -1,9 +1,7 @@
|
|
|
1
|
-
import {
|
|
1
|
+
import { Effect, Layer, Option, Schema } from "effect";
|
|
2
2
|
import type { Headers } from "effect/http";
|
|
3
|
-
import type { Permission } from "@shivaedev/access/permission.ts";
|
|
4
|
-
import type { RoleSet } from "@shivaedev/access/roleSet.ts";
|
|
5
3
|
import { authorizeReads } from "@shivaedev/contract/readPolicy.ts";
|
|
6
|
-
import { type AuthUnavailable,
|
|
4
|
+
import { type AuthUnavailable, Unauthorized } from "@shivaedev/errors/taxonomy.ts";
|
|
7
5
|
import {
|
|
8
6
|
Identity,
|
|
9
7
|
OptionalIdentity,
|
|
@@ -15,7 +13,8 @@ import {
|
|
|
15
13
|
} from "#identity.ts";
|
|
16
14
|
import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated } from "#middleware.ts";
|
|
17
15
|
import { commandChanges } from "#server/commandChanges.ts";
|
|
18
|
-
import
|
|
16
|
+
import { providerAccountsUser } from "#server/providerAccountsUser.ts";
|
|
17
|
+
import { SessionPolicy } from "#server/SessionPolicy.ts";
|
|
19
18
|
import { lookupSession, sessionRequest } from "./lookupSession.ts";
|
|
20
19
|
import { recheckSession } from "./recheckSession.ts";
|
|
21
20
|
import { revalidateStream } from "./revalidateStream.ts";
|
|
@@ -27,71 +26,69 @@ export interface SessionShape {
|
|
|
27
26
|
export interface SessionProvider<TSession extends SessionShape> {
|
|
28
27
|
readonly get: (headers: Headers.Headers) => Effect.Effect<Option.Option<TSession>, AuthUnavailable>;
|
|
29
28
|
}
|
|
30
|
-
export
|
|
31
|
-
|
|
32
|
-
|
|
33
|
-
|
|
34
|
-
readonly streamRevalidationInterval?: Duration.Input | undefined;
|
|
35
|
-
}
|
|
36
|
-
export const resolveSession: <TSession extends SessionShape>(
|
|
37
|
-
policy: SessionPolicy<TSession>,
|
|
38
|
-
headers: Headers.Headers,
|
|
39
|
-
rpc: string,
|
|
40
|
-
) => Effect.Effect<Option.Option<TSession & { readonly user: { readonly permissions?: readonly Permission[] } }>, AuthUnavailable | Forbidden> =
|
|
41
|
-
Effect.fn("PlatformRpc.resolveSession")(function* <TSession extends SessionShape>(
|
|
42
|
-
policy: SessionPolicy<TSession>,
|
|
43
|
-
headers: Headers.Headers,
|
|
44
|
-
rpc: string,
|
|
45
|
-
) {
|
|
46
|
-
const request = yield* sessionRequest(policy, headers, rpc);
|
|
47
|
-
return yield* lookupSession(policy, request.headers);
|
|
48
|
-
});
|
|
29
|
+
export const resolveSession = Effect.fn("Identity.resolveSession")(function* (headers: Headers.Headers, rpc: string) {
|
|
30
|
+
const request = yield* sessionRequest(headers, rpc);
|
|
31
|
+
return yield* lookupSession(request.headers);
|
|
32
|
+
});
|
|
49
33
|
function identified(id: string) {
|
|
50
34
|
return Effect.andThen(Effect.annotateCurrentSpan("user.id", id), Effect.succeed(id));
|
|
51
35
|
}
|
|
52
|
-
export function authenticatedLayer
|
|
53
|
-
return Layer.
|
|
54
|
-
|
|
55
|
-
|
|
56
|
-
|
|
57
|
-
|
|
58
|
-
|
|
59
|
-
|
|
60
|
-
|
|
61
|
-
|
|
62
|
-
|
|
63
|
-
|
|
64
|
-
|
|
65
|
-
|
|
36
|
+
export function authenticatedLayer() {
|
|
37
|
+
return Layer.effect(
|
|
38
|
+
Authenticated,
|
|
39
|
+
Effect.map(
|
|
40
|
+
SessionPolicy,
|
|
41
|
+
(policy) =>
|
|
42
|
+
(effect, { headers, rpc, payload }) =>
|
|
43
|
+
Effect.gen(function* () {
|
|
44
|
+
const session = yield* resolveSession(headers, rpc._tag);
|
|
45
|
+
if (Option.isNone(session)) {
|
|
46
|
+
return yield* new Unauthorized({ message: "Authentication required" });
|
|
47
|
+
}
|
|
48
|
+
const id = yield* identified(session.value.user.id);
|
|
49
|
+
return yield* authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some({ id })).pipe(
|
|
50
|
+
revalidateStream(rpc, id, recheckSession(headers, rpc._tag)),
|
|
51
|
+
Effect.provideService(Identity, { id }),
|
|
52
|
+
Effect.annotateLogs({ userId: id }),
|
|
53
|
+
);
|
|
54
|
+
}).pipe(Effect.provideService(SessionPolicy, policy)),
|
|
55
|
+
),
|
|
66
56
|
);
|
|
67
57
|
}
|
|
68
|
-
export function maybeAuthenticatedLayer
|
|
69
|
-
return Layer.
|
|
70
|
-
|
|
71
|
-
|
|
72
|
-
|
|
73
|
-
|
|
74
|
-
|
|
75
|
-
|
|
76
|
-
|
|
77
|
-
|
|
78
|
-
|
|
79
|
-
|
|
80
|
-
|
|
81
|
-
|
|
58
|
+
export function maybeAuthenticatedLayer() {
|
|
59
|
+
return Layer.effect(
|
|
60
|
+
MaybeAuthenticated,
|
|
61
|
+
Effect.map(
|
|
62
|
+
SessionPolicy,
|
|
63
|
+
(policy) =>
|
|
64
|
+
(effect, { headers, rpc, payload }) =>
|
|
65
|
+
Effect.gen(function* () {
|
|
66
|
+
const session = yield* resolveSession(headers, rpc._tag);
|
|
67
|
+
if (Option.isNone(session)) {
|
|
68
|
+
const invocation = authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.none());
|
|
69
|
+
return yield* Effect.provideService(invocation, OptionalIdentity, Option.none());
|
|
70
|
+
}
|
|
71
|
+
const id = yield* identified(session.value.user.id);
|
|
72
|
+
return yield* authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some({ id })).pipe(
|
|
73
|
+
revalidateStream(rpc, id, recheckSession(headers, rpc._tag)),
|
|
74
|
+
Effect.provideService(OptionalIdentity, Option.some({ id })),
|
|
75
|
+
Effect.annotateLogs({ userId: id }),
|
|
76
|
+
);
|
|
77
|
+
}).pipe(Effect.provideService(SessionPolicy, policy)),
|
|
78
|
+
),
|
|
82
79
|
);
|
|
83
80
|
}
|
|
84
81
|
export interface UserSessionShape extends SessionShape {
|
|
85
82
|
readonly user: SessionUserValue;
|
|
86
83
|
}
|
|
87
|
-
export function withSessionUser
|
|
84
|
+
export function withSessionUser(headers: Headers.Headers, operation: string) {
|
|
88
85
|
return <A, E, R>(effect: Effect.Effect<A, E, R>) =>
|
|
89
86
|
Effect.gen(function* () {
|
|
90
|
-
const session = yield* resolveSession(
|
|
87
|
+
const session = yield* resolveSession(headers, operation);
|
|
91
88
|
if (Option.isNone(session)) {
|
|
92
89
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
93
90
|
}
|
|
94
|
-
const user = Schema.
|
|
91
|
+
const user = Schema.decodeUnknownSync(SessionUserSchema)(session.value.user);
|
|
95
92
|
const id = yield* identified(session.value.user.id);
|
|
96
93
|
return yield* effect.pipe(
|
|
97
94
|
Effect.provideService(Identity, { id }),
|
|
@@ -100,12 +97,18 @@ export function withSessionUser<TSession extends UserSessionShape>(policy: Sessi
|
|
|
100
97
|
);
|
|
101
98
|
});
|
|
102
99
|
}
|
|
103
|
-
export function authenticatedUserLayer
|
|
104
|
-
return Layer.
|
|
105
|
-
|
|
106
|
-
|
|
107
|
-
|
|
108
|
-
|
|
100
|
+
export function authenticatedUserLayer() {
|
|
101
|
+
return Layer.effect(
|
|
102
|
+
AuthenticatedUser,
|
|
103
|
+
Effect.map(
|
|
104
|
+
SessionPolicy,
|
|
105
|
+
(policy) =>
|
|
106
|
+
(effect, { headers, rpc, payload }) =>
|
|
107
|
+
Effect.flatMap(Identity, (viewer) => authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some(viewer))).pipe(
|
|
108
|
+
(invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)))),
|
|
109
|
+
withSessionUser(headers, rpc._tag),
|
|
110
|
+
Effect.provideService(SessionPolicy, policy),
|
|
111
|
+
),
|
|
109
112
|
),
|
|
110
113
|
);
|
|
111
114
|
}
|
|
@@ -113,29 +116,29 @@ export function authenticatedUserLayer<TSession extends UserSessionShape>(policy
|
|
|
113
116
|
export interface ProviderAccountsSessionShape extends UserSessionShape {
|
|
114
117
|
readonly user: SessionUserWithProviderAccountsValue;
|
|
115
118
|
}
|
|
116
|
-
export function authenticatedUserWithProviderAccountsLayer
|
|
117
|
-
|
|
118
|
-
|
|
119
|
-
|
|
120
|
-
|
|
121
|
-
|
|
122
|
-
|
|
123
|
-
|
|
124
|
-
|
|
125
|
-
|
|
126
|
-
|
|
127
|
-
|
|
128
|
-
|
|
129
|
-
|
|
130
|
-
|
|
131
|
-
|
|
132
|
-
|
|
133
|
-
|
|
134
|
-
|
|
135
|
-
|
|
136
|
-
|
|
137
|
-
|
|
138
|
-
|
|
139
|
-
|
|
119
|
+
export function authenticatedUserWithProviderAccountsLayer() {
|
|
120
|
+
return Layer.effect(
|
|
121
|
+
AuthenticatedUserWithProviderAccounts,
|
|
122
|
+
Effect.map(
|
|
123
|
+
SessionPolicy,
|
|
124
|
+
(policy) =>
|
|
125
|
+
(effect, { headers, rpc, payload }) =>
|
|
126
|
+
Effect.gen(function* () {
|
|
127
|
+
const session = yield* resolveSession(headers, rpc._tag);
|
|
128
|
+
if (Option.isNone(session)) {
|
|
129
|
+
return yield* new Unauthorized({ message: "Authentication required" });
|
|
130
|
+
}
|
|
131
|
+
const { providerAccounts, ...user } = yield* providerAccountsUser(session.value.user);
|
|
132
|
+
const { id } = user;
|
|
133
|
+
yield* identified(id);
|
|
134
|
+
return yield* authorizeReads(commandChanges(effect, rpc, payload), { payload, rpc }, Option.some({ id })).pipe(
|
|
135
|
+
revalidateStream(rpc, id, recheckSession(headers, rpc._tag)),
|
|
136
|
+
Effect.provideService(Identity, { id }),
|
|
137
|
+
Effect.provideService(SessionUser, user),
|
|
138
|
+
Effect.provideService(SessionUserWithProviderAccounts, { ...user, providerAccounts }),
|
|
139
|
+
Effect.annotateLogs({ userId: id }),
|
|
140
|
+
);
|
|
141
|
+
}).pipe(Effect.provideService(SessionPolicy, policy)),
|
|
142
|
+
),
|
|
140
143
|
);
|
|
141
144
|
}
|
package/src/server/tracing.ts
CHANGED
|
@@ -5,7 +5,7 @@ import { redact } from "@shivaedev/errors/redact.ts";
|
|
|
5
5
|
import { redactCause, redactDiagnosticCause } from "@shivaedev/errors/redactCause.ts";
|
|
6
6
|
import { isSensitiveKey, REDACTED, redactText, type SensitiveKey } from "@shivaedev/errors/sensitive.ts";
|
|
7
7
|
import { RequestId } from "#identity.ts";
|
|
8
|
-
import { RequestTracing } from "#middleware.ts";
|
|
8
|
+
import { Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated, RequestTracing } from "#middleware.ts";
|
|
9
9
|
import { commandChanges } from "#server/commandChanges.ts";
|
|
10
10
|
export interface RequestTracingOptions {
|
|
11
11
|
readonly header?: string;
|
|
@@ -61,7 +61,10 @@ export function requestTracingLayer(options: RequestTracingOptions = {}): Layer.
|
|
|
61
61
|
Effect.gen(function* () {
|
|
62
62
|
const requestId = yield* requestIdOf(headers, options.header ?? "x-request-id");
|
|
63
63
|
yield* Effect.annotateCurrentSpan({ "request.id": requestId, "rpc.method": rpc._tag });
|
|
64
|
-
const
|
|
64
|
+
const hasSession = [Authenticated, AuthenticatedUser, AuthenticatedUserWithProviderAccounts, MaybeAuthenticated].some((middleware) =>
|
|
65
|
+
rpc.middlewares.has(middleware),
|
|
66
|
+
);
|
|
67
|
+
const invocation = hasSession || Option.isSome(Context.getOption(rpc.annotations, KeyScope)) ? effect : commandChanges(effect, rpc, payload);
|
|
65
68
|
return yield* invocation.pipe(
|
|
66
69
|
Effect.catchCauseIf(Cause.hasDies, (cause) => Effect.failCause(redactCause(cause, options.sensitive))),
|
|
67
70
|
Effect.onExit((exit) => (Exit.isFailure(exit) ? logFailure(exit.cause, payload, options.sensitive) : Effect.void)),
|