@shivaedev/identity 0.19.0 → 0.21.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 +46 -0
- package/README.md +171 -80
- package/dist/PermissionSession.d.ts +11 -0
- package/dist/PermissionSession.d.ts.map +1 -0
- package/dist/PermissionSession.js +6 -0
- package/dist/PermissionSession.js.map +1 -0
- package/dist/authRefusal.d.ts +18 -0
- package/dist/authRefusal.d.ts.map +1 -0
- package/dist/authRefusal.js +11 -0
- package/dist/authRefusal.js.map +1 -0
- package/dist/client/AuthFailure.d.ts +18 -0
- package/dist/client/AuthFailure.d.ts.map +1 -0
- package/dist/client/AuthFailure.js +15 -0
- package/dist/client/AuthFailure.js.map +1 -0
- package/dist/client/AuthFailureCode.d.ts +4 -0
- package/dist/client/AuthFailureCode.d.ts.map +1 -0
- package/dist/client/AuthFailureCode.js +57 -0
- package/dist/client/AuthFailureCode.js.map +1 -0
- package/dist/client/adapters/authCall.d.ts +8 -0
- package/dist/client/adapters/authCall.d.ts.map +1 -0
- package/dist/client/adapters/authCall.js +31 -0
- package/dist/client/adapters/authCall.js.map +1 -0
- package/dist/client/adapters/authQuery.d.ts +5 -0
- package/dist/client/adapters/authQuery.d.ts.map +1 -0
- package/dist/client/adapters/authQuery.js +9 -0
- package/dist/client/adapters/authQuery.js.map +1 -0
- package/dist/client/adapters/authSession.d.ts +9 -0
- package/dist/client/adapters/authSession.d.ts.map +1 -0
- package/dist/client/adapters/authSession.js +20 -0
- package/dist/client/adapters/authSession.js.map +1 -0
- package/dist/client/adapters/changeEmail.d.ts +12 -0
- package/dist/client/adapters/changeEmail.d.ts.map +1 -0
- package/dist/client/adapters/changeEmail.js +5 -0
- package/dist/client/adapters/changeEmail.js.map +1 -0
- package/dist/roles.d.ts +16 -0
- package/dist/roles.d.ts.map +1 -0
- package/dist/roles.js +6 -0
- package/dist/roles.js.map +1 -0
- package/dist/server/UserDirectory.d.ts +14 -0
- package/dist/server/UserDirectory.d.ts.map +1 -0
- package/dist/server/UserDirectory.js +4 -0
- package/dist/server/UserDirectory.js.map +1 -0
- package/dist/server/better-auth/UndeclaredDefaultRole.d.ts +9 -0
- package/dist/server/better-auth/UndeclaredDefaultRole.d.ts.map +1 -0
- package/dist/server/better-auth/UndeclaredDefaultRole.js +9 -0
- package/dist/server/better-auth/UndeclaredDefaultRole.js.map +1 -0
- package/dist/server/better-auth/accountRoleSeed.d.ts +2 -2
- package/dist/server/better-auth/accountRoleSeed.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/acquire.d.ts +7 -0
- package/dist/server/better-auth/adapters/acquire.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/acquire.js +14 -0
- package/dist/server/better-auth/adapters/acquire.js.map +1 -0
- package/dist/server/better-auth/adapters/emailOptions.d.ts +2 -2
- package/dist/server/better-auth/adapters/emailOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/emailOptions.js +13 -9
- package/dist/server/better-auth/adapters/emailOptions.js.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.d.ts +7 -1
- package/dist/server/better-auth/adapters/hookRuntime.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/hookRuntime.js +9 -1
- package/dist/server/better-auth/adapters/hookRuntime.js.map +1 -1
- package/dist/server/better-auth/adapters/mount.d.ts +51 -40
- package/dist/server/better-auth/adapters/mount.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/mount.js +19 -6
- package/dist/server/better-auth/adapters/mount.js.map +1 -1
- package/dist/server/better-auth/adapters/oauthGrants.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/oauthGrants.js +17 -7
- package/dist/server/better-auth/adapters/oauthGrants.js.map +1 -1
- package/dist/server/better-auth/adapters/oauthProvider.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/oauthProvider.js +25 -2
- package/dist/server/better-auth/adapters/oauthProvider.js.map +1 -1
- package/dist/server/better-auth/adapters/profileStorage.d.ts +6 -0
- package/dist/server/better-auth/adapters/profileStorage.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/profileStorage.js +13 -0
- package/dist/server/better-auth/adapters/profileStorage.js.map +1 -0
- package/dist/server/better-auth/adapters/providerOnlyOptions.d.ts +3 -0
- package/dist/server/better-auth/adapters/providerOnlyOptions.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/providerOnlyOptions.js +56 -0
- package/dist/server/better-auth/adapters/providerOnlyOptions.js.map +1 -0
- package/dist/server/better-auth/adapters/response.d.ts +3 -1
- package/dist/server/better-auth/adapters/response.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/response.js +8 -6
- package/dist/server/better-auth/adapters/response.js.map +1 -1
- package/dist/server/better-auth/adapters/roleSeedOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/roleSeedOptions.js +2 -1
- package/dist/server/better-auth/adapters/roleSeedOptions.js.map +1 -1
- package/dist/server/better-auth/adapters/signInPolicyOptions.d.ts.map +1 -1
- package/dist/server/better-auth/adapters/signInPolicyOptions.js +3 -2
- package/dist/server/better-auth/adapters/signInPolicyOptions.js.map +1 -1
- package/dist/server/better-auth/adapters/userDirectory.d.ts +7 -0
- package/dist/server/better-auth/adapters/userDirectory.d.ts.map +1 -0
- package/dist/server/better-auth/adapters/userDirectory.js +20 -0
- package/dist/server/better-auth/adapters/userDirectory.js.map +1 -0
- package/dist/server/better-auth/assignRole.d.ts +1 -1
- package/dist/server/better-auth/assignRole.d.ts.map +1 -1
- package/dist/server/better-auth/assignRole.js +4 -2
- package/dist/server/better-auth/assignRole.js.map +1 -1
- package/dist/server/better-auth/emails.d.ts +11 -8
- package/dist/server/better-auth/emails.d.ts.map +1 -1
- package/dist/server/better-auth/mountRoutes.d.ts +1 -0
- package/dist/server/better-auth/mountRoutes.d.ts.map +1 -1
- package/dist/server/better-auth/mountRoutes.js +1 -1
- package/dist/server/better-auth/mountRoutes.js.map +1 -1
- package/dist/server/better-auth/userDirectoryReads.d.ts +26 -0
- package/dist/server/better-auth/userDirectoryReads.d.ts.map +1 -0
- package/dist/server/better-auth/userDirectoryReads.js +42 -0
- package/dist/server/better-auth/userDirectoryReads.js.map +1 -0
- package/dist/server/better-auth/userProfiles.d.ts +4 -6
- package/dist/server/better-auth/userProfiles.d.ts.map +1 -1
- package/dist/server/better-auth/userProfiles.js +2 -11
- package/dist/server/better-auth/userProfiles.js.map +1 -1
- package/dist/server/oauthGrants.d.ts +4 -1
- package/dist/server/oauthGrants.d.ts.map +1 -1
- package/dist/server/oauthGrants.js.map +1 -1
- package/dist/server/permissions.d.ts.map +1 -1
- package/dist/server/permissions.js +2 -4
- package/dist/server/permissions.js.map +1 -1
- package/dist/server/resolveChanges.d.ts +8 -0
- package/dist/server/resolveChanges.d.ts.map +1 -0
- package/dist/server/resolveChanges.js +13 -0
- package/dist/server/resolveChanges.js.map +1 -0
- package/dist/server/session.d.ts +1 -1
- package/dist/server/session.d.ts.map +1 -1
- package/dist/server/session.js +10 -11
- package/dist/server/session.js.map +1 -1
- package/dist/server/tracing.d.ts.map +1 -1
- package/dist/server/tracing.js +3 -7
- package/dist/server/tracing.js.map +1 -1
- package/dist/sessions.d.ts +22 -6
- package/dist/sessions.d.ts.map +1 -1
- package/dist/users.d.ts +29 -0
- package/dist/users.d.ts.map +1 -0
- package/dist/users.js +18 -0
- package/dist/users.js.map +1 -0
- package/package.json +17 -17
- package/src/PermissionSession.ts +7 -0
- package/src/authRefusal.ts +13 -0
- package/src/client/AuthFailure.ts +19 -0
- package/src/client/AuthFailureCode.ts +58 -0
- package/src/client/adapters/authCall.ts +44 -0
- package/src/client/adapters/authQuery.ts +13 -0
- package/src/client/adapters/authSession.ts +30 -0
- package/src/client/adapters/changeEmail.ts +13 -0
- package/src/roles.ts +5 -0
- package/src/server/UserDirectory.ts +14 -0
- package/src/server/better-auth/UndeclaredDefaultRole.ts +9 -0
- package/src/server/better-auth/adapters/acquire.ts +17 -0
- package/src/server/better-auth/adapters/emailOptions.ts +21 -9
- package/src/server/better-auth/adapters/hookRuntime.ts +17 -3
- package/src/server/better-auth/adapters/mount.ts +38 -7
- package/src/server/better-auth/adapters/oauthGrants.ts +17 -7
- package/src/server/better-auth/adapters/oauthProvider.ts +32 -2
- package/src/server/better-auth/adapters/profileStorage.ts +18 -0
- package/src/server/better-auth/adapters/providerOnlyOptions.ts +63 -0
- package/src/server/better-auth/adapters/response.ts +15 -7
- package/src/server/better-auth/adapters/roleSeedOptions.ts +2 -1
- package/src/server/better-auth/adapters/signInPolicyOptions.ts +3 -2
- package/src/server/better-auth/adapters/userDirectory.ts +33 -0
- package/src/server/better-auth/assignRole.ts +4 -2
- package/src/server/better-auth/emails.ts +11 -8
- package/src/server/better-auth/mountRoutes.ts +2 -1
- package/src/server/better-auth/userDirectoryReads.ts +47 -0
- package/src/server/better-auth/userProfiles.ts +6 -12
- package/src/server/oauthGrants.ts +5 -1
- package/src/server/permissions.ts +2 -4
- package/src/server/resolveChanges.ts +24 -0
- package/src/server/session.ts +14 -11
- package/src/server/tracing.ts +4 -9
- package/src/users.ts +19 -0
- package/dist/server/better-auth/emailWindow.d.ts +0 -3
- package/dist/server/better-auth/emailWindow.d.ts.map +0 -1
- package/dist/server/better-auth/emailWindow.js +0 -23
- package/dist/server/better-auth/emailWindow.js.map +0 -1
- package/dist/server/better-auth/testing.d.ts +0 -90
- package/dist/server/better-auth/testing.d.ts.map +0 -1
- package/dist/server/better-auth/testing.js +0 -37
- package/dist/server/better-auth/testing.js.map +0 -1
- package/dist/server/commandChanges.d.ts +0 -4
- package/dist/server/commandChanges.d.ts.map +0 -1
- package/dist/server/commandChanges.js +0 -48
- package/dist/server/commandChanges.js.map +0 -1
- package/dist/server/sessionKeys.d.ts +0 -13
- package/dist/server/sessionKeys.d.ts.map +0 -1
- package/dist/server/sessionKeys.js +0 -27
- package/dist/server/sessionKeys.js.map +0 -1
- package/src/server/better-auth/emailWindow.ts +0 -27
- package/src/server/better-auth/testing.ts +0 -59
- package/src/server/commandChanges.ts +0 -63
- package/src/server/sessionKeys.ts +0 -42
package/dist/server/session.js
CHANGED
|
@@ -1,9 +1,8 @@
|
|
|
1
1
|
import { Effect, Layer, Option, Schema } from "effect";
|
|
2
|
-
import {
|
|
2
|
+
import { CurrentViewer } 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
|
-
import { commandChanges } from "#server/commandChanges.ts";
|
|
7
6
|
import { providerAccountsUser } from "#server/providerAccountsUser.ts";
|
|
8
7
|
import { SessionPolicy } from "#server/SessionPolicy.ts";
|
|
9
8
|
import { lookupSession, sessionRequest } from "./lookupSession.js";
|
|
@@ -17,24 +16,24 @@ function identified(id) {
|
|
|
17
16
|
return Effect.andThen(Effect.annotateCurrentSpan("user.id", id), Effect.succeed(id));
|
|
18
17
|
}
|
|
19
18
|
export function authenticatedLayer() {
|
|
20
|
-
return Layer.effect(Authenticated, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc
|
|
19
|
+
return Layer.effect(Authenticated, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc }) => Effect.gen(function* () {
|
|
21
20
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
22
21
|
if (Option.isNone(session)) {
|
|
23
22
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
24
23
|
}
|
|
25
24
|
const id = yield* identified(session.value.user.id);
|
|
26
|
-
return yield*
|
|
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 }));
|
|
27
26
|
}).pipe(Effect.provideService(SessionPolicy, policy))));
|
|
28
27
|
}
|
|
29
28
|
export function maybeAuthenticatedLayer() {
|
|
30
|
-
return Layer.effect(MaybeAuthenticated, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc
|
|
29
|
+
return Layer.effect(MaybeAuthenticated, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc }) => Effect.gen(function* () {
|
|
31
30
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
32
31
|
if (Option.isNone(session)) {
|
|
33
|
-
const invocation =
|
|
32
|
+
const invocation = effect.pipe(Effect.provideService(CurrentViewer, Option.none()));
|
|
34
33
|
return yield* Effect.provideService(invocation, OptionalIdentity, Option.none());
|
|
35
34
|
}
|
|
36
35
|
const id = yield* identified(session.value.user.id);
|
|
37
|
-
return yield*
|
|
36
|
+
return yield* effect.pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)), Effect.provideService(OptionalIdentity, Option.some({ id })), Effect.provideService(CurrentViewer, Option.some({ id })), Effect.annotateLogs({ userId: id }));
|
|
38
37
|
}).pipe(Effect.provideService(SessionPolicy, policy))));
|
|
39
38
|
}
|
|
40
39
|
export function withSessionUser(headers, operation) {
|
|
@@ -45,14 +44,14 @@ export function withSessionUser(headers, operation) {
|
|
|
45
44
|
}
|
|
46
45
|
const user = Schema.decodeUnknownSync(SessionUserSchema)(session.value.user);
|
|
47
46
|
const id = yield* identified(session.value.user.id);
|
|
48
|
-
return yield* effect.pipe(Effect.provideService(Identity, { id }), Effect.provideService(SessionUser, user), Effect.annotateLogs({ userId: id }));
|
|
47
|
+
return yield* effect.pipe(Effect.provideService(Identity, { id }), Effect.provideService(CurrentViewer, Option.some({ id })), Effect.provideService(SessionUser, user), Effect.annotateLogs({ userId: id }));
|
|
49
48
|
});
|
|
50
49
|
}
|
|
51
50
|
export function authenticatedUserLayer() {
|
|
52
|
-
return Layer.effect(AuthenticatedUser, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc
|
|
51
|
+
return Layer.effect(AuthenticatedUser, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc }) => effect.pipe((invocation) => Effect.flatMap(Identity, ({ id }) => invocation.pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)))), withSessionUser(headers, rpc._tag), Effect.provideService(SessionPolicy, policy))));
|
|
53
52
|
}
|
|
54
53
|
export function authenticatedUserWithProviderAccountsLayer() {
|
|
55
|
-
return Layer.effect(AuthenticatedUserWithProviderAccounts, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc
|
|
54
|
+
return Layer.effect(AuthenticatedUserWithProviderAccounts, Effect.map(SessionPolicy, (policy) => (effect, { headers, rpc }) => Effect.gen(function* () {
|
|
56
55
|
const session = yield* resolveSession(headers, rpc._tag);
|
|
57
56
|
if (Option.isNone(session)) {
|
|
58
57
|
return yield* new Unauthorized({ message: "Authentication required" });
|
|
@@ -60,7 +59,7 @@ export function authenticatedUserWithProviderAccountsLayer() {
|
|
|
60
59
|
const { providerAccounts, ...user } = yield* providerAccountsUser(session.value.user);
|
|
61
60
|
const { id } = user;
|
|
62
61
|
yield* identified(id);
|
|
63
|
-
return yield*
|
|
62
|
+
return yield* effect.pipe(revalidateStream(rpc, id, recheckSession(headers, rpc._tag)), Effect.provideService(Identity, { id }), Effect.provideService(CurrentViewer, Option.some({ id })), Effect.provideService(SessionUser, user), Effect.provideService(SessionUserWithProviderAccounts, { ...user, providerAccounts }), Effect.annotateLogs({ userId: id }));
|
|
64
63
|
}).pipe(Effect.provideService(SessionPolicy, policy))));
|
|
65
64
|
}
|
|
66
65
|
//# sourceMappingURL=session.js.map
|
|
@@ -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":"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"}
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/server/tracing.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"tracing.d.ts","sourceRoot":"","sources":["../../src/server/tracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAsC,KAAK,EAA6B,MAAM,QAAQ,CAAC;AAI9F,OAAO,EAAwC,KAAK,YAAY,EAAE,MAAM,gCAAgC,CAAC;AAEzG,OAAO,EAAE,cAAc,EAAE,MAAM,gBAAgB,CAAC;AAChD,MAAM,WAAW,qBAAqB;IACrC,QAAQ,CAAC,MAAM,CAAC,EAAE,MAAM,CAAC;IACzB,QAAQ,CAAC,SAAS,CAAC,EAAE,YAAY,CAAC;CAClC;AA8CD,wBAAgB,mBAAmB,CAAC,OAAO,GAAE,qBAA0B,GAAG,KAAK,CAAC,KAAK,CAAC,cAAc,CAAC,CAepG"}
|
package/dist/server/tracing.js
CHANGED
|
@@ -1,12 +1,10 @@
|
|
|
1
|
-
import { Cause,
|
|
1
|
+
import { Cause, Effect, ErrorReporter, Exit, Layer, Option, Predicate, Random } from "effect";
|
|
2
2
|
import { Headers } from "effect/http";
|
|
3
|
-
import { KeyScope } from "@shivaedev/contract/serverMetadata.ts";
|
|
4
3
|
import { redact } from "@shivaedev/errors/redact.ts";
|
|
5
4
|
import { redactCause, redactDiagnosticCause } from "@shivaedev/errors/redactCause.ts";
|
|
6
5
|
import { isSensitiveKey, REDACTED, redactText } from "@shivaedev/errors/sensitive.ts";
|
|
7
6
|
import { RequestId } from "#identity.ts";
|
|
8
|
-
import {
|
|
9
|
-
import { commandChanges } from "#server/commandChanges.ts";
|
|
7
|
+
import { RequestTracing } from "#middleware.ts";
|
|
10
8
|
const ACCEPTED_REQUEST_ID = /^[A-Za-z0-9._:-]{1,128}$/u;
|
|
11
9
|
function hex(byte) {
|
|
12
10
|
return byte.toString(16).padStart(2, "0");
|
|
@@ -48,9 +46,7 @@ export function requestTracingLayer(options = {}) {
|
|
|
48
46
|
return Layer.succeed(RequestTracing, (effect, { headers, payload, rpc }) => Effect.gen(function* () {
|
|
49
47
|
const requestId = yield* requestIdOf(headers, options.header ?? "x-request-id");
|
|
50
48
|
yield* Effect.annotateCurrentSpan({ "request.id": requestId, "rpc.method": rpc._tag });
|
|
51
|
-
|
|
52
|
-
const invocation = hasSession || Option.isSome(Context.getOption(rpc.annotations, KeyScope)) ? effect : commandChanges(effect, rpc, payload);
|
|
53
|
-
return yield* invocation.pipe(Effect.catchCauseIf(Cause.hasDies, (cause) => Effect.failCause(redactCause(cause, options.sensitive))), Effect.onExit((exit) => (Exit.isFailure(exit) ? logFailure(exit.cause, payload, options.sensitive) : Effect.void)), Effect.provideService(RequestId, requestId), Effect.annotateLogs({ requestId, "rpc.method": rpc._tag }), Effect.withLogSpan("rpc.duration"));
|
|
49
|
+
return yield* effect.pipe(Effect.catchCauseIf(Cause.hasDies, (cause) => Effect.failCause(redactCause(cause, options.sensitive))), Effect.onExit((exit) => (Exit.isFailure(exit) ? logFailure(exit.cause, payload, options.sensitive) : Effect.void)), Effect.provideService(RequestId, requestId), Effect.annotateLogs({ requestId, "rpc.method": rpc._tag }), Effect.withLogSpan("rpc.duration"));
|
|
54
50
|
}));
|
|
55
51
|
}
|
|
56
52
|
//# sourceMappingURL=tracing.js.map
|
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/server/tracing.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,KAAK,EAAE,
|
|
1
|
+
{"version":3,"file":"tracing.js","sourceRoot":"","sources":["../../src/server/tracing.ts"],"names":[],"mappings":"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"}
|
package/dist/sessions.d.ts
CHANGED
|
@@ -1,4 +1,4 @@
|
|
|
1
|
-
import { Schema } from "effect";
|
|
1
|
+
import { Effect, Schema } from "effect";
|
|
2
2
|
import { AuthUnavailable, Forbidden, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
3
3
|
import { SessionsPermission } from "#sessionPermissions.ts";
|
|
4
4
|
export declare const SignedInSession: Schema.Struct<{
|
|
@@ -71,7 +71,9 @@ export declare const Sessions: import("@shivaedev/contract/contract.ts").Contrac
|
|
|
71
71
|
readonly AuthUnavailable: typeof AuthUnavailable;
|
|
72
72
|
readonly Forbidden: typeof Forbidden;
|
|
73
73
|
readonly NotFound: typeof NotFound;
|
|
74
|
-
}>>], import("effect/rpc/Rpc").Rpc<"identity.sessions
|
|
74
|
+
}>>], import("effect/rpc/Rpc").Rpc<"identity.sessions.revoke", Schema.Struct<{
|
|
75
|
+
id: Schema.String;
|
|
76
|
+
}>, Schema.Void, Schema.Union<readonly (typeof NotFound | typeof Forbidden | typeof AuthUnavailable)[]>, typeof SessionsPermission, never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.$changes", Schema.Struct<{
|
|
75
77
|
queries: Schema.$Array<Schema.Union<readonly Schema.Struct<{
|
|
76
78
|
query: Schema.Literal<"list">;
|
|
77
79
|
payload: Schema.Struct<{
|
|
@@ -100,7 +102,15 @@ export declare const Sessions: import("@shivaedev/contract/contract.ts").Contrac
|
|
|
100
102
|
readonly queryIndexes: Schema.optional<Schema.$Array<Schema.Number>>;
|
|
101
103
|
}>, Schema.Struct<{
|
|
102
104
|
readonly _tag: Schema.Literal<"Resync">;
|
|
103
|
-
}>]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof SessionsPermission
|
|
105
|
+
}>]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, ...never[]]>, Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired, ...Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>[]]>>, Schema.Never, typeof SessionsPermission | (import("effect/Context").Reference<<A, E, R>(effect: Effect.Effect<A, E, R>, request: {
|
|
106
|
+
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
107
|
+
readonly payload: unknown;
|
|
108
|
+
}) => Effect.Effect<A, E | import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy | import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied | import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
|
|
109
|
+
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
110
|
+
"~ClientError": never;
|
|
111
|
+
error: Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
112
|
+
requiredForClient: false;
|
|
113
|
+
}), never> | import("effect/rpc/Rpc").Rpc<"identity.sessions.list", Schema.Struct<{
|
|
104
114
|
readonly cursor: Schema.optionalKey<Schema.Struct<{
|
|
105
115
|
readonly id: Schema.String;
|
|
106
116
|
readonly lastActivityAt: Schema.DateTimeUtcFromString;
|
|
@@ -122,7 +132,13 @@ export declare const Sessions: import("@shivaedev/contract/contract.ts").Contrac
|
|
|
122
132
|
readonly name: Schema.String;
|
|
123
133
|
}>;
|
|
124
134
|
}>>;
|
|
125
|
-
}>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof SessionsPermission
|
|
126
|
-
|
|
127
|
-
|
|
135
|
+
}>, Schema.Union<readonly [Schema.Union<readonly (typeof Forbidden | typeof AuthUnavailable)[]>, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied]>, typeof SessionsPermission | (import("effect/Context").Reference<<A, E, R>(effect: Effect.Effect<A, E, R>, request: {
|
|
136
|
+
readonly rpc: import("effect/rpc/Rpc").Any;
|
|
137
|
+
readonly payload: unknown;
|
|
138
|
+
}) => Effect.Effect<A, E | import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy | import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied | import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired | import("effect/Types").unhandled, R>> & {
|
|
139
|
+
"~effect/rpc/RpcMiddleware": "~effect/rpc/RpcMiddleware";
|
|
140
|
+
"~ClientError": never;
|
|
141
|
+
error: Schema.Union<readonly [typeof import("@shivaedev/contract/readPolicyErrors.ts").MissingReadPolicy, typeof import("@shivaedev/contract/readPolicyErrors.ts").QueryReadDenied, typeof import("@shivaedev/contract/WebSocketRequired.ts").WebSocketRequired]>;
|
|
142
|
+
requiredForClient: false;
|
|
143
|
+
}), never>, readonly [], undefined>;
|
|
128
144
|
//# sourceMappingURL=sessions.d.ts.map
|
package/dist/sessions.d.ts.map
CHANGED
|
@@ -1 +1 @@
|
|
|
1
|
-
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,
|
|
1
|
+
{"version":3,"file":"sessions.d.ts","sourceRoot":"","sources":["../src/sessions.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAIxC,OAAO,EAAE,eAAe,EAAE,SAAS,EAAE,QAAQ,EAAE,MAAM,+BAA+B,CAAC;AACrF,OAAO,EAAE,kBAAkB,EAAE,MAAM,wBAAwB,CAAC;AAI5D,eAAO,MAAM,eAAe;;;;;;;;;;EAM1B,CAAC;AAEH,eAAO,MAAM,aAAa;;;EAAqF,CAAC;AAChH,eAAO,MAAM,gBAAgB;;;;;;EAG3B,CAAC;AACH,eAAO,MAAM,WAAW;;;;;;;;;;;;;;;;EAA2G,CAAC;AAEpI,eAAO,MAAM,QAAQ;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;;mCAiBY,CAAC"}
|
package/dist/users.d.ts
ADDED
|
@@ -0,0 +1,29 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
export declare const userKeys: import("@shivaedev/changes/keys.ts").Collection<"identity.users", string, Record<never, never>>;
|
|
3
|
+
export declare const roleKeys: import("@shivaedev/changes/keys.ts").Collection<"identity.roles", string, Record<never, never>>;
|
|
4
|
+
export declare const DirectoryUser: Schema.Struct<{
|
|
5
|
+
readonly createdAt: Schema.DateTimeUtcFromDate;
|
|
6
|
+
readonly email: Schema.String;
|
|
7
|
+
readonly id: Schema.String;
|
|
8
|
+
readonly name: Schema.String;
|
|
9
|
+
readonly role: Schema.String;
|
|
10
|
+
}>;
|
|
11
|
+
export declare const UserListInput: Schema.Struct<{
|
|
12
|
+
readonly cursor: Schema.optionalKey<Schema.String>;
|
|
13
|
+
readonly limit: Schema.Number;
|
|
14
|
+
}>;
|
|
15
|
+
export declare const UserList: Schema.Struct<{
|
|
16
|
+
readonly next: Schema.OptionFromNullOr<Schema.String>;
|
|
17
|
+
readonly users: Schema.$Array<Schema.Struct<{
|
|
18
|
+
readonly createdAt: Schema.DateTimeUtcFromDate;
|
|
19
|
+
readonly email: Schema.String;
|
|
20
|
+
readonly id: Schema.String;
|
|
21
|
+
readonly name: Schema.String;
|
|
22
|
+
readonly role: Schema.String;
|
|
23
|
+
}>>;
|
|
24
|
+
}>;
|
|
25
|
+
export declare const AccountName: Schema.Struct<{
|
|
26
|
+
readonly id: Schema.String;
|
|
27
|
+
readonly name: Schema.String;
|
|
28
|
+
}>;
|
|
29
|
+
//# sourceMappingURL=users.d.ts.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"users.d.ts","sourceRoot":"","sources":["../src/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAGhC,eAAO,MAAM,QAAQ,iGAA8C,CAAC;AACpE,eAAO,MAAM,QAAQ,iGAA8C,CAAC;AAEpE,eAAO,MAAM,aAAa;;;;;;EAMxB,CAAC;AACH,eAAO,MAAM,aAAa;;;EAGxB,CAAC;AACH,eAAO,MAAM,QAAQ;;;;;;;;;EAAsG,CAAC;AAC5H,eAAO,MAAM,WAAW;;;EAA4D,CAAC"}
|
package/dist/users.js
ADDED
|
@@ -0,0 +1,18 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { collection } from "@shivaedev/changes/keys.ts";
|
|
3
|
+
export const userKeys = collection("identity.users", Schema.String);
|
|
4
|
+
export const roleKeys = collection("identity.roles", Schema.String);
|
|
5
|
+
export const DirectoryUser = Schema.Struct({
|
|
6
|
+
createdAt: Schema.DateTimeUtcFromDate,
|
|
7
|
+
email: Schema.String,
|
|
8
|
+
id: Schema.String,
|
|
9
|
+
name: Schema.String,
|
|
10
|
+
role: Schema.String,
|
|
11
|
+
});
|
|
12
|
+
export const UserListInput = Schema.Struct({
|
|
13
|
+
cursor: Schema.optionalKey(Schema.String),
|
|
14
|
+
limit: Schema.Number.check(Schema.isInt(), Schema.isBetween({ maximum: 100, minimum: 1 })),
|
|
15
|
+
});
|
|
16
|
+
export const UserList = Schema.Struct({ next: Schema.OptionFromNullOr(Schema.String), users: Schema.Array(DirectoryUser) });
|
|
17
|
+
export const AccountName = Schema.Struct({ id: Schema.String, name: Schema.String });
|
|
18
|
+
//# sourceMappingURL=users.js.map
|
|
@@ -0,0 +1 @@
|
|
|
1
|
+
{"version":3,"file":"users.js","sourceRoot":"","sources":["../src/users.ts"],"names":[],"mappings":"AAAA,OAAO,EAAE,MAAM,EAAE,MAAM,QAAQ,CAAC;AAChC,OAAO,EAAE,UAAU,EAAE,MAAM,4BAA4B,CAAC;AAExD,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AACpE,MAAM,CAAC,MAAM,QAAQ,GAAG,UAAU,CAAC,gBAAgB,EAAE,MAAM,CAAC,MAAM,CAAC,CAAC;AAEpE,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,SAAS,EAAE,MAAM,CAAC,mBAAmB;IACrC,KAAK,EAAE,MAAM,CAAC,MAAM;IACpB,EAAE,EAAE,MAAM,CAAC,MAAM;IACjB,IAAI,EAAE,MAAM,CAAC,MAAM;IACnB,IAAI,EAAE,MAAM,CAAC,MAAM;CACnB,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,aAAa,GAAG,MAAM,CAAC,MAAM,CAAC;IAC1C,MAAM,EAAE,MAAM,CAAC,WAAW,CAAC,MAAM,CAAC,MAAM,CAAC;IACzC,KAAK,EAAE,MAAM,CAAC,MAAM,CAAC,KAAK,CAAC,MAAM,CAAC,KAAK,EAAE,EAAE,MAAM,CAAC,SAAS,CAAC,EAAE,OAAO,EAAE,GAAG,EAAE,OAAO,EAAE,CAAC,EAAE,CAAC,CAAC;CAC1F,CAAC,CAAC;AACH,MAAM,CAAC,MAAM,QAAQ,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,IAAI,EAAE,MAAM,CAAC,gBAAgB,CAAC,MAAM,CAAC,MAAM,CAAC,EAAE,KAAK,EAAE,MAAM,CAAC,KAAK,CAAC,aAAa,CAAC,EAAE,CAAC,CAAC;AAC5H,MAAM,CAAC,MAAM,WAAW,GAAG,MAAM,CAAC,MAAM,CAAC,EAAE,EAAE,EAAE,MAAM,CAAC,MAAM,EAAE,IAAI,EAAE,MAAM,CAAC,MAAM,EAAE,CAAC,CAAC"}
|
package/package.json
CHANGED
|
@@ -1,6 +1,6 @@
|
|
|
1
1
|
{
|
|
2
2
|
"name": "@shivaedev/identity",
|
|
3
|
-
"version": "0.
|
|
3
|
+
"version": "0.21.0",
|
|
4
4
|
"description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
|
|
5
5
|
"keywords": [
|
|
6
6
|
"effect"
|
|
@@ -45,32 +45,32 @@
|
|
|
45
45
|
"README.md"
|
|
46
46
|
],
|
|
47
47
|
"dependencies": {
|
|
48
|
-
"@shivaedev/access": "0.
|
|
49
|
-
"@shivaedev/changes": "0.
|
|
50
|
-
"@shivaedev/contract": "0.
|
|
51
|
-
"@shivaedev/errors": "0.
|
|
52
|
-
"@shivaedev/rate-limit": "0.
|
|
53
|
-
"@shivaedev/sql": "0.
|
|
48
|
+
"@shivaedev/access": "0.4.1",
|
|
49
|
+
"@shivaedev/changes": "0.9.0",
|
|
50
|
+
"@shivaedev/contract": "0.33.0",
|
|
51
|
+
"@shivaedev/errors": "0.7.0",
|
|
52
|
+
"@shivaedev/rate-limit": "0.3.1",
|
|
53
|
+
"@shivaedev/sql": "0.35.0"
|
|
54
54
|
},
|
|
55
55
|
"devDependencies": {
|
|
56
|
-
"@better-auth/oauth-provider": "1.7.
|
|
56
|
+
"@better-auth/oauth-provider": "1.7.14",
|
|
57
57
|
"@effect/platform-node": "4.0.6",
|
|
58
58
|
"@effect/sql-pg": "4.0.6",
|
|
59
|
-
"@shivaedev/admin": "0.
|
|
60
|
-
"@shivaedev/quality": "0.
|
|
61
|
-
"@shivaedev/server": "0.
|
|
62
|
-
"@shivaedev/test": "0.
|
|
63
|
-
"@shivaedev/test-sql": "0.
|
|
64
|
-
"@shivaedev/test-story": "0.
|
|
59
|
+
"@shivaedev/admin": "0.19.1",
|
|
60
|
+
"@shivaedev/quality": "0.57.1",
|
|
61
|
+
"@shivaedev/server": "0.20.1",
|
|
62
|
+
"@shivaedev/test-kits": "0.1.0",
|
|
63
|
+
"@shivaedev/test-sql": "0.18.0",
|
|
64
|
+
"@shivaedev/test-story": "0.36.0",
|
|
65
65
|
"@types/node": "24.19.2",
|
|
66
|
-
"better-auth": "1.7.
|
|
66
|
+
"better-auth": "1.7.14",
|
|
67
67
|
"effect": "4.0.6",
|
|
68
68
|
"typescript": "7.0.2",
|
|
69
69
|
"vitest": "5.0.5"
|
|
70
70
|
},
|
|
71
71
|
"peerDependencies": {
|
|
72
|
-
"@better-auth/oauth-provider": "1.7.
|
|
73
|
-
"better-auth": "1.7.
|
|
72
|
+
"@better-auth/oauth-provider": "1.7.14",
|
|
73
|
+
"better-auth": "1.7.14",
|
|
74
74
|
"effect": "4.0.6"
|
|
75
75
|
},
|
|
76
76
|
"peerDependenciesMeta": {
|
|
@@ -0,0 +1,7 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { Permission } from "@shivaedev/access/permission.ts";
|
|
3
|
+
|
|
4
|
+
export const PermissionSession = Schema.Struct({
|
|
5
|
+
user: Schema.Struct({ permissions: Schema.optionalKey(Schema.Array(Permission)) }),
|
|
6
|
+
});
|
|
7
|
+
export type PermissionSession = typeof PermissionSession.Type;
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
|
|
3
|
+
export const authRefusals = {
|
|
4
|
+
roleSeedFailed: { code: "AUTH_UNAVAILABLE", wire: "role_seed_failed" },
|
|
5
|
+
signInRefused: { code: "SIGN_IN_REFUSED", wire: "sign_in_refused" },
|
|
6
|
+
signInUnavailable: { code: "AUTH_UNAVAILABLE", wire: "sign_in_unavailable" },
|
|
7
|
+
} as const;
|
|
8
|
+
|
|
9
|
+
export const IdentityAuthFailureCode = Schema.Literals(Object.values(authRefusals).map(({ code }) => code));
|
|
10
|
+
|
|
11
|
+
export function identityAuthFailureCode(wire: unknown) {
|
|
12
|
+
return Object.values(authRefusals).find((refusal) => refusal.wire === wire)?.code;
|
|
13
|
+
}
|
|
@@ -0,0 +1,19 @@
|
|
|
1
|
+
import { type Cause, Schema } from "effect";
|
|
2
|
+
import { AuthFailureCode } from "./AuthFailureCode.ts";
|
|
3
|
+
|
|
4
|
+
export type AuthFailureWithCodes<TCode extends string> = Pick<AuthFailure, "_tag" | "cause"> &
|
|
5
|
+
Cause.YieldableError & { readonly code: AuthFailureCode | TCode };
|
|
6
|
+
|
|
7
|
+
function withCodes<TCode extends string>(codes: readonly TCode[]) {
|
|
8
|
+
return Schema.TaggedError<AuthFailureWithCodes<TCode>>()("AuthFailure", {
|
|
9
|
+
cause: AuthFailure.fields.cause,
|
|
10
|
+
code: Schema.Union([AuthFailureCode, Schema.Literals(codes)]),
|
|
11
|
+
});
|
|
12
|
+
}
|
|
13
|
+
|
|
14
|
+
export class AuthFailure extends Schema.TaggedError<AuthFailure>()("AuthFailure", {
|
|
15
|
+
cause: Schema.Unknown,
|
|
16
|
+
code: AuthFailureCode,
|
|
17
|
+
}) {
|
|
18
|
+
static readonly withCodes = withCodes;
|
|
19
|
+
}
|
|
@@ -0,0 +1,58 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { IdentityAuthFailureCode } from "#authRefusal.ts";
|
|
3
|
+
|
|
4
|
+
export const AuthFailureCode = Schema.Literals([
|
|
5
|
+
...IdentityAuthFailureCode.literals,
|
|
6
|
+
"USER_NOT_FOUND",
|
|
7
|
+
"FAILED_TO_CREATE_USER",
|
|
8
|
+
"FAILED_TO_CREATE_SESSION",
|
|
9
|
+
"FAILED_TO_UPDATE_USER",
|
|
10
|
+
"FAILED_TO_GET_SESSION",
|
|
11
|
+
"INVALID_PASSWORD",
|
|
12
|
+
"INVALID_EMAIL",
|
|
13
|
+
"INVALID_EMAIL_OR_PASSWORD",
|
|
14
|
+
"INVALID_USER",
|
|
15
|
+
"SOCIAL_ACCOUNT_ALREADY_LINKED",
|
|
16
|
+
"PROVIDER_NOT_FOUND",
|
|
17
|
+
"INVALID_TOKEN",
|
|
18
|
+
"TOKEN_EXPIRED",
|
|
19
|
+
"ID_TOKEN_NOT_SUPPORTED",
|
|
20
|
+
"FAILED_TO_GET_USER_INFO",
|
|
21
|
+
"USER_EMAIL_NOT_FOUND",
|
|
22
|
+
"EMAIL_NOT_VERIFIED",
|
|
23
|
+
"PASSWORD_TOO_SHORT",
|
|
24
|
+
"PASSWORD_TOO_LONG",
|
|
25
|
+
"USER_ALREADY_EXISTS",
|
|
26
|
+
"USER_ALREADY_EXISTS_USE_ANOTHER_EMAIL",
|
|
27
|
+
"EMAIL_CAN_NOT_BE_UPDATED",
|
|
28
|
+
"CHANGE_EMAIL_DISABLED",
|
|
29
|
+
"CREDENTIAL_ACCOUNT_NOT_FOUND",
|
|
30
|
+
"SESSION_EXPIRED",
|
|
31
|
+
"FAILED_TO_UNLINK_LAST_ACCOUNT",
|
|
32
|
+
"ACCOUNT_NOT_FOUND",
|
|
33
|
+
"USER_ALREADY_HAS_PASSWORD",
|
|
34
|
+
"CROSS_SITE_NAVIGATION_LOGIN_BLOCKED",
|
|
35
|
+
"VERIFICATION_EMAIL_NOT_ENABLED",
|
|
36
|
+
"EMAIL_ALREADY_VERIFIED",
|
|
37
|
+
"EMAIL_MISMATCH",
|
|
38
|
+
"SESSION_NOT_FRESH",
|
|
39
|
+
"LINKED_ACCOUNT_ALREADY_EXISTS",
|
|
40
|
+
"INVALID_ORIGIN",
|
|
41
|
+
"INVALID_CALLBACK_URL",
|
|
42
|
+
"INVALID_REDIRECT_URL",
|
|
43
|
+
"INVALID_ERROR_CALLBACK_URL",
|
|
44
|
+
"INVALID_NEW_USER_CALLBACK_URL",
|
|
45
|
+
"MISSING_OR_NULL_ORIGIN",
|
|
46
|
+
"CALLBACK_URL_REQUIRED",
|
|
47
|
+
"FAILED_TO_CREATE_VERIFICATION",
|
|
48
|
+
"FIELD_NOT_ALLOWED",
|
|
49
|
+
"ASYNC_VALIDATION_NOT_SUPPORTED",
|
|
50
|
+
"VALIDATION_ERROR",
|
|
51
|
+
"MISSING_FIELD",
|
|
52
|
+
"METHOD_NOT_ALLOWED_DEFER_SESSION_REQUIRED",
|
|
53
|
+
"BODY_MUST_BE_AN_OBJECT",
|
|
54
|
+
"PASSWORD_ALREADY_SET",
|
|
55
|
+
"RATE_LIMITED",
|
|
56
|
+
"UNKNOWN",
|
|
57
|
+
]);
|
|
58
|
+
export type AuthFailureCode = typeof AuthFailureCode.Type;
|
|
@@ -0,0 +1,44 @@
|
|
|
1
|
+
import { Effect, Schema } from "effect";
|
|
2
|
+
import * as HttpStatus from "effect/http/HttpStatus";
|
|
3
|
+
import { identityAuthFailureCode } from "#authRefusal.ts";
|
|
4
|
+
import { AuthFailure, type AuthFailureWithCodes } from "#client/AuthFailure.ts";
|
|
5
|
+
import { AuthFailureCode } from "#client/AuthFailureCode.ts";
|
|
6
|
+
|
|
7
|
+
export interface AuthActionResult<A, E> {
|
|
8
|
+
readonly data: A;
|
|
9
|
+
readonly error: E | null;
|
|
10
|
+
}
|
|
11
|
+
|
|
12
|
+
const supportedCode = Schema.is(AuthFailureCode);
|
|
13
|
+
|
|
14
|
+
function fallbackCode(error: object) {
|
|
15
|
+
return "status" in error && error.status === HttpStatus.fromLiteral("TooManyRequests") ? "RATE_LIMITED" : "UNKNOWN";
|
|
16
|
+
}
|
|
17
|
+
|
|
18
|
+
export function authCall<TInput, A, E extends object = never, TCode extends string = never>(
|
|
19
|
+
run: (input: TInput, signal: AbortSignal) => Promise<AuthActionResult<A, E>>,
|
|
20
|
+
codes: readonly TCode[] = [],
|
|
21
|
+
): (input: TInput) => Effect.Effect<A, AuthFailure | AuthFailureWithCodes<TCode>> {
|
|
22
|
+
const ApplicationFailure = AuthFailure.withCodes(codes);
|
|
23
|
+
const applicationCode = Schema.is(Schema.Literals(codes));
|
|
24
|
+
return (input: TInput) =>
|
|
25
|
+
Effect.tryPromise({
|
|
26
|
+
catch: (cause) => new AuthFailure({ cause, code: "UNKNOWN" }),
|
|
27
|
+
try: (signal) => run(input, signal),
|
|
28
|
+
}).pipe(
|
|
29
|
+
Effect.flatMap(({ data, error }) => {
|
|
30
|
+
if (error === null) {
|
|
31
|
+
return Effect.succeed(data);
|
|
32
|
+
}
|
|
33
|
+
const wire = "code" in error ? error.code : undefined;
|
|
34
|
+
const code = identityAuthFailureCode(wire) ?? wire;
|
|
35
|
+
if (supportedCode(code)) {
|
|
36
|
+
return Effect.fail(new AuthFailure({ cause: error, code }));
|
|
37
|
+
}
|
|
38
|
+
if (applicationCode(wire)) {
|
|
39
|
+
return Effect.fail(new ApplicationFailure({ cause: error, code: wire }));
|
|
40
|
+
}
|
|
41
|
+
return Effect.fail(new AuthFailure({ cause: error, code: fallbackCode(error) }));
|
|
42
|
+
}),
|
|
43
|
+
);
|
|
44
|
+
}
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { Effect } from "effect";
|
|
2
|
+
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import type { AuthActionResult } from "./authCall.ts";
|
|
4
|
+
|
|
5
|
+
export function authQuery<TInput, A, E extends object = never>(
|
|
6
|
+
run: (input: TInput, signal: AbortSignal) => Promise<AuthActionResult<A, E>>,
|
|
7
|
+
): (input: TInput) => Effect.Effect<A, E | AuthUnavailable> {
|
|
8
|
+
return (input) =>
|
|
9
|
+
Effect.tryPromise({
|
|
10
|
+
catch: (cause) => new AuthUnavailable({ message: String(cause) }),
|
|
11
|
+
try: (signal) => run(input, signal),
|
|
12
|
+
}).pipe(Effect.flatMap((result) => (result.error === null ? Effect.succeed(result.data) : Effect.fail(result.error))));
|
|
13
|
+
}
|
|
@@ -0,0 +1,30 @@
|
|
|
1
|
+
import { Effect, Schema } from "effect";
|
|
2
|
+
import { AuthUnavailable } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import { PermissionSession } from "#PermissionSession.ts";
|
|
4
|
+
import type { AuthActionResult } from "./authCall.ts";
|
|
5
|
+
|
|
6
|
+
export type SessionWithPermissions<A> = A extends null ? null : A & PermissionSession;
|
|
7
|
+
|
|
8
|
+
function decodeSession<A extends { readonly user: object } | null>(data: A): Effect.Effect<SessionWithPermissions<A>, AuthUnavailable>;
|
|
9
|
+
function decodeSession(data: { readonly user: object } | null) {
|
|
10
|
+
if (data === null) {
|
|
11
|
+
return Effect.succeed(null);
|
|
12
|
+
}
|
|
13
|
+
return Schema.decodeUnknownEffect(PermissionSession)(data).pipe(
|
|
14
|
+
Effect.map((access) => ({ ...data, user: { ...data.user, ...access.user } })),
|
|
15
|
+
Effect.mapError(() => new AuthUnavailable({ message: "Could not read session permissions" })),
|
|
16
|
+
);
|
|
17
|
+
}
|
|
18
|
+
|
|
19
|
+
export const authSession = Effect.fnUntraced(function* <A extends { readonly user: object } | null, E extends object = never>(
|
|
20
|
+
read: (signal: AbortSignal) => Promise<AuthActionResult<A, E>>,
|
|
21
|
+
): Effect.fn.Return<SessionWithPermissions<A>, E | AuthUnavailable> {
|
|
22
|
+
const result = yield* Effect.tryPromise({
|
|
23
|
+
catch: (cause) => new AuthUnavailable({ message: String(cause) }),
|
|
24
|
+
try: read,
|
|
25
|
+
});
|
|
26
|
+
if (result.error !== null) {
|
|
27
|
+
return yield* Effect.fail(result.error);
|
|
28
|
+
}
|
|
29
|
+
return yield* decodeSession(result.data);
|
|
30
|
+
});
|
|
@@ -0,0 +1,13 @@
|
|
|
1
|
+
import { type AuthActionResult, authCall } from "./authCall.ts";
|
|
2
|
+
|
|
3
|
+
export interface ChangeEmailInput {
|
|
4
|
+
readonly "callbackURL"?: string;
|
|
5
|
+
readonly newEmail: string;
|
|
6
|
+
readonly password: string;
|
|
7
|
+
}
|
|
8
|
+
|
|
9
|
+
export function changeEmail<A, E extends object>(client: {
|
|
10
|
+
readonly changeEmail: (input: ChangeEmailInput, options: { readonly signal: AbortSignal }) => Promise<AuthActionResult<A, E>>;
|
|
11
|
+
}) {
|
|
12
|
+
return authCall((input: ChangeEmailInput, signal) => client.changeEmail(input, { signal }));
|
|
13
|
+
}
|
package/src/roles.ts
ADDED
|
@@ -0,0 +1,5 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
import { permission } from "@shivaedev/access/permission.ts";
|
|
3
|
+
|
|
4
|
+
export const AssignRoles = permission("roles.assign");
|
|
5
|
+
export class LastRoleAssigner extends Schema.TaggedError<LastRoleAssigner>()("LastRoleAssigner", { userId: Schema.String }) {}
|
|
@@ -0,0 +1,14 @@
|
|
|
1
|
+
import { Context, type Effect } from "effect";
|
|
2
|
+
import type { AuthUnavailable, NotFound } from "@shivaedev/errors/taxonomy.ts";
|
|
3
|
+
import type { LastRoleAssigner } from "#roles.ts";
|
|
4
|
+
import type { AccountName, UserList, UserListInput } from "#users.ts";
|
|
5
|
+
|
|
6
|
+
export class UserDirectory extends Context.Service<
|
|
7
|
+
UserDirectory,
|
|
8
|
+
{
|
|
9
|
+
readonly list: (input: typeof UserListInput.Type) => Effect.Effect<typeof UserList.Type, AuthUnavailable>;
|
|
10
|
+
readonly role: (userId: string) => Effect.Effect<string, AuthUnavailable | NotFound>;
|
|
11
|
+
readonly assignRole: (userId: string, role: string) => Effect.Effect<boolean, AuthUnavailable | NotFound | LastRoleAssigner>;
|
|
12
|
+
readonly names: (userIds: readonly string[]) => Effect.Effect<readonly (typeof AccountName.Type)[], AuthUnavailable>;
|
|
13
|
+
}
|
|
14
|
+
>()("@shivaedev/identity/UserDirectory") {}
|
|
@@ -0,0 +1,9 @@
|
|
|
1
|
+
import { Schema } from "effect";
|
|
2
|
+
|
|
3
|
+
export class UndeclaredDefaultRole extends Schema.TaggedError<UndeclaredDefaultRole>()("UndeclaredDefaultRole", {
|
|
4
|
+
role: Schema.String,
|
|
5
|
+
}) {
|
|
6
|
+
override get message() {
|
|
7
|
+
return `Default user role is not declared by the application: ${JSON.stringify(this.role)}`;
|
|
8
|
+
}
|
|
9
|
+
}
|
|
@@ -0,0 +1,17 @@
|
|
|
1
|
+
import { type BetterAuthOptions, betterAuth } from "better-auth";
|
|
2
|
+
import { Effect } from "effect";
|
|
3
|
+
import { providerFailure } from "#server/providerFailure.ts";
|
|
4
|
+
import { profileStorage } from "./profileStorage.ts";
|
|
5
|
+
|
|
6
|
+
export const acquireAuth = Effect.fnUntraced(function* <TOptions extends BetterAuthOptions>(options: TOptions) {
|
|
7
|
+
const auth = betterAuth(options);
|
|
8
|
+
const context = yield* Effect.tryPromise(async () => {
|
|
9
|
+
const ready = await auth.$context;
|
|
10
|
+
await ready.checkSchema?.();
|
|
11
|
+
return ready;
|
|
12
|
+
}).pipe(
|
|
13
|
+
Effect.uninterruptible,
|
|
14
|
+
Effect.catch((error) => providerFailure(error.cause)),
|
|
15
|
+
);
|
|
16
|
+
return { auth, profiles: profileStorage(context) };
|
|
17
|
+
});
|