@shivaedev/identity 0.32.2 → 0.33.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 CHANGED
@@ -1,5 +1,17 @@
1
1
  # Changelog
2
2
 
3
+ ## 0.33.0 - 2026-11-19
4
+
5
+ ### Added
6
+
7
+ - the subject guard reads `x-platform-subject` from each call's own RPC message and falls back to the transport header, so existing Node clients that set it on the WebSocket upgrade keep working. It reads no other header from the message; the session, Origin, cookies and authorization stay bound to the transport.
8
+
9
+ ## 0.32.3 - 2026-11-18
10
+
11
+ ### Changed
12
+
13
+ - Update `@shivaedev/contract` from 0.46.0 to 0.47.0.
14
+
3
15
  ## 0.32.2 - 2026-11-18
4
16
 
5
17
  ### Changed
package/README.md CHANGED
@@ -71,13 +71,13 @@ const delegated = accountSubject({
71
71
  });
72
72
  ```
73
73
 
74
- Pass `subject: delegated` to the contract. A delegated request selects the account with the `x-platform-subject` transport header; omitting it selects the session account. Acting on another account requires the named permission's `any` grant. An `own` grant does not authorize another account. A refusal reaches the native client as the declared error instance before the handler runs. `Identity` and `SessionUser` still describe the actor when `Subject` describes another account. The session provider must supply the `SessionUserSchema` profile fields, as for `AuthenticatedUser`.
74
+ Pass `subject: delegated` to the contract. A delegated call selects the account with the `x-platform-subject` header of its own RPC message, which a bound client sets from the `subject` option (see [contract's declared subjects](https://github.com/ShivaeDev/platform/tree/main/packages/contract#whose-account-a-request-acts-on)); without one, the guard falls back to that header on the transport, such as a Node client's WebSocket upgrade, and omitting both selects the session account. The subject is the only header the guard takes from the message: the session, Origin, cookies and authorization still come from the transport, so a message cannot forge them. Because each call carries its own subject, one socket, including a browser's or Capacitor app's first-frame bearer socket, serves the actor's own data and any number of subjects at once. Acting on another account requires the named permission's `any` grant. An `own` grant does not authorize another account. A refusal reaches the native client as the declared error instance before the handler runs. Every stream, including a live query's changes stream, rechecks at the session's `streamRevalidationInterval` (30 seconds by default) with its own subject: the recheck looks the session up again, shared by every stream on the same socket, and repeats the permission check for that stream's subject, so a stream whose grant was withdrawn ends with the declared refusal. Reruns after a change keep the stream's subject. `Identity` and `SessionUser` still describe the actor when `Subject` describes another account. The session provider must supply the `SessionUserSchema` profile fields, as for `AuthenticatedUser`.
75
75
 
76
76
  `appHost` installs `subjectResolverLayer()` from `@shivaedev/identity/server/subjectResolverLayer.ts` for session hosts. Custom native RPC hosts provide that Layer with their `SessionPolicy` and install `subjectLayers(group)` from `@shivaedev/contract/subjectLayers.ts` when building the native RPC server. The subject declaration includes authentication failures in the client's error type; it needs no separate authentication middleware.
77
77
 
78
78
  ### Account preferences and logical days
79
79
 
80
- `AccountPreferences` exposes authenticated `get`, `set` and `capture` operations for the caller's timezone, locale and units (`metric` or `imperial`). `set` replaces all three values. `capture` only creates a missing record, preserving saved preferences on subsequent sign-ins. An account without a record reads `UTC`, `en` and `metric`. The module uses `selfSubject`, so a caller cannot select another account with a transport header. `AccountPreferenceValues`, `AccountTimezone` and the `accountPreferenceKeys` collection come from `@shivaedev/identity/accountPreferenceValues.ts`.
80
+ `AccountPreferences` exposes authenticated `get`, `set` and `capture` operations for the caller's timezone, locale and units (`metric` or `imperial`). `set` replaces all three values. `capture` only creates a missing record, preserving saved preferences on subsequent sign-ins. An account without a record reads `UTC`, `en` and `metric`. The module uses `selfSubject`, so a caller cannot select another account with a subject header. `AccountPreferenceValues`, `AccountTimezone` and the `accountPreferenceKeys` collection come from `@shivaedev/identity/accountPreferenceValues.ts`.
81
81
 
82
82
  `AccountPreferences` from `@shivaedev/identity/AccountPreferences.ts` is a defined module, which is server code: register it as `module: AccountPreferences` in an `AppModule` with `accountPreferencesStore` from `@shivaedev/identity/server/account-preferences/store.ts` as its services, and apply `accountPreferencesMigration` from `@shivaedev/identity/server/adapters/accountPreferencesMigration.ts` as one of its numbered migrations. The store needs only the application's `SqlClient`. The host supplies subject middleware as for other subject contracts, and each operation reads the authorized account from `Subject`. Browser code imports the client contract under the same name from `@shivaedev/identity/generated/AccountPreferences.ts`, which holds no server code:
83
83
 
@@ -1 +1 @@
1
- {"version":3,"file":"subjectResolverLayer.d.ts","sourceRoot":"","sources":["../../src/server/subjectResolverLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAWvD,OAAO,EAA8C,eAAe,EAAE,MAAM,aAAa,CAAC;AAqC1F,wBAAgB,oBAAoB,+CAiBnC"}
1
+ {"version":3,"file":"subjectResolverLayer.d.ts","sourceRoot":"","sources":["../../src/server/subjectResolverLayer.ts"],"names":[],"mappings":"AAAA,OAAO,EAAU,KAAK,EAAkB,MAAM,QAAQ,CAAC;AAYvD,OAAO,EAA8C,eAAe,EAAE,MAAM,aAAa,CAAC;AAsC1F,wBAAgB,oBAAoB,+CAiBnC"}
@@ -1,5 +1,6 @@
1
1
  import { Effect, Layer, Option, Schema } from "effect";
2
2
  import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
3
+ import { subjectHeader } from "@shivaedev/contract/subjectHeader.ts";
3
4
  import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
4
5
  import { Identity, SessionUser, SessionUserSchema } from "#identity.ts";
5
6
  import { hasPermission } from "#permission.ts";
@@ -9,6 +10,12 @@ import { SessionPolicy } from "#server/SessionPolicy.ts";
9
10
  import { resolveSession } from "#server/session.ts";
10
11
  import { transportHeaders } from "#server/transportHeaders.ts";
11
12
  import { Subject, SubjectId, SubjectResolver } from "#subject.ts";
13
+ // The one place that decides whether an actor may act for a subject; the guard asks it before the handler runs and again at every stream recheck.
14
+ function authorize(policy, actor, subject) {
15
+ return policy.kind === "account" && subject !== actor.id && !hasPermission(actor, { ...policy.permission, strength: "any" })
16
+ ? Effect.fail(policy.deny(subject))
17
+ : Effect.void;
18
+ }
12
19
  function guard(policy) {
13
20
  return (effect, { headers, rpc }) => Effect.gen(function* () {
14
21
  const session = yield* resolveSession(headers, rpc._tag);
@@ -16,17 +23,13 @@ function guard(policy) {
16
23
  return yield* new Unauthorized({ message: "Authentication required" });
17
24
  }
18
25
  const user = session.value.user;
19
- const transport = yield* transportHeaders(headers);
20
- const id = policy.kind === "self" ? user.id : (transport["x-platform-subject"] ?? user.id);
21
- if (policy.kind === "account" && id !== user.id && !hasPermission(user, { ...policy.permission, strength: "any" })) {
22
- return yield* Effect.fail(policy.deny(id));
23
- }
24
- const lookup = recheckSession(headers, rpc._tag).pipe(Effect.tap((next) => Option.isSome(next)
25
- && policy.kind === "account"
26
- && id !== next.value.user.id
27
- && !hasPermission(next.value.user, { ...policy.permission, strength: "any" })
28
- ? Effect.fail(policy.deny(id))
29
- : Effect.void));
26
+ // RPC merges each call's message headers over its transport's, so the call's own subject comes first and a subject set on the
27
+ // socket upgrade is the fallback. The subject is the only header taken from the message: it names what to act on, and the
28
+ // authorization below decides whether that is allowed, while the session, origin and cookies stay bound to the transport.
29
+ const wanted = subjectHeader(headers) ?? subjectHeader(yield* transportHeaders(headers));
30
+ const id = policy.kind === "self" ? user.id : (wanted ?? user.id);
31
+ yield* authorize(policy, user, id);
32
+ const lookup = recheckSession(headers, rpc._tag).pipe(Effect.tap((next) => (Option.isSome(next) ? authorize(policy, next.value.user, id) : Effect.void)));
30
33
  return yield* effect.pipe(revalidateStream(rpc, user.id, lookup), Effect.provideService(Subject, { id: SubjectId(id) }), Effect.provideService(Identity, { id: user.id }), Effect.provideService(SessionUser, Schema.decodeUnknownSync(SessionUserSchema)(user)), Effect.provideService(CurrentViewer, Option.some({ id: user.id })));
31
34
  });
32
35
  }
@@ -1 +1 @@
1
- {"version":3,"file":"subjectResolverLayer.js","sourceRoot":"","sources":["../../src/server/subjectResolverLayer.ts"],"names":[],"mappings":"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"}
1
+ {"version":3,"file":"subjectResolverLayer.js","sourceRoot":"","sources":["../../src/server/subjectResolverLayer.ts"],"names":[],"mappings":"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"}
package/package.json CHANGED
@@ -1,6 +1,6 @@
1
1
  {
2
2
  "name": "@shivaedev/identity",
3
- "version": "0.32.2",
3
+ "version": "0.33.0",
4
4
  "description": "Request identity, sessions, transport trust and permission enforcement for Effect RPC servers",
5
5
  "keywords": [
6
6
  "effect"
@@ -46,25 +46,25 @@
46
46
  "README.md"
47
47
  ],
48
48
  "dependencies": {
49
- "@shivaedev/access": "0.6.3",
50
- "@shivaedev/changes": "0.13.0",
51
- "@shivaedev/contract": "0.46.0",
52
- "@shivaedev/errors": "0.12.0",
53
- "@shivaedev/rate-limit": "0.6.12",
49
+ "@shivaedev/access": "0.6.4",
50
+ "@shivaedev/changes": "0.14.0",
51
+ "@shivaedev/contract": "0.48.0",
52
+ "@shivaedev/errors": "0.13.0",
53
+ "@shivaedev/rate-limit": "0.6.13",
54
54
  "@shivaedev/service": "0.9.1",
55
- "@shivaedev/sql": "0.49.0"
55
+ "@shivaedev/sql": "0.50.0"
56
56
  },
57
57
  "devDependencies": {
58
58
  "@better-auth/oauth-provider": "1.7.16",
59
59
  "@effect/platform-node": "4.1.2",
60
60
  "@effect/sql-pg": "4.1.2",
61
- "@shivaedev/admin": "0.26.1",
62
- "@shivaedev/build": "0.2.1",
63
- "@shivaedev/quality": "0.78.2",
64
- "@shivaedev/server": "0.35.0",
65
- "@shivaedev/test-kits": "0.13.1",
66
- "@shivaedev/test-sql": "0.25.2",
67
- "@shivaedev/test-story": "0.47.3",
61
+ "@shivaedev/admin": "0.26.3",
62
+ "@shivaedev/build": "0.2.3",
63
+ "@shivaedev/quality": "0.78.4",
64
+ "@shivaedev/server": "0.36.0",
65
+ "@shivaedev/test-kits": "0.13.3",
66
+ "@shivaedev/test-sql": "0.25.3",
67
+ "@shivaedev/test-story": "0.48.1",
68
68
  "@types/node": "24.19.2",
69
69
  "better-auth": "1.7.16",
70
70
  "effect": "4.1.2",
@@ -1,6 +1,7 @@
1
1
  import { Effect, Layer, Option, Schema } from "effect";
2
2
  import type { Permission } from "@shivaedev/access/permission.ts";
3
3
  import { CurrentViewer } from "@shivaedev/contract/readPolicy.ts";
4
+ import { subjectHeader } from "@shivaedev/contract/subjectHeader.ts";
4
5
  import { Unauthorized } from "@shivaedev/errors/taxonomy.ts";
5
6
  import { Identity, SessionUser, SessionUserSchema } from "#identity.ts";
6
7
  import { hasPermission } from "#permission.ts";
@@ -13,6 +14,13 @@ import { Subject, SubjectId, type SubjectMiddleware, SubjectResolver } from "#su
13
14
 
14
15
  type Policy<E> = { readonly kind: "self" } | { readonly kind: "account"; readonly permission: Permission; readonly deny: (id: string) => E };
15
16
 
17
+ // The one place that decides whether an actor may act for a subject; the guard asks it before the handler runs and again at every stream recheck.
18
+ function authorize<E>(policy: Policy<E>, actor: Parameters<typeof hasPermission>[0], subject: string): Effect.Effect<void, E> {
19
+ return policy.kind === "account" && subject !== actor.id && !hasPermission(actor, { ...policy.permission, strength: "any" })
20
+ ? Effect.fail(policy.deny(subject))
21
+ : Effect.void;
22
+ }
23
+
16
24
  function guard<E>(policy: Policy<E>): SubjectMiddleware<E, SessionPolicy> {
17
25
  return (effect, { headers, rpc }) =>
18
26
  Effect.gen(function* () {
@@ -21,20 +29,14 @@ function guard<E>(policy: Policy<E>): SubjectMiddleware<E, SessionPolicy> {
21
29
  return yield* new Unauthorized({ message: "Authentication required" });
22
30
  }
23
31
  const user = session.value.user;
24
- const transport = yield* transportHeaders(headers);
25
- const id = policy.kind === "self" ? user.id : (transport["x-platform-subject"] ?? user.id);
26
- if (policy.kind === "account" && id !== user.id && !hasPermission(user, { ...policy.permission, strength: "any" })) {
27
- return yield* Effect.fail(policy.deny(id));
28
- }
32
+ // RPC merges each call's message headers over its transport's, so the call's own subject comes first and a subject set on the
33
+ // socket upgrade is the fallback. The subject is the only header taken from the message: it names what to act on, and the
34
+ // authorization below decides whether that is allowed, while the session, origin and cookies stay bound to the transport.
35
+ const wanted = subjectHeader(headers) ?? subjectHeader(yield* transportHeaders(headers));
36
+ const id = policy.kind === "self" ? user.id : (wanted ?? user.id);
37
+ yield* authorize(policy, user, id);
29
38
  const lookup = recheckSession(headers, rpc._tag).pipe(
30
- Effect.tap((next) =>
31
- Option.isSome(next)
32
- && policy.kind === "account"
33
- && id !== next.value.user.id
34
- && !hasPermission(next.value.user, { ...policy.permission, strength: "any" })
35
- ? Effect.fail(policy.deny(id))
36
- : Effect.void,
37
- ),
39
+ Effect.tap((next) => (Option.isSome(next) ? authorize(policy, next.value.user, id) : Effect.void)),
38
40
  );
39
41
  return yield* effect.pipe(
40
42
  revalidateStream(rpc, user.id, lookup),